diff --git a/_maps/gaxstation.json b/_maps/gaxstation.json index 4eb557731c31..8fb2aeebce07 100644 --- a/_maps/gaxstation.json +++ b/_maps/gaxstation.json @@ -7,5 +7,6 @@ "cargo": "cargo_gax", "ferry": "ferry_fancy", "emergency": "emergency_box" - } + }, + "cryo_spawn": true } diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 917e56bba07c..47fc08d563a2 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -396,6 +396,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"aiz" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "aiE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -804,13 +815,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"atJ" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "atQ" = ( /obj/effect/turf_decal/trimline/white/filled/corner/lower{ dir = 1 @@ -841,6 +845,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"auN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "avc" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, @@ -1120,6 +1134,12 @@ /obj/structure/bed/roller, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"aCP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "aCU" = ( /obj/structure/chair{ dir = 4 @@ -1977,6 +1997,12 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"aXC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "aXP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -2817,6 +2843,14 @@ }, /turf/open/space/basic, /area/space/nearstation) +"bvc" = ( +/obj/structure/rack, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/aft) "bvi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6392,15 +6426,6 @@ }, /turf/open/space/basic, /area/solar/starboard/fore) -"deA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "deH" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, @@ -6769,6 +6794,13 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"dkM" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/hallway/secondary/entry) "dkN" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -8573,6 +8605,13 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) +"ejV" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "ejY" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible, /turf/open/floor/plasteel, @@ -9442,21 +9481,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) -"eBm" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "eBt" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -9704,6 +9728,13 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/heads/captain) +"eGD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "eHi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -9850,6 +9881,16 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"eKc" = ( +/obj/machinery/computer/cryopod{ + dir = 8; + pixel_x = 26 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "eKg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -9917,6 +9958,9 @@ /obj/item/storage/pencil_holder/crew, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"eLr" = ( +/turf/closed/wall/r_wall, +/area/crew_quarters/cryopods) "eLA" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -10661,6 +10705,19 @@ }, /turf/open/floor/grass, /area/hydroponics/garden) +"feh" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/obj/machinery/atmospherics/components/unary/tank/air{ + piping_layer = 2 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "few" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -10729,6 +10786,10 @@ }, /turf/open/floor/plasteel/airless/solarpanel, /area/solar/port/aft) +"fgy" = ( +/obj/item/stock_parts/micro_laser, +/turf/open/floor/plating, +/area/maintenance/aft) "fgB" = ( /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) @@ -10968,18 +11029,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"fme" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "fmk" = ( /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -11076,6 +11125,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/science/mixing) +"foH" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "foW" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -12519,18 +12576,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) -"fWw" = ( -/obj/machinery/power/apc{ - areastring = "/area/crew_quarters/cryopods"; - dir = 8; - name = "Cryogenic Crew Storage APC"; - pixel_x = -25 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "fWC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -13038,11 +13083,6 @@ dir = 5 }, /area/crew_quarters/kitchen) -"giq" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "giB" = ( /obj/machinery/power/smes, /obj/structure/cable{ @@ -13303,16 +13343,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"gql" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "gqK" = ( /obj/structure/displaycase/labcage, /obj/structure/cable{ @@ -14015,18 +14045,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"gIn" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 3; - height = 15; - id = "arrivals_stationary"; - name = "arrivals"; - roundstart_template = /datum/map_template/shuttle/arrival/gax; - width = 7 - }, -/turf/open/space/basic, -/area/space) "gIp" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -14107,6 +14125,21 @@ "gJV" = ( /turf/closed/wall/r_wall, /area/security/processing) +"gJW" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "gKH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14293,6 +14326,13 @@ /obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/dark, /area/bridge) +"gQo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "gRH" = ( /obj/machinery/light{ dir = 4 @@ -15417,6 +15457,13 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) +"hth" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "htr" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 9 @@ -16053,6 +16100,10 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"hHC" = ( +/obj/effect/spawner/structure/window/reinforced/shutter, +/turf/open/floor/plating, +/area/crew_quarters/cryopods) "hHG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -16108,6 +16159,9 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/distro) +"hJl" = ( +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "hJp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor/border_only, @@ -16269,21 +16323,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/security/main) -"hOw" = ( -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "hOz" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 4 @@ -16491,6 +16530,12 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"hTx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "hTG" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -17698,6 +17743,9 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"ixL" = ( +/turf/open/floor/plasteel/dark, +/area/crew_quarters/cryopods) "iyb" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -18713,19 +18761,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"jam" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = -24 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "jaK" = ( /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 @@ -21358,6 +21393,25 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"kvA" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Cryogenics" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "kvW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21525,6 +21579,13 @@ icon_state = "platingdmg1" }, /area/maintenance/department/medical/central) +"kzh" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kzS" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -21619,6 +21680,18 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/wood, /area/hallway/primary/central) +"kCg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kCl" = ( /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 @@ -21740,17 +21813,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"kGF" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 26 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "kGI" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -23590,6 +23652,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) +"lzs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "lzE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -25865,24 +25934,6 @@ /obj/machinery/vending/boozeomat, /turf/closed/wall, /area/crew_quarters/bar) -"mDz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner/lower{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner/lower{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "mFc" = ( /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; @@ -26649,6 +26700,18 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"nbF" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "nbL" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 @@ -26797,6 +26860,21 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) +"nfE" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "nfG" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/white/filled/line/lower{ @@ -26983,6 +27061,11 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"nkl" = ( +/obj/effect/spawner/lootdrop/maintenance/four, +/obj/structure/table, +/turf/open/floor/plating, +/area/maintenance/aft) "nky" = ( /obj/structure/cable{ icon_state = "1-4" @@ -27000,18 +27083,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ai_monitored/storage/eva) -"nkM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "nkP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -27399,6 +27470,10 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"nuD" = ( +/obj/item/circuitboard/machine/experimentor, +/turf/open/floor/plating, +/area/maintenance/aft) "nuI" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower, /obj/machinery/power/apc{ @@ -27796,6 +27871,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) +"nDd" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/crew_quarters/cryopods) "nDx" = ( /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 @@ -27811,6 +27890,12 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) +"nDE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "nDJ" = ( /turf/closed/wall/r_wall, /area/security/checkpoint/engineering) @@ -27843,6 +27928,27 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) +"nEA" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 4 + }, +/obj/machinery/power/apc{ + areastring = "/area/crew_quarters/cryopods"; + dir = 8; + name = "Cryogenic Crew Storage APC"; + pixel_x = -25 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "nEQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -28419,13 +28525,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"nTF" = ( -/obj/structure/rack, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "nTH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -28685,27 +28784,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner/lower, /turf/open/floor/plasteel, /area/hallway/primary/central) -"obf" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Cryogenics" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "obz" = ( /obj/machinery/light{ dir = 1 @@ -28829,18 +28907,6 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower, /turf/open/floor/plasteel, /area/security/main) -"oha" = ( -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 1" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "ohg" = ( /obj/structure/cable{ icon_state = "1-8" @@ -29284,6 +29350,22 @@ }, /turf/open/floor/plasteel, /area/hydroponics/garden) +"otf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/neutral/filled/corner/lower, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "otk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -29551,19 +29633,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"oAE" = ( -/obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "oAK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29711,17 +29780,6 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/hydroponics) -"oFK" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "oGc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -30263,6 +30321,20 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"oXk" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Cryogenics" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/cryopods) "oXp" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/stripes/corner{ @@ -32431,6 +32503,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"pXl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "pXn" = ( /obj/machinery/light/small{ dir = 1 @@ -32896,12 +32974,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"qhp" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "qhL" = ( /turf/open/floor/plasteel, /area/quartermaster/office) @@ -33355,6 +33427,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"qtO" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "qub" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -33668,23 +33747,17 @@ }, /turf/open/floor/plasteel, /area/security/processing) -"qEh" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "qEC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"qFp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "qFF" = ( /obj/effect/turf_decal/trimline/secred/filled/line/lower, /obj/structure/sign/warning/pods{ @@ -34012,6 +34085,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/stairs/goon/stairs_middle, /area/hydroponics/garden) +"qQe" = ( +/obj/structure/girder, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "qQC" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=CHW"; @@ -34340,6 +34421,15 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"qXH" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "qXK" = ( /obj/effect/landmark/stationroom/maint/threexfive, /turf/template_noop, @@ -34945,6 +35035,13 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"rlo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/cryopods) "rlY" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/bot, @@ -35479,18 +35576,6 @@ }, /turf/open/space/basic, /area/solar/starboard/aft) -"rxz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "rxG" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -35631,13 +35716,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) -"rAS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "rBc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -36047,11 +36125,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"rKC" = ( -/obj/structure/sign/warning/vacuum/external, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "rKM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -37777,6 +37850,15 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"sDZ" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "sEp" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/machinery/camera{ @@ -38940,6 +39022,12 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"tfe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "tfA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -39547,6 +39635,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"txz" = ( +/obj/item/stock_parts/manipulator, +/turf/open/floor/plating, +/area/maintenance/aft) "tyq" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sparsegrass, @@ -39762,15 +39854,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/eva) -"tDj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "tDw" = ( /obj/structure/sign/departments/minsky/medical/virology/virology2{ pixel_y = 32 @@ -39804,10 +39887,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"tEs" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/cryopods) "tEt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, @@ -39898,6 +39977,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"tHq" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/maintenance/aft) "tHs" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/department/eva"; @@ -41581,6 +41664,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"uCH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uCM" = ( /obj/machinery/door/airlock/research{ name = "Genetics Research Access"; @@ -41709,6 +41801,13 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) +"uEx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uEI" = ( /obj/machinery/shower{ pixel_y = 20 @@ -42097,25 +42196,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/theatre) -"uNq" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner/lower, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/dorms) "uNv" = ( /obj/effect/turf_decal/trimline/neutral/filled/line/lower{ dir = 8 @@ -44742,6 +44822,10 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"wck" = ( +/obj/item/stock_parts/scanning_module, +/turf/open/floor/plating, +/area/maintenance/aft) "wcp" = ( /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -46153,6 +46237,12 @@ }, /turf/open/space/basic, /area/solar/port/aft) +"wMH" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "wMY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -46305,6 +46395,10 @@ /obj/effect/spawner/lootdrop/techstorage/security, /turf/open/floor/plasteel/white, /area/storage/tech) +"wQm" = ( +/obj/structure/frame/machine, +/turf/open/floor/plating, +/area/maintenance/aft) "wQn" = ( /obj/structure/disposalpipe/segment, /turf/template_noop, @@ -47240,21 +47334,16 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"xme" = ( -/obj/effect/turf_decal/stripes/corner{ +"xmg" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/closet/firecloset/full, +/obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/area/crew_quarters/cryopods) "xmi" = ( /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -47596,6 +47685,22 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/lawoffice) +"xww" = ( +/obj/item/beacon, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "xwU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -47818,6 +47923,13 @@ }, /turf/open/floor/plasteel, /area/hydroponics/garden) +"xBd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/chair, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "xBC" = ( /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 6 @@ -48456,10 +48568,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) -"xPX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet, -/area/crew_quarters/cryopods) "xQb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -48684,6 +48792,12 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) +"xUY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/cryopods) "xVi" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -79068,7 +79182,7 @@ fbN geS xNy kgb -nTF +bvc mQK mpT abO @@ -79584,13 +79698,13 @@ trH wTB wTB wTB -fXQ -fXQ -fXQ -fXQ -fXQ -fXQ -fXQ +xNs +tHq +txz +nJe +xNs +xNs +xNs hBZ nJe xNs @@ -79841,13 +79955,13 @@ fCm wTB bJd eRu -fXQ -atJ -fWw -qhp -qhp -qhp -fXQ +xNs +wck +lId +nuD +fgy +nkl +xNs hBZ xNs xNs @@ -80098,13 +80212,13 @@ wTB wTB jPa oyD -fXQ -kGF -rAS -rxz -xPX -oFK -fXQ +xNs +wQm +nYY +txz +nJe +fgy +qQe hBZ bnZ vNF @@ -80355,13 +80469,13 @@ vrF wTB oci opt -fXQ -fXQ -tEs -obf -tEs -fXQ -fXQ +xNs +xNs +xNs +xNs +xNs +xNs +xNs hBZ vIr hWB @@ -80615,7 +80729,7 @@ wTB wTB xGG vcc -mDz +lqe lqe xeO wTB @@ -80872,7 +80986,7 @@ lqe xxy rXO hHK -gql +qFp kqt eFs wTB @@ -81129,7 +81243,7 @@ kqt eDB kqt dtJ -fme +pXl vNq cKZ wTB @@ -81386,8 +81500,8 @@ mVE eNT xIE yiu -nkM -uNq +hth +otf wqv wTB hBZ @@ -89626,9 +89740,9 @@ vIw vIw vIw uzX -vRP -vRP -vRP +tkl +tkl +tkl tkl tkl tkl @@ -89884,8 +89998,8 @@ vIw vIw uzX tkl -tkl -tkl +aCD +aCD ubS ubS ubS @@ -90141,8 +90255,8 @@ uli vIw uzX tkl -aCD -aCD +vRP +vRP vRP aCD vRP @@ -90398,9 +90512,9 @@ uzX uzX uzX tkl -vRP aCD -vRP +aCD +aCD aCD vRP vRP @@ -90653,11 +90767,11 @@ xTV xTV xTV xTV -xTV -xTV -uqY -uqY -xNw +iwu +tkl +vRP +aCD +vRP ubS tTD tTD @@ -90900,21 +91014,21 @@ aCD vRP vRP vRP -tkl +aCD +vRP +aCD vRP vRP +aCD vRP vRP -vRP -vRP -vRP -vRP -vRP -vRP -tkl -vRP -ubS +aCD +aCD pCt +ubS +aCD +ubS +ubS aCD vRP vRP @@ -91155,20 +91269,16 @@ tSW tSW tSW tSW -lMA -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl -tkl +tSW +vRP +aCD +vRP +aCD +vRP +vRP +aCD +vRP +vRP tkl ubS jta @@ -91263,6 +91373,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (164,1,1) = {" vRP @@ -91412,25 +91526,25 @@ uxf gIq nXc neX -lMA -aCD +eLr +eLr +eLr +hHC +hHC +hHC +eLr +eLr vRP vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -aCD -aCD -aCD tkl aCD -aCD -aCD -aCD +vRP +vRP +vRP +vRP +vRP +vRP +vRP vRP vRP vRP @@ -91669,23 +91783,23 @@ kbG vvd atx oaC -sqz -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP +nDd +feh +nEA +sDZ +sDZ +sDZ +aiz +eLr +eLr vRP tkl ubS -aCD +vRP +vRP +vRP +vRP +vRP vRP vRP vRP @@ -91926,20 +92040,16 @@ nPi vvd atx pnP -sqz -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP +nDd +ixL +nfE +hJl +hJl +xUY +hJl +qtO +hHC +aCD tkl aCD vRP @@ -92034,6 +92144,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (167,1,1) = {" vRP @@ -92180,22 +92294,18 @@ wcy lzE jWH lzE -oAE -atx -pnP -sqz -gIn -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP +xww +foH +dkM +oXk +rlo +gJW +gQo +lzs +nDE +hJl +qtO +hHC vRP tkl ubS @@ -92291,6 +92401,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (168,1,1) = {" vRP @@ -92440,20 +92554,16 @@ vvd rRY atx pnP -sqz -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP +nDd +ixL +ejV +nDE +wMH +aCP +hJl +qtO +hHC +aCD tkl aCD vRP @@ -92472,6 +92582,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP cFo vRP vRP @@ -92697,19 +92811,15 @@ oRf eXj kqi sod -sqz -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP +nDd +xmg +nbF +eKc +auN +aXC +qXH +eLr +eLr vRP tkl aCD @@ -92805,6 +92915,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (170,1,1) = {" vRP @@ -92954,20 +93068,16 @@ smm rRY atx xHB -lMA -aCD +fXQ +fXQ +fXQ +fXQ +kvA +nDd +eLr +eLr vRP vRP -vRP -vRP -vRP -vRP -vRP -vRP -vRP -aCD -aCD -aCD tkl ubS vRP @@ -93062,6 +93172,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (171,1,1) = {" vRP @@ -93210,21 +93324,17 @@ pKx lwC rWP nBO -lMA -lMA -tkl -tkl -tkl +tSW +tSW +vRP sqz -oha +kzh +kCg +hTx sqz -oha -sqz -tkl -tkl -tkl -tkl -tkl +vRP +vRP +vRP tkl ubS vRP @@ -93319,6 +93429,10 @@ vRP vRP vRP vRP +vRP +vRP +vRP +vRP "} (172,1,1) = {" vRP @@ -93467,15 +93581,13 @@ pKx cVQ hjp ryX -lMA -aCD -aCD -vRP -aCD -sqz -jam tSW -qEh +aCD +aCD +sqz +xBd +tfe +vaq sqz aCD aCD @@ -93483,6 +93595,8 @@ aCD tkl tkl tkl +tkl +tkl aCD flE aCD @@ -93724,16 +93838,16 @@ faQ wtt lVK gsE -lMA -lMA +tSW +tSW +sqz +sqz +eGD +tfe +vaq sqz sqz sqz -sqz -hOw -rKC -hOw -rrx lMA lMA aCD @@ -93985,11 +94099,11 @@ xpQ mmo xpQ xpQ -tDj +uCH +tfe +unc xpQ -eBm xpQ -xme ktG eLA lMA @@ -94243,10 +94357,10 @@ blt aAR aAR ofj +uEx aAR -deA aAR -giq +blt nOX wUk vha diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index a71908583fd0..924b5b22ba79 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -893,38 +893,66 @@ SUBSYSTEM_DEF(job) return //bad mojo - var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival] - if(A) - //first check if we can find a chair - var/obj/structure/chair/C = locate() in A - if(C) - C.JoinPlayerHere(M, buckle) - return - - //last hurrah - var/list/avail = list() - for(var/turf/T in A) - if(!T.is_blocked_turf(TRUE)) - avail += T - if(avail.len) - destination = pick(avail) + if(SSmapping.config.cryo_spawn) + var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/crew_quarters/cryopods] + if(A) + var/list/pods = list() + var/list/unoccupied_pods = list() + for(var/obj/machinery/cryopod/pod in A) + pods |= pod + if(!pod.occupant) + unoccupied_pods |= pod + if(length(unoccupied_pods)) //if we have any unoccupied ones + destination = pick(unoccupied_pods) + else if(length(pods)) + destination = pick(pods) //if they're all full somehow?? + else //no pods at all + var/list/available = list() + for(var/turf/T in A) + if(!T.is_blocked_turf(TRUE)) + available += T + if(length(available)) + destination = pick(available) + if(destination) destination.JoinPlayerHere(M, FALSE) - return + else + var/msg = "Unable to send mob [M] to late join (CRYOPODS)!" + message_admins(msg) + CRASH(msg) - //pick an open spot on arrivals and dump em - var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival)) - if(arrivals_turfs.len) - for(var/turf/T in arrivals_turfs) - if(!T.is_blocked_turf(TRUE)) - T.JoinPlayerHere(M, FALSE) - return - //last chance, pick ANY spot on arrivals and dump em - destination = arrivals_turfs[1] - destination.JoinPlayerHere(M, FALSE) else - var/msg = "Unable to send mob [M] to late join!" - message_admins(msg) - CRASH(msg) + var/area/shuttle/arrival/A = GLOB.areas_by_type[/area/shuttle/arrival] + if(A) + //first check if we can find a chair + var/obj/structure/chair/C = locate() in A + if(C) + C.JoinPlayerHere(M, buckle) + return + + //last hurrah + var/list/avail = list() + for(var/turf/T in A) + if(!T.is_blocked_turf(TRUE)) + avail += T + if(avail.len) + destination = pick(avail) + destination.JoinPlayerHere(M, FALSE) + return + + //pick an open spot on arrivals and dump em + var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival)) + if(arrivals_turfs.len) + for(var/turf/T in arrivals_turfs) + if(!T.is_blocked_turf(TRUE)) + T.JoinPlayerHere(M, FALSE) + return + //last chance, pick ANY spot on arrivals and dump em + destination = arrivals_turfs[1] + destination.JoinPlayerHere(M, FALSE) + else + var/msg = "Unable to send mob [M] to late join!" + message_admins(msg) + CRASH(msg) ///Lands specified mob at a random spot in the hallways /datum/controller/subsystem/job/proc/DropLandAtRandomHallwayPoint(mob/living/living_mob) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index b5c72aa16ddf..e246ccaa4620 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -24,6 +24,7 @@ var/space_empty_levels = 1 var/minetype = "lavaland" + var/cryo_spawn = FALSE var/allow_custom_shuttles = TRUE var/shuttles = list( @@ -135,6 +136,9 @@ if ("minetype" in json) minetype = json["minetype"] + if("cryo_spawn" in json) + cryo_spawn = json["cryo_spawn"] + allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE #ifdef UNIT_TESTS diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 8fb9435b6e7c..973b7e39f7d9 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -432,3 +432,27 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) log_admin(span_notice("[key_name(target)] entered a stasis pod.")) message_admins("[key_name_admin(target)] entered a stasis pod. (JMP)") add_fingerprint(target) + +/obj/machinery/cryopod/JoinPlayerHere(mob/M, buckle) + . = ..() + open_machine() + if(iscarbon(M)) + apply_effects_to_mob(M) + +/obj/machinery/cryopod/proc/apply_effects_to_mob(mob/living/carbon/sleepyhead) + to_chat(sleepyhead, span_boldnotice("You begin to wake from cryosleep...")) + sleepyhead.set_nutrition(200) + sleepyhead.SetSleeping(60) //if you read this comment and feel like shitting together something to adjust IPC charge on wakeup, be my guest. + //but it can be worse. + if(prob(90)) + sleepyhead.adjust_drowsiness(rand(3 SECONDS, 10 SECONDS)) + if(prob(75)) + sleepyhead.blur_eyes(rand(3, 6)) + //so much worse + if(prob(66)) + sleepyhead.adjust_disgust(rand(25,35)) + if(prob(33)) + sleepyhead.adjust_disgust(rand(20,30)) + if(prob(16)) + sleepyhead.adjust_disgust(rand(10, 17)) + to_chat(sleepyhead, "The symptoms of cryosleep set in as you awaken...")