Skip to content

Commit

Permalink
Merge branch 'master220' into trans
Browse files Browse the repository at this point in the history
  • Loading branch information
@syndicatecat
syndicatecat authored Sep 7, 2024
2 parents 3c37e55 + 972f461 commit 399570a
Show file tree
Hide file tree
Showing 27 changed files with 241 additions and 221 deletions.
119 changes: 51 additions & 68 deletions _maps/map_files/generic/CentComm.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6023,13 +6023,12 @@
dir = 8;
id_tag = "CC_supply_internal";
layer = 5;
locked = 1;
name = "Central Command Supply Internal Shutter"
locked = 1
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door_control/secure{
id = "CC_supply_internal";
name = "Central Command Supply Internal Shutter";
name = "Supply External Shutters";
pixel_y = 24;
req_access = list(114)
},
Expand Down Expand Up @@ -6739,7 +6738,7 @@
},
/obj/machinery/door_control/secure{
id = "Drop";
name = "Central Command Mass Driver Shutte";
name = "Massdriver Shutters";
pixel_y = 24;
req_access = list(114)
},
Expand Down Expand Up @@ -9045,7 +9044,7 @@
dir = 4;
icon_state = "darkyellowalt"
},
/area/centcom/specops)
/area/centcom/supply)
"eji" = (
/obj/structure/chair/sofa{
dir = 8
Expand Down Expand Up @@ -11075,12 +11074,6 @@
},
/turf/simulated/floor/carpet/green,
/area/ninja/outpost)
"fjr" = (
/obj/effect/turf_decal/bot,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/centcom/specops)
"fjw" = (
/obj/structure/window/reinforced{
dir = 1;
Expand Down Expand Up @@ -14386,8 +14379,7 @@
dir = 8;
id_tag = "CC_supply_internal";
layer = 5;
locked = 1;
name = "Central Command Supply Internal Shutter"
locked = 1
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -16557,8 +16549,8 @@
dir = 4;
dwidth = 4;
height = 6;
id = "gamma_transit";
name = "gamma in transit. IT SHOULD NOT BE IN TRANSIT";
id = "gamma_shuttle_transit";
name = "gamma in transit";
pixel_x = -32;
turf_type = /turf/space/transit/south;
width = 7
Expand Down Expand Up @@ -17063,12 +17055,6 @@
icon_state = "sepia"
},
/area/ninja/outpost)
"icG" = (
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellowalt"
},
/area/centcom/specops)
"icT" = (
/obj/effect/turf_decal{
dir = 10;
Expand Down Expand Up @@ -19262,8 +19248,7 @@
dir = 2;
id_tag = "CC_supply_external2";
layer = 5;
locked = 1;
name = "Central Command Supply External Shutte"
locked = 1
},
/turf/simulated/floor/plasteel{
dir = 4;
Expand Down Expand Up @@ -21175,7 +21160,7 @@
"jWN" = (
/obj/machinery/door_control/secure{
id = "CC_Armory_Grenade";
name = "Grebades";
name = "Grenades";
pixel_x = 24;
pixel_y = -24;
req_access = list(114)
Expand Down Expand Up @@ -27256,14 +27241,13 @@
dir = 2;
id_tag = "CC_supply_internal2";
layer = 5;
locked = 1;
name = "Central Command Supply Internal Shutter"
locked = 1
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellowalt"
},
/area/centcom/specops)
/area/centcom/supply)
"mNh" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/latex/nitrile,
Expand Down Expand Up @@ -30222,8 +30206,7 @@
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door/poddoor/shutters/invincible{
dir = 2;
id_tag = "Drop";
name = "Central Command Supply Massdriver Shutte"
id_tag = "Drop"
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -33179,6 +33162,19 @@
icon_state = "floor13"
},
/area/shuttle/ninja)
"pse" = (
/obj/machinery/door_control/secure{
id = "gamma shuttle";
name = "Gamma Armory Shutters";
req_access = list(114);
pixel_x = 24;
pixel_y = 26
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellowaltstrip"
},
/area/centcom/supply)
"psf" = (
/turf/space/transit/east{
icon_state = "speedspace_ew_1"
Expand Down Expand Up @@ -34029,19 +34025,15 @@
dir = 2;
id_tag = "CC_supply_external2";
layer = 5;
locked = 1;
name = "Central Command Supply External Shutte"
locked = 1
},
/obj/machinery/door_control/secure{
id = "CC_supply_external2";
name = "Central Command Supply External Shutte";
name = "Supply Internal Shutters";
req_access = list(114);
pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowalt"
},
/turf/simulated/wall/indestructible/reinforced,
/area/centcom/supply)
"pLm" = (
/obj/machinery/light{
Expand Down Expand Up @@ -34659,12 +34651,6 @@
icon_state = "navyblue"
},
/area/centcom/specops)
"pYg" = (
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowaltstrip"
},
/area/centcom/specops)
"pYo" = (
/obj/effect/decal/syndie_logo{
icon_state = "logo9"
Expand Down Expand Up @@ -35564,8 +35550,7 @@
dir = 8;
id_tag = "CC_supply_external";
layer = 5;
locked = 1;
name = "Central Command Supply External Shutte"
locked = 1
},
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -38555,20 +38540,19 @@
dir = 2;
id_tag = "CC_supply_internal2";
layer = 5;
locked = 1;
name = "Central Command Supply Internal Shutter"
locked = 1
},
/obj/machinery/door_control/secure{
id = "CC_supply_internal2";
name = "Central Command Supply Internal Shutter";
name = "Supply External Shutters";
req_access = list(114);
pixel_x = -24
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowalt"
},
/area/centcom/specops)
/area/centcom/supply)
"rLX" = (
/obj/effect/decal/warning_stripes/northwestsouth,
/obj/machinery/door/poddoor/shutters/invincible{
Expand Down Expand Up @@ -49677,13 +49661,6 @@
/obj/structure/flora/ausbushes/sunnybush,
/turf/simulated/floor/indestructible/grass,
/area/syndicate_mothership/outside)
"wRr" = (
/obj/effect/turf_decal/arrows,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowaltstrip"
},
/area/centcom/specops)
"wRu" = (
/turf/simulated/floor/plasteel{
dir = 5;
Expand Down Expand Up @@ -50790,13 +50767,12 @@
dir = 8;
id_tag = "CC_supply_external";
layer = 5;
locked = 1;
name = "Central Command Supply External Shutte"
locked = 1
},
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/door_control/secure{
id = "CC_supply_external";
name = "Central Command Supply External Shutte";
name = "Supply Internal Shutters";
pixel_y = 24;
req_access = list(114)
},
Expand Down Expand Up @@ -50862,6 +50838,13 @@
req_access = list(114)
},
/obj/structure/fans/tiny,
/obj/machinery/door/poddoor/shutters/invincible{
armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100);
dir = 2;
id_tag = "gamma shuttle";
layer = 5;
locked = 1
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -103892,9 +103875,9 @@ afP
uab
afP
afP
nAN
nAN
nAN
afP
afP
afP
nAN
aFB
wEo
Expand Down Expand Up @@ -104149,9 +104132,9 @@ hOx
lzS
lzS
afP
fjr
fjr
nAN
lzS
lzS
afP
nNb
ric
qgi
Expand Down Expand Up @@ -104406,8 +104389,8 @@ rgL
rgL
coX
pKM
pYg
wRr
rgL
coX
rLT
mpv
hTD
Expand Down Expand Up @@ -104663,7 +104646,7 @@ ofy
fon
jCz
jgl
icG
fqL
eiV
mMp
aWp
Expand Down Expand Up @@ -105688,7 +105671,7 @@ qix
fqL
fqL
fqL
ifZ
pse
tgA
tyO
nAN
Expand Down
Loading

0 comments on commit 399570a

Please sign in to comment.