Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
This commit is contained in:
Putnam
@@ -295,9 +295,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"fK" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"fW" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
@@ -427,9 +424,6 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"iU" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"jg" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 8
|
||||
@@ -531,16 +525,19 @@
|
||||
/obj/machinery/meter,
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"mE" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
|
||||
dir = 1
|
||||
"mG" = (
|
||||
/obj/machinery/power/rad_collector/anchored,
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
/obj/structure/window/plasma/reinforced{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/general/visible{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
/area/engine/supermatter)
|
||||
"mH" = (
|
||||
/obj/structure/sign/poster/official/safety_eye_protection,
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -552,12 +549,6 @@
|
||||
/obj/effect/spawner/structure/window/plasma/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"mW" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
"mX" = (
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/obj/structure/cable{
|
||||
@@ -588,10 +579,6 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"ni" = (
|
||||
/obj/machinery/status_display/ai,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"nz" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 6
|
||||
@@ -770,6 +757,19 @@
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"qP" = (
|
||||
/obj/machinery/power/rad_collector/anchored,
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/structure/window/plasma/reinforced{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/general/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
"re" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "engsm";
|
||||
@@ -870,12 +870,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/green/visible,
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"ti" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
"tn" = (
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
@@ -1288,14 +1282,6 @@
|
||||
/obj/item/clothing/glasses/welding,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/engineering)
|
||||
"EX" = (
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/machinery/portable_atmospherics/canister,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/engineering)
|
||||
"Fr" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/general/visible{
|
||||
dir = 4
|
||||
@@ -1451,13 +1437,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"JK" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"JL" = (
|
||||
/obj/structure/sign/warning/fire,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"JV" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/engineering/glass{
|
||||
@@ -1898,12 +1877,6 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"UP" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
"Vg" = (
|
||||
/obj/machinery/status_display/ai,
|
||||
/turf/closed/wall/r_wall,
|
||||
@@ -1912,14 +1885,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/engineering)
|
||||
"VN" = (
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen,
|
||||
/obj/effect/turf_decal/bot,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/engineering)
|
||||
"VP" = (
|
||||
/obj/item/wrench,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
|
||||
@@ -1928,12 +1893,6 @@
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/engineering)
|
||||
"Wf" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/supermatter)
|
||||
"Ws" = (
|
||||
/obj/machinery/atmospherics/components/binary/pump{
|
||||
dir = 1;
|
||||
@@ -1966,9 +1925,6 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/engine/engineering)
|
||||
"Xy" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/supermatter)
|
||||
"XA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 10
|
||||
@@ -2426,7 +2382,7 @@ Ne
|
||||
yd
|
||||
bW
|
||||
VP
|
||||
EX
|
||||
rt
|
||||
Vg
|
||||
px
|
||||
px
|
||||
@@ -2454,14 +2410,14 @@ MP
|
||||
zh
|
||||
QD
|
||||
Hj
|
||||
EX
|
||||
rt
|
||||
un
|
||||
CT
|
||||
na
|
||||
na
|
||||
mG
|
||||
KX
|
||||
KX
|
||||
Xy
|
||||
vO
|
||||
Ml
|
||||
Ef
|
||||
iD
|
||||
@@ -2482,14 +2438,14 @@ MP
|
||||
aC
|
||||
ey
|
||||
TO
|
||||
Xy
|
||||
vO
|
||||
OR
|
||||
UP
|
||||
UP
|
||||
UP
|
||||
UP
|
||||
UP
|
||||
Xy
|
||||
Bk
|
||||
Bk
|
||||
Bk
|
||||
Bk
|
||||
Bk
|
||||
vO
|
||||
WT
|
||||
UM
|
||||
MP
|
||||
@@ -2573,7 +2529,7 @@ tn
|
||||
tn
|
||||
tn
|
||||
tn
|
||||
JL
|
||||
jB
|
||||
Nx
|
||||
aw
|
||||
iD
|
||||
@@ -2593,15 +2549,15 @@ yf
|
||||
MP
|
||||
Bl
|
||||
jp
|
||||
Xy
|
||||
JL
|
||||
vO
|
||||
jB
|
||||
OR
|
||||
Wf
|
||||
Wf
|
||||
Wf
|
||||
Wf
|
||||
Wf
|
||||
Xy
|
||||
RA
|
||||
RA
|
||||
RA
|
||||
RA
|
||||
RA
|
||||
vO
|
||||
WT
|
||||
UM
|
||||
MP
|
||||
@@ -2620,16 +2576,16 @@ yf
|
||||
(21,1,1) = {"
|
||||
MP
|
||||
nV
|
||||
mE
|
||||
hy
|
||||
Ws
|
||||
VN
|
||||
Pa
|
||||
wz
|
||||
Dj
|
||||
tE
|
||||
tE
|
||||
qP
|
||||
NU
|
||||
NU
|
||||
Xy
|
||||
vO
|
||||
Np
|
||||
YD
|
||||
iD
|
||||
@@ -2648,9 +2604,9 @@ yf
|
||||
(22,1,1) = {"
|
||||
iD
|
||||
fa
|
||||
mE
|
||||
hy
|
||||
js
|
||||
VN
|
||||
Pa
|
||||
xB
|
||||
Nw
|
||||
Nw
|
||||
|
||||
@@ -25388,6 +25388,7 @@
|
||||
/obj/structure/sign/poster/official/state_laws{
|
||||
pixel_y = -32
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/mechbay)
|
||||
"blu" = (
|
||||
@@ -25544,7 +25545,7 @@
|
||||
/area/science/lab)
|
||||
"blM" = (
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/effect/landmark/start/roboticist,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/lab)
|
||||
"blO" = (
|
||||
@@ -26053,6 +26054,7 @@
|
||||
/area/maintenance/aft)
|
||||
"bnb" = (
|
||||
/obj/machinery/recharge_station,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/mechbay)
|
||||
"bnc" = (
|
||||
@@ -49290,6 +49292,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctv" = (
|
||||
@@ -49315,6 +49318,7 @@
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctx" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"cty" = (
|
||||
@@ -49322,6 +49326,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctz" = (
|
||||
@@ -49375,6 +49380,7 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctH" = (
|
||||
@@ -49399,6 +49405,7 @@
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctI" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctJ" = (
|
||||
@@ -49442,6 +49449,7 @@
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctQ" = (
|
||||
@@ -49477,6 +49485,7 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctT" = (
|
||||
@@ -49487,6 +49496,7 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel/grimy,
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"ctU" = (
|
||||
@@ -49644,6 +49654,7 @@
|
||||
/area/ai_monitored/turret_protected/aisat_interior)
|
||||
"cum" = (
|
||||
/obj/machinery/recharge_station,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/aisat/service)
|
||||
"cun" = (
|
||||
@@ -52348,6 +52359,7 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/landmark/start/roboticist,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/lab)
|
||||
"cHT" = (
|
||||
@@ -52424,7 +52436,7 @@
|
||||
"cIc" = (
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/effect/landmark/start/roboticist,
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/lab)
|
||||
"cId" = (
|
||||
@@ -55360,6 +55372,10 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/fitness)
|
||||
"kRw" = (
|
||||
/obj/effect/landmark/start/roboticist,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/robotics/lab)
|
||||
"kSb" = (
|
||||
/obj/effect/turf_decal/bot,
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -57190,8 +57206,7 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Bar Backroom";
|
||||
dir = 2
|
||||
c_tag = "Bar Backroom"
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
@@ -102892,7 +102907,7 @@ aYV
|
||||
bfV
|
||||
bhw
|
||||
cHM
|
||||
biL
|
||||
kRw
|
||||
blB
|
||||
blF
|
||||
cHS
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -6418,15 +6418,6 @@
|
||||
/obj/effect/turf_decal/tile/brown,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/centcom/supplypod/loading/two)
|
||||
"oV" = (
|
||||
/obj/machinery/vr_sleeper{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"oX" = (
|
||||
/obj/structure/bookcase/random,
|
||||
/obj/machinery/light{
|
||||
@@ -12460,12 +12451,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/centcom/evac)
|
||||
"CT" = (
|
||||
/obj/machinery/vr_sleeper{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"CV" = (
|
||||
/obj/structure/chair/stool,
|
||||
/turf/open/indestructible/hotelwood,
|
||||
@@ -12658,12 +12643,6 @@
|
||||
"Di" = (
|
||||
/turf/closed/indestructible/riveted,
|
||||
/area/ai_multicam_room)
|
||||
"Dj" = (
|
||||
/obj/machinery/vr_sleeper{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"Dk" = (
|
||||
/obj/structure/table,
|
||||
/turf/open/floor/plasteel/cafeteria,
|
||||
@@ -13266,7 +13245,7 @@
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/wizard_station)
|
||||
"ED" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/obj/machinery/vending/boozeomat/all_access,
|
||||
/turf/closed/indestructible{
|
||||
icon = 'icons/turf/walls/wood_wall.dmi';
|
||||
icon_state = "wood";
|
||||
@@ -16736,6 +16715,10 @@
|
||||
smooth = 1
|
||||
},
|
||||
/area/centcom/holding)
|
||||
"Nf" = (
|
||||
/obj/machinery/autoylathe,
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"Ni" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/clipboard,
|
||||
@@ -16800,13 +16783,6 @@
|
||||
/obj/machinery/recharge_station,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/centcom/holding)
|
||||
"Ny" = (
|
||||
/obj/machinery/modular_computer/console/preset/research,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"Nz" = (
|
||||
/obj/effect/turf_decal/tile/brown{
|
||||
dir = 8
|
||||
@@ -17123,15 +17099,6 @@
|
||||
"PD" = (
|
||||
/turf/open/floor/plasteel/cafeteria,
|
||||
/area/syndicate_mothership)
|
||||
"PF" = (
|
||||
/obj/machinery/vr_sleeper{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"PG" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/camera,
|
||||
@@ -17786,6 +17753,7 @@
|
||||
/obj/item/stack/sheet/glass/fifty,
|
||||
/obj/item/stack/sheet/metal/fifty,
|
||||
/obj/item/storage/toolbox/mechanical,
|
||||
/obj/item/stack/sheet/plastic/fifty,
|
||||
/obj/item/multitool,
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
@@ -18166,6 +18134,13 @@
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"VL" = (
|
||||
/obj/machinery/button/crematorium{
|
||||
id = "crematoriumGhostDojo";
|
||||
pixel_x = -25
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
"VO" = (
|
||||
/turf/closed/indestructible/riveted,
|
||||
/area/centcom/supplypod)
|
||||
@@ -18248,7 +18223,8 @@
|
||||
/area/centcom/holding)
|
||||
"Ww" = (
|
||||
/obj/structure/bodycontainer/crematorium{
|
||||
dir = 4
|
||||
dir = 4;
|
||||
id = "crematoriumGhostDojo"
|
||||
},
|
||||
/turf/open/indestructible/hotelwood,
|
||||
/area/centcom/holding)
|
||||
@@ -43137,15 +43113,15 @@ UV
|
||||
CV
|
||||
Sd
|
||||
NT
|
||||
CT
|
||||
oV
|
||||
CT
|
||||
CT
|
||||
CT
|
||||
oV
|
||||
CT
|
||||
Nd
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
Nd
|
||||
VL
|
||||
Ww
|
||||
Sd
|
||||
Nd
|
||||
@@ -43651,13 +43627,13 @@ UV
|
||||
CV
|
||||
Sd
|
||||
NT
|
||||
Dj
|
||||
PF
|
||||
Dj
|
||||
Sd
|
||||
Dj
|
||||
PF
|
||||
Dj
|
||||
MR
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
MR
|
||||
Sd
|
||||
Nd
|
||||
Sd
|
||||
Sd
|
||||
@@ -45169,7 +45145,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
Nd
|
||||
Sd
|
||||
Nf
|
||||
Sd
|
||||
Rh
|
||||
Mm
|
||||
@@ -47225,7 +47201,7 @@ aa
|
||||
aa
|
||||
aa
|
||||
Nd
|
||||
Ny
|
||||
Gs
|
||||
Sd
|
||||
Sd
|
||||
Sd
|
||||
|
||||
Reference in New Issue
Block a user