Removes cryostasis pods from the game pending creation of a proper design document (#62731)

* Baleeted

* Unmap

* Nudge the cabinet out of the way of the door
This commit is contained in:
Timberpoes
2021-11-12 15:57:22 -08:00
committed by GitHub
parent 2ddb3c6afd
commit 1950da9f70
15 changed files with 199 additions and 978 deletions
+52 -140
View File
@@ -4470,8 +4470,8 @@
dir = 8
},
/obj/machinery/airalarm/unlocked{
pixel_y = 23;
dir = 1
dir = 1;
pixel_y = 23
},
/obj/machinery/atmospherics/components/binary/thermomachine/heater{
dir = 8
@@ -6419,11 +6419,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/cargo/warehouse)
"aZc" = (
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/space/basic,
/area/space)
"aZk" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/red,
@@ -37361,8 +37356,8 @@
dir = 8
},
/obj/machinery/airalarm/mixingchamber{
pixel_y = 24;
dir = 1
dir = 1;
pixel_y = 24
},
/turf/open/floor/iron/dark,
/area/science/mixing/chamber)
@@ -41010,15 +41005,6 @@
},
/turf/open/floor/iron,
/area/science/misc_lab/range)
"gvu" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"gvv" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -45155,15 +45141,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/security/brig)
"hDq" = (
/obj/machinery/cryopod,
/obj/effect/landmark/start/hangover,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"hDz" = (
/obj/structure/chair/stool/directional/west,
/obj/effect/turf_decal/tile/red{
@@ -49484,10 +49461,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
"iQu" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"iQv" = (
/turf/open/floor/wood,
/area/service/abandoned_gambling_den)
@@ -53717,9 +53690,6 @@
},
/turf/open/floor/iron/checker,
/area/engineering/atmos)
"kgb" = (
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"kgo" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -61766,10 +61736,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
/turf/open/floor/iron,
/area/engineering/supermatter/room)
"mtN" = (
/obj/machinery/cryopod,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"mtS" = (
/obj/machinery/computer/prisoner/gulag_teleporter_computer{
dir = 1
@@ -66628,10 +66594,6 @@
},
/turf/open/floor/iron/white,
/area/medical/treatment_center)
"nOg" = (
/obj/structure/lattice,
/turf/open/space,
/area/space)
"nOi" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -71734,11 +71696,6 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/port)
"pmL" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"pnb" = (
/obj/effect/turf_decal/tile/purple,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
@@ -77818,11 +77775,6 @@
"qZr" = (
/turf/closed/wall,
/area/service/hydroponics)
"qZx" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/commons/cryopods)
"qZH" = (
/obj/effect/landmark/start/botanist,
/obj/effect/turf_decal/tile/neutral{
@@ -81137,10 +81089,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/cargo/storage)
"sdh" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/commons/cryopods)
"sdn" = (
/obj/structure/chair{
dir = 4
@@ -86065,13 +86013,6 @@
},
/turf/open/floor/iron,
/area/science/xenobiology)
"tCL" = (
/obj/machinery/cryopod,
/obj/machinery/computer/cryopod{
pixel_y = 24
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"tCT" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/apron/chef,
@@ -87577,13 +87518,6 @@
},
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/hop)
"tYy" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"tYJ" = (
/turf/closed/wall/r_wall,
/area/command/teleporter)
@@ -90912,8 +90846,8 @@
/area/engineering/supermatter/room)
"uWq" = (
/obj/machinery/airalarm/engine{
pixel_y = 23;
dir = 1
dir = 1;
pixel_y = 23
},
/turf/open/floor/engine,
/area/engineering/supermatter)
@@ -95898,11 +95832,6 @@
},
/turf/open/floor/iron,
/area/service/janitor)
"wvq" = (
/obj/machinery/door/airlock/glass,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"wvy" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
@@ -97662,9 +97591,6 @@
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central/aft)
"wWo" = (
/turf/closed/wall,
/area/commons/cryopods)
"wWB" = (
/obj/structure/lattice/catwalk,
/obj/structure/transit_tube/crossing/horizontal,
@@ -98228,15 +98154,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/hallway/primary/central/aft)
"xem" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"xeo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -99516,11 +99433,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/maintenance/aft)
"xyn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/commons/cryopods)
"xyw" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple{
@@ -157821,7 +157733,7 @@ aPQ
eqG
wZU
qYo
mIc
aaa
qYo
qYo
aaa
@@ -158078,7 +157990,7 @@ nOw
mnP
wZU
qYo
mIc
aaa
aaa
aaa
xTK
@@ -158314,7 +158226,7 @@ oNH
wZU
wZU
wZU
oNH
wZU
aad
lFd
lFd
@@ -158329,11 +158241,11 @@ sip
sip
sip
aad
oNH
xyn
wvq
qZx
wWo
wZU
wZU
wZU
wZU
wZU
qYo
qYo
qYo
@@ -158586,13 +158498,13 @@ cFF
cFF
sip
aaa
oNH
hDq
iQu
gvu
wWo
wZU
aad
aad
aad
aad
qYo
mIc
aaa
xTK
xTK
aaa
@@ -158843,13 +158755,13 @@ cFF
cFF
sip
aaa
oNH
tCL
kgb
tYy
sdh
mIc
mIc
wZU
aad
aaa
aaa
xTK
aaa
aaa
aaa
aaa
aaa
@@ -159085,7 +158997,7 @@ xTK
qYo
qYo
aad
wZU
oNH
aad
wFC
cFG
@@ -159100,11 +159012,11 @@ cFF
cTi
olL
aad
wZU
mtN
pmL
xem
sdh
oNH
aad
aaa
aaa
xTK
aaa
aaa
aaa
@@ -159358,10 +159270,10 @@ cFF
sip
aaa
wZU
sdh
sdh
sdh
sdh
aad
aaa
aaa
xTK
aaa
aaa
aaa
@@ -159856,7 +159768,7 @@ aaa
aaa
xTK
aad
oNH
wZU
aad
lFd
cFF
@@ -159871,7 +159783,7 @@ cFF
cFF
sip
aad
oNH
wZU
aad
xTK
qYo
@@ -160111,7 +160023,7 @@ aaa
aaa
aaa
aaa
aZc
xTK
aad
wZU
aaa
@@ -160368,7 +160280,7 @@ aaa
aaa
aaa
aaa
aZc
xTK
aad
wZU
aaa
@@ -160625,9 +160537,9 @@ aaa
aaa
aaa
aaa
aZc
xTK
aad
wZU
oNH
aad
lFd
cFF
@@ -160642,7 +160554,7 @@ cFF
cFF
sip
aad
wZU
oNH
aad
xTK
aaa
@@ -160882,8 +160794,8 @@ aaa
aaa
aaa
aaa
aZc
nOg
xTK
aad
wZU
aaa
lFd
@@ -161140,7 +161052,7 @@ aaa
aaa
aaa
aaa
nOg
aad
wZU
aaa
aaa
@@ -161396,12 +161308,12 @@ aaa
aaa
aaa
aaa
aZc
nOg
wZU
xTK
aad
wZU
wZU
wZU
oNH
wZU
wZU
vpA
@@ -161410,7 +161322,7 @@ wZU
qix
wZU
wZU
wZU
oNH
wZU
wZU
wZU
@@ -161654,7 +161566,7 @@ aaa
aaa
aaa
aaa
nOg
aad
aad
aad
aad
+36 -185
View File
@@ -18305,13 +18305,14 @@
/turf/open/floor/iron/white,
/area/medical/pharmacy)
"fzJ" = (
/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
/obj/machinery/door/airlock{
id_tag = "Dorm2";
name = "Dorm 1"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/cryopods)
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/commons/dorms)
"fzU" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -21002,13 +21003,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"gSD" = (
/obj/machinery/door/airlock/public/glass{
name = "Dormitory"
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/commons/cryopods)
"gSF" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21687,19 +21681,6 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/hallway/primary/central)
"hja" = (
/obj/effect/turf_decal/tile/green{
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/stripes/white/line{
color = "#9FED58";
name = "green line"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"hjf" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -25460,9 +25441,6 @@
},
/turf/open/openspace,
/area/commons/storage/mining)
"jfd" = (
/turf/closed/wall,
/area/commons/cryopods)
"jff" = (
/turf/open/openspace,
/area/hallway/secondary/service)
@@ -26420,29 +26398,6 @@
},
/turf/open/floor/iron/dark,
/area/command/heads_quarters/cmo)
"jES" = (
/obj/structure/flora/ausbushes/fernybush{
pixel_x = -3;
pixel_y = -3
},
/obj/structure/flora/ausbushes/fullgrass{
pixel_x = -3;
pixel_y = -3
},
/obj/structure/flora/ausbushes/brflowers{
pixel_x = -3;
pixel_y = -3
},
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
},
/turf/open/floor/grass,
/area/commons/cryopods)
"jEW" = (
/obj/structure/cable,
/obj/machinery/firealarm/directional/north,
@@ -32276,14 +32231,6 @@
dir = 1
},
/area/engineering/engine_smes)
"mIi" = (
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"mIq" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -32533,23 +32480,6 @@
},
/turf/open/floor/iron/white,
/area/science/mixing)
"mOd" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/green{
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/stripes/white/line{
color = "#9FED58";
dir = 5;
name = "green line"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"mOp" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -33331,14 +33261,6 @@
"nhQ" = (
/turf/open/floor/carpet,
/area/service/library)
"nhU" = (
/obj/machinery/cryopod,
/obj/machinery/light/directional/north,
/obj/machinery/computer/cryopod{
pixel_y = 24
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"nhX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -37784,25 +37706,11 @@
/turf/open/floor/plating,
/area/engineering/atmos)
"puW" = (
/obj/structure/flora/ausbushes/fullgrass{
pixel_x = -3;
pixel_y = 3
},
/obj/structure/flora/ausbushes/ywflowers{
pixel_x = -3;
pixel_y = 3
},
/obj/structure/flora/ausbushes/stalkybush{
pixel_x = -3;
pixel_y = 3
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
},
/turf/open/floor/grass,
/area/commons/cryopods)
/obj/machinery/light/small/directional/west,
/obj/structure/table/wood,
/obj/effect/landmark/start/hangover,
/turf/open/floor/carpet,
/area/commons/dorms)
"pva" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -44129,12 +44037,6 @@
},
/turf/open/floor/catwalk_floor,
/area/maintenance/starboard/fore)
"sMn" = (
/obj/machinery/cryopod{
dir = 4
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"sMr" = (
/obj/effect/landmark/start/ai,
/obj/item/radio/intercom/directional/west{
@@ -46277,15 +46179,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/science/robotics/lab)
"tTw" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"tTR" = (
/obj/machinery/conveyor{
dir = 9;
@@ -48956,23 +48849,12 @@
/turf/open/floor/iron/large,
/area/service/kitchen/diner)
"vjL" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/green{
dir = 8
},
/obj/effect/turf_decal/tile/green{
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/turf_decal/stripes/white/line{
color = "#9FED58";
dir = 6;
name = "green line"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
/turf/open/floor/carpet,
/area/commons/dorms)
"vjW" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -50556,7 +50438,7 @@
"vXm" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/commons/cryopods)
/area/commons/dorms)
"vXP" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -50570,11 +50452,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/smooth,
/area/maintenance/starboard/fore)
"vYo" = (
/obj/machinery/cryopod,
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"vYu" = (
/obj/effect/turf_decal/box,
/obj/structure/closet/crate,
@@ -50900,16 +50777,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/command/bridge)
"whN" = (
/obj/machinery/cryopod{
dir = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"whR" = (
/obj/item/beacon,
/obj/structure/cable,
@@ -51329,22 +51196,6 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
"wrs" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/green{
dir = 4
},
/obj/effect/turf_decal/stripes/white/line{
color = "#9FED58";
dir = 1;
name = "green line"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"wsg" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -85343,12 +85194,12 @@ dfj
hTM
buo
dzt
jfd
hTM
puW
sMn
mIi
jES
jfd
dzt
hTM
boP
boP
boP
aJn
aJq
@@ -85600,12 +85451,12 @@ ruL
hTM
pLQ
jiT
jfd
nhU
hTM
pLQ
vjL
mOd
tTw
jfd
hTM
boP
boP
boP
aJn
aLY
@@ -85857,12 +85708,12 @@ oZT
hTM
kxw
sko
jfd
vYo
wrs
hja
whN
jfd
hTM
kxw
sko
hTM
boP
aJw
aJw
aJw
beX
@@ -86114,12 +85965,12 @@ pkS
hTM
hTM
fhi
jfd
vXm
hTM
hTM
fzJ
gSD
hTM
vXm
jfd
hTM
lRr
hhm
aMg
+25 -13
View File
@@ -12079,6 +12079,14 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"bhQ" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/locker)
"bhT" = (
/obj/machinery/chem_dispenser{
layer = 2.7
@@ -27655,6 +27663,11 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/command/bridge)
"dGT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/locker)
"dHr" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -35354,6 +35367,11 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/plating,
/area/maintenance/disposal/incinerator)
"gyK" = (
/obj/structure/flora/grass/jungle,
/obj/structure/chair,
/turf/open/floor/plating/asteroid,
/area/maintenance/port/aft)
"gyT" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -68030,13 +68048,12 @@
/turf/closed/wall/rust,
/area/cargo/drone_bay)
"ski" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/cryopod,
/obj/machinery/status_display/evac/directional/north,
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/commons/locker)
"sko" = (
@@ -73630,13 +73647,12 @@
},
/area/maintenance/port/fore)
"usn" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/cryopod,
/obj/structure/chair/stool,
/turf/open/floor/iron/dark,
/area/commons/locker)
"usI" = (
@@ -80754,16 +80770,12 @@
/turf/open/floor/iron,
/area/engineering/atmos)
"xbU" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/light/directional/north,
/obj/machinery/cryopod,
/obj/machinery/computer/cryopod{
pixel_y = 24
},
/obj/structure/chair/stool,
/turf/open/floor/iron/dark,
/area/commons/locker)
"xbZ" = (
@@ -104871,7 +104883,7 @@ fSW
rOO
afe
usn
kcq
dGT
eoj
lmP
riz
@@ -105128,7 +105140,7 @@ bwD
agm
aoH
ski
kcq
dGT
haI
jbj
oVx
@@ -105385,7 +105397,7 @@ bwO
kwO
afe
xbU
kcq
bhQ
kCl
lmP
tKx
@@ -105393,7 +105405,7 @@ tNZ
dNK
erP
cOg
cBv
gyK
bUv
szb
ttf
+78 -197
View File
@@ -11,10 +11,12 @@
/turf/open/space,
/area/space/nearstation)
"aag" = (
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
/obj/structure/chair/sofa/corp/right{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"aaj" = (
/obj/structure/grille,
/turf/open/space,
@@ -1709,10 +1711,12 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"anT" = (
/obj/structure/lattice,
/obj/structure/grille,
/turf/open/space,
/area/space/nearstation)
/obj/structure/chair/sofa/corp/left{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"anU" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -3294,7 +3298,6 @@
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"aBR" = (
@@ -9114,9 +9117,10 @@
/turf/open/floor/iron,
/area/commons/locker)
"bWq" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
/area/commons/locker)
/obj/structure/grille,
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"bWv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/junction{
@@ -9723,10 +9727,10 @@
/turf/open/floor/wood,
/area/service/bar)
"cfr" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/commons/cryopods)
/obj/structure/lattice,
/obj/structure/grille,
/turf/open/space,
/area/space/nearstation)
"cfu" = (
/obj/machinery/firealarm/directional/east,
/obj/machinery/camera/directional/east{
@@ -14858,7 +14862,6 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"dlA" = (
@@ -14906,11 +14909,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"dms" = (
/obj/machinery/door/airlock/glass,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"dmu" = (
/obj/structure/table,
/obj/item/folder,
@@ -17075,12 +17073,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/medical/virology)
"dZa" = (
/obj/machinery/cryopod{
dir = 8
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"dZe" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white,
@@ -19437,7 +19429,6 @@
},
/obj/structure/cable,
/obj/machinery/bluespace_vendor/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"eNg" = (
@@ -20034,14 +20025,6 @@
},
/turf/open/floor/iron/dark,
/area/security/prison/safe)
"eWx" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"eWz" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
@@ -21356,15 +21339,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/security/range)
"fvd" = (
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"fve" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -24170,10 +24144,6 @@
},
/turf/open/floor/iron/dark,
/area/medical/cryo)
"gsL" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"gty" = (
/obj/item/beacon,
/obj/effect/turf_decal/tile/neutral,
@@ -24261,13 +24231,6 @@
/obj/effect/turf_decal/tile/brown,
/turf/open/floor/iron,
/area/cargo/sorting)
"gvn" = (
/obj/structure/chair/sofa/corp/left{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"gvs" = (
/obj/structure/rack,
/obj/item/screwdriver{
@@ -29573,10 +29536,6 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/maintenance/starboard)
"isd" = (
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/commons/locker)
"isn" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -30228,7 +30187,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"iFn" = (
@@ -31448,10 +31406,6 @@
/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/iron,
/area/cargo/miningoffice)
"jfA" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron,
/area/commons/dorms)
"jfN" = (
/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
dir = 1
@@ -31994,10 +31948,19 @@
/turf/open/floor/engine/vacuum,
/area/engineering/atmos)
"jpI" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/commons/cryopods)
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/spawner/random/entertainment/arcade,
/turf/open/floor/iron/dark,
/area/commons/fitness/recreation)
"jpN" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/neutral{
@@ -33272,13 +33235,6 @@
"jNL" = (
/turf/open/floor/plating,
/area/maintenance/aft)
"jNR" = (
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"jNT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36545,13 +36501,6 @@
/obj/item/paper,
/turf/open/floor/plating,
/area/maintenance/port)
"kZk" = (
/obj/structure/chair/sofa/corp/right{
desc = "Looks like someone threw it out. Covered in donut crumbs.";
name = "couch"
},
/turf/open/space/basic,
/area/space)
"kZq" = (
/obj/structure/sink{
dir = 4;
@@ -37492,12 +37441,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/vacant_room/commissary)
"lqp" = (
/obj/structure/chair/stool/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/service/bar)
"lqt" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -38279,7 +38222,6 @@
/obj/structure/table,
/obj/item/clothing/under/suit/sl,
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"lHu" = (
@@ -38301,14 +38243,6 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/exit/departure_lounge)
"lHS" = (
/obj/machinery/cryopod{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"lIi" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38761,10 +38695,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/central)
"lQp" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/wood,
/area/service/bar)
"lQv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -39438,13 +39368,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/hallway/primary/central)
"mbU" = (
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"mcg" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -41171,10 +41094,6 @@
/obj/effect/turf_decal/stripes/white/line,
/turf/open/floor/iron/dark,
/area/science/storage)
"mKd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/commons/cryopods)
"mKp" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
@@ -43479,14 +43398,6 @@
},
/turf/open/floor/iron,
/area/security/brig)
"nuO" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"nuV" = (
/turf/closed/wall,
/area/commons/storage/art)
@@ -46384,9 +46295,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/engineering/break_room)
"owL" = (
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"owS" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -50440,7 +50348,6 @@
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"pSS" = (
@@ -53770,7 +53677,6 @@
pixel_x = -32
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"rfJ" = (
@@ -56244,13 +56150,6 @@
icon_state = "platingdmg1"
},
/area/maintenance/department/science/xenobiology)
"sau" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"saz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -57536,7 +57435,6 @@
"syl" = (
/obj/structure/table,
/obj/item/storage/firstaid/brute,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"syo" = (
@@ -58219,9 +58117,6 @@
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"sLD" = (
/turf/closed/wall,
/area/commons/cryopods)
"sLN" = (
/obj/effect/landmark/start/ai/secondary,
/obj/item/radio/intercom/directional/north{
@@ -58421,8 +58316,8 @@
dir = 4
},
/obj/machinery/airalarm/kitchen_cold_room{
pixel_y = 24;
dir = 1
dir = 1;
pixel_y = 24
},
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/service/kitchen/coldroom)
@@ -63280,12 +63175,6 @@
icon_state = "platingdmg2"
},
/area/maintenance/starboard/aft)
"uBw" = (
/obj/machinery/computer/cryopod{
pixel_y = 24
},
/turf/open/floor/iron/dark,
/area/commons/cryopods)
"uBx" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -72821,14 +72710,6 @@
},
/turf/open/floor/iron/white/smooth_large,
/area/medical/medbay/central)
"ycL" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/commons/fitness/recreation)
"ycU" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
@@ -107698,11 +107579,11 @@ aaa
aaa
aaa
aaa
aaa
siF
lMJ
lMJ
lMJ
lMJ
ebG
ebG
agq
@@ -107955,8 +107836,8 @@ aaa
aaa
aaa
aaa
fwb
aaa
fwb
aaa
aaa
aaa
@@ -108212,13 +108093,13 @@ aaa
aaa
aaa
aaa
aaa
fwb
aaa
mKd
mKd
mKd
sLD
sLD
aaa
aaa
ebG
ebG
iai
agq
agq
@@ -108469,20 +108350,20 @@ aaa
aaa
aaa
aaa
aaa
fwb
aaa
mKd
mbU
jNR
fvd
cfr
eWx
aaa
aaa
tdI
ihY
lHu
eMZ
dls
pSI
rfz
nuO
nuO
euT
euT
aBN
uAh
qSs
@@ -108726,13 +108607,13 @@ aaa
aaa
aaa
aaa
aaa
nYJ
aaa
sLD
uBw
owL
gsL
dms
aaa
aaa
tdI
jpI
lHu
dUA
dUA
@@ -108983,21 +108864,21 @@ aaa
aaa
aaa
aaa
aaa
lMJ
aaa
mKd
dZa
dZa
lHS
aaa
aaa
tdI
jpI
ycL
xBD
xBD
lHu
hJy
hJy
lHr
syl
iFg
sau
sau
hNh
hNh
uAh
wHx
dqy
@@ -109240,13 +109121,13 @@ aaa
aaa
aaa
aaa
aaa
lMJ
lMJ
mKd
mKd
mKd
sLD
sLD
aaa
aaa
aaa
ebG
ebG
dtt
hJy
ocJ
@@ -109496,9 +109377,9 @@ aaa
aaa
aaa
aaa
kZk
aag
aaa
aag
bWq
aaa
aaa
aaa
@@ -109753,9 +109634,9 @@ aaa
aaa
aaa
aaa
gvn
aag
aaa
anT
bWq
aaa
aaa
aaa
@@ -110010,10 +109891,10 @@ aaa
aaa
aaa
aaa
anT
anT
aaa
aaa
cfr
aaa
aaa
aaa
tdI
@@ -110268,8 +110149,8 @@ aaa
aaa
aaa
aaa
aaa
nYJ
lMJ
aaa
aaa
aaa
@@ -110525,7 +110406,7 @@ aaa
aaa
aaa
aaa
lMJ
aaa
ebG
ebG
tdI
+8 -35
View File
@@ -792,9 +792,6 @@
dir = 4
},
/obj/effect/landmark/start/hangover,
/obj/machinery/computer/cryopod{
pixel_y = 32
},
/turf/open/floor/iron/cafeteria,
/area/commons/locker)
"afG" = (
@@ -12026,18 +12023,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/smooth,
/area/command/gateway)
"cKs" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/cryopod{
dir = 8
},
/turf/open/floor/iron/cafeteria,
/area/commons/locker)
"cKC" = (
/obj/effect/turf_decal/sand/plating,
/obj/effect/turf_decal/stripes/asteroid/line{
@@ -27094,8 +27079,8 @@
"imK" = (
/obj/machinery/icecream_vat,
/obj/machinery/airalarm/kitchen_cold_room{
pixel_y = 24;
dir = 1
dir = 1;
pixel_y = 24
},
/turf/open/floor/iron/showroomfloor,
/area/service/kitchen/coldroom)
@@ -55431,18 +55416,6 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plating,
/area/service/janitor)
"tfY" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/cryopod{
dir = 4
},
/turf/open/floor/iron/cafeteria,
/area/commons/locker)
"tgg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -90196,9 +90169,9 @@ aSb
xgH
arc
qqP
cKs
cKs
cKs
aDH
aDH
aDH
aUD
sZY
aKl
@@ -90453,9 +90426,9 @@ aSd
vIq
aBx
qqP
tfY
tfY
tfY
aDH
aDH
aDH
aUD
aks
aKl
-9
View File
@@ -210,15 +210,6 @@ SUBSYSTEM_DEF(job)
job.current_positions++
return TRUE
/datum/controller/subsystem/job/proc/FreeRole(rank)
if(!rank)
return
JobDebug("Freeing role: [rank]")
var/datum/job/job = GetJob(rank)
if(!job)
return FALSE
job.current_positions = max(0, job.current_positions - 1)
/datum/controller/subsystem/job/proc/FindOccupationCandidates(datum/job/job, level)
JobDebug("Running FOC, Job: [job], Level: [job_priority_level_to_string(level)]")
var/list/candidates = list()
-1
View File
@@ -45,7 +45,6 @@
var/datum/job/assigned_role
var/special_role
var/list/restricted_roles = list()
var/list/datum/objective/objectives = list()
var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
-5
View File
@@ -623,12 +623,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Recreation Area"
icon_state = "rec"
/area/commons/cryopods
name = "\improper Cryopod Room"
icon_state = "cryopod"
// Commons - Vacant Rooms
/area/commons/vacant_room
name = "\improper Vacant Room"
icon_state = "vacant_room"
-3
View File
@@ -1,5 +1,4 @@
GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
GLOBAL_LIST_EMPTY(objectives)
/datum/objective
var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code.
@@ -15,13 +14,11 @@ GLOBAL_LIST_EMPTY(objectives)
var/martyr_compatible = FALSE //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
/datum/objective/New(text)
GLOB.objectives += src
if(text)
explanation_text = text
//Apparently objectives can be qdel'd. Learn a new thing every day
/datum/objective/Destroy()
GLOB.objectives -= src
return ..()
/datum/objective/proc/get_owners() // Combine owner and team into a single list.
@@ -83,8 +83,6 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message = CompileText(arrival, user, rank)
else if(message_type == "NEWHEAD" && newheadToggle)
message = CompileText(newhead, user, rank)
else if(message_type == "CRYOSTORAGE")
message = "[user][rank ? ", [rank]" : ""] has been moved to cryo storage."
else if(message_type == "ARRIVALS_BROKEN")
message = "The arrivals shuttle has been damaged. Docking for repairs..."
-334
View File
@@ -1,334 +0,0 @@
#define AHELP_FIRST_MESSAGE "Please adminhelp before leaving the round, even if there are no administrators online!"
/*
* Cryogenic refrigeration unit. Basically a despawner.
* Stealing a lot of concepts/code from sleepers due to massive laziness.
* The despawn tick will only fire if it's been more than time_till_despawned ticks
* since time_entered, which is world.time when the occupant moves in.
* ~ Zuhayr
*/
GLOBAL_LIST_EMPTY(cryopod_computers)
//Main cryopod console.
/obj/machinery/computer/cryopod
name = "cryogenic oversight console"
desc = "An interface between crew and the cryogenic storage oversight systems."
icon = 'icons/obj/machines/cryopod.dmi'
icon_state = "cellconsole_1"
icon_keyboard = null
// circuit = /obj/item/circuitboard/cryopodcontrol
density = FALSE
interaction_flags_machine = INTERACT_MACHINE_OFFLINE
req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) // Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with.
var/mode = null
// Used for logging people entering cryosleep and important items they are carrying.
var/list/frozen_crew = list()
var/storage_type = "crewmembers"
var/storage_name = "Cryogenic Oversight Control"
/obj/machinery/computer/cryopod/Initialize(mapload)
. = ..()
GLOB.cryopod_computers += src
/obj/machinery/computer/cryopod/Destroy()
GLOB.cryopod_computers -= src
return ..()
/obj/machinery/computer/cryopod/update_icon_state()
if(machine_stat & (NOPOWER|BROKEN))
icon_state = "cellconsole"
return ..()
icon_state = "cellconsole_1"
return ..()
/obj/machinery/computer/cryopod/ui_interact(mob/user, datum/tgui/ui)
if(machine_stat & (NOPOWER|BROKEN))
return
add_fingerprint(user)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "CryopodConsole", name)
ui.open()
/obj/machinery/computer/cryopod/ui_data(mob/user)
var/list/data = list()
data["frozen_crew"] = frozen_crew
var/obj/item/card/id/id_card
var/datum/bank_account/current_user
if(isliving(user))
var/mob/living/person = user
id_card = person.get_idcard()
if(id_card?.registered_account)
current_user = id_card.registered_account
if(current_user)
data["account_name"] = current_user.account_holder
return data
// Cryopods themselves.
/obj/machinery/cryopod
name = "cryogenic freezer"
desc = "Suited for Cyborgs and Humanoids, the pod is a safe place for personnel affected by the Space Sleep Disorder to get some rest."
icon = 'icons/obj/machines/cryopod.dmi'
icon_state = "cryopod-open"
density = TRUE
anchored = TRUE
state_open = TRUE
var/on_store_message = "has entered long-term storage."
var/on_store_name = "Cryogenic Oversight"
/// Time until despawn when a mob enters a cryopod. You cannot other people in pods unless they're catatonic.
var/time_till_despawn = 30 SECONDS
/// Cooldown for when it's now safe to try an despawn the player.
COOLDOWN_DECLARE(despawn_world_time)
///Weakref to our controller
var/datum/weakref/control_computer_weakref
COOLDOWN_DECLARE(last_no_computer_message)
/obj/machinery/cryopod/Initialize(mapload)
..()
return INITIALIZE_HINT_LATELOAD //Gotta populate the cryopod computer GLOB first
/obj/machinery/cryopod/LateInitialize()
update_icon()
find_control_computer()
// This is not a good situation
/obj/machinery/cryopod/Destroy()
control_computer_weakref = null
return ..()
/obj/machinery/cryopod/proc/find_control_computer(urgent = FALSE)
for(var/cryo_console as anything in GLOB.cryopod_computers)
var/obj/machinery/computer/cryopod/console = cryo_console
if(get_area(console) == get_area(src))
control_computer_weakref = WEAKREF(console)
break
// Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged
if(!control_computer_weakref && urgent && COOLDOWN_FINISHED(src, last_no_computer_message))
COOLDOWN_START(src, last_no_computer_message, 5 MINUTES)
log_admin("Cryopod in [get_area(src)] could not find control computer!")
message_admins("Cryopod in [get_area(src)] could not find control computer!")
last_no_computer_message = world.time
return control_computer_weakref != null
/obj/machinery/cryopod/close_machine(atom/movable/target)
if(!control_computer_weakref)
find_control_computer(TRUE)
if((isnull(target) || isliving(target)) && state_open && !panel_open)
..(target)
var/mob/living/mob_occupant = occupant
if(mob_occupant && mob_occupant.stat != DEAD)
to_chat(occupant, span_notice("<b>You feel cool air surround you. You go numb as your senses turn inward.</b>"))
COOLDOWN_START(src, despawn_world_time, time_till_despawn)
icon_state = "cryopod"
/obj/machinery/cryopod/open_machine()
..()
icon_state = "cryopod-open"
set_density(TRUE)
name = initial(name)
/obj/machinery/cryopod/container_resist_act(mob/living/user)
visible_message(span_notice("[occupant] emerges from [src]!"),
span_notice("You climb out of [src]!"))
open_machine()
/obj/machinery/cryopod/relaymove(mob/user)
container_resist_act(user)
/obj/machinery/cryopod/process()
if(!occupant)
return
var/mob/living/mob_occupant = occupant
if(mob_occupant.stat == DEAD)
open_machine()
if(!mob_occupant.client && COOLDOWN_FINISHED(src, despawn_world_time))
if(!control_computer_weakref)
find_control_computer(urgent = TRUE)
despawn_occupant()
/obj/machinery/cryopod/proc/handle_objectives()
var/mob/living/mob_occupant = occupant
// Update any existing objectives involving this mob.
for(var/datum/objective/objective in GLOB.objectives)
// We don't want revs to get objectives that aren't for heads of staff. Letting
// them win or lose based on cryo is silly so we remove the objective.
if(istype(objective,/datum/objective/mutiny) && objective.target == mob_occupant.mind)
objective.team.objectives -= objective
qdel(objective)
for(var/datum/mind/mind in objective.team.members)
to_chat(mind.current, "<BR>[span_userdanger("Your target is no longer within reach. Objective removed!")]")
mind.announce_objectives()
else if(istype(objective.target) && objective.target == mob_occupant.mind)
if(istype(objective, /datum/objective/contract))
var/datum/antagonist/traitor/affected_traitor = objective.owner.has_antag_datum(/datum/antagonist/traitor)
var/datum/contractor_hub/affected_contractor_hub = affected_traitor.contractor_hub
for(var/datum/syndicate_contract/affected_contract as anything in affected_contractor_hub.assigned_contracts)
if(affected_contract.contract == objective)
affected_contract.generate(affected_contractor_hub.assigned_targets)
affected_contractor_hub.assigned_targets.Add(affected_contract.contract.target)
to_chat(objective.owner.current, "<BR>[span_userdanger("Contract target out of reach. Contract rerolled.")]")
break
else
var/old_target = objective.target
objective.target = null
if(!objective)
return
objective.find_target()
if(!objective.target && objective.owner)
to_chat(objective.owner.current, "<BR>[span_userdanger("Your target is no longer within reach. Objective removed!")]")
for(var/datum/antagonist/antag in objective.owner.antag_datums)
antag.objectives -= objective
if (!objective.team)
objective.update_explanation_text()
objective.owner.announce_objectives()
to_chat(objective.owner.current, "<BR>[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]")
else
var/list/objectivestoupdate
for(var/datum/mind/objective_owner in objective.get_owners())
to_chat(objective_owner.current, "<BR>[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]")
for(var/datum/objective/update_target_objective in objective_owner.get_all_objectives())
LAZYADD(objectivestoupdate, update_target_objective)
objectivestoupdate += objective.team.objectives
for(var/datum/objective/update_objective in objectivestoupdate)
if(update_objective.target != old_target || !istype(update_objective,objective.type))
continue
update_objective.target = objective.target
update_objective.update_explanation_text()
to_chat(objective.owner.current, "<BR>[span_userdanger("You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!")]")
update_objective.owner.announce_objectives()
qdel(objective)
/obj/machinery/cryopod/proc/should_preserve_item(obj/item/item)
for(var/datum/objective_item/steal/possible_item in GLOB.possible_items)
if(istype(item, possible_item.targetitem))
return TRUE
return FALSE
// This function can not be undone; do not call this unless you are sure
/obj/machinery/cryopod/proc/despawn_occupant()
var/mob/living/mob_occupant = occupant
var/list/crew_member = list()
crew_member["name"] = mob_occupant.real_name
if(mob_occupant.mind)
// Handle job slot/tater cleanup.
var/job = mob_occupant.mind.assigned_role.title
crew_member["job"] = job
SSjob.FreeRole(job)
if(LAZYLEN(mob_occupant.mind.objectives))
mob_occupant.mind.objectives.Cut()
mob_occupant.mind.special_role = null
else
crew_member["job"] = "N/A"
// Delete them from datacore.
var/announce_rank = null
for(var/datum/data/record/medical_record as anything in GLOB.data_core.medical)
if(medical_record.fields["name"] == mob_occupant.real_name)
qdel(medical_record)
for(var/datum/data/record/security_record as anything in GLOB.data_core.security)
if(security_record.fields["name"] == mob_occupant.real_name)
qdel(security_record)
for(var/datum/data/record/general_record as anything in GLOB.data_core.general)
if(general_record.fields["name"] == mob_occupant.real_name)
announce_rank = general_record.fields["rank"]
qdel(general_record)
var/obj/machinery/computer/cryopod/control_computer = control_computer_weakref?.resolve()
if(!control_computer)
control_computer_weakref = null
else
control_computer.frozen_crew += list(crew_member)
// Make an announcement and log the person entering storage.
if(GLOB.announcement_systems.len)
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list())
visible_message(span_notice("[src] hums and hisses as it moves [mob_occupant.real_name] into storage."))
for(var/obj/item/item_content as anything in mob_occupant)
if(!istype(item_content) || HAS_TRAIT(item_content, TRAIT_NODROP))
continue
if (issilicon(mob_occupant) && istype(item_content, /obj/item/mmi))
continue
mob_occupant.transferItemToLoc(item_content, drop_location(), force = TRUE, silent = TRUE)
handle_objectives()
QDEL_NULL(occupant)
open_machine()
name = initial(name)
/obj/machinery/cryopod/MouseDrop_T(mob/living/target, mob/user)
if(!istype(target) || !can_interact(user) || !target.Adjacent(user) || !ismob(target) || isanimal(target) || !istype(user.loc, /turf) || target.buckled)
return
if(occupant)
to_chat(user, span_notice("[src] is already occupied!"))
return
if(target.stat == DEAD)
to_chat(user, span_notice("Dead people can not be put into cryo."))
return
if(target.key && user != target)
if(iscyborg(target))
to_chat(user, span_danger("You can't put [target] into [src]. [target.p_theyre(capitalized = TRUE)] online."))
else
to_chat(user, span_danger("You can't put [target] into [src]. [target.p_theyre(capitalized = TRUE)] conscious."))
return
if(target == user && (tgalert(target, "Would you like to enter cryosleep?", "Enter Cryopod?", "Yes", "No") != "Yes"))
return
if(target == user)
if(target.mind.assigned_role.req_admin_notify)
tgui_alert(target, "You're an important role! [AHELP_FIRST_MESSAGE]")
var/datum/antagonist/antag = target.mind.has_antag_datum(/datum/antagonist)
if(antag)
tgui_alert(target, "You're \a [antag.name]! [AHELP_FIRST_MESSAGE]")
if(!istype(target) || !can_interact(user) || !target.Adjacent(user) || !ismob(target) || isanimal(target) || !istype(user.loc, /turf) || target.buckled)
return
// rerun the checks in case of shenanigans
if(occupant)
to_chat(user, span_notice("[src] is already occupied!"))
return
if(target == user)
visible_message("<span class='infoplain'>[user] starts climbing into the cryo pod.</span>")
else
visible_message("<span class='infoplain'>[user] starts putting [target] into the cryo pod.</span>")
to_chat(target, span_warning("<b>If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.</b>"))
log_admin("[key_name(target)] entered a stasis pod.")
message_admins("[key_name_admin(target)] entered a stasis pod. [ADMIN_JMP(src)]")
add_fingerprint(target)
close_machine(target)
name = "[name] ([target.name])"
// Attacks/effects.
/obj/machinery/cryopod/blob_act()
return // Sorta gamey, but we don't really want these to be destroyed.
#undef AHELP_FIRST_MESSAGE
-2
View File
@@ -30,8 +30,6 @@
var/total_count_reset = 0
///Internal counter for clients sending external (IRC/Discord) relay messages via ahelp to prevent spamming. Set to a number every time an admin reply is sent, decremented for every client send.
var/externalreplyamount = 0
///When was the last time we warned them about not cryoing without an ahelp, set to -5 minutes so that rounstart cryo still warns
COOLDOWN_DECLARE(cryo_warned)
///Tracks say() usage for ic/dchat while slowmode is enabled
COOLDOWN_DECLARE(say_slowmode)
/////////
Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

