Revert "Merge branch 'Cryopods-Oh-God-Why-Help-me-This-wont-work' of https://github.com/JamieD1/Yogstation into Cryopods-Oh-God-Why-Help-me-This-wont-work"

This reverts commit a546410348, reversing
changes made to 74c51ad5d2.
This commit is contained in:
Jamie D
2020-05-29 16:03:41 +01:00
parent a546410348
commit 0902448c1f

View File

@@ -1232,6 +1232,10 @@
/obj/item/stack/cable_coil/random,
/turf/open/space,
/area/space/nearstation)
"acz" = (
/obj/machinery/computer/holodeck/perma,
/turf/open/floor/plasteel,
/area/security/prison)
"acA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 10
@@ -7319,6 +7323,18 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"aoa" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aob" = (
/obj/machinery/camera{
c_tag = "Detective's Office"
@@ -11010,6 +11026,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"awy" = (
/obj/structure/bookcase,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/prison)
"awz" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/neutral{
@@ -14485,6 +14506,13 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"aDQ" = (
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aDR" = (
/turf/closed/wall,
/area/medical/psych)
@@ -14852,6 +14880,25 @@
},
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"aEA" = (
/obj/machinery/camera{
c_tag = "Dormitory South";
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aEB" = (
/obj/machinery/airalarm{
dir = 8;
@@ -15947,6 +15994,19 @@
},
/turf/open/floor/plasteel,
/area/clerk)
"aGI" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aGJ" = (
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/kitchen";
@@ -15989,6 +16049,24 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aGN" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aGO" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -16148,6 +16226,15 @@
},
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"aHh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aHi" = (
/obj/structure/table,
/obj/item/pen,
@@ -21283,6 +21370,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel,
/area/engine/atmos_distro)
"aSL" = (
/obj/machinery/computer/arcade,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/prison)
"aSM" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -21587,6 +21679,13 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
/obj/machinery/vending/sustenance{
onstation = 0
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/prison)
"aTz" = (
/obj/structure/table,
/turf/open/floor/plasteel,
@@ -24152,6 +24251,12 @@
/obj/item/storage/pill_bottle/dice,
/turf/open/floor/wood,
/area/medical/psych)
"aYZ" = (
/obj/machinery/computer/libraryconsole/bookmanagement,
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/prison)
"aZa" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50369,13 +50474,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"dcK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/sustenance{
onstation = 0
},
/turf/open/floor/plasteel,
/area/security/prison)
"dfD" = (
/obj/machinery/door/airlock/security/glass{
name = "Security Office";
@@ -50823,24 +50921,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"esY" = (
/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/cryopods)
"evF" = (
/obj/structure/sign/warning/vacuum/external{
pixel_x = 32
@@ -51135,9 +51215,6 @@
dir = 4
},
/area/escapepodbay)
"eZW" = (
/turf/closed/wall,
/area/crew_quarters/cryopods)
"eZX" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
@@ -51329,10 +51406,6 @@
/obj/item/stack/rods/twentyfive,
/turf/open/floor/plasteel,
/area/escapepodbay)
"fxV" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/crew_quarters/cryopods)
"fya" = (
/obj/structure/table,
/obj/item/stock_parts/subspace/amplifier,
@@ -52423,15 +52496,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"hPH" = (
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/cryopods";
name = "Cryogenic Crew Storage APC";
pixel_y = -24
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"hQb" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52565,21 +52629,6 @@
"ihS" = (
/turf/closed/wall/r_wall,
/area/medical/sleeper)
"iin" = (
/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/crew_quarters/cryopods)
"ijY" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 5
@@ -53725,17 +53774,6 @@
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
"kBH" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/camera{
c_tag = "Dormitory South";
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"kCm" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
@@ -53837,11 +53875,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"kQC" = (
/obj/machinery/computer/libraryconsole/bookmanagement,
/obj/structure/table,
/turf/open/floor/plasteel,
/area/security/prison)
"kQW" = (
/obj/machinery/door/airlock/engineering{
name = "Starboard Quarter Solar Access";
@@ -53987,12 +54020,6 @@
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall,
/area/engine/atmos)
"lfZ" = (
/obj/machinery/airalarm{
pixel_y = 24
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"lgx" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -54098,24 +54125,6 @@
/obj/structure/transit_tube_pod,
/turf/open/floor/plasteel/dark,
/area/tcommsat/lounge)
"lsc" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"lsn" = (
/obj/machinery/light,
/turf/open/floor/engine,
@@ -54277,13 +54286,6 @@
},
/turf/open/floor/plasteel,
/area/science/nanite)
"lMw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/obj/machinery/computer/cryopod{
pixel_y = 26
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"lQG" = (
/obj/machinery/door/firedoor/border_only{
dir = 1
@@ -54505,15 +54507,6 @@
},
/turf/closed/wall,
/area/maintenance/starboard/fore)
"mxS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 8
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"myI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/turf/open/floor/plasteel/grimy,
@@ -54633,17 +54626,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"mJK" = (
/obj/structure/sink{
dir = 8;
pixel_x = -12;
pixel_y = 2
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"mJV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -54763,6 +54745,16 @@
/obj/machinery/atmospherics/components/unary/vent_pump/layer1,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"mOR" = (
/obj/machinery/button/door{
id = "Dorm1";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/turf/template_noop,
/area/crew_quarters/dorms)
"mRQ" = (
/obj/machinery/door/airlock/external{
name = "Engineering External Access";
@@ -55218,27 +55210,6 @@
/obj/structure/closet/secure_closet/atmospherics,
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"nJX" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"nLY" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -55532,12 +55503,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"oCz" = (
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"oDw" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -55849,22 +55814,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/wood,
/area/lawoffice)
"pwZ" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"pxz" = (
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel/white,
@@ -55938,10 +55887,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"pFA" = (
/obj/structure/bookcase,
/turf/open/floor/plasteel,
/area/security/prison)
"pGe" = (
/obj/structure/lattice,
/turf/open/space,
@@ -56483,15 +56428,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
"qHm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"qIU" = (
/obj/item/storage/secure/safe{
pixel_x = 5;
@@ -56649,13 +56585,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"qZr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cryopod{
dir = 1
},
/turf/open/floor/plasteel,
/area/security/prison)
"rcY" = (
/obj/machinery/atmospherics/pipe/simple{
dir = 4
@@ -56846,13 +56775,6 @@
/obj/structure/sign/departments/minsky/research/research,
/turf/closed/wall/r_wall,
/area/science/lab)
"rzB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/holodeck/perma{
dir = 8
},
/turf/open/floor/plasteel,
/area/security/prison)
"rzM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
@@ -56873,16 +56795,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"rBG" = (
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"rEb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -56904,16 +56816,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"rEC" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/computer/cryopod{
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/security/prison)
"rEH" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 4
@@ -58033,18 +57935,6 @@
},
/turf/open/floor/plasteel,
/area/storage/tools)
"tPV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"tPY" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -58055,10 +57945,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"tQn" = (
/obj/machinery/computer/arcade,
/turf/open/floor/plasteel,
/area/security/prison)
"tQA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -58184,6 +58070,19 @@
},
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"ucA" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/airlock{
id_tag = "Dorm1";
name = "Dorm 1"
},
/turf/template_noop,
/area/crew_quarters/dorms)
"udc" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -58726,12 +58625,6 @@
/obj/effect/turf_decal/bot_white/left,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"vrb" = (
/obj/machinery/cryopod{
dir = 1
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"vrz" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -58931,12 +58824,6 @@
},
/turf/open/space,
/area/space)
"vPL" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 1
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"vRI" = (
/obj/machinery/door/airlock/external{
req_access_txt = "13"
@@ -59633,12 +59520,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/aft)
"xti" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 5
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"xul" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -59858,15 +59739,6 @@
},
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
"xZR" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/firealarm{
pixel_y = 26
},
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
"yan" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -85475,9 +85347,9 @@ aWi
aXO
abi
aYN
qZr
rEC
aat
awy
aSL
aTy
aUg
afA
abt
@@ -85735,7 +85607,7 @@ aYX
aat
aat
aat
dcK
aat
afA
abw
acc
@@ -85991,7 +85863,7 @@ aat
aat
aat
aat
aat
aSO
aat
afA
abv
@@ -86247,8 +86119,8 @@ aat
acK
aat
aat
aat
aSO
aET
aSP
bab
afA
afA
@@ -86501,11 +86373,11 @@ aay
aVz
aXj
aat
pFA
aat
aat
aET
aSP
aat
aHi
aSV
aat
abj
abA
@@ -86758,11 +86630,11 @@ aVB
aVz
aXk
aat
kQC
aYZ
axm
aat
aHi
aSV
axm
baa
aat
aat
aat
@@ -87018,8 +86890,8 @@ aat
ach
aat
aTM
baa
baa
aat
aat
aat
aat
aat
@@ -87528,7 +87400,7 @@ aaj
aVE
aVH
aXi
tQn
acz
aat
aat
aTN
@@ -87789,7 +87661,7 @@ aat
aat
aat
aat
rzB
aat
aat
aat
aat
@@ -91683,10 +91555,10 @@ tFJ
tfA
tfA
tFJ
eZW
eZW
eZW
eZW
tfA
tfA
tFJ
anF
aJw
bOS
bOS
@@ -91940,10 +91812,10 @@ tfA
tfA
tfA
tfA
xZR
vrb
vrb
vrb
tfA
tfA
tfA
anF
aJw
aaa
bOS
@@ -92197,10 +92069,10 @@ tfA
tfA
tfA
tfA
lMw
xti
oCz
hPH
tfA
tfA
tfA
anF
aJw
aaa
bOS
@@ -92454,10 +92326,10 @@ pxG
sGC
pxG
pxG
lfZ
mxS
qHm
vPL
mOR
pxG
tfA
anF
aJw
aJw
aJw
@@ -92711,10 +92583,10 @@ pxG
pxG
pxV
pxG
fxV
esY
iin
fxV
pxG
ucA
tfA
aoa
aJw
aJv
aKG
@@ -92970,7 +92842,7 @@ ayh
auR
aul
ayh
lsc
aEA
aul
aHT
aJy
@@ -93226,8 +93098,8 @@ bbl
azT
ati
ati
kBH
pwZ
ati
aGI
sSM
aHH
aJg
@@ -93484,7 +93356,7 @@ aRA
aAh
aAh
aAh
nJX
aGN
aAh
aAh
aAh
@@ -93740,8 +93612,8 @@ awr
aAd
aAh
aCm
mJK
tPV
aGk
aHh
aGk
aHU
aJz
@@ -93997,7 +93869,7 @@ awr
aAg
aAh
aDO
rBG
aDQ
aHD
ayE
aBy