-1
View File
@@ -1042,7 +1042,6 @@
#include "code\game\machinery\cell_charger.dm"
#include "code\game\machinery\civilian_bounties.dm"
#include "code\game\machinery\constructable_frame.dm"
#include "code\game\machinery\cryopod.dm"
#include "code\game\machinery\dance_machine.dm"
#include "code\game\machinery\defibrillator_mount.dm"
#include "code\game\machinery\deployable.dm"
@@ -1,51 +0,0 @@
import { useBackend } from '../backend';
import { LabeledList, NoticeBox, Section, Stack } from '../components';
import { Window } from '../layouts';
export const CryopodConsole = (props, context) => {
const { data } = useBackend(context);
const { account_name } = data;
const welcomeTitle = `Hello, ${account_name || '[REDACTED]'}!`;
return (
<Window title="Cryopod Console" width={400} height={480}>
<Window.Content>
<Stack vertical fill>
<Stack.Item>
<Section title={welcomeTitle}>
This automated cryogenic freezing unit will safely store your
corporeal form until your next assignment.
</Section>
</Stack.Item>
<Stack.Item grow>
<CrewList />
</Stack.Item>
</Stack>
</Window.Content>
</Window>
);
};
const CrewList = (props, context) => {
const { data } = useBackend(context);
const { frozen_crew } = data;
return (
frozen_crew.length && (
<Section
fill
scrollable>
<LabeledList>
{frozen_crew.map((person) => (
<LabeledList.Item key={person} label={person.name}>
{person.job}
</LabeledList.Item>
))}
</LabeledList>
</Section>
) || (
<NoticeBox>No stored crew!</NoticeBox>
)
);
};