diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8d69c91deff6..7525d08afa85 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1584,24 +1584,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
-"amx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/button/door/directional/east{
- id = "left_arrivals_shutters";
- name = "Left Arrivals Hallway Shutters";
- pixel_y = 6
- },
-/obj/machinery/button/door/directional/east{
- id = "right_arrivals_shutters";
- name = "Right Arrivals Hallway Shutters";
- pixel_y = -4
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/customs/fore)
"amB" = (
/obj/structure/sign/warning/electric_shock{
pixel_y = -32
@@ -2623,6 +2605,11 @@
/obj/effect/spawner/random/trash/graffiti,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"awY" = (
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/checker,
+/area/station/hallway/secondary/service)
"axa" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/turf_decal/bot,
@@ -8530,15 +8517,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/detectives_office)
-"bJm" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/status_display/ai/directional/north,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/detectives_office)
"bJn" = (
/obj/structure/rack,
/obj/item/storage/briefcase{
@@ -12199,6 +12177,7 @@
/obj/item/storage/box/rxglasses,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"cla" = (
@@ -13459,6 +13438,13 @@
},
/turf/open/floor/wood,
/area/station/engineering/break_room)
+"cwC" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/cargo/office)
"cwF" = (
/obj/effect/turf_decal/siding/white{
dir = 1
@@ -14014,6 +14000,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"cCA" = (
+/obj/machinery/light_switch/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain)
"cCC" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
@@ -17006,6 +16998,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/main)
+"dcb" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"dce" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -17363,6 +17361,18 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/library)
+"ddc" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/photocopier/prebuilt,
+/obj/item/newspaper{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/newspaper,
+/turf/open/floor/plating,
+/area/station/security/detectives_office/private_investigators_office)
"ddd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -17521,15 +17531,6 @@
/obj/structure/sink/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"ddU" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"ddW" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/purple/filled/warning{
@@ -17744,12 +17745,12 @@
/turf/open/floor/iron,
/area/station/science/lab)
"dfw" = (
-/obj/machinery/firealarm/directional/north,
/obj/item/stack/medical/wrap/gauze,
/obj/item/stack/medical/mesh,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/light/cold/directional/north,
+/obj/item/radio/intercom/directional/north,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"dfx" = (
@@ -17763,9 +17764,7 @@
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"dfz" = (
-/obj/structure/extinguisher_cabinet/directional/north,
/obj/item/stack/medical/wrap/gauze,
-/obj/item/stack/medical/suture,
/obj/machinery/camera/directional/north{
c_tag = "Medbay - Treatment Center";
name = "medbay camera";
@@ -17773,6 +17772,8 @@
},
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/stack/medical/suture,
+/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"dfD" = (
@@ -17981,12 +17982,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"dhb" = (
-/obj/machinery/stasis,
-/obj/machinery/newscaster/directional/east,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
"dhf" = (
/obj/machinery/newscaster/directional/south,
/turf/open/floor/wood,
@@ -18240,6 +18235,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"dix" = (
@@ -18386,6 +18382,7 @@
/obj/machinery/computer/operating,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/bot_white,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/surgery/theatre)
"djo" = (
@@ -18766,16 +18763,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"dlN" = (
-/obj/machinery/camera/directional/north{
- c_tag = "Medbay - Central Hallway";
- dir = 9;
- name = "medbay camera";
- network = list("ss13","medbay")
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay)
"dlO" = (
/turf/closed/wall/r_wall,
/area/station/security/checkpoint/medical/medsci)
@@ -19458,7 +19445,6 @@
/area/station/science/research)
"dqC" = (
/obj/machinery/defibrillator_mount/directional/south,
-/obj/item/radio/intercom/directional/west,
/obj/item/emergency_bed{
pixel_y = 6
},
@@ -19467,6 +19453,7 @@
},
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"dqL" = (
@@ -22828,10 +22815,10 @@
/obj/effect/turf_decal/trimline/neutral/mid_joiner{
dir = 8
},
-/obj/machinery/status_display/evac/directional/north,
/obj/structure/bodycontainer/morgue{
dir = 2
},
+/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
@@ -24993,6 +24980,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"efv" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/carpet/royalblack,
+/area/station/service/chapel/office)
"efw" = (
/obj/structure/sign/nanotrasen{
pixel_y = 32
@@ -28525,23 +28517,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/aft)
-"ffd" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/requests_console/directional/north{
- department = "Head of Security's Desk";
- name = "Head of Security's Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/structure/sign/nanotrasen{
- pixel_x = 32;
- pixel_y = 32
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
"ffk" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -30535,6 +30510,7 @@
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/bot_white,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/surgery/theatre)
"fHF" = (
@@ -32607,11 +32583,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"goP" = (
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/checker,
-/area/station/hallway/secondary/service)
"goR" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -35293,13 +35264,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/corporate_showroom)
-"hbs" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
"hbu" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -41736,11 +41700,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"iKf" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/carpet/royalblack,
-/area/station/service/chapel/office)
"iKm" = (
/obj/effect/turf_decal/siding/white{
dir = 9
@@ -42986,7 +42945,6 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"jey" = (
/obj/structure/mannequin/skeleton,
-/obj/machinery/status_display/ai/directional/north,
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
dir = 1
},
@@ -43011,6 +42969,14 @@
},
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"jfu" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/newscaster/directional/east,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"jfA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/grimy,
@@ -43982,6 +43948,11 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"juJ" = (
+/obj/effect/turf_decal/stripes/white/line,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/engineering/break_room)
"jvc" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/office,
@@ -44386,6 +44357,13 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"jBN" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/box/white,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"jBO" = (
/obj/machinery/duct,
/obj/effect/turf_decal/stripes/line{
@@ -44609,6 +44587,7 @@
/obj/structure/bodycontainer/morgue{
dir = 2
},
+/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
@@ -45267,12 +45246,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
-"jNF" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"jNV" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -48919,11 +48892,11 @@
/area/station/service/theater)
"kPo" = (
/obj/machinery/firealarm/directional/east,
-/obj/structure/extinguisher_cabinet/directional/north,
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
/area/station/medical/storage)
"kPq" = (
@@ -50704,18 +50677,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/electronic_marketing_den)
-"loW" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/photocopier/prebuilt,
-/obj/item/newspaper{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/newspaper,
-/turf/open/floor/plating,
-/area/station/security/detectives_office/private_investigators_office)
"loX" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -51894,11 +51855,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
-"lEN" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/captain/private)
"lES" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -52676,6 +52632,16 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/station/maintenance/disposal)
+"lSf" = (
+/obj/machinery/camera/directional/north{
+ c_tag = "Medbay - Central Hallway";
+ dir = 9;
+ name = "medbay camera";
+ network = list("ss13","medbay")
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay)
"lSl" = (
/obj/machinery/duct,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -52694,11 +52660,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
-"lSF" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/turf/open/floor/wood/large,
-/area/station/service/library)
"lSI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/office{
@@ -53721,6 +53682,16 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/construction)
+"mgF" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/customs/aft)
"mgK" = (
/obj/effect/decal/cleanable/blood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -55114,6 +55085,23 @@
dir = 8
},
/area/station/security/medical)
+"mCp" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/requests_console/directional/north{
+ department = "Head of Security's Desk";
+ name = "Head of Security's Requests Console"
+ },
+/obj/effect/mapping_helpers/requests_console/announcement,
+/obj/effect/mapping_helpers/requests_console/information,
+/obj/effect/mapping_helpers/requests_console/assistance,
+/obj/structure/sign/nanotrasen{
+ pixel_x = 32;
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hos)
"mCs" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
dir = 4
@@ -56418,16 +56406,6 @@
/obj/structure/closet/firecloset,
/turf/open/floor/iron,
/area/station/engineering/main)
-"mUF" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/customs/aft)
"mUZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch"
@@ -56695,12 +56673,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
-"mYI" = (
-/obj/machinery/light_switch/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/light/directional/north,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/captain)
"mYQ" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/newscaster/directional/west,
@@ -57194,6 +57166,11 @@
/obj/effect/turf_decal/bot/right,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"ngv" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/turf/open/floor/wood/large,
+/area/station/service/library)
"ngy" = (
/obj/structure/closet/emcloset/anchored,
/obj/effect/turf_decal/bot,
@@ -57570,7 +57547,6 @@
/area/station/command/teleporter)
"nls" = (
/obj/machinery/defibrillator_mount/directional/north,
-/obj/item/radio/intercom/directional/east,
/obj/item/storage/box/bodybags{
pixel_x = 3;
pixel_y = 3
@@ -57578,6 +57554,7 @@
/obj/item/storage/box/masks,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"nly" = (
@@ -60652,11 +60629,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"ocD" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/sign/poster/official/work_for_a_future/directional/east,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"ocM" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
@@ -65710,6 +65682,7 @@
/obj/item/reagent_containers/syringe,
/obj/structure/table/reinforced/rglass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
"pxU" = (
@@ -65934,13 +65907,6 @@
/obj/item/tank/internals/anesthetic{
pixel_x = -3
},
-/obj/item/clothing/mask/breath/medical{
- pixel_y = 3
- },
-/obj/item/clothing/mask/breath/medical,
-/obj/item/clothing/mask/breath/medical{
- pixel_y = -3
- },
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/status_display/evac/directional/south,
/obj/machinery/door/window/left/directional/north{
@@ -65948,6 +65914,9 @@
req_access = list("surgery")
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/clothing/mask/muzzle/breath,
+/obj/item/clothing/mask/muzzle/breath,
+/obj/item/clothing/mask/muzzle/breath,
/turf/open/floor/iron/dark,
/area/station/medical/surgery/theatre)
"pCH" = (
@@ -67143,7 +67112,6 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
-/obj/machinery/vending/wallmed/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/textured,
@@ -68106,6 +68074,15 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
+"qgM" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/status_display/ai/directional/north,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/detectives_office)
"qgN" = (
/obj/structure/table,
/obj/effect/spawner/random/entertainment/drugs{
@@ -69377,6 +69354,13 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"qzV" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"qAm" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -70154,11 +70138,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"qKC" = (
-/obj/effect/turf_decal/stripes/white/line,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/engineering/break_room)
"qKF" = (
/obj/structure/chair{
dir = 4
@@ -70931,16 +70910,12 @@
"qVD" = (
/obj/structure/sign/poster/official/report_crimes/directional/north,
/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/suit/jacket{
- desc = "All the class of a trenchcoat without the security fibers.";
- icon_state = "detective";
- name = "trenchcoat"
- },
/obj/item/clothing/head/fedora{
icon_state = "detective"
},
/obj/item/clothing/gloves/color/black,
/obj/effect/mapping_helpers/broken_floor,
+/obj/item/clothing/suit/jacket/leather_trenchcoat,
/turf/open/floor/wood,
/area/station/security/detectives_office/private_investigators_office)
"qVG" = (
@@ -73351,6 +73326,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"rFl" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/grimy,
+/area/station/commons/vacant_room/office)
"rFw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
@@ -73945,12 +73927,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"rPg" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/south,
-/turf/open/floor/plating,
-/area/station/service/library/abandoned)
"rPv" = (
/obj/structure/cable,
/obj/effect/landmark/start/paramedic,
@@ -76269,13 +76245,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/security/prison/safe)
-"syb" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/ai/directional/south,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/iron/dark,
-/area/station/medical/surgery/theatre)
"sye" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -77134,11 +77103,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/kitchen/abandoned)
-"sKa" = (
-/obj/structure/cable,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/command/meeting_room/council)
"sKd" = (
/obj/effect/spawner/random/trash/box,
/obj/effect/spawner/random/food_or_drink/seed,
@@ -77333,6 +77297,14 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/maintenance/department/security)
+"sNP" = (
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"sOa" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
@@ -78637,14 +78609,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"tiI" = (
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"tiJ" = (
/obj/structure/filingcabinet/filingcabinet,
/obj/machinery/airalarm/directional/north,
@@ -79989,6 +79953,11 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/iron,
/area/station/cargo/sorting)
+"tEq" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/sign/poster/official/work_for_a_future/directional/east,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"tEw" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -80009,14 +79978,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"tEy" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/status_display/evac/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Lawyer's Office"
- },
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"tEB" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -80469,6 +80430,24 @@
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
+"tKp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/button/door/directional/east{
+ id = "left_arrivals_shutters";
+ name = "Left Arrivals Hallway Shutters";
+ pixel_y = 6
+ },
+/obj/machinery/button/door/directional/east{
+ id = "right_arrivals_shutters";
+ name = "Right Arrivals Hallway Shutters";
+ pixel_y = -4
+ },
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint/customs/fore)
"tKq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/circuit/green,
@@ -80500,6 +80479,14 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
+"tKM" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/camera/directional/east{
+ c_tag = "Lawyer's Office"
+ },
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"tKN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
@@ -80605,13 +80592,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"tMm" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/box/white,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"tMt" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
dir = 6
@@ -83192,13 +83172,6 @@
},
/turf/open/floor/iron/white,
/area/station/maintenance/fore)
-"uyC" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/grimy,
-/area/station/commons/vacant_room/office)
"uyF" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -83467,6 +83440,13 @@
/obj/item/paper/fluff/holodeck/disclaimer,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
+"uBh" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"uBn" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/light_switch/directional/north{
@@ -84304,13 +84284,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
-"uOw" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"uOJ" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -84512,6 +84485,11 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/office)
+"uRY" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain/private)
"uSa" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -85192,6 +85170,11 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/maintenance/disposal/incinerator)
+"vbB" = (
+/obj/structure/cable,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/command/meeting_room/council)
"vbE" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -87173,6 +87156,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"vFn" = (
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"vFo" = (
/obj/item/reagent_containers/condiment/enzyme{
layer = 5
@@ -89109,7 +89101,6 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"wfS" = (
-/obj/machinery/status_display/ai/directional/south,
/obj/effect/turf_decal/siding/thinplating/dark/corner,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 8
@@ -91780,13 +91771,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"wPU" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/office)
"wPX" = (
/obj/structure/table/wood,
/obj/item/pai_card,
@@ -95353,6 +95337,12 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
+"xOy" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/broken/directional/south,
+/turf/open/floor/plating,
+/area/station/service/library/abandoned)
"xOD" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -120070,7 +120060,7 @@ qVS
kPH
pqg
cwz
-qKC
+juJ
goG
fLB
rtP
@@ -120339,7 +120329,7 @@ foo
pQg
oFe
ibr
-tMm
+jBN
xPF
gIV
pIG
@@ -128117,7 +128107,7 @@ sKr
uDH
mvJ
sHV
-rPg
+xOy
ert
ert
ert
@@ -129370,7 +129360,7 @@ rkE
cZa
daE
dct
-ddU
+vFn
dFu
jpO
dhX
@@ -130090,7 +130080,7 @@ vzA
tCD
xFX
oky
-uyC
+rFl
alf
ghU
alf
@@ -132156,7 +132146,7 @@ fhT
lRN
uKR
tZP
-sKa
+vbB
pTo
kcH
wpW
@@ -133966,7 +133956,7 @@ wVf
sDz
fOk
xwZ
-ocD
+tEq
wVo
iYA
reS
@@ -135457,7 +135447,7 @@ wKe
wKe
liV
wKe
-goP
+awY
vTS
wKe
qFH
@@ -135550,7 +135540,7 @@ dlO
duZ
dsl
duZ
-dlN
+lSf
qrs
dgR
din
@@ -136825,12 +136815,12 @@ dbb
dcN
whw
pxG
-hbs
+uBh
dip
dba
wHY
nAG
-hbs
+uBh
dqC
sdI
hpY
@@ -137782,7 +137772,7 @@ eqO
wAv
rzu
duL
-wPU
+cwC
pzB
eDV
llC
@@ -137874,7 +137864,7 @@ uMR
aEi
dVm
dVm
-syb
+aEi
lmf
jey
heX
@@ -138012,7 +138002,7 @@ fIY
akj
akE
alB
-amx
+tKp
anx
fiW
vKY
@@ -138065,7 +138055,7 @@ xTi
pjP
vfg
glH
-mYI
+cCA
lrp
ilY
gaN
@@ -138073,7 +138063,7 @@ fwz
jpd
wQc
rWM
-lEN
+uRY
vtq
lIk
hft
@@ -138624,7 +138614,7 @@ wmA
tHg
wmA
nls
-dhb
+jfu
diu
ndH
bXP
@@ -141460,7 +141450,7 @@ jSo
sec
sec
sec
-loW
+ddc
nSm
txo
qfr
@@ -142239,7 +142229,7 @@ sgL
iBN
fIV
uDa
-mUF
+mgF
oLE
ubA
vyC
@@ -142408,7 +142398,7 @@ wvS
tLy
viJ
nRx
-uOw
+qzV
sqj
eEM
xAE
@@ -144007,7 +143997,7 @@ mag
nvx
nvx
xWC
-lSF
+ngv
sNF
cNN
gFe
@@ -145003,7 +144993,7 @@ aaa
aaa
aaa
bHr
-bJm
+qgM
xXz
bNd
bPk
@@ -145321,7 +145311,7 @@ gaw
doA
jzr
sec
-iKf
+efv
xPr
dmV
aHu
@@ -145560,7 +145550,7 @@ dbw
cYc
qRO
qRO
-jNF
+dcb
hWD
xjz
qMA
@@ -145787,7 +145777,7 @@ fof
fjU
xKt
pcN
-tEy
+tKM
rCa
qmf
pNK
@@ -151414,7 +151404,7 @@ aaa
aaa
tuZ
dIz
-tiI
+sNP
uRO
kmY
ums
@@ -152955,7 +152945,7 @@ aad
aaa
aad
arn
-ffd
+mCp
mqy
lrZ
jML
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 8fdff6e0d46e..122d798bf559 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -166,6 +166,7 @@
},
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/blue/full,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"adq" = (
@@ -191,11 +192,6 @@
},
/turf/open/floor/plating,
/area/station/science/xenobiology)
-"adZ" = (
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/engineering/lobby)
"aee" = (
/obj/structure/ladder,
/obj/effect/mapping_helpers/broken_floor,
@@ -1578,6 +1574,7 @@
dir = 5
},
/obj/machinery/light/small/directional/east,
+/obj/machinery/vending/wallmed/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"ayR" = (
@@ -1947,17 +1944,6 @@
/obj/machinery/dna_scannernew,
/turf/open/floor/iron/dark,
/area/station/science/genetics)
-"aFw" = (
-/obj/machinery/sleeper/cryo,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 10
- },
-/obj/effect/turf_decal/tile/green/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"aFx" = (
/obj/structure/rack,
/obj/item/clothing/suit/hooded/wintercoat/eva{
@@ -9466,6 +9452,12 @@
/obj/machinery/bookbinder,
/turf/open/floor/wood,
/area/station/service/library)
+"cIT" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/sign/calendar/directional/west,
+/turf/open/floor/wood,
+/area/station/commons/vacant_room/office)
"cIU" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
@@ -10643,6 +10635,14 @@
/obj/item/cultivator,
/turf/open/floor/iron,
/area/station/maintenance/starboard/aft)
+"daU" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/office)
"daX" = (
/obj/structure/sign/warning/gas_mask,
/turf/closed/wall,
@@ -17598,11 +17598,6 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"fgm" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/wood,
-/area/station/service/library)
"fgo" = (
/obj/effect/spawner/random/trash/mess,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18799,10 +18794,15 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -5
+ },
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
},
+/obj/machinery/light_switch/directional/west{
+ pixel_y = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"fzv" = (
@@ -20213,7 +20213,6 @@
/area/station/service/bar)
"fWn" = (
/obj/structure/table/glass,
-/obj/machinery/vending/wallmed/directional/north,
/obj/item/book/manual/wiki/surgery{
pixel_x = -4;
pixel_y = 3
@@ -20228,6 +20227,7 @@
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"fWo" = (
@@ -20824,6 +20824,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
/area/station/commons/storage/art)
+"gfL" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 6
+ },
+/obj/effect/turf_decal/tile/green/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"gfY" = (
/obj/effect/spawner/random/structure/tank_holder,
/obj/structure/sign/poster/official/wtf_is_co2/directional/east,
@@ -20860,6 +20871,10 @@
/obj/effect/spawner/random/trash/bin,
/turf/open/floor/plating,
/area/station/maintenance/starboard/lesser)
+"ggE" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/command/meeting_room)
"ggG" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -23771,10 +23786,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"hbp" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
"hbt" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/spawner/random/clothing/mafia_outfit,
@@ -24475,12 +24486,6 @@
},
/turf/open/openspace,
/area/station/science/xenobiology)
-"hnP" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/cafeteria{
- dir = 8
- },
-/area/station/science/research)
"hnV" = (
/obj/structure/table/glass,
/obj/item/stack/cable_coil,
@@ -25302,12 +25307,6 @@
dir = 4
},
/area/station/science/research)
-"hAo" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/structure/sign/calendar/directional/west,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
"hAq" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25534,6 +25533,11 @@
},
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
+"hDH" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron,
+/area/station/cargo/office)
"hDI" = (
/obj/machinery/computer/order_console/cook{
dir = 4
@@ -25857,19 +25861,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
-"hJz" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"hJD" = (
/obj/structure/ladder,
/turf/open/floor/wood,
@@ -25890,6 +25881,11 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
+"hJN" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/sign/poster/official/random/directional/east,
+/turf/open/floor/wood,
+/area/station/service/library)
"hJY" = (
/obj/structure/closet/l3closet/janitor,
/obj/machinery/airalarm/directional/north,
@@ -26804,11 +26800,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"hXU" = (
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/floor/iron/white,
-/area/station/medical/cryo)
"hYb" = (
/obj/machinery/door/airlock/maintenance{
name = "Disposal Access"
@@ -26877,6 +26868,14 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/bar/atrium)
+"iab" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"iag" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -28340,6 +28339,11 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"ivk" = (
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/engineering/lobby)
"ivo" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -28526,19 +28530,6 @@
},
/turf/open/floor/plating,
/area/mine/living_quarters)
-"iyK" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
"iyL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -30125,6 +30116,7 @@
dir = 4
},
/obj/structure/sink/directional/west,
+/obj/structure/mirror/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/aft)
"iYt" = (
@@ -30198,7 +30190,11 @@
dir = 1
},
/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/medical/cryo)
"iZz" = (
/turf/open/misc/asteroid/snow/icemoon,
@@ -30585,13 +30581,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"jeE" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"jeF" = (
/obj/effect/landmark/start/security_officer,
/turf/open/floor/glass/reinforced,
@@ -33505,11 +33494,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"kaw" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron,
-/area/station/cargo/office)
"kax" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
@@ -39972,6 +39956,12 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"lRu" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/cafeteria{
+ dir = 8
+ },
+/area/station/science/research)
"lRx" = (
/obj/effect/turf_decal/tile/dark_green,
/turf/open/floor/iron/dark,
@@ -40582,7 +40572,6 @@
/turf/open/floor/iron,
/area/station/tcommsat/computer)
"mbB" = (
-/obj/machinery/newscaster/directional/west,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
@@ -41286,6 +41275,11 @@
},
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai_upload)
+"mnY" = (
+/obj/machinery/newscaster/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/hop)
"moc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -44326,6 +44320,16 @@
/obj/effect/spawner/random/trash/mess,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
+"njR" = (
+/obj/effect/turf_decal/siding/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 1
+ },
+/obj/machinery/sleeper/stasis/cryo,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"njT" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -47093,13 +47097,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/security/prison/visit)
-"nYl" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/sleeper/cryo,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/prison)
"nYn" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/carpet,
@@ -48704,6 +48701,17 @@
/obj/machinery/newscaster/directional/east,
/turf/open/floor/iron,
/area/station/security/prison/workout)
+"owj" = (
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -4
+ },
+/obj/machinery/light_switch/directional/west{
+ pixel_y = 5
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood,
+/area/station/hallway/secondary/service)
"owk" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -50193,6 +50201,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/structure/table/glass,
/obj/machinery/light/cold/directional/east,
+/obj/machinery/status_display/ai/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/cryo)
"oRy" = (
@@ -50289,6 +50298,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"oSR" = (
@@ -51417,7 +51427,6 @@
/turf/open/floor/iron,
/area/mine/laborcamp/security)
"piI" = (
-/obj/machinery/airalarm/directional/south,
/obj/machinery/camera{
c_tag = "Medbay Stasis Center South";
network = list("ss13","medbay")
@@ -51425,6 +51434,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
+/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"piJ" = (
@@ -54326,10 +54336,15 @@
/area/station/maintenance/starboard/fore)
"qaU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = 5
+ },
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 1
},
+/obj/machinery/light_switch/directional/west{
+ pixel_y = -5
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"qbb" = (
@@ -55259,11 +55274,11 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
-/obj/machinery/light_switch/directional/west,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 8
},
/obj/item/radio/intercom/directional/south,
+/obj/machinery/vending/wallmed/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"qpd" = (
@@ -55586,12 +55601,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"qsQ" = (
-/obj/machinery/stasis,
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/large,
-/area/station/medical/treatment_center)
"qsR" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/rack,
@@ -56008,7 +56017,9 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -6
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"qyR" = (
@@ -56593,7 +56604,6 @@
/turf/open/floor/iron/dark,
/area/station/science/breakroom)
"qHz" = (
-/obj/machinery/light_switch/directional/west,
/obj/machinery/disposal/bin{
desc = "A pneumatic waste disposal unit. This one leads to the morgue.";
name = "corpse disposal"
@@ -56603,6 +56613,7 @@
dir = 1
},
/obj/item/radio/intercom/directional/north,
+/obj/machinery/vending/wallmed/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"qHD" = (
@@ -57741,6 +57752,19 @@
/obj/structure/flora/bush/jungle/c/style_random,
/turf/open/floor/grass,
/area/station/medical/virology)
+"qXR" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"qXY" = (
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
@@ -60114,12 +60138,12 @@
network = list("ss13","medbay");
pixel_x = 22
},
-/obj/machinery/vending/wallmed/directional/south,
/obj/structure/cable,
/obj/structure/table/glass,
/obj/item/stack/medical/wrap/sticky_tape/surgical,
/obj/item/stack/medical/bone_gel,
/obj/effect/turf_decal/tile/blue/half/contrasted,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"rKZ" = (
@@ -60696,6 +60720,13 @@
dir = 4
},
/area/station/hallway/secondary/entry)
+"rUw" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/sleeper/stasis/cryo,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/prison)
"rUz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -61154,11 +61185,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
-"sbi" = (
-/obj/machinery/newscaster/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/hop)
"sbv" = (
/obj/structure/closet/secure_closet/personal{
anchored = 1
@@ -63899,6 +63925,13 @@
"sOn" = (
/turf/closed/wall,
/area/station/cargo/lobby)
+"sOu" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/large,
+/area/station/medical/treatment_center)
"sOz" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64287,7 +64320,11 @@
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/medical/cryo)
"sVn" = (
/obj/machinery/light_switch/directional/north,
@@ -64926,9 +64963,9 @@
},
/obj/item/reagent_containers/syringe,
/obj/machinery/defibrillator_mount/directional/north,
-/obj/item/radio/intercom/directional/west,
/obj/effect/turf_decal/tile/blue/full,
/obj/machinery/light/cold/directional/north,
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
"thA" = (
@@ -67482,6 +67519,19 @@
/obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"tWs" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/aft)
"tWy" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -68163,16 +68213,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"ugP" = (
-/obj/effect/turf_decal/siding/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 1
- },
-/obj/machinery/sleeper/cryo,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/prison)
"ugR" = (
/obj/structure/reagent_dispensers/watertank/high,
/obj/structure/cable,
@@ -69978,7 +70018,11 @@
dir = 1
},
/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/iron/white,
+/obj/effect/turf_decal/tile/blue/full,
+/obj/effect/turf_decal/stripes/red/line{
+ dir = 1
+ },
+/turf/open/floor/iron/textured_large,
/area/station/medical/cryo)
"uKx" = (
/obj/structure/closet,
@@ -70493,17 +70537,6 @@
dir = 4
},
/area/station/hallway/secondary/entry)
-"uRy" = (
-/obj/machinery/sleeper/cryo,
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 6
- },
-/obj/effect/turf_decal/tile/green/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"uRL" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/light/directional/north,
@@ -71579,6 +71612,17 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"vjV" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/green/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"vjZ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -73359,14 +73403,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
-"vLt" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/office)
"vLC" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -73632,7 +73668,7 @@
/obj/effect/turf_decal/trimline/blue/line{
dir = 9
},
-/obj/machinery/status_display/evac/directional/south,
+/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark/textured,
/area/station/medical/treatment_center)
"vRy" = (
@@ -73947,17 +73983,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"vWc" = (
-/obj/machinery/firealarm/directional/west{
- pixel_y = -4
- },
-/obj/machinery/light_switch/directional/west{
- pixel_y = 5
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/wood,
-/area/station/hallway/secondary/service)
"vWe" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -165246,7 +165271,7 @@ sTh
kwo
sPC
ybV
-hJz
+qXR
vEq
scw
oif
@@ -165501,9 +165526,9 @@ qxI
qxI
rVC
kwo
-aFw
+vjV
slb
-hJz
+qXR
vEq
iDt
scw
@@ -165758,9 +165783,9 @@ qxI
qxI
coT
kwo
-uRy
+gfL
slb
-hJz
+qXR
vEq
iDt
iDt
@@ -166017,7 +166042,7 @@ dwI
kwo
bAx
cwP
-hJz
+qXR
vEq
ebd
iDt
@@ -175462,7 +175487,7 @@ gjq
gjq
gjq
upw
-nYl
+rUw
iRV
cvq
xgL
@@ -175976,7 +176001,7 @@ gjq
gjq
gjq
upw
-ugP
+njR
uRu
uRu
uRu
@@ -226156,7 +226181,7 @@ fUR
teE
bKA
nwT
-hAo
+cIT
tzM
vgj
tKI
@@ -234638,7 +234663,7 @@ tKI
tKI
tKI
tKI
-kaw
+hDH
vkF
rTt
sOJ
@@ -238486,7 +238511,7 @@ xyl
dnq
qjm
dxK
-hbp
+ggE
oyp
phf
sEl
@@ -239267,7 +239292,7 @@ iYb
txI
xvZ
iYb
-sbi
+mnY
jWP
ool
jRC
@@ -241257,7 +241282,7 @@ bln
lbc
nbp
lau
-vLt
+daU
dlK
pbI
jIm
@@ -243152,7 +243177,7 @@ jkx
fLq
hro
tKi
-adZ
+ivk
dxA
oht
rSC
@@ -246699,7 +246724,7 @@ jlP
ePq
twU
uja
-vWc
+owj
dNf
aKw
dLc
@@ -249295,7 +249320,7 @@ mcW
sFG
lwQ
tht
-jeE
+sOu
xtv
lup
aCA
@@ -250836,7 +250861,7 @@ iAO
niu
pZm
lwQ
-qsQ
+iab
kQM
rVq
nji
@@ -251617,7 +251642,7 @@ rjC
qjF
pPO
wbN
-iyK
+tWs
tOO
qQp
qQp
@@ -253926,7 +253951,7 @@ amE
lei
klc
pgY
-hXU
+ufN
oRu
hIe
uKj
@@ -257237,7 +257262,7 @@ bla
sil
hUD
hUD
-fgm
+hJN
qok
iZn
xzd
@@ -259585,7 +259610,7 @@ kdJ
vjj
wLl
wol
-hnP
+lRu
gPE
bpD
wLl
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index bb4f167d9440..244bd6116651 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -830,19 +830,6 @@
/obj/structure/cable,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"aeM" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/box/white,
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
"aeO" = (
/obj/structure/bonfire,
/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{
@@ -7141,18 +7128,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/medical/storage)
-"aPE" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/box,
-/obj/machinery/defibrillator_mount/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/medical/exam_room)
"aPI" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -13155,17 +13130,6 @@
/obj/effect/turf_decal/caution/stand_clear,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
-"bCd" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/security/detectives_office)
"bCg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24520,20 +24484,6 @@
/obj/structure/noticeboard/directional/north,
/turf/open/floor/wood,
/area/station/service/theater)
-"dug" = (
-/obj/machinery/status_display/ai/directional/north,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"dum" = (
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/obj/machinery/door/airlock/maintenance,
@@ -24912,6 +24862,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"dCS" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/structure/sign/painting/library{
+ pixel_x = 32
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"dDc" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -28194,21 +28157,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/rd)
-"eLd" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hop)
"eLj" = (
/obj/structure/grille/broken,
/obj/effect/decal/cleanable/dirt,
@@ -30478,7 +30426,7 @@
},
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/south,
-/obj/machinery/computer/vitals_reader/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"ftn" = (
@@ -31006,19 +30954,6 @@
},
/turf/open/floor/iron,
/area/station/service/theater)
-"fDx" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/box,
-/obj/machinery/defibrillator_mount/directional/west,
-/obj/machinery/computer/vitals_reader/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/medical/exam_room)
"fDz" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -32372,25 +32307,6 @@
/obj/structure/flora/bush/flowers_pp/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/monastery)
-"gdj" = (
-/obj/machinery/button/flasher{
- id = "IsolationFlash";
- pixel_x = -23;
- pixel_y = 8;
- req_access = list("brig")
- },
-/obj/machinery/button/door/directional/west{
- id = "Isolation";
- name = "Isolation Shutter Button";
- pixel_y = -6;
- req_access = list("brig")
- },
-/obj/machinery/computer/security/telescreen/isolation/directional/north,
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"gdk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/green/filled/line,
@@ -32868,6 +32784,12 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"gkz" = (
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/sign/poster/official/space_cops/directional/south,
+/turf/open/floor/iron,
+/area/station/security/office)
"gkD" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -38081,7 +38003,7 @@
/obj/structure/table,
/obj/item/healthanalyzer,
/obj/item/crowbar/red,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/exam_room)
"hUq" = (
@@ -38430,6 +38352,20 @@
/obj/effect/landmark/navigate_destination,
/turf/open/floor/iron,
/area/station/commons/long_term_storage)
+"iaT" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/directional/north{
+ c_tag = "Head of Security's Office"
+ },
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hos)
"iba" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -39171,19 +39107,6 @@
/obj/structure/sign/warning/deathsposal,
/turf/closed/wall,
/area/station/maintenance/starboard/aft)
-"imu" = (
-/obj/machinery/light/small/directional/west,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/bot_white,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/sign/poster/contraband/random/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/starboard/fore)
"imD" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -43291,6 +43214,19 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating/rust,
/area/station/maintenance/starboard)
+"jGS" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/box/white,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/courtroom)
"jHh" = (
/obj/structure/table_frame/wood,
/mob/living/basic/mining/basilisk{
@@ -44306,6 +44242,20 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"jZt" = (
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/light/small/directional/south,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"jZA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/door/airlock/research/glass{
@@ -49320,6 +49270,25 @@
},
/turf/open/floor/iron/dark,
/area/station/security/office)
+"lFI" = (
+/obj/machinery/button/flasher{
+ id = "IsolationFlash";
+ pixel_x = -23;
+ pixel_y = 8;
+ req_access = list("brig")
+ },
+/obj/machinery/button/door/directional/west{
+ id = "Isolation";
+ name = "Isolation Shutter Button";
+ pixel_y = -6;
+ req_access = list("brig")
+ },
+/obj/machinery/computer/security/telescreen/isolation/directional/north,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/prison)
"lGd" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -49765,6 +49734,22 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"lNU" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/station/cargo/sorting)
"lOa" = (
/obj/effect/landmark/start/lawyer,
/obj/structure/chair/office{
@@ -52086,12 +52071,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/security/prison/safe)
-"mAS" = (
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/sign/poster/official/space_cops/directional/south,
-/turf/open/floor/iron,
-/area/station/security/office)
"mAW" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -54427,19 +54406,6 @@
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"noV" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/structure/sign/painting/library{
- pixel_x = 32
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/south,
-/obj/effect/turf_decal/box/white,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"noY" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -56826,6 +56792,21 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/office)
+"ohn" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hop)
"oho" = (
/obj/structure/flora/bush/flowers_pp/style_random,
/obj/structure/flora/bush/generic/style_random,
@@ -57586,6 +57567,19 @@
/obj/machinery/duct,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/monastery)
+"otv" = (
+/obj/machinery/light/small/directional/west,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/sign/poster/contraband/random/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/maintenance/starboard/fore)
"otx" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -58766,22 +58760,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/storage)
-"oMj" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/requests_console/directional/south{
- department = "Law Office";
- name = "Law Office Requests Console"
- },
-/obj/effect/turf_decal/box/white,
-/turf/open/floor/iron/dark,
-/area/station/service/lawoffice)
"oMm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
@@ -61380,18 +61358,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"pCg" = (
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"pCm" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -64607,6 +64573,17 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"qEe" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/photocopier/prebuilt,
+/obj/item/newspaper{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/newspaper,
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/service/electronic_marketing_den)
"qEk" = (
/obj/machinery/atmospherics/components/tank/air{
piping_layer = 4
@@ -70070,6 +70047,18 @@
/obj/effect/turf_decal/siding/purple,
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"snk" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"sno" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -71515,7 +71504,7 @@
/obj/effect/turf_decal/loading_area/white{
dir = 1
},
-/obj/machinery/computer/vitals_reader/no_hand/directional/north,
+/obj/machinery/vitals_reader/one_beep/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/lobby)
"sLL" = (
@@ -73816,6 +73805,18 @@
/obj/machinery/light_switch/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
+"tDG" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/box,
+/obj/machinery/defibrillator_mount/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/medical/exam_room)
"tDM" = (
/obj/structure/flora/bush/fullgrass/style_random,
/obj/structure/flora/bush/pointy/style_random,
@@ -76027,6 +76028,19 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
+"unE" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/box,
+/obj/machinery/defibrillator_mount/directional/west,
+/obj/machinery/vitals_reader/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/medical/exam_room)
"unL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/structure/closet_private,
@@ -76107,22 +76121,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"uou" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/cargo/sorting)
"uow" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -76743,6 +76741,20 @@
dir = 1
},
/area/station/hallway/primary/fore)
+"uzi" = (
+/obj/machinery/status_display/ai/directional/north,
+/obj/machinery/light/small/directional/north,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"uzl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -77880,7 +77892,7 @@
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/medical2,
-/obj/machinery/computer/vitals_reader/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/surgery/aft)
"uSE" = (
@@ -78252,17 +78264,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/cargo/warehouse)
-"vaK" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/photocopier/prebuilt,
-/obj/item/newspaper{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/newspaper,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/service/electronic_marketing_den)
"vaP" = (
/obj/item/storage/box/chemimp{
pixel_x = 6;
@@ -78286,6 +78287,22 @@
/obj/item/storage/lockbox/loyalty,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
+"vbd" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/requests_console/directional/south{
+ department = "Law Office";
+ name = "Law Office Requests Console"
+ },
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/iron/dark,
+/area/station/service/lawoffice)
"vbe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -79679,20 +79696,6 @@
/obj/item/stamp/head/ce,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/ce)
-"vuP" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"vuR" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -80649,18 +80652,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/misc/asteroid/airless,
/area/space/nearstation)
-"vKG" = (
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"vKK" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -83633,7 +83624,7 @@
},
/obj/structure/table/optable,
/obj/effect/turf_decal/bot,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/dark,
/area/station/medical/surgery/fore)
"wNi" = (
@@ -85351,6 +85342,17 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"xpJ" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/detectives_office)
"xpL" = (
/obj/structure/table,
/obj/item/transfer_valve{
@@ -86691,20 +86693,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"xIW" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north{
- c_tag = "Head of Security's Office"
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
"xJP" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -87443,6 +87431,18 @@
/obj/structure/sign/warning/vacuum/external/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"xVg" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 8
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"xVo" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -94306,7 +94306,7 @@ cpx
cpx
ulN
cpx
-gdj
+lFI
oYa
ldG
fUK
@@ -99157,7 +99157,7 @@ aeu
alm
acm
cyT
-vaK
+qEe
jSw
hEn
xRx
@@ -105340,9 +105340,9 @@ xYn
beX
szD
amA
-dug
-vKG
-vKG
+uzi
+snk
+snk
wVP
lwp
imR
@@ -106369,9 +106369,9 @@ amR
amA
amA
pxj
-pCg
-pCg
-vuP
+xVg
+xVg
+jZt
lwp
fdS
iNC
@@ -107890,9 +107890,9 @@ gDp
yio
jdX
hUp
-aPE
+tDG
aOp
-fDx
+unE
jdX
aFp
aQF
@@ -107942,14 +107942,14 @@ ikU
oYg
sfT
jzK
-mAS
+gkz
hOw
hOw
emC
jpH
hOw
dUp
-xIW
+iaT
wSC
swh
hzw
@@ -113303,7 +113303,7 @@ fIn
qgX
ejD
qLE
-noV
+dCS
thh
uwS
rMv
@@ -113576,7 +113576,7 @@ bqX
hbJ
eVk
lOa
-oMj
+vbd
nJY
blJ
tYW
@@ -114106,7 +114106,7 @@ wbd
cNx
nbk
ntr
-bCd
+xpJ
bBk
mdR
cpd
@@ -115366,7 +115366,7 @@ kFX
nJp
ezO
unh
-aeM
+jGS
nyV
bkQ
aaD
@@ -116920,7 +116920,7 @@ dbG
rZn
tNO
iba
-eLd
+ohn
olM
hmJ
fWe
@@ -120473,7 +120473,7 @@ cIX
cIX
baH
cCP
-imu
+otv
cEj
kLe
cEx
@@ -126426,7 +126426,7 @@ aLN
blf
qlU
lXC
-uou
+lNU
sdY
oEt
lKR
diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm
index 6a3d4b8040f0..dab2f0904eb5 100644
--- a/_maps/map_files/LimaStation/LimaStation.dmm
+++ b/_maps/map_files/LimaStation/LimaStation.dmm
@@ -1128,16 +1128,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/commons/dorms)
-"arO" = (
-/obj/machinery/light/cold/directional/west,
-/obj/machinery/defibrillator_mount/directional/south,
-/obj/machinery/stasis{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue/full,
-/obj/machinery/computer/vitals_reader/directional/west,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/treatment_center)
"arS" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5750,13 +5740,6 @@
dir = 1
},
/area/station/security/lockers)
-"bTN" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/security/courtroom)
"bUh" = (
/obj/item/wallframe/newscaster{
pixel_y = -9;
@@ -6916,10 +6899,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/library)
-"cra" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/service/library)
"crf" = (
/obj/structure/ladder,
/turf/open/floor/plating,
@@ -7273,6 +7252,16 @@
/obj/effect/turf_decal/stripes,
/turf/open/floor/iron/smooth,
/area/station/security/mechbay)
+"cwH" = (
+/obj/machinery/light/cold/directional/west,
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/machinery/vitals_reader/directional/west,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/treatment_center)
"cwT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/brown/filled/line{
@@ -8402,6 +8391,10 @@
/obj/structure/cable,
/turf/open/floor/engine,
/area/station/engineering/main)
+"cNQ" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/service/library)
"cNW" = (
/obj/structure/chair{
dir = 8
@@ -9220,25 +9213,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/department/engine/atmos)
-"dbs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/long_term_storage)
"dbG" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/weather/dirt{
@@ -10827,13 +10801,6 @@
},
/turf/open/floor/carpet,
/area/station/hallway/primary/central)
-"dEM" = (
-/obj/structure/secure_safe{
- pixel_x = -23
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
"dEN" = (
/obj/machinery/door/airlock/maintenance{
name = "Crematorium Maintenance"
@@ -14704,7 +14671,7 @@
},
/obj/machinery/light/cold/directional/east,
/obj/effect/turf_decal/tile/blue/full,
-/obj/machinery/computer/vitals_reader/directional/east,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron/textured_large,
/area/station/medical/cryo)
"eTW" = (
@@ -15500,6 +15467,12 @@
},
/turf/open/floor/engine,
/area/station/engineering/main)
+"fgV" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/status_display/evac/directional/west,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/grimy,
+/area/station/security/detectives_office)
"fgY" = (
/obj/structure/rack,
/obj/item/coin/silver,
@@ -17653,15 +17626,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/experiment_room)
-"fQB" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/qm)
"fQC" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -23550,6 +23514,25 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"hLE" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/window/reinforced/spawner/directional/west{
+ layer = 2.9
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/long_term_storage)
"hLH" = (
/obj/structure/disposalpipe/trunk{
dir = 2
@@ -23812,7 +23795,7 @@
/obj/item/cautery{
pixel_x = 4
},
-/obj/machinery/computer/vitals_reader/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/dark/textured,
/area/station/science/robotics/lab)
"hQb" = (
@@ -27406,21 +27389,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/lower)
-"iTB" = (
-/obj/structure/window/reinforced/spawner/directional/west{
- layer = 2.9
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/long_term_storage)
"iTG" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/obj/effect/decal/cleanable/cobweb,
@@ -29552,12 +29520,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/library)
-"jEc" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/status_display/evac/directional/west,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/grimy,
-/area/station/security/detectives_office)
"jEi" = (
/obj/structure/table,
/obj/effect/spawner/random/decoration/ornament,
@@ -30623,6 +30585,13 @@
/obj/effect/turf_decal/trimline/white/filled/line,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
+"jUV" = (
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/security/courtroom)
"jUY" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -34359,6 +34328,15 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron,
/area/station/security/prison)
+"ldM" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/light/cold/directional/south,
+/obj/machinery/defibrillator_mount/directional/south,
+/obj/effect/turf_decal/tile/blue/full,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/treatment_center)
"ldP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39364,15 +39342,6 @@
name = "black plastitanium floor"
},
/area/station/service/bar)
-"mHl" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"mHx" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -43409,6 +43378,15 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"nPL" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"nPO" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
@@ -43465,6 +43443,17 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison)
+"nRl" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/camera/directional/south{
+ c_tag = "Prison Wing - Foyer";
+ network = list("ss13", "prison")
+ },
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/security/prison)
"nRm" = (
/obj/structure/table,
/obj/machinery/cell_charger,
@@ -46750,7 +46739,7 @@
dir = 1
},
/obj/machinery/light/directional/west,
-/obj/machinery/computer/vitals_reader/no_hand/directional/south,
+/obj/machinery/vitals_reader/one_beep/directional/south,
/turf/open/floor/iron,
/area/station/medical/medbay/lobby)
"oTG" = (
@@ -47451,6 +47440,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/port)
+"peU" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"pfh" = (
/obj/machinery/door/airlock/medical{
name = "Medical Bathroom"
@@ -49639,6 +49636,20 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen)
+"pNn" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/long_term_storage)
"pNr" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -52382,6 +52393,20 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"qCE" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/long_term_storage)
"qCP" = (
/obj/structure/lattice,
/obj/structure/window/reinforced/spawner/directional/east,
@@ -53009,7 +53034,7 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
-/obj/machinery/computer/vitals_reader/directional/east,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron,
/area/station/medical/surgery)
"qNN" = (
@@ -54195,6 +54220,21 @@
/obj/effect/decal/cleanable/generic,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen/abandoned)
+"rfk" = (
+/obj/structure/window/reinforced/spawner/directional/west{
+ layer = 2.9
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/long_term_storage)
"rfB" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot,
@@ -54733,7 +54773,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/computer/vitals_reader/no_hand/directional/south,
+/obj/machinery/vitals_reader/one_beep/directional/south,
/turf/open/floor/iron,
/area/station/medical/medbay/lobby)
"rpk" = (
@@ -55166,14 +55206,6 @@
/obj/effect/turf_decal/bot/right,
/turf/open/floor/iron/sepia,
/area/station/hallway/secondary/service)
-"rvi" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/status_display/supply{
- pixel_y = 30
- },
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron,
-/area/station/cargo/office)
"rvq" = (
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/iron/sepia,
@@ -55333,16 +55365,6 @@
/obj/structure/mirror/directional/west,
/turf/open/floor/iron/cafeteria,
/area/station/service/theater)
-"rxQ" = (
-/obj/machinery/light/cold/directional/west,
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/machinery/stasis{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue/full,
-/obj/machinery/computer/vitals_reader/directional/west,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/treatment_center)
"rxZ" = (
/obj/machinery/door/window/right/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
@@ -56394,6 +56416,14 @@
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"rMT" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/status_display/supply{
+ pixel_y = 30
+ },
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron,
+/area/station/cargo/office)
"rMW" = (
/turf/closed/wall/r_wall,
/area/station/engineering/storage)
@@ -58090,13 +58120,6 @@
"slw" = (
/turf/closed/wall,
/area/station/maintenance/department/cargo)
-"slB" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"slJ" = (
/obj/effect/turf_decal/trimline/blue/filled/line,
/obj/machinery/status_display/evac/directional/south,
@@ -58307,6 +58330,16 @@
"soY" = (
/turf/closed/wall,
/area/station/maintenance/department/eva)
+"sph" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/smooth_edge{
+ dir = 4
+ },
+/area/station/security/lockers)
"spi" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58446,6 +58479,13 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"sqY" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/security/prison)
"srd" = (
/obj/machinery/camera{
c_tag = "Atmospherics Tank - N2";
@@ -60542,17 +60582,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"sYd" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/camera/directional/south{
- c_tag = "Prison Wing - Foyer";
- network = list("ss13", "prison")
- },
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
"sYe" = (
/obj/structure/closet/secure_closet/brig/genpop,
/obj/effect/turf_decal/tile/red,
@@ -60646,6 +60675,16 @@
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron,
/area/station/medical/medbay/lobby)
+"taa" = (
+/obj/machinery/light/cold/directional/west,
+/obj/machinery/defibrillator_mount/directional/south,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/full,
+/obj/machinery/vitals_reader/directional/west,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/treatment_center)
"tab" = (
/obj/machinery/newscaster/directional/east,
/obj/structure/reagent_dispensers/water_cooler,
@@ -63328,20 +63367,13 @@
dir = 1
},
/area/station/hallway/secondary/service)
-"tSg" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/sleeper/cryo{
- dir = 8
+"tSi" = (
+/obj/structure/secure_safe/hos{
+ pixel_y = 34
},
-/turf/open/floor/iron/freezer,
-/area/station/commons/long_term_storage)
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hos)
"tSo" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -64116,6 +64148,13 @@
},
/turf/open/floor/plating,
/area/station/engineering/main)
+"ucP" = (
+/obj/machinery/status_display/ai/directional/west,
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/cable,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/dark/telecomms,
+/area/station/ai_monitored/turret_protected/ai)
"ucT" = (
/obj/machinery/door/airlock/maintenance{
name = "Disposal Access"
@@ -65784,6 +65823,20 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit/departure_lounge)
+"uHE" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron/freezer,
+/area/station/commons/long_term_storage)
"uHJ" = (
/obj/effect/turf_decal/siding/purple{
dir = 10
@@ -66130,13 +66183,6 @@
"uML" = (
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"uMU" = (
-/obj/machinery/status_display/ai/directional/west,
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/cable,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/dark/telecomms,
-/area/station/ai_monitored/turret_protected/ai)
"uMX" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/carpet/black,
@@ -67277,6 +67323,15 @@
},
/turf/open/floor/plating,
/area/station/security/brig)
+"vgz" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/newscaster/directional/south,
+/obj/effect/turf_decal/bot_white,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/qm)
"vgB" = (
/obj/machinery/conveyor{
dir = 6;
@@ -67454,20 +67509,6 @@
},
/turf/open/floor/iron,
/area/station/service/kitchen)
-"vjF" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/long_term_storage)
"vjH" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -68529,13 +68570,6 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/general,
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"vED" = (
-/obj/machinery/stasis,
-/obj/machinery/light/cold/directional/south,
-/obj/machinery/defibrillator_mount/directional/south,
-/obj/effect/turf_decal/tile/blue/full,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/treatment_center)
"vEL" = (
/obj/machinery/computer/records/security{
dir = 1
@@ -68713,14 +68747,6 @@
"vHx" = (
/turf/closed/wall/r_wall,
/area/station/medical/abandoned)
-"vHB" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"vHC" = (
/obj/structure/flora/bush/lavendergrass/style_random,
/obj/structure/flora/bush/flowers_br/style_random,
@@ -69383,13 +69409,6 @@
/obj/structure/flora/bush/jungle/a/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics/park)
-"vTD" = (
-/obj/structure/secure_safe/hos{
- pixel_y = 34
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
"vTG" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -69498,20 +69517,6 @@
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
-"vWd" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/turf/open/floor/iron/freezer,
-/area/station/commons/long_term_storage)
"vWg" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/stripes/corner{
@@ -72728,6 +72733,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/airless,
/area/station/tcommsat/oldaisat/stationside)
+"wYD" = (
+/obj/structure/secure_safe{
+ pixel_x = -23
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/commons/vacant_room/office)
"wYG" = (
/obj/machinery/atmospherics/components/tank/air{
piping_layer = 4;
@@ -73257,16 +73269,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"xfM" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/smooth_edge{
- dir = 4
- },
-/area/station/security/lockers)
"xfP" = (
/obj/effect/turf_decal/bot_red,
/obj/structure/sign/warning/secure_area/directional/west,
@@ -95656,7 +95658,7 @@ iIy
sJB
sJB
qQq
-slB
+sqY
eyn
cYc
wOX
@@ -95913,7 +95915,7 @@ lhT
pwZ
pwZ
xPD
-sYd
+nRl
eyn
sUi
lGt
@@ -99771,7 +99773,7 @@ pTR
bAV
aCX
vOR
-jEc
+fgV
bxS
ocv
mAc
@@ -101322,7 +101324,7 @@ aXr
ljV
anX
wMT
-bTN
+jUV
jCA
jLv
ljV
@@ -102336,7 +102338,7 @@ iTs
hBi
rzT
xct
-xfM
+sph
cQX
pCg
iHT
@@ -163513,7 +163515,7 @@ hTK
djK
fhD
vLq
-vTD
+tSi
vvW
hLp
fXe
@@ -167129,13 +167131,13 @@ kaq
pYJ
xwd
dfM
-dEM
+wYD
aNW
uTm
aKr
oSS
aKr
-vHB
+peU
sgz
wRX
sgz
@@ -167371,7 +167373,7 @@ wcR
wcR
wcR
wcR
-cra
+cNQ
syv
ptG
ptG
@@ -169220,7 +169222,7 @@ jRp
lLR
teZ
gjZ
-fQB
+vgz
slw
eoB
bvU
@@ -170746,7 +170748,7 @@ iKd
rAj
jty
kEQ
-rvi
+rMT
rKW
rvL
aCL
@@ -178143,9 +178145,9 @@ sPV
fSl
tbh
via
-iTB
-iTB
-dbs
+rfk
+rfk
+hLE
mfX
sVB
uhR
@@ -178167,12 +178169,12 @@ bDY
jxL
ipX
dvO
-rxQ
+cwH
vEM
cDx
rgx
wNc
-arO
+taa
hPH
vio
lxP
@@ -178914,9 +178916,9 @@ aHn
hIQ
fka
arF
-vWd
-tSg
-vjF
+qCE
+pNn
+uHE
mfX
gec
pHt
@@ -179747,7 +179749,7 @@ ora
thG
eOq
ewO
-mHl
+nPL
ora
fgy
oqB
@@ -180228,7 +180230,7 @@ nCx
quK
jTR
dYs
-vED
+ldM
kHd
vAU
lhy
@@ -190307,7 +190309,7 @@ dRB
rPN
oiW
jRY
-uMU
+ucP
oml
hin
wkj
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 5fbbe49938c2..758063576916 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1003,6 +1003,7 @@
dir = 1
},
/obj/machinery/firealarm/directional/west,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/medical/cryo)
"ajc" = (
@@ -2656,6 +2657,14 @@
},
/turf/open/space,
/area/space/nearstation)
+"ayl" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/camera/directional/east{
+ c_tag = "Law Office"
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"ayx" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -3687,6 +3696,12 @@
"aJS" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/ai_upload)
+"aJT" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 3
+ },
+/turf/open/floor/wood,
+/area/station/service/library)
"aJY" = (
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 1
@@ -5940,15 +5955,6 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
-"bnK" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 10
- },
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/security/prison)
"bnM" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -8049,10 +8055,6 @@
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"bSY" = (
-/obj/structure/sign/map/meta/right{
- name = "station map";
- pixel_y = 32
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment{
dir = 9
@@ -8060,6 +8062,10 @@
/obj/effect/turf_decal/tile/neutral/opposingcorners{
dir = 1
},
+/obj/structure/sign/map/meta/right{
+ name = "station map";
+ pixel_y = -32
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/port)
"bTe" = (
@@ -10156,11 +10162,8 @@
/obj/item/circular_saw,
/obj/item/blood_filter,
/obj/item/bonesetter,
-/obj/machinery/button/door/directional/south{
- id = "main_surgery";
- name = "privacy shutters control"
- },
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vending/wallmed/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"crm" = (
@@ -13211,15 +13214,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/security/prison/garden)
-"deY" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/hos)
"dfo" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/brown/filled/line,
@@ -13864,7 +13858,6 @@
dir = 1
},
/obj/machinery/airalarm/directional/south,
-/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/office)
"doZ" = (
@@ -14148,6 +14141,15 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/office)
+"dtV" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/long_term_storage)
"dtZ" = (
/obj/structure/rack,
/obj/effect/spawner/random/clothing/costume,
@@ -14841,6 +14843,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/locker)
+"dEF" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"dER" = (
/obj/machinery/requests_console/directional/west{
department = "Detective";
@@ -14983,7 +14989,7 @@
network = list("ss13","medbay")
},
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/airalarm/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/cryo)
"dIj" = (
@@ -15328,6 +15334,19 @@
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
+"dOT" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 3
+ },
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
"dPa" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -15545,14 +15564,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"dTc" = (
-/obj/machinery/sleeper/cryo,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/commons/long_term_storage)
"dTq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/hatch{
@@ -17777,13 +17788,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/starboard/greater)
-"eJb" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/floor/iron,
-/area/station/engineering/break_room)
"eJf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -18641,15 +18645,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"eZD" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/light/cold/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"eZU" = (
/turf/closed/wall/r_wall,
/area/station/security/courtroom)
@@ -19258,6 +19253,15 @@
/obj/structure/railing,
/turf/open/space/basic,
/area/space/nearstation)
+"flP" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/light/cold/directional/north,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"fme" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron/white,
@@ -19968,15 +19972,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/security/courtroom)
-"fym" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/commons/long_term_storage)
"fys" = (
/obj/structure/table/glass,
/obj/item/folder/blue,
@@ -20444,11 +20439,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"fFD" = (
-/obj/structure/cable,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/hop)
"fFJ" = (
/obj/structure/table,
/obj/structure/disposalpipe/segment,
@@ -21005,7 +20995,15 @@
/obj/machinery/shower/directional/west,
/obj/structure/extinguisher_cabinet/directional/north,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/light_switch/directional/east,
+/obj/machinery/light_switch/directional/east{
+ pixel_y = 5
+ },
+/obj/machinery/button/door/directional/east{
+ pixel_y = -6;
+ pixel_x = 28;
+ id = "main_surgery";
+ name = "privacy shutters control"
+ },
/turf/open/floor/iron/white/textured,
/area/station/medical/surgery/theatre)
"fPu" = (
@@ -21687,12 +21685,6 @@
"gdP" = (
/turf/open/floor/carpet,
/area/station/service/theater)
-"gdY" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 3
- },
-/turf/open/floor/wood,
-/area/station/service/library)
"gep" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/space_heater,
@@ -23505,6 +23497,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/service/hydroponics)
+"gQS" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/light/cold/directional/north,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"gQU" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
@@ -27378,7 +27379,7 @@
/area/station/engineering/atmos/storage/gas)
"inv" = (
/obj/structure/sign/map/meta/left{
- pixel_y = 32;
+ pixel_y = -32;
name = "station map"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -27646,10 +27647,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"isH" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"isK" = (
/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible,
/obj/effect/turf_decal/tile/yellow{
@@ -27775,7 +27772,6 @@
/obj/item/storage/box/masks{
pixel_y = 4
},
-/obj/item/storage/box/bodybags,
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron/white/side{
dir = 9
@@ -29910,13 +29906,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison/garden)
-"jqO" = (
-/obj/machinery/stasis,
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/light/cold/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"jqS" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
@@ -30855,6 +30844,7 @@
},
/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
/obj/machinery/light_switch/directional/south,
+/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/medical/cryo)
"jJK" = (
@@ -32140,11 +32130,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"kjv" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/service/library)
"kjG" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -32516,6 +32501,17 @@
},
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
+"ksP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/button/door/directional/north{
+ id = "AuxShower";
+ name = "Lock Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/iron,
+/area/station/commons/toilet/auxiliary)
"ksV" = (
/obj/structure/chair{
dir = 8
@@ -32871,12 +32867,6 @@
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron,
/area/station/commons/locker)
-"kyN" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 3
- },
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"kyS" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/rods,
@@ -34262,13 +34252,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"lbR" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/medical/office)
"lcd" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
@@ -34665,11 +34648,8 @@
/obj/item/circular_saw,
/obj/item/blood_filter,
/obj/item/bonesetter,
-/obj/machinery/button/door/directional/north{
- id = "main_surgery";
- name = "privacy shutters control"
- },
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/vending/wallmed/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"ljG" = (
@@ -36428,7 +36408,6 @@
/area/station/service/chapel)
"lUJ" = (
/obj/structure/table/glass,
-/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/item/reagent_containers/cup/beaker/cryoxadone{
pixel_x = -6;
@@ -36451,7 +36430,8 @@
pixel_y = 6
},
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/item/radio/intercom/directional/west,
+/obj/machinery/vitals_reader/directional/north,
+/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/cryo)
"lVw" = (
@@ -36643,6 +36623,13 @@
/obj/structure/sign/warning/secure_area/directional/south,
/turf/open/floor/plating,
/area/station/maintenance/aft/greater)
+"lYd" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"lYl" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -36896,7 +36883,7 @@
dir = 8
},
/obj/effect/turf_decal/tile/blue/half/contrasted,
-/obj/machinery/status_display/ai/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"mcC" = (
@@ -37527,6 +37514,15 @@
/obj/structure/sign/warning/secure_area,
/turf/closed/wall/r_wall,
/area/station/science/research)
+"mpg" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/long_term_storage)
"mph" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
@@ -40049,12 +40045,6 @@
"njw" = (
/obj/machinery/shower/directional/east,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door/directional/north{
- id = "AuxShower";
- name = "Lock Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
/obj/effect/spawner/random/trash/soap{
spawn_scatter_radius = 1
},
@@ -40833,8 +40823,14 @@
"nyq" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/ai/directional/east,
/obj/item/radio/intercom/directional/south,
+/obj/item/storage/box/rxglasses{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/storage/box/bodybags{
+ pixel_y = 4
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"nyJ" = (
@@ -41434,7 +41430,6 @@
/area/station/hallway/primary/starboard)
"nKB" = (
/obj/structure/table/glass,
-/obj/item/stack/medical/mesh,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/white/corner{
@@ -41667,7 +41662,9 @@
"nNX" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/evac/directional/east,
+/obj/machinery/vitals_reader/directional/east,
+/obj/item/stack/medical/wrap/gauze,
+/obj/item/stack/medical/suture,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"nOc" = (
@@ -41772,7 +41769,8 @@
/obj/item/hemostat,
/obj/item/cautery,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/evac/directional/west,
+/obj/machinery/vitals_reader/directional/west,
+/obj/machinery/digital_clock/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"nQG" = (
@@ -44087,7 +44085,9 @@
/area/station/medical/chem_storage)
"oKv" = (
/obj/structure/table/glass,
-/obj/machinery/light_switch/directional/west,
+/obj/machinery/light_switch/directional/west{
+ pixel_y = 5
+ },
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/camera/directional/west{
c_tag = "Medbay Primary Treatment Centre West";
@@ -44938,8 +44938,8 @@
/obj/item/hemostat,
/obj/item/cautery,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/evac/directional/west,
/obj/machinery/digital_clock/directional/south,
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/surgery/theatre)
"pbd" = (
@@ -45273,14 +45273,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/security/prison)
-"pgZ" = (
-/obj/machinery/sleeper/cryo,
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/commons/long_term_storage)
"pha" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -47850,6 +47842,11 @@
/obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall,
/area/station/science/cytology)
+"qfa" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/service/library)
"qfc" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/north,
@@ -51809,6 +51806,14 @@
"rJv" = (
/turf/open/floor/plating,
/area/station/hallway/primary/port)
+"rJB" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/long_term_storage)
"rJE" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/east,
@@ -52022,6 +52027,14 @@
/obj/structure/cable,
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/station/medical/coldroom)
+"rOd" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/item/radio/intercom/directional/north,
+/obj/effect/turf_decal/tile/green/opposingcorners{
+ dir = 1
+ },
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/long_term_storage)
"rOi" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -52125,6 +52138,13 @@
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
+"rPE" = (
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/yellow/half/contrasted,
+/turf/open/floor/iron,
+/area/station/engineering/break_room)
"rPX" = (
/obj/machinery/shower/directional/west,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -54234,6 +54254,14 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
+"sET" = (
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/extinguisher_cabinet/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/office)
"sFe" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -54407,17 +54435,6 @@
/area/station/maintenance/starboard/lesser)
"sII" = (
/obj/structure/table/glass,
-/obj/item/reagent_containers/chem_pack{
- pixel_x = 10;
- pixel_y = 10
- },
-/obj/item/storage/box/rxglasses{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/stack/medical/wrap/gauze{
- pixel_x = 8
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/white/corner{
@@ -54455,19 +54472,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"sJV" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 4
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
"sKe" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{
@@ -54634,14 +54638,6 @@
},
/turf/open/floor/iron/dark,
/area/station/service/chapel)
-"sOr" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/camera/directional/east{
- c_tag = "Law Office"
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"sOs" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable,
@@ -55461,6 +55457,11 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"tdl" = (
+/obj/structure/cable,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hop)
"tdz" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/effect/spawner/random/maintenance,
@@ -56358,6 +56359,15 @@
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron/white,
/area/station/security/prison/safe)
+"tvI" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hos)
"tvP" = (
/obj/machinery/camera/directional/north{
c_tag = "Atmospherics - Distro Loop"
@@ -59093,6 +59103,7 @@
"uzN" = (
/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/blue/half/contrasted,
+/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"uzR" = (
@@ -60176,7 +60187,11 @@
"uWf" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/evac/directional/west,
+/obj/item/reagent_containers/chem_pack,
+/obj/item/reagent_containers/chem_pack{
+ pixel_x = 7;
+ pixel_y = 6
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"uWm" = (
@@ -63400,6 +63415,15 @@
/obj/machinery/duct,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
+"wki" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 10
+ },
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/security/prison)
"wkj" = (
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
@@ -63533,8 +63557,10 @@
"wmP" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/status_display/ai/directional/west,
/obj/item/radio/intercom/directional/north,
+/obj/machinery/vitals_reader/directional/west,
+/obj/item/stack/medical/wrap/gauze,
+/obj/item/stack/medical/mesh,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"wmV" = (
@@ -64770,13 +64796,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet,
/area/station/command/heads_quarters/hop)
-"wNe" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"wNm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -65191,15 +65210,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"wVp" = (
-/obj/machinery/sleeper/cryo,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/green/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/cafeteria,
-/area/station/commons/long_term_storage)
"wVz" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -68488,6 +68498,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"ykj" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 3
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"ykr" = (
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 8
@@ -85459,7 +85475,7 @@ mwd
mwd
mwd
mwd
-bLT
+ksP
rPX
alK
xYz
@@ -87768,7 +87784,7 @@ fhj
eMW
nxp
kBZ
-gdY
+aJT
nbM
omo
blh
@@ -87778,7 +87794,7 @@ xnK
eqw
mvv
eMW
-kjv
+qfa
uDt
ejn
mht
@@ -88820,7 +88836,7 @@ uWR
dux
dux
dux
-eZD
+flP
nCO
gIf
vjp
@@ -89500,7 +89516,7 @@ arH
ixt
vrL
yfg
-bnK
+wki
fiu
fiu
wvy
@@ -89553,7 +89569,7 @@ rVn
fhB
jdn
vKw
-wNe
+lYd
eGZ
hRz
iAO
@@ -89825,7 +89841,7 @@ eMW
lTG
gUu
eMW
-gdY
+aJT
xls
lgw
tTL
@@ -90362,7 +90378,7 @@ iEO
ifK
gfu
mRw
-jqO
+gQS
duA
uNh
vsw
@@ -91898,7 +91914,7 @@ aWf
vKT
cHb
ifK
-lbR
+sET
iCG
sme
cey
@@ -92390,7 +92406,7 @@ nxX
fdu
tMo
qcp
-fFD
+tdl
hyz
qnZ
nxX
@@ -94154,7 +94170,7 @@ afZ
agQ
pdx
irI
-sJV
+dOT
auW
keY
ukl
@@ -98773,7 +98789,7 @@ hPK
ris
jLR
mVh
-kyN
+ykj
uEZ
hBM
lsL
@@ -100336,7 +100352,7 @@ led
oBX
nXS
iZl
-sOr
+ayl
eZk
vXF
luN
@@ -100396,7 +100412,7 @@ efD
oiC
oqy
jeM
-isH
+dEF
aVe
suh
hMa
@@ -101598,7 +101614,7 @@ rqq
tMV
xVg
gSo
-deY
+tvI
vGk
vGk
vGk
@@ -102646,9 +102662,9 @@ wpL
rpK
xOr
gsa
-dTc
+rJB
wQQ
-fym
+mpg
gsa
lLr
drO
@@ -102903,9 +102919,9 @@ lks
mGe
oOj
gsa
-pgZ
+rOd
dGp
-fym
+mpg
utC
jKz
oAC
@@ -103160,9 +103176,9 @@ wpL
ful
ggP
gsa
-wVp
+dtV
uLh
-fym
+mpg
gsa
ian
gBl
@@ -109611,7 +109627,7 @@ kgQ
owz
xgO
rvR
-eJb
+rPE
pSK
pSK
iqL
diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm
index 2f537e54506e..c90394d23ec2 100644
--- a/_maps/map_files/NebulaStation/NebulaStation.dmm
+++ b/_maps/map_files/NebulaStation/NebulaStation.dmm
@@ -4763,12 +4763,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"aKP" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/bot,
-/obj/structure/sign/calendar/directional/north,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/storage_shared)
"aKQ" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 6
@@ -7073,11 +7067,6 @@
dir = 8
},
/area/station/engineering/atmos/storage)
-"bcE" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/iron/dark/textured,
-/area/station/security/office)
"bcJ" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 4
@@ -7570,15 +7559,6 @@
/obj/structure/secure_safe/directional/west,
/turf/open/floor/wood/large,
/area/station/commons/dorms)
-"bgz" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/wood/large,
-/area/station/security/detectives_office)
"bgN" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7769,6 +7749,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/main)
+"biP" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/treatment_center)
"biQ" = (
/obj/structure/flora/bush/fullgrass,
/obj/structure/flora/bush/grassy/style_random,
@@ -14758,11 +14747,11 @@
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 4
},
-/obj/machinery/digital_clock/directional/east,
/obj/structure/bed/medical{
dir = 4
},
/obj/item/bedsheet/medical,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"ckV" = (
@@ -15787,6 +15776,20 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
+"ctj" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/obj/machinery/status_display/ai/directional/south,
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"ctp" = (
/obj/effect/turf_decal/siding/dark{
dir = 4
@@ -19027,6 +19030,22 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
+"cRj" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/obj/machinery/light/cold/directional/south{
+ pixel_x = -16
+ },
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"cRl" = (
/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 4
@@ -19227,14 +19246,6 @@
/obj/structure/railing,
/turf/open/floor/iron/white/herringbone,
/area/station/medical/office)
-"cSt" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/treatment_center)
"cSv" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -20168,6 +20179,22 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/secondary/exit/departure_lounge)
+"cZC" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/obj/structure/sign/warning/cold_temp/directional/south{
+ pixel_x = 16
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"cZG" = (
/obj/effect/turf_decal/caution/stand_clear,
/obj/effect/turf_decal/trimline/dark_blue/filled/warning,
@@ -20797,20 +20824,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"dep" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/obj/machinery/status_display/ai/directional/south,
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"dew" = (
/obj/effect/spawner/random/structure/grille,
/obj/structure/lattice,
@@ -22970,6 +22983,17 @@
/obj/effect/turf_decal/trimline/dark,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
+"dtP" = (
+/obj/effect/turf_decal/trimline/purple/corner{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/structure/table/glass,
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/white,
+/area/station/science/research)
"dtW" = (
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/trimline/blue/filled/corner,
@@ -24188,6 +24212,9 @@
/obj/effect/turf_decal/siding/dark/end{
dir = 8
},
+/obj/machinery/vitals_reader/directional/west{
+ id_tag = "uppercryo"
+ },
/turf/open/floor/iron/dark/small,
/area/station/medical/cryo)
"dDn" = (
@@ -28963,15 +28990,6 @@
dir = 8
},
/area/station/security/interrogation)
-"eoe" = (
-/obj/structure/window/spawner/directional/south,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/wood/large,
-/area/station/service/lawoffice)
"eof" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/cmo)
@@ -29259,13 +29277,6 @@
/obj/machinery/modular_computer/preset/id,
/turf/open/floor/carpet/red,
/area/station/command/heads_quarters/hos)
-"eqm" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood/large,
-/area/station/service/library)
"eqr" = (
/obj/structure/railing{
dir = 1
@@ -32848,12 +32859,6 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
-"eSx" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/cargo/storage)
"eSD" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34558,11 +34563,6 @@
/obj/effect/turf_decal/siding/thinplating_new,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"ffC" = (
-/obj/effect/turf_decal/siding/wood/end,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood/large,
-/area/station/service/chapel/office)
"ffE" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/red/filled/line{
@@ -35194,6 +35194,9 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/vitals_reader/directional/west{
+ id_tag = "lowercryo"
+ },
/turf/open/floor/iron/dark/small,
/area/station/medical/cryo)
"fkb" = (
@@ -36404,6 +36407,23 @@
},
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"ful" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/line{
+ dir = 8
+ },
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/security/prison)
"fut" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -41741,6 +41761,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
+"giO" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/medical/treatment_center)
"giQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -45003,19 +45031,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/textured,
/area/station/commons/fitness/recreation)
-"gIo" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/item/ammo_casing/rocket{
- pixel_x = 4;
- pixel_y = 15;
- name = "Dud Rocket";
- desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure."
- },
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/qm)
"gIt" = (
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
@@ -46005,6 +46020,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"gPU" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/item/ammo_casing/rocket{
+ pixel_x = 4;
+ pixel_y = 15;
+ name = "Dud Rocket";
+ desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure."
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/qm)
"gPZ" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -46926,6 +46954,12 @@
},
/turf/open/floor/wood/large,
/area/station/commons/lounge)
+"gXI" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/bot,
+/obj/structure/sign/calendar/directional/north,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/engineering/storage_shared)
"gXM" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -49942,6 +49976,7 @@
dir = 1
},
/obj/machinery/digital_clock/directional/south,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/surgery/theatre)
"hud" = (
@@ -50096,17 +50131,6 @@
/obj/item/kirbyplants/random,
/turf/open/floor/iron/white/small,
/area/station/science/lobby)
-"hvE" = (
-/obj/effect/turf_decal/siding/brown{
- dir = 10
- },
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 10
- },
-/obj/machinery/firealarm/directional/south,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/cargo/office)
"hvR" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 4
@@ -53306,6 +53330,20 @@
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
+"hTw" = (
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/obj/machinery/status_display/evac/directional/south,
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"hTz" = (
/obj/structure/rack,
/obj/item/emergency_bed,
@@ -58800,6 +58838,17 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"iJD" = (
+/obj/effect/turf_decal/trimline/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/white/line,
+/obj/structure/table/reinforced/rglass,
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 4
+ },
+/turf/open/floor/iron/dark/textured_large,
+/area/station/hallway/secondary/service)
"iJI" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/broken_floor,
@@ -59314,15 +59363,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"iNb" = (
-/obj/machinery/sleeper/cryo,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/siding/dark_green,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"iNg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/plastic{
@@ -60130,6 +60170,13 @@
/obj/effect/turf_decal/tile/blue/diagonal_centre,
/turf/open/floor/iron/white/diagonal,
/area/station/science/breakroom)
+"iUk" = (
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood/large,
+/area/station/service/library)
"iUp" = (
/obj/effect/turf_decal/trimline/dark/warning,
/obj/structure/chair/stool/directional/south,
@@ -61025,6 +61072,15 @@
},
/turf/open/floor/iron/dark/smooth_edge,
/area/station/hallway/primary/port)
+"jbS" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/siding/dark_green,
+/obj/effect/turf_decal/tile/green/half/contrasted{
+ dir = 1
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"jbW" = (
/obj/effect/turf_decal/siding/dark/corner{
dir = 1
@@ -65866,6 +65922,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/cargo/miningoffice)
+"jNk" = (
+/obj/structure/railing{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 10
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood/large,
+/area/station/service/library/upper)
"jNn" = (
/obj/effect/turf_decal/trimline/dark/warning{
dir = 4
@@ -66398,6 +66467,17 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/project)
+"jQP" = (
+/obj/effect/turf_decal/siding/brown{
+ dir = 10
+ },
+/obj/effect/turf_decal/trimline/brown/filled/line{
+ dir = 10
+ },
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/cargo/office)
"jQQ" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
@@ -67504,22 +67584,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"kaw" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/obj/structure/sign/warning/cold_temp/directional/south{
- pixel_x = 16
- },
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"kay" = (
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
@@ -69352,13 +69416,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"knc" = (
-/obj/machinery/stasis,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/medical/treatment_center)
"knd" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 4
@@ -70320,11 +70377,6 @@
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
-"ksS" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/sign/flag/ssc/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/command/meeting_room)
"ksT" = (
/obj/structure/chair/sofa/corp,
/obj/effect/landmark/start/assistant,
@@ -70800,6 +70852,16 @@
name = "hyper-reinforced wall"
},
/area/station/science/ordnance/bomb)
+"kvR" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 1
+ },
+/turf/open/floor/wood/tile,
+/area/station/maintenance/starboard/central)
"kvX" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/border_only{
@@ -74398,6 +74460,13 @@
},
/turf/open/floor/wood/large,
/area/station/commons/vacant_room/office)
+"kXY" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 6
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/ce)
"kYa" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt/dust,
@@ -74860,6 +74929,17 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
+"lcp" = (
+/obj/machinery/cryo_cell{
+ dir = 4;
+ id_tag = "uppercryo"
+ },
+/obj/effect/turf_decal/bot_white{
+ color = "#52B4E9"
+ },
+/obj/structure/sign/warning/cold_temp/directional/west,
+/turf/open/floor/iron/dark/textured,
+/area/station/medical/cryo)
"lcq" = (
/obj/machinery/computer/operating,
/obj/effect/turf_decal/siding{
@@ -75117,14 +75197,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/red,
/area/station/commons/dorms)
-"lff" = (
-/obj/effect/turf_decal/siding/dark{
- dir = 4
- },
-/obj/machinery/light_switch/directional/west,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/command)
"lfg" = (
/obj/structure/cable,
/obj/structure/railing/corner{
@@ -75239,6 +75311,7 @@
/obj/machinery/computer/operating{
dir = 1
},
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron/showroomfloor,
/area/station/medical/surgery/theatre)
"lfV" = (
@@ -77887,16 +77960,17 @@
"lAm" = (
/obj/machinery/defibrillator_mount/directional/south,
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/obj/machinery/digital_clock/directional/east,
/obj/structure/bed/medical{
dir = 4
},
/obj/item/bedsheet/medical,
+/obj/machinery/vitals_reader/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"lAq" = (
/obj/machinery/cryo_cell{
- dir = 4
+ dir = 4;
+ id_tag = "lowercryo"
},
/obj/effect/turf_decal/bot_white{
color = "#52B4E9"
@@ -81998,6 +82072,11 @@
},
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"miZ" = (
+/obj/effect/turf_decal/siding/wood/end,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood/large,
+/area/station/service/chapel/office)
"mjb" = (
/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{
dir = 8
@@ -82165,13 +82244,6 @@
},
/turf/open/floor/iron/dark/small,
/area/station/service/theater)
-"mkr" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/ce)
"mkx" = (
/obj/effect/turf_decal/plaque{
icon_state = "L12"
@@ -84738,18 +84810,6 @@
/obj/structure/marker_beacon/lime,
/turf/open/floor/grass,
/area/station/hallway/secondary/entry)
-"mEP" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 10
- },
-/obj/effect/turf_decal/tile/yellow/diagonal_centre,
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/dark/diagonal,
-/area/station/engineering/lobby)
"mFe" = (
/obj/effect/decal/cleanable/confetti,
/turf/open/floor/wood,
@@ -91397,6 +91457,15 @@
/obj/structure/flora/tree/jungle/small/style_5,
/turf/open/floor/grass,
/area/station/service/chapel)
+"nGA" = (
+/obj/structure/window/spawner/directional/south,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/camera/autoname/directional/east,
+/turf/open/floor/wood/large,
+/area/station/service/lawoffice)
"nGH" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/turf/open/floor/iron/white,
@@ -97063,22 +97132,6 @@
},
/turf/open/floor/grass,
/area/station/maintenance/port/central)
-"owH" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/obj/machinery/light/cold/directional/south{
- pixel_x = -16
- },
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"owM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
@@ -99227,6 +99280,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/lower)
+"oNu" = (
+/obj/effect/turf_decal/siding/dark{
+ dir = 4
+ },
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/command)
"oNx" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -99835,19 +99896,6 @@
},
/turf/open/floor/wood/large,
/area/station/security/prison/rec)
-"oQy" = (
-/obj/structure/railing{
- dir = 10
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood/large,
-/area/station/service/library/upper)
"oQA" = (
/obj/structure/stairs/north,
/turf/open/floor/iron/dark,
@@ -106781,6 +106829,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
+"pPj" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
"pPk" = (
/obj/structure/sign/poster/official/random/directional/north,
/obj/effect/spawner/random/vending/snackvend,
@@ -112076,6 +112130,16 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
+"qFz" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/siding/wood{
+ dir = 5
+ },
+/obj/structure/secure_safe/directional/north,
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/hop)
"qFE" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -117664,6 +117728,9 @@
/obj/item/bedsheet/medical{
dir = 4
},
+/obj/machinery/digital_clock/directional/north{
+ pixel_y = 36
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"rwS" = (
@@ -119053,23 +119120,6 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
-"rHO" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/line{
- dir = 8
- },
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/prison)
"rHT" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -123356,17 +123406,6 @@
/obj/effect/turf_decal/trimline/yellow/warning,
/turf/open/floor/iron/dark/textured,
/area/station/maintenance/disposal/incinerator)
-"srt" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/item/toy/figure/hos{
- pixel_y = 12;
- pixel_x = 3
- },
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/hos)
"sry" = (
/obj/effect/turf_decal/siding/dark,
/obj/effect/turf_decal/siding/dark{
@@ -126892,20 +126931,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"sUF" = (
-/obj/machinery/sleeper/cryo{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/obj/machinery/status_display/evac/directional/south,
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"sUI" = (
/obj/effect/turf_decal/siding/dark,
/obj/effect/turf_decal/trimline/purple/filled/line,
@@ -129604,6 +129629,17 @@
},
/turf/open/openspace,
/area/station/science/research)
+"tpu" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 9
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/item/toy/figure/hos{
+ pixel_y = 12;
+ pixel_x = 3
+ },
+/turf/open/floor/wood/large,
+/area/station/command/heads_quarters/hos)
"tpv" = (
/turf/open/floor/iron/stairs{
color = "#3d3e42";
@@ -136139,6 +136175,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"uoc" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 3
+ },
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/wood/large,
+/area/station/service/library/upper)
"uof" = (
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/suit/hazardvest,
@@ -140327,16 +140370,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/service)
-"uVy" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/secure_safe/directional/north,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/hop)
"uVB" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/turf/open/floor/grass,
@@ -142358,17 +142391,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/project)
-"viM" = (
-/obj/effect/turf_decal/trimline/white/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/white/line,
-/obj/structure/table/reinforced/rglass,
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 4
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/hallway/secondary/service)
"viP" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/turf_decal/trimline/red/line{
@@ -146501,6 +146523,18 @@
/obj/structure/cable,
/turf/open/floor/iron/dark/textured_large,
/area/station/ai_monitored/security/armory)
+"vPk" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 10
+ },
+/obj/effect/turf_decal/tile/yellow/diagonal_centre,
+/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/camera/autoname/directional/south,
+/turf/open/floor/iron/dark/diagonal,
+/area/station/engineering/lobby)
"vPm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -148161,6 +148195,15 @@
/obj/structure/flora/bush/sparsegrass/style_3,
/turf/open/floor/grass,
/area/station/ai_monitored/aisat/exterior)
+"wco" = (
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/wood/large,
+/area/station/security/detectives_office)
"wcq" = (
/obj/structure/chair/sofa/corp,
/obj/machinery/incident_display/delam/directional/north,
@@ -149491,6 +149534,11 @@
},
/turf/open/floor/iron/dark/small,
/area/station/service/minibar)
+"wna" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/dark/textured,
+/area/station/security/office)
"wnh" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/south,
@@ -150553,13 +150601,6 @@
/obj/effect/spawner/structure/window/reinforced/tinted,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"wwD" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 3
- },
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/wood/large,
-/area/station/service/library/upper)
"wwI" = (
/turf/open/floor/iron/dark/small,
/area/station/engineering/atmos)
@@ -151375,16 +151416,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/misc/asteroid/airless,
/area/space/nearstation)
-"wCZ" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/maintenance/starboard/central)
"wDd" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb,
@@ -156074,6 +156105,11 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
+"xoW" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/sign/flag/ssc/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/command/meeting_room)
"xpa" = (
/obj/machinery/plumbing/synthesizer/beer,
/obj/effect/turf_decal/trimline/brown/line{
@@ -157177,17 +157213,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lower)
-"xxS" = (
-/obj/effect/turf_decal/trimline/purple/corner{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/structure/table/glass,
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 5
- },
-/turf/open/floor/iron/white,
-/area/station/science/research)
"xxU" = (
/obj/effect/turf_decal/siding/wood,
/obj/effect/turf_decal/siding/wood{
@@ -186713,7 +186738,7 @@ nAv
uXR
uYw
wdk
-eqm
+iUk
hQo
hhW
bKj
@@ -196405,7 +196430,7 @@ nnP
mBN
ufX
oZM
-gIo
+gPU
skL
brW
flO
@@ -197284,7 +197309,7 @@ diw
rqr
mIi
lnO
-mkr
+kXY
diw
aHQ
cXo
@@ -200606,7 +200631,7 @@ cDk
suG
suG
wFE
-wCZ
+kvR
bcm
qfr
jQm
@@ -201885,7 +201910,7 @@ roG
iQc
vqc
aLU
-bcE
+wna
lYc
rsx
wkV
@@ -202643,7 +202668,7 @@ iUM
gAJ
mus
isy
-srt
+tpu
gBS
pCG
mzH
@@ -211901,7 +211926,7 @@ ehw
fnu
uRf
wFX
-lff
+oNu
mqK
fyL
qEH
@@ -236818,7 +236843,7 @@ kaT
jIo
eLb
bMt
-ffC
+miZ
wjK
ewF
txW
@@ -242471,7 +242496,7 @@ jAf
noR
kKe
aOZ
-viM
+iJD
vHB
sDr
tqa
@@ -253258,12 +253283,12 @@ nxv
hYO
onh
hCZ
-wwD
+uoc
bsr
cuf
iyM
ils
-oQy
+jNk
aTs
uTX
xku
@@ -253504,7 +253529,7 @@ aqQ
gyf
nHB
dCZ
-lAq
+lcp
tMT
lAq
fjZ
@@ -254012,7 +254037,7 @@ myd
erL
rZy
kvF
-knc
+biP
tjx
wzO
qTK
@@ -254524,7 +254549,7 @@ lRl
xby
hFq
mcX
-cSt
+giO
gtI
gpj
oKN
@@ -258617,7 +258642,7 @@ qUA
dcm
taD
uyZ
-hvE
+jQP
kLa
bIz
kyi
@@ -259987,7 +260012,7 @@ unz
gFi
ggN
mOg
-mEP
+vPk
gFi
mYB
yfU
@@ -261023,7 +261048,7 @@ agg
npO
tHx
cAe
-aKP
+gXI
iHY
nrq
ekj
@@ -262281,10 +262306,10 @@ tDi
cmp
xQi
sWO
-iNb
+jbS
ogO
ogO
-sUF
+hTw
nVN
mXZ
uEE
@@ -262538,10 +262563,10 @@ lMy
ijB
ued
sWO
-iNb
+jbS
ogO
ogO
-kaw
+cZC
lIM
lIM
pAZ
@@ -262795,10 +262820,10 @@ czt
ijB
ued
sWO
-iNb
+jbS
ogO
ogO
-owH
+cRj
lIM
tqW
lvi
@@ -263052,10 +263077,10 @@ ijB
fub
udF
sWO
-iNb
+jbS
ogO
ogO
-dep
+ctj
lIM
nOB
fni
@@ -263487,7 +263512,7 @@ pCa
pCa
pCa
aGm
-eSx
+pPj
lhh
vMr
iip
@@ -267113,7 +267138,7 @@ eGZ
iyS
vvX
caI
-xxS
+dtP
sjb
vtP
bSI
@@ -269256,9 +269281,9 @@ jCB
egF
dIN
hAa
-rHO
+ful
tcY
-rHO
+ful
bJw
dIN
iqP
@@ -272051,7 +272076,7 @@ qpP
sfP
bzz
fsP
-bgz
+wco
gNB
tfl
ind
@@ -272801,7 +272826,7 @@ xGM
ebd
xGM
kcr
-eoe
+nGA
eVi
jGD
trk
@@ -275646,7 +275671,7 @@ jIV
kmF
pdM
mzP
-ksS
+xoW
uiw
pCa
txW
@@ -276396,7 +276421,7 @@ fsc
cvQ
exz
exz
-uVy
+qFz
ocS
dCb
pUj
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index bb83ed43d2c0..af0a05f97df5 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -360,6 +360,12 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
+"aeo" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/bot,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/library/printer)
"aeu" = (
/obj/machinery/power/terminal{
dir = 1
@@ -961,6 +967,11 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/brig)
+"amr" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/turf/open/floor/iron/white,
+/area/station/science/circuits)
"ams" = (
/obj/effect/turf_decal/tile/red/fourcorners,
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -7350,6 +7361,17 @@
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/pod/light,
/area/station/maintenance/floor4/starboard)
+"bPk" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/status_display/ai/directional/south,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/command/teleporter)
"bPq" = (
/obj/effect/spawner/random/structure/grille,
/obj/structure/disposalpipe/segment{
@@ -9868,10 +9890,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/office)
-"cuK" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hop)
"cuL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -13370,6 +13388,12 @@
},
/turf/open/floor/wood/parquet,
/area/station/service/lawoffice)
+"drR" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/half{
+ dir = 1
+ },
+/area/station/engineering/lobby)
"dsb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26706,6 +26730,14 @@
},
/turf/open/floor/wood/large,
/area/station/security/prison/safe)
+"gWH" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/turf/open/floor/iron/white/textured,
+/area/station/medical/treatment_center)
"gWN" = (
/obj/structure/railing{
dir = 1
@@ -31071,6 +31103,12 @@
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
/area/station/maintenance/floor3/starboard/fore)
+"idc" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/camera/autoname/directional/north,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/wood/tile,
+/area/station/service/library)
"idn" = (
/obj/structure/sign/directions/science/directional/west,
/turf/open/floor/iron/dark/side{
@@ -41051,12 +41089,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
/area/station/maintenance/floor4/starboard/aft)
-"kFJ" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/light_switch/directional/north,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
"kFO" = (
/obj/effect/turf_decal/trimline/brown/warning{
dir = 1
@@ -50769,11 +50801,6 @@
dir = 8
},
/area/station/commons/fitness/recreation)
-"naI" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/science/circuits)
"naR" = (
/obj/structure/frame/computer{
dir = 4
@@ -53739,12 +53766,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/hallway/floor4/aft)
-"nMD" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/engineering/lobby)
"nMI" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
/obj/structure/cable,
@@ -54639,10 +54660,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/floor3/aft)
-"nXJ" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
"nXO" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2,
/obj/machinery/igniter/incinerator_atmos,
@@ -55724,12 +55741,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/floor1/port/fore)
-"omG" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/bot,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/service/library/printer)
"omK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
@@ -57407,14 +57418,6 @@
/obj/machinery/airalarm/directional/south,
/turf/open/floor/iron/dark/smooth_large,
/area/station/engineering/storage/tech)
-"oKD" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/requests_console/directional/west{
- department = "Detective";
- name = "Detective Requests Console"
- },
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
"oKK" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 6
@@ -58503,12 +58506,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/cytology)
-"oYL" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
"oYT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59165,6 +59162,10 @@
dir = 8
},
/area/station/engineering/storage/tech)
+"pjc" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/hop)
"pjf" = (
/turf/open/floor/light/colour_cycle/dancefloor_a,
/area/station/maintenance/floor2/port/fore)
@@ -60492,6 +60493,14 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/pod/light,
/area/station/maintenance/floor3/starboard/aft)
+"pAr" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/turf/open/floor/iron/white/textured,
+/area/station/medical/treatment_center)
"pAy" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/flora/bush/snow/style_random,
@@ -61798,17 +61807,6 @@
},
/turf/open/floor/iron/dark/side,
/area/station/hallway/floor4/fore)
-"pSz" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/status_display/ai/directional/south,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/command/teleporter)
"pSE" = (
/obj/effect/turf_decal/trimline/yellow/corner,
/turf/open/floor/iron/dark/side{
@@ -65493,12 +65491,6 @@
/obj/item/radio/intercom/chapel/directional/south,
/turf/open/floor/iron/dark/small,
/area/station/service/chapel/office)
-"qPu" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/stasis,
-/obj/machinery/defibrillator_mount/directional/north,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
"qPv" = (
/obj/item/kirbyplants/random,
/turf/open/floor/iron/dark,
@@ -70342,11 +70334,6 @@
/obj/structure/cable/multilayer/multiz,
/turf/open/floor/plating,
/area/station/maintenance/floor4/port/aft)
-"sfR" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/parquet,
-/area/station/service/lawoffice)
"sfS" = (
/obj/effect/turf_decal/trimline/green/line{
dir = 1
@@ -73138,6 +73125,11 @@
},
/turf/open/floor/carpet/orange,
/area/station/service/chapel/office)
+"sSu" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/parquet,
+/area/station/service/lawoffice)
"sSz" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/turf/open/floor/iron/white,
@@ -73204,6 +73196,10 @@
},
/turf/open/floor/iron/dark,
/area/station/security/checkpoint)
+"sTA" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/science/lower)
"sTD" = (
/obj/structure/cable,
/turf/open/floor/iron,
@@ -76668,6 +76664,12 @@
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor3/port)
+"tMb" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
"tMd" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
@@ -76900,14 +76902,6 @@
/obj/structure/cable,
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/aisat/service)
-"tOW" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/machinery/defibrillator_mount/directional/north,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
"tPj" = (
/obj/effect/turf_decal/tile/purple/opposingcorners,
/obj/structure/table/glass,
@@ -83860,6 +83854,14 @@
dir = 4
},
/area/station/engineering/storage/tech)
+"vDD" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/requests_console/directional/west{
+ department = "Detective";
+ name = "Detective Requests Console"
+ },
+/turf/open/floor/wood,
+/area/station/security/detectives_office)
"vDJ" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/vending/wardrobe/det_wardrobe,
@@ -138987,7 +138989,7 @@ fXd
pLJ
eLQ
rBP
-nMD
+drR
wKT
rBP
uMl
@@ -182145,7 +182147,7 @@ pmy
srR
bQs
sxl
-naI
+amr
lNN
peN
xuv
@@ -191148,7 +191150,7 @@ aip
gzM
swk
tYg
-nXJ
+sTA
maW
rxL
rxL
@@ -196817,7 +196819,7 @@ wMN
tsN
dhZ
sRR
-tOW
+pAr
rwv
aTc
dgm
@@ -197845,7 +197847,7 @@ tEe
fYt
loQ
sRR
-qPu
+gWH
sEl
vOo
xwZ
@@ -262845,7 +262847,7 @@ qrd
xPv
lvW
kGv
-omG
+aeo
qrd
qrd
sSB
@@ -267992,7 +267994,7 @@ hLd
bfj
bfj
iMN
-kFJ
+idc
oqd
slz
nqr
@@ -311424,7 +311426,7 @@ xHe
olV
abP
vLW
-oYL
+tMb
wYR
jZL
kWx
@@ -314017,7 +314019,7 @@ uqc
jIJ
ezm
hzQ
-pSz
+bPk
uIx
uIx
uIx
@@ -315810,7 +315812,7 @@ jzF
nFH
bkT
apq
-oKD
+vDD
uqc
xrh
krU
@@ -319647,7 +319649,7 @@ lkc
spI
rLM
nPE
-cuK
+pjc
ipn
fBw
tPG
@@ -326851,7 +326853,7 @@ odP
tme
ohm
upx
-sfR
+sSu
dJF
bVy
vOE
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 181d04a347bb..584a23cc8538 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -356,13 +356,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/testlab)
-"abm" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"abn" = (
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
@@ -567,18 +560,6 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
/area/station/asteroid)
-"abT" = (
-/obj/item/radio/intercom/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/stripes/line{
- dir = 2
- },
-/obj/machinery/meter/layer4,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/port/fore)
"abU" = (
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/hos)
@@ -1620,11 +1601,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark/side,
/area/station/command/heads_quarters/hop)
-"aeL" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side,
-/area/station/command/heads_quarters/hop)
"aeM" = (
/obj/structure/filingcabinet/security,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2287,22 +2263,6 @@
/obj/machinery/light/warm/dim/directional/south,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"agr" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
- pixel_y = 2;
- pixel_x = 2
- },
-/obj/item/pen,
-/obj/item/stamp/head/hop,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/cable,
-/obj/item/ashtray{
- pixel_y = -5;
- pixel_x = -8
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"ags" = (
/obj/effect/landmark/start/head_of_personnel,
/obj/effect/mapping_helpers/broken_floor,
@@ -2494,18 +2454,6 @@
/obj/effect/landmark/start/captain,
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain/private)
-"agQ" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/folder/blue,
-/obj/item/melee/chainofcommand,
-/obj/item/stamp/head/captain,
-/obj/item/ashtray{
- pixel_y = 12;
- pixel_x = -6
- },
-/turf/open/floor/carpet/royalblue,
-/area/station/command/heads_quarters/captain/private)
"agR" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -2794,16 +2742,6 @@
},
/turf/open/floor/iron/white/textured,
/area/station/security/prison/safe)
-"ahE" = (
-/obj/structure/table/wood,
-/obj/item/folder/red,
-/obj/item/stamp/head/hos,
-/obj/item/ashtray{
- pixel_y = 12;
- pixel_x = -6
- },
-/turf/open/floor/carpet/red,
-/area/station/command/heads_quarters/hos)
"ahF" = (
/obj/machinery/holopad,
/obj/structure/cable,
@@ -2849,13 +2787,6 @@
/obj/item/storage/lockbox/medal,
/turf/open/floor/carpet/royalblue,
/area/station/command/heads_quarters/captain/private)
-"ahL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/newscaster/directional/south,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/grimy,
-/area/station/command/heads_quarters/captain/private)
"ahM" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3625,14 +3556,6 @@
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"ajM" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
"ajO" = (
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/white,
@@ -3645,21 +3568,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison)
-"ajR" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/firealarm/directional/west{
- pixel_y = -5
- },
-/obj/item/toy/figure/hos{
- pixel_y = 8
- },
-/obj/machinery/light_switch/directional/west{
- pixel_y = 5
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/command/heads_quarters/hos)
"ajS" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -3700,27 +3608,6 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
-"ajV" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/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/machinery/newscaster/directional/east,
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = -7
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/primary/fore)
"ajW" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -4697,36 +4584,6 @@
/obj/structure/table_frame/wood,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"amF" = (
-/obj/machinery/light/directional/north,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/item/stamp/head/ce,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
- dir = 8
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Engineering - Chief Engineer's Office";
- network = list("ss13","engine","heads")
- },
-/obj/item/ashtray{
- pixel_y = -5;
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/ce)
"amG" = (
/obj/structure/table,
/obj/item/clothing/mask/gas,
@@ -5624,22 +5481,6 @@
},
/turf/open/floor/wood,
/area/station/service/lawoffice)
-"aoD" = (
-/obj/machinery/light/small/directional/south,
-/obj/structure/table/wood,
-/obj/structure/window/spawner/directional/west,
-/obj/item/gavelblock{
- pixel_y = 5;
- pixel_x = 4
- },
-/obj/item/gavelhammer,
-/obj/machinery/airalarm/directional/south,
-/obj/item/ashtray{
- pixel_y = -4;
- pixel_x = -2
- },
-/turf/open/floor/carpet/green,
-/area/station/service/lawoffice)
"aoE" = (
/obj/structure/filingcabinet/employment,
/obj/machinery/requests_console/directional/south,
@@ -7435,14 +7276,6 @@
"atk" = (
/turf/closed/wall,
/area/station/maintenance/solars/port/fore)
-"atr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/table/wood,
-/obj/item/stack/medical/wrap/gauze/improvised,
-/obj/item/restraints/handcuffs/cable,
-/turf/open/floor/wood,
-/area/station/maintenance/department/science)
"ats" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -7500,13 +7333,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
-"atC" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/photocopier/gratis/prebuilt,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/wood,
-/area/station/maintenance/department/science)
"atF" = (
/obj/structure/table,
/obj/item/kitchen/spoon/plastic{
@@ -8052,21 +7878,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"ave" = (
-/obj/structure/table/wood,
-/obj/item/clothing/head/fedora,
-/obj/item/cigarette/pipe,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = 5
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/service/cafeteria)
"avg" = (
/obj/structure/table/wood,
/obj/item/pai_card,
@@ -8526,14 +8337,6 @@
/obj/structure/cable,
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/port/fore)
-"awX" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/ashtray/random_contents,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/service/bar)
"awY" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9198,20 +9001,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
-"ayI" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/revolver/russian,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/item/ashtray{
- pixel_y = -4;
- pixel_x = 5
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/service/cafeteria)
"ayL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -9897,22 +9686,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"aBe" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/brigdoor/right/directional/south{
- dir = 1;
- name = "Security Desk";
- req_access = list("security")
- },
-/obj/structure/table/reinforced,
-/obj/item/folder/red,
-/obj/effect/turf_decal/stripes/line,
-/obj/item/ashtray{
- pixel_y = -3;
- pixel_x = -8
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"aBg" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -10874,14 +10647,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/service/kitchen)
-"aEa" = (
-/obj/structure/table,
-/obj/effect/turf_decal/delivery,
-/obj/item/storage/medkit/emergency,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/primary/starboard)
"aEb" = (
/obj/effect/spawner/random/entertainment/arcade{
dir = 4
@@ -11193,22 +10958,6 @@
dir = 10
},
/area/station/service/theater)
-"aET" = (
-/obj/structure/table/wood,
-/obj/item/storage/crayons,
-/obj/item/flashlight/lamp/bananalamp{
- pixel_y = 5
- },
-/obj/item/radio/intercom{
- name = "Station Intercom";
- pixel_y = -26
- },
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = 5
- },
-/turf/open/floor/iron/dark/side,
-/area/station/service/theater)
"aEU" = (
/obj/structure/sign/poster/contraband/random/directional/south,
/obj/structure/closet/crate/wooden/toy,
@@ -11458,14 +11207,6 @@
/obj/structure/closet/radiation,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"aFB" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/maintenance/department/cargo)
"aFC" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -11520,27 +11261,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"aFN" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Cafeteria - Aft";
- network = list("ss13","service")
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"aFO" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/cup/soda_cans/dr_gibb{
@@ -11556,28 +11276,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/service/cafeteria)
-"aFQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "kitchencounter";
- name = "Kitchen Counter Shutters";
- dir = 8
- },
-/obj/structure/desk_bell/ringer/chef{
- dir = 1
- },
-/obj/item/storage/fancy/donut_box{
- pixel_y = 15
- },
-/obj/item/ashtray{
- pixel_y = 3;
- pixel_x = -4
- },
-/turf/open/floor/iron,
-/area/station/service/kitchen)
"aFR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12011,7 +11709,7 @@
/obj/item/wrench/medical,
/obj/effect/turf_decal/bot_red,
/obj/machinery/light/cold/dim/directional/north,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -12298,25 +11996,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/fore)
-"aHU" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/status_display/ai/directional/east,
-/obj/machinery/light/directional/east,
-/obj/item/kirbyplants/organic/plant21,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"aHW" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -12690,15 +12369,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"aIQ" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/restaurant_portal/restaurant,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"aIR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/light_switch/directional/north{
@@ -12799,22 +12469,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/engineering/gravity_generator)
-"aJf" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin,
-/obj/item/stamp/head/cmo,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/item/toy/figure/cmo{
- pixel_y = 7;
- pixel_x = 7
- },
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/cmo)
"aJg" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/holopad,
@@ -13147,16 +12801,6 @@
/obj/item/pen,
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"aJX" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/structure/sign/poster/official/random/directional/east,
-/obj/effect/landmark/start/hangover,
-/obj/structure/closet/crate/bin,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"aJY" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
@@ -13211,42 +12855,11 @@
"aKh" = (
/turf/closed/wall,
/area/station/hallway/secondary/exit/departure_lounge)
-"aKi" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/item/folder/yellow,
-/obj/item/pen,
-/obj/machinery/door/window/left/directional/south{
- name = "Cargo Desk";
- req_access = list("cargo")
- },
-/obj/effect/turf_decal/delivery,
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = -8
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"aKj" = (
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"aKk" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/landmark/event_spawn,
-/mob/living/basic/bot/cleanbot/medbay,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"aKm" = (
/turf/closed/wall,
/area/station/maintenance/department/medical)
@@ -13687,12 +13300,6 @@
},
/turf/open/floor/iron,
/area/station/service/cafeteria)
-"aLg" = (
-/obj/machinery/vending/coffee,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/service/cafeteria)
"aLi" = (
/obj/structure/kitchenspike,
/obj/effect/turf_decal/bot,
@@ -14035,16 +13642,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
-"aMd" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/structure/table/reinforced,
-/obj/item/storage/medkit/emergency,
-/turf/open/floor/iron,
-/area/station/engineering/main)
"aMe" = (
/obj/item/storage/box/lights/mixed{
pixel_x = 3;
@@ -14702,12 +14299,6 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"aNS" = (
-/obj/machinery/sleeper/cryo,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/siding/dark_green,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"aNT" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -15096,15 +14687,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
-"aOY" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/medical/wrap/gauze{
- pixel_x = 8
- },
-/obj/item/stack/medical/suture,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
"aOZ" = (
/obj/structure/bodycontainer/morgue{
dir = 8
@@ -15112,18 +14694,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"aPa" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"aPc" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -16657,23 +16227,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"aTn" = (
-/obj/machinery/recharger,
-/obj/item/pai_card{
- pixel_x = 15
- },
-/obj/item/toy/figure/rd{
- pixel_x = -14;
- pixel_y = 5
- },
-/obj/structure/table/reinforced,
-/obj/structure/sign/poster/official/ue_no/directional/north,
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = -8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/rd)
"aTp" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -16745,19 +16298,6 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"aTy" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp{
- pixel_y = 5;
- pixel_x = -3
- },
-/obj/machinery/status_display/evac/directional/north,
-/obj/effect/turf_decal/siding/thinplating{
- dir = 8
- },
-/obj/item/stack/medical/wrap/gauze,
-/turf/open/floor/iron/grimy,
-/area/station/hallway/primary/aft)
"aTz" = (
/obj/structure/chair/comfy/brown,
/obj/effect/landmark/start/hangover,
@@ -16866,14 +16406,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
-"aTS" = (
-/obj/effect/landmark/blobstart,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"aTU" = (
/turf/closed/wall/rust,
/area/station/maintenance/department/medical)
@@ -16939,15 +16471,6 @@
"aUi" = (
/turf/closed/wall/rust,
/area/station/maintenance/department/engine)
-"aUj" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/service/library)
"aUk" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle,
@@ -17152,34 +16675,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"aUK" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/virology{
- autoclose = 0;
- frequency = 1449;
- id_tag = "virology_airlock_interior";
- name = "Virology Interior Airlock"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/obj/effect/mapping_helpers/airlock/access/any/medical/virology,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/cycling_airlock_old/marker/inner_door{
- dir = 2
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"aUL" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/crew_quarters/bar)
@@ -17543,17 +17038,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/dark,
/area/station/service/library)
-"aVP" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = -8
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/service/library)
"aVQ" = (
/turf/open/floor/iron/dark,
/area/station/service/library)
@@ -17912,19 +17396,6 @@
dir = 10
},
/area/station/service/library)
-"aWG" = (
-/obj/item/radio/intercom/directional/east,
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/machinery/camera/directional/east{
- c_tag = "Library - Starboard"
- },
-/obj/item/ashtray{
- pixel_y = -2;
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"aWH" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -17946,41 +17417,6 @@
/obj/structure/cable,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"aWJ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/duct,
-/obj/effect/turf_decal/siding/green{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/light/small/directional/north,
-/obj/effect/mapping_helpers/cycling_airlock_old{
- access = list("virology")
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
-"aWL" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/duct,
-/obj/machinery/firealarm/directional/east{
- pixel_y = -6
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/siding/green{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/medical/virology)
"aWM" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -18030,26 +17466,13 @@
"aWR" = (
/obj/structure/closet/crate/bin,
/obj/effect/spawner/random/trash/food_packaging,
-/obj/machinery/newscaster/directional/south,
/obj/machinery/light/warm/directional/south,
/turf/open/floor/iron/grimy,
/area/station/hallway/primary/aft)
"aWS" = (
/obj/structure/sign/poster/official/random/directional/south,
/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron/grimy,
-/area/station/hallway/primary/aft)
-"aWT" = (
-/obj/structure/table/wood,
-/obj/item/folder,
-/obj/item/pen,
-/obj/effect/turf_decal/siding/thinplating{
- dir = 4
- },
-/obj/item/ashtray{
- pixel_y = 3;
- pixel_x = -4
- },
+/obj/machinery/newscaster/directional/south,
/turf/open/floor/iron/grimy,
/area/station/hallway/primary/aft)
"aWU" = (
@@ -18096,34 +17519,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden,
/turf/open/floor/plating,
/area/station/science/server)
-"aXd" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/virology{
- autoclose = 0;
- frequency = 1449;
- id_tag = "virology_airlock_exterior";
- name = "Virology Exterior Airlock"
- },
-/obj/effect/landmark/navigate_destination{
- location = "Virology"
- },
-/obj/effect/mapping_helpers/airlock/access/any/medical/virology,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/cycling_airlock_old/marker/outer_door{
- dir = 2
- },
-/turf/open/floor/iron/white,
-/area/station/maintenance/department/medical)
"aXe" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -18209,7 +17604,7 @@
network = list("ss13","medbay")
},
/obj/structure/cable,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
@@ -18241,7 +17636,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"aXt" = (
@@ -18378,13 +17773,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"aXN" = (
-/obj/effect/spawner/random/structure/closet_maintenance,
-/obj/structure/sign/warning/secure_area/directional/west{
- pixel_y = -32
- },
-/turf/open/floor/plating,
-/area/station/maintenance/department/medical)
"aXP" = (
/obj/structure/closet/secure_closet/medical3,
/obj/item/storage/box/beakers{
@@ -18425,29 +17813,6 @@
dir = 8
},
/area/station/medical/treatment_center)
-"aXT" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/medical/wrap/gauze{
- pixel_x = 8
- },
-/obj/item/stack/medical/mesh,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
-"aXU" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
-"aXX" = (
-/obj/machinery/stasis{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
"aXZ" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -18484,6 +17849,7 @@
pixel_y = 1
},
/obj/machinery/light/small/directional/north,
+/obj/machinery/vitals_reader/one_beep/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -18611,25 +17977,6 @@
/obj/item/storage/fancy/candle_box,
/turf/open/floor/wood,
/area/station/service/library)
-"aYz" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/obj/effect/turf_decal/siding/green{
- dir = 10
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Medical - Virology Airlock";
- network = list("ss13","medbay","viro")
- },
-/obj/machinery/firealarm/directional/west{
- pixel_y = -6
- },
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"aYA" = (
/obj/machinery/duct,
/obj/effect/decal/cleanable/blood/old,
@@ -19939,7 +19286,7 @@
/obj/structure/table/optable,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/siding/blue,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -20173,19 +19520,6 @@
},
/turf/open/floor/iron/edge,
/area/station/hallway/secondary/entry)
-"bcK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/caution{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/maintenance/department/cargo)
"bcL" = (
/obj/machinery/door/airlock/external{
name = "External Airlock"
@@ -21282,7 +20616,9 @@
"bfv" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/box/red,
-/obj/machinery/medical_kiosk,
+/obj/machinery/vital_floor_scanner{
+ dir = 1
+ },
/turf/open/floor/iron/dark/side{
dir = 1
},
@@ -21399,19 +20735,6 @@
dir = 4
},
/area/station/hallway/primary/aft)
-"bfM" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/shower/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/siding/green,
-/obj/effect/turf_decal/trimline/green/end{
- dir = 1
- },
-/obj/structure/sign/departments/virology/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"bfN" = (
/obj/effect/turf_decal/stripes/end{
dir = 8
@@ -21850,24 +21173,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
-"bhp" = (
-/obj/machinery/door/morgue{
- name = "Relic Closet";
- req_one_access = list("chapel_office", "crematorium");
- dir = 1
- },
-/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
- },
-/turf/open/floor/iron/dark,
-/area/station/service/chapel/office)
"bhr" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -22520,12 +21825,6 @@
},
/turf/open/floor/circuit/telecomms,
/area/station/science/xenobiology)
-"bjJ" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/turf/open/floor/iron/grimy,
-/area/station/service/chapel/office)
"bjK" = (
/obj/structure/table/wood,
/obj/item/folder{
@@ -22658,14 +21957,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"bkk" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/mob/living/basic/bot/medbot/autopatrol,
-/turf/open/floor/iron,
-/area/station/medical/treatment_center)
"bkt" = (
/obj/effect/turf_decal/delivery,
/obj/item/kirbyplants/random,
@@ -23704,6 +22995,17 @@
/obj/machinery/requests_console/auto_name/directional/west,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"bAO" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
+/area/station/service/library)
"bAU" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -23728,6 +23030,25 @@
dir = 4
},
/area/station/hallway/secondary/service)
+"bEM" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/duct,
+/obj/effect/turf_decal/siding/green{
+ dir = 1
+ },
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/light/small/directional/north,
+/obj/effect/mapping_helpers/cycling_airlock_old{
+ access = list("virology")
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"bFp" = (
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
@@ -23801,12 +23122,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
-"bNe" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/service/cafeteria)
"bOo" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -23996,22 +23311,6 @@
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"cbF" = (
-/obj/machinery/requests_console/auto_name/directional/west,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/item/newspaper{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/newspaper,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/wood/large,
-/area/station/security/detectives_office)
"ccZ" = (
/obj/structure/sign/warning/fire/directional/south,
/turf/closed/mineral/random/labormineral,
@@ -24044,17 +23343,6 @@
dir = 1
},
/area/station/hallway/secondary/service)
-"cgi" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/caution{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/maintenance/department/science)
"cgO" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -24192,20 +23480,6 @@
},
/turf/open/floor/iron,
/area/station/service/hydroponics)
-"cpo" = (
-/obj/structure/sign/warning/doors/directional/south,
-/obj/structure/table,
-/obj/effect/spawner/random/trash/food_packaging,
-/obj/effect/spawner/random/trash/cigbutt,
-/obj/effect/spawner/random/trash/cigbutt,
-/obj/item/ashtray{
- pixel_y = 3;
- pixel_x = -4
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/service/cafeteria)
"cpS" = (
/obj/effect/landmark/start/atmospheric_technician,
/obj/structure/cable,
@@ -24214,6 +23488,22 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"cpU" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/duct,
+/obj/machinery/firealarm/directional/east{
+ pixel_y = -6
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/green{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"cqU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/frame/machine,
@@ -24221,6 +23511,21 @@
/obj/item/stack/cable_coil/five,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"crH" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/purple{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/landmark/event_spawn,
+/mob/living/basic/bot/cleanbot/medbay,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"crT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24431,6 +23736,19 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter)
+"cKT" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/caution{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/department/cargo)
"cLk" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
@@ -24442,6 +23760,21 @@
},
/turf/closed/wall/r_wall,
/area/station/medical/virology)
+"cNr" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/landmark/start/hangover,
+/obj/item/kirbyplants/organic/plant21,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"cNy" = (
/obj/machinery/door/firedoor,
/obj/structure/cable,
@@ -24641,6 +23974,36 @@
/obj/item/stack/ore/silver,
/turf/open/misc/asteroid/airless,
/area/station/asteroid)
+"ddJ" = (
+/obj/machinery/light/directional/north,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/stamp/head/ce,
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Engineering - Chief Engineer's Office";
+ network = list("ss13","engine","heads")
+ },
+/obj/item/ashtray{
+ pixel_y = -5;
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/ce)
"deA" = (
/obj/machinery/status_display/evac/directional/east,
/obj/structure/table,
@@ -24824,6 +24187,14 @@
dir = 8
},
/area/station/science/breakroom)
+"duc" = (
+/obj/structure/table,
+/obj/effect/turf_decal/delivery,
+/obj/item/storage/medkit/emergency,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/hallway/primary/starboard)
"duf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25076,6 +24447,25 @@
dir = 1
},
/area/station/hallway/secondary/exit)
+"dVl" = (
+/obj/structure/table/wood,
+/obj/item/camera_film{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/camera_film,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/item/ashtray{
+ pixel_y = -2;
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"dWs" = (
/obj/structure/cable,
/obj/effect/turf_decal/caution{
@@ -25160,6 +24550,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"ebp" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"ebS" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -25184,6 +24582,18 @@
dir = 4
},
/area/station/engineering/atmos)
+"edW" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 8
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/camera/autoname/directional/east,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"eew" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -25346,6 +24756,27 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"epO" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -26
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Cafeteria - Aft";
+ network = list("ss13","service")
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"eqU" = (
/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -25593,6 +25024,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"eJP" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/machinery/photocopier/gratis/prebuilt,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/wood,
+/area/station/maintenance/department/science)
"eKQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -25824,13 +25262,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"fcU" = (
-/obj/item/cigbutt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/department/engine)
"fet" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -25944,20 +25375,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"flE" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 1
- },
-/obj/structure/sign/nanotrasen{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/station/hallway/primary/aft)
"fmq" = (
/obj/structure/table/wood,
/obj/machinery/door/window/right/directional/west{
@@ -26174,6 +25591,17 @@
/obj/machinery/air_sensor/plasma_tank,
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"fGX" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/corner{
+ dir = 8
+ },
+/area/station/hallway/primary/aft)
"fHw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -26292,6 +25720,17 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"fQn" = (
+/obj/structure/sign/nanotrasen{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
"fRt" = (
/obj/effect/spawner/random/structure/closet_empty,
/turf/open/floor/plating,
@@ -26468,6 +25907,39 @@
/obj/structure/sign/poster/ripped/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/department/security)
+"gnM" = (
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
+ pixel_y = -27;
+ pixel_x = 3
+ },
+/obj/machinery/light_switch/directional/south{
+ pixel_x = -8;
+ pixel_y = -27
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_y = 4;
+ pixel_x = -2
+ },
+/obj/item/pen,
+/obj/item/stamp/head/qm{
+ pixel_x = -1
+ },
+/obj/item/toy/figure/qm{
+ pixel_x = 7;
+ pixel_y = 2
+ },
+/obj/item/ashtray{
+ pixel_y = -5;
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/qm)
"gpG" = (
/obj/structure/table/wood,
/obj/item/kitchen/fork,
@@ -26615,6 +26087,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron,
/area/station/cargo/storage)
+"gFg" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/medical/wrap/gauze{
+ pixel_x = 8
+ },
+/obj/item/stack/medical/mesh,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"gGq" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -26815,6 +26296,22 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/iron,
/area/station/maintenance/department/medical)
+"gXK" = (
+/obj/structure/table/wood,
+/obj/item/storage/crayons,
+/obj/item/flashlight/lamp/bananalamp{
+ pixel_y = 5
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_y = -26
+ },
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = 5
+ },
+/turf/open/floor/iron/dark/side,
+/area/station/service/theater)
"gYv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron,
@@ -26953,6 +26450,15 @@
/obj/effect/mapping_helpers/airlock/access/any/security/detective,
/turf/open/floor/iron/dark,
/area/station/security/detectives_office)
+"hok" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/medical/wrap/gauze{
+ pixel_x = 8
+ },
+/obj/item/stack/medical/suture,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"hot" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
@@ -26986,6 +26492,16 @@
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"hrj" = (
+/obj/effect/turf_decal/tile/yellow/opposingcorners{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/structure/sign/poster/official/random/directional/east,
+/obj/effect/landmark/start/hangover,
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"hsj" = (
/obj/effect/turf_decal/siding/yellow,
/obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -27106,6 +26622,12 @@
/obj/structure/girder,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"hCA" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
"hCD" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -27359,6 +26881,17 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
+"hST" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/structure/closet/l3closet/virology,
+/obj/effect/turf_decal/siding/green{
+ dir = 6
+ },
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"hTb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/chair/sofa/bench/left{
@@ -27518,6 +27051,19 @@
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
+"idu" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/shower/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/green,
+/obj/effect/turf_decal/trimline/green/end{
+ dir = 1
+ },
+/obj/structure/sign/departments/virology/directional/south,
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"idD" = (
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -27652,6 +27198,22 @@
},
/turf/open/floor/wood/large,
/area/station/security/detectives_office)
+"inE" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+ pixel_y = 2;
+ pixel_x = 2
+ },
+/obj/item/pen,
+/obj/item/stamp/head/hop,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/cable,
+/obj/item/ashtray{
+ pixel_y = -5;
+ pixel_x = -8
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"inL" = (
/obj/structure/chair/sofa/bench/left{
dir = 4
@@ -27689,6 +27251,25 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
+"ivx" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/machinery/status_display/ai/directional/east,
+/obj/machinery/light/directional/east,
+/obj/item/kirbyplants/organic/plant21,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"iwN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/structure/window,
@@ -27700,6 +27281,27 @@
},
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
+"iyw" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/side,
+/area/station/command/heads_quarters/hop)
+"iyZ" = (
+/obj/structure/table/glass,
+/obj/item/paper_bin,
+/obj/item/stamp/head/cmo,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/item/toy/figure/cmo{
+ pixel_y = 7;
+ pixel_x = 7
+ },
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/cmo)
"iAD" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
@@ -27893,6 +27495,19 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/brig)
+"iRS" = (
+/obj/item/radio/intercom/directional/east,
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/obj/machinery/camera/directional/east{
+ c_tag = "Library - Starboard"
+ },
+/obj/item/ashtray{
+ pixel_y = -2;
+ pixel_x = -8
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"iSv" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -27903,6 +27518,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
+"iTy" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 4
+ },
+/obj/structure/sign/warning/cold_temp/directional/north,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"iTF" = (
/obj/machinery/air_sensor/air_tank,
/turf/open/floor/engine/air,
@@ -28158,6 +27786,14 @@
dir = 8
},
/area/station/science/genetics)
+"jjn" = (
+/obj/effect/landmark/blobstart,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"jjV" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/stripes/line,
@@ -28412,6 +28048,22 @@
/obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
/turf/open/floor/plating,
/area/station/service/kitchen/coldroom)
+"jBC" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/window/brigdoor/right/directional/south{
+ dir = 1;
+ name = "Security Desk";
+ req_access = list("security")
+ },
+/obj/structure/table/reinforced,
+/obj/item/folder/red,
+/obj/effect/turf_decal/stripes/line,
+/obj/item/ashtray{
+ pixel_y = -3;
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
"jBW" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
@@ -29333,6 +28985,25 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/engineering/main)
+"ler" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 4
+ },
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 4
+ },
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
+"lgX" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/sleeper/stasis/cryo,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"liB" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
@@ -29370,6 +29041,12 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"llk" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
"llL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -29392,6 +29069,24 @@
},
/turf/open/floor/iron,
/area/station/medical/storage)
+"lmL" = (
+/obj/machinery/door/morgue{
+ name = "Relic Closet";
+ req_one_access = list("chapel_office", "crematorium");
+ dir = 1
+ },
+/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
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/chapel/office)
"loB" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/cable,
@@ -29635,6 +29330,13 @@
"lIM" = (
/turf/closed/wall/rust,
/area/station/hallway/primary/aft)
+"lJg" = (
+/obj/effect/spawner/random/structure/closet_maintenance,
+/obj/structure/sign/warning/secure_area/directional/west{
+ pixel_y = -32
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/department/medical)
"lJL" = (
/obj/machinery/netpod,
/obj/item/radio/intercom/directional/west,
@@ -29814,6 +29516,14 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/dorms)
+"lZF" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
"lZR" = (
/turf/open/floor/iron{
heat_capacity = 1e+006
@@ -29845,6 +29555,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"mbs" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/item/folder/yellow,
+/obj/item/pen,
+/obj/machinery/door/window/left/directional/south{
+ name = "Cargo Desk";
+ req_access = list("cargo")
+ },
+/obj/effect/turf_decal/delivery,
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
"mdx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
@@ -29855,15 +29581,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"mdS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/airlock_pump{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/maintenance/department/science)
"meo" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=5.2-Cargo";
@@ -29935,6 +29652,22 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/dorms)
+"mjV" = (
+/obj/machinery/light/small/directional/south,
+/obj/structure/table/wood,
+/obj/structure/window/spawner/directional/west,
+/obj/item/gavelblock{
+ pixel_y = 5;
+ pixel_x = 4
+ },
+/obj/item/gavelhammer,
+/obj/machinery/airalarm/directional/south,
+/obj/item/ashtray{
+ pixel_y = -4;
+ pixel_x = -2
+ },
+/turf/open/floor/carpet/green,
+/area/station/service/lawoffice)
"mjY" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/effect/turf_decal/stripes/line{
@@ -29969,26 +29702,12 @@
dir = 1
},
/area/station/hallway/secondary/entry)
-"mlz" = (
-/turf/closed/wall/r_wall/rust,
-/area/station/maintenance/department/medical)
"mmf" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/brig)
-"mmR" = (
-/obj/structure/sign/nanotrasen{
- pixel_y = 32
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"mmW" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron/dark/side,
@@ -30121,12 +29840,25 @@
/obj/item/inspector,
/turf/open/floor/iron,
/area/station/security/brig)
-"mtl" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/ashtray/random_contents,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
+"muJ" = (
+/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/machinery/door/morgue{
+ name = "Curator's Study";
+ req_access = list("library");
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/service/library)
"mvj" = (
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{
dir = 9
@@ -30204,19 +29936,6 @@
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron,
/area/station/service/cafeteria)
-"mJn" = (
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 4
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
"mJF" = (
/obj/structure/bed{
dir = 1
@@ -30238,6 +29957,21 @@
/obj/machinery/igniter/incinerator_atmos,
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
+"mMr" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -5
+ },
+/obj/item/toy/figure/hos{
+ pixel_y = 8
+ },
+/obj/machinery/light_switch/directional/west{
+ pixel_y = 5
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
+/area/station/command/heads_quarters/hos)
"mMv" = (
/obj/machinery/door/airlock/engineering,
/obj/structure/cable,
@@ -30641,6 +30375,19 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"nmE" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/aft)
+"nne" = (
+/obj/machinery/vending/coffee,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/service/cafeteria)
"nng" = (
/turf/closed/wall,
/area/station/service/chapel/office)
@@ -30694,6 +30441,9 @@
"nty" = (
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
+"ntM" = (
+/turf/closed/wall/r_wall/rust,
+/area/station/maintenance/department/medical)
"nuf" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -30776,6 +30526,14 @@
dir = 4
},
/area/station/hallway/secondary/entry)
+"nDp" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/ashtray/random_contents,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/service/bar)
"nEk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
@@ -30889,6 +30647,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/service/bar)
+"nPf" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/maintenance/department/cargo)
"nPS" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -31135,6 +30901,19 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/iron/dark/side,
/area/station/science/breakroom)
+"oqe" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp{
+ pixel_y = 5;
+ pixel_x = -3
+ },
+/obj/machinery/status_display/evac/directional/north,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 8
+ },
+/obj/item/stack/medical/wrap/gauze,
+/turf/open/floor/iron/grimy,
+/area/station/hallway/primary/aft)
"oqR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31304,14 +31083,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
-"oCw" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
"oCy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/radiation,
@@ -31433,6 +31204,17 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/dorms)
+"oRt" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/caution{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/maintenance/department/science)
"oRB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -31454,6 +31236,20 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/department/science)
+"oSd" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 1
+ },
+/obj/structure/sign/nanotrasen{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/station/hallway/primary/aft)
"oTd" = (
/obj/machinery/holopad,
/obj/effect/spawner/random/engineering/tracking_beacon,
@@ -31476,6 +31272,13 @@
/obj/item/transfer_valve,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
+"oXd" = (
+/obj/item/cigbutt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/department/engine)
"oXj" = (
/obj/structure/toilet{
dir = 8
@@ -31522,6 +31325,13 @@
/obj/structure/sign/warning/directional/south,
/turf/open/misc/asteroid/airless,
/area/centcom/asteroid/nearstation/bomb_site)
+"pbj" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/side{
+ dir = 4
+ },
+/area/station/hallway/primary/aft)
"pbB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -31549,6 +31359,13 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/service/cafeteria)
+"pcV" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+ dir = 8
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"pdu" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/iron,
@@ -31598,6 +31415,34 @@
},
/turf/open/space,
/area/space/nearstation)
+"php" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/virology{
+ autoclose = 0;
+ frequency = 1449;
+ id_tag = "virology_airlock_exterior";
+ name = "Virology Exterior Airlock"
+ },
+/obj/effect/landmark/navigate_destination{
+ location = "Virology"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/medical/virology,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/mapping_helpers/cycling_airlock_old/marker/outer_door{
+ dir = 2
+ },
+/turf/open/floor/iron/white,
+/area/station/maintenance/department/medical)
"phF" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -31762,6 +31607,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"psu" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/service/cafeteria)
"psK" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -31864,6 +31715,14 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"pCB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/table/wood,
+/obj/item/stack/medical/wrap/gauze/improvised,
+/obj/item/restraints/handcuffs/cable,
+/turf/open/floor/wood,
+/area/station/maintenance/department/science)
"pCJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -31904,6 +31763,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"pEn" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/effect/turf_decal/siding/green{
+ dir = 10
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Medical - Virology Airlock";
+ network = list("ss13","medbay","viro")
+ },
+/obj/machinery/firealarm/directional/west{
+ pixel_y = -6
+ },
+/turf/open/floor/iron/white,
+/area/station/medical/virology)
"pEt" = (
/obj/machinery/camera/directional/south{
c_tag = "Engineering - Foyer";
@@ -32068,6 +31946,13 @@
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/maintenance/department/science)
+"pSb" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"pSp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32463,6 +32348,15 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/entry)
+"qBu" = (
+/obj/effect/turf_decal/tile/yellow/opposingcorners{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red/opposingcorners,
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/restaurant_portal/restaurant,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"qEl" = (
/obj/machinery/pipedispenser/disposal/transit_tube,
/obj/effect/turf_decal/bot,
@@ -32638,15 +32532,6 @@
},
/turf/open/floor/iron/dark/corner,
/area/station/cargo/bitrunning/den)
-"qQo" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
"qQO" = (
/obj/machinery/door/firedoor,
/obj/structure/sign/departments/medbay/alt/directional/south,
@@ -32662,11 +32547,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"qRz" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/carpet/green,
-/area/station/service/lawoffice)
"qSs" = (
/turf/open/floor/iron/dark/side{
dir = 6
@@ -32701,6 +32581,12 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"qUm" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/computer/security/telescreen/entertainment/directional/south,
+/turf/open/floor/iron/grimy,
+/area/station/service/chapel/office)
"qUR" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/random/trash/grille_or_waste,
@@ -32824,6 +32710,19 @@
/obj/structure/sign/warning/docking/directional/west,
/turf/open/space,
/area/space/nearstation)
+"rfC" = (
+/obj/structure/table/wood,
+/obj/item/folder,
+/obj/item/pen,
+/obj/effect/turf_decal/siding/thinplating{
+ dir = 4
+ },
+/obj/item/ashtray{
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/turf/open/floor/iron/grimy,
+/area/station/hallway/primary/aft)
"rfL" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -33121,6 +33020,35 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"rEN" = (
+/obj/structure/sign/warning/doors/directional/south,
+/obj/structure/table,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/effect/spawner/random/trash/cigbutt,
+/obj/effect/spawner/random/trash/cigbutt,
+/obj/item/ashtray{
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
+/area/station/service/cafeteria)
+"rEO" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/landmark/start/hangover,
+/obj/structure/tank_holder/extinguisher,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"rFx" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
@@ -33128,11 +33056,6 @@
},
/turf/open/space,
/area/space/nearstation)
-"rFA" = (
-/obj/structure/table,
-/obj/item/storage/medkit/emergency,
-/turf/open/floor/iron,
-/area/station/commons/dorms)
"rIZ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
@@ -33179,21 +33102,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
-"rMs" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/landmark/start/hangover,
-/obj/item/kirbyplants/organic/plant21,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"rOb" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{
dir = 4
@@ -33872,14 +33780,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
-"sHf" = (
-/obj/effect/turf_decal/tile/dark_green/fourcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+"sGJ" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/sleeper/stasis{
dir = 4
},
-/obj/machinery/light/cold/dim/directional/south,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"sHz" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/bot,
@@ -34515,39 +34422,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"sMd" = (
-/obj/machinery/keycard_auth/wall_mounted/directional/south{
- pixel_y = -27;
- pixel_x = 3
- },
-/obj/machinery/light_switch/directional/south{
- pixel_x = -8;
- pixel_y = -27
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/brown,
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_y = 4;
- pixel_x = -2
- },
-/obj/item/pen,
-/obj/item/stamp/head/qm{
- pixel_x = -1
- },
-/obj/item/toy/figure/qm{
- pixel_x = 7;
- pixel_y = 2
- },
-/obj/item/ashtray{
- pixel_y = -5;
- pixel_x = -8
- },
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/qm)
"sMe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35337,12 +35211,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/white/corner,
/area/station/hallway/primary/starboard)
-"tbZ" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
"tdz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/table,
@@ -35396,18 +35264,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos)
-"tgp" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/glass/mug/britcup,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/ashtray{
- pixel_y = 6;
- pixel_x = 2
- },
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"tin" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -35459,17 +35315,6 @@
/obj/effect/landmark/navigate_destination/court,
/turf/open/floor/iron,
/area/station/service/lawoffice)
-"tkU" = (
-/obj/machinery/door/airlock/maintenance_hatch{
- name = "Maintenance Hatch"
- },
-/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
"tlg" = (
/obj/machinery/atmospherics/components/binary/pump/on/layer4{
dir = 2;
@@ -35478,17 +35323,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
-"tlw" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white/corner{
- dir = 8
- },
-/area/station/hallway/primary/aft)
"tly" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -35544,6 +35378,28 @@
/obj/effect/mapping_helpers/airlock/autoname,
/turf/open/floor/iron/dark/textured,
/area/station/tcommsat/server)
+"tpt" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "kitchencounter";
+ name = "Kitchen Counter Shutters";
+ dir = 8
+ },
+/obj/structure/desk_bell/ringer/chef{
+ dir = 1
+ },
+/obj/item/storage/fancy/donut_box{
+ pixel_y = 15
+ },
+/obj/item/ashtray{
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/turf/open/floor/iron,
+/area/station/service/kitchen)
"tpH" = (
/obj/effect/turf_decal/stripes/white/corner{
dir = 1
@@ -35612,6 +35468,15 @@
/obj/item/kirbyplants/organic/plant22,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"tvl" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 10
+ },
+/area/station/service/library)
"tvK" = (
/obj/structure/lattice,
/obj/structure/sign/warning/secure_area/directional/east,
@@ -35807,13 +35672,14 @@
/obj/effect/landmark/start/station_engineer,
/turf/open/floor/iron,
/area/station/engineering/main)
-"tVj" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+"tUj" = (
+/obj/effect/turf_decal/tile/dark_green/fourcorners,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/primary/aft)
+/obj/machinery/light/cold/dim/directional/south,
+/turf/open/floor/iron/white,
+/area/station/commons/long_term_storage)
"tVp" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -35825,25 +35691,18 @@
"tWh" = (
/turf/closed/wall,
/area/station/hallway/primary/aft)
-"tXd" = (
-/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{
+"tXr" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/sleeper/stasis{
dir = 8
},
-/obj/machinery/door/morgue{
- name = "Curator's Study";
- req_access = list("library");
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/service/library)
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
+"tXM" = (
+/obj/structure/table,
+/obj/item/storage/medkit/emergency,
+/turf/open/floor/iron,
+/area/station/commons/dorms)
"tXQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/north,
@@ -36064,6 +35923,27 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/security)
+"uhq" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/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/machinery/newscaster/directional/east,
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = -7
+ },
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/fore)
"uhz" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/disposal/incinerator)
@@ -36098,6 +35978,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"ulP" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/miningdock)
"uoo" = (
/obj/structure/table,
/obj/item/assembly/timer{
@@ -36234,17 +36123,6 @@
dir = 4
},
/area/station/science/genetics)
-"uuX" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron{
- heat_capacity = 1e+006
- },
-/area/station/hallway/primary/aft)
"uxz" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -36298,12 +36176,6 @@
/obj/machinery/iv_drip,
/turf/open/floor/iron,
/area/station/medical/treatment_center)
-"uAP" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
"uBJ" = (
/obj/machinery/computer/security{
dir = 1
@@ -36367,6 +36239,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5,
/turf/open/floor/iron/white/corner,
/area/station/hallway/primary/starboard)
+"uHm" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/emergency,
+/turf/open/floor/iron,
+/area/station/engineering/main)
"uIq" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -36381,6 +36263,15 @@
},
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"uIH" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/maintenance/department/science)
"uKr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/spawner/random/structure/tank_holder,
@@ -36524,19 +36415,18 @@
/obj/structure/grille,
/turf/open/floor/plating/airless,
/area/station/asteroid)
-"veL" = (
-/obj/machinery/sleeper/cryo{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/siding/dark_green{
- dir = 4
+"veG" = (
+/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/item/folder/blue,
+/obj/item/melee/chainofcommand,
+/obj/item/stamp/head/captain,
+/obj/item/ashtray{
+ pixel_y = 12;
+ pixel_x = -6
},
-/obj/structure/sign/warning/cold_temp/directional/north,
-/turf/open/floor/iron/white,
-/area/station/commons/long_term_storage)
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/captain/private)
"vfx" = (
/obj/structure/cable,
/obj/machinery/airalarm/directional/south,
@@ -36721,6 +36611,21 @@
/obj/machinery/light/small/dim/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"vye" = (
+/obj/structure/table/wood,
+/obj/item/clothing/head/fedora,
+/obj/item/cigarette/pipe,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = 5
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/service/cafeteria)
"vys" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/tile/purple{
@@ -36762,6 +36667,16 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"vBW" = (
+/obj/structure/table/wood,
+/obj/item/folder/red,
+/obj/item/stamp/head/hos,
+/obj/item/ashtray{
+ pixel_y = 12;
+ pixel_x = -6
+ },
+/turf/open/floor/carpet/red,
+/area/station/command/heads_quarters/hos)
"vCc" = (
/obj/effect/turf_decal/siding/yellow{
dir = 10
@@ -36806,6 +36721,13 @@
},
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
+"vGH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/newscaster/directional/south,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/grimy,
+/area/station/command/heads_quarters/captain/private)
"vHt" = (
/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
name = "Burn Chamber Exterior Airlock"
@@ -36870,6 +36792,23 @@
/obj/effect/spawner/random/trash/food_packaging,
/turf/open/floor/wood,
/area/station/maintenance/department/science)
+"vPp" = (
+/obj/machinery/recharger,
+/obj/item/pai_card{
+ pixel_x = 15
+ },
+/obj/item/toy/figure/rd{
+ pixel_x = -14;
+ pixel_y = 5
+ },
+/obj/structure/table/reinforced,
+/obj/structure/sign/poster/official/ue_no/directional/north,
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = -8
+ },
+/turf/open/floor/iron,
+/area/station/command/heads_quarters/rd)
"vPH" = (
/obj/effect/turf_decal/box,
/obj/machinery/power/tracker{
@@ -36919,6 +36858,18 @@
/obj/machinery/air_sensor/incinerator_tank,
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
+"vUM" = (
+/obj/item/radio/intercom/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+ dir = 2
+ },
+/obj/machinery/meter/layer4,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/port/fore)
"vVA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/no_smoking{
@@ -37046,13 +36997,6 @@
dir = 1
},
/area/station/science/breakroom)
-"wdt" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/primary/aft)
"wdw" = (
/obj/item/book/manual/wiki/cooking_to_serve_man,
/obj/structure/closet/crate,
@@ -37115,6 +37059,17 @@
heat_capacity = 1e+006
},
/area/station/hallway/primary/central)
+"wji" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron{
+ heat_capacity = 1e+006
+ },
+/area/station/hallway/primary/aft)
"wjE" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/tank_holder/extinguisher,
@@ -37202,6 +37157,11 @@
},
/turf/open/floor/iron/white,
/area/station/science/ordnance/testlab)
+"wnf" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/carpet/green,
+/area/station/service/lawoffice)
"woi" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple{
@@ -37329,13 +37289,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"wAa" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
+"wAp" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/ashtray/random_contents,
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"wAw" = (
/turf/open/space,
/area/space)
@@ -37463,6 +37422,20 @@
/obj/structure/sign/poster/official/report_crimes/directional/west,
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
+"wJU" = (
+/obj/structure/table/wood,
+/obj/item/gun/ballistic/revolver/russian,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/item/ashtray{
+ pixel_y = -4;
+ pixel_x = 5
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 8
+ },
+/area/station/service/cafeteria)
"wLP" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/spawner/random/trash/mess,
@@ -37617,6 +37590,18 @@
/obj/machinery/shieldgen,
/turf/open/floor/iron/dark,
/area/station/tcommsat/server)
+"wZx" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/mug/britcup,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/ashtray{
+ pixel_y = 6;
+ pixel_x = 2
+ },
+/turf/open/floor/iron,
+/area/station/service/cafeteria)
"xaF" = (
/obj/effect/turf_decal/plaque{
icon_state = "L5"
@@ -37927,6 +37912,22 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
+"xuT" = (
+/obj/machinery/requests_console/auto_name/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/item/newspaper{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/newspaper,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/wood/large,
+/area/station/security/detectives_office)
"xwu" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
@@ -38072,6 +38073,14 @@
/obj/structure/sign/warning/electric_shock/directional/north,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"xKY" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/mob/living/basic/bot/medbot/autopatrol,
+/turf/open/floor/iron,
+/area/station/medical/treatment_center)
"xMv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38145,25 +38154,6 @@
/obj/machinery/meter,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"xSr" = (
-/obj/structure/table/wood,
-/obj/item/camera_film{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/camera_film,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/item/ashtray{
- pixel_y = -2;
- pixel_x = -8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/library)
"xSs" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -38234,21 +38224,6 @@
/obj/machinery/newscaster/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/storage)
-"xZz" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/landmark/start/hangover,
-/obj/structure/tank_holder/extinguisher,
-/turf/open/floor/iron,
-/area/station/service/cafeteria)
"xZL" = (
/turf/open/floor/plating,
/area/station/service/abandoned_gambling_den)
@@ -38305,6 +38280,34 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/testlab)
+"ycc" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/virology{
+ autoclose = 0;
+ frequency = 1449;
+ id_tag = "virology_airlock_interior";
+ name = "Virology Interior Airlock"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/airlock/access/any/medical/virology,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/cycling_airlock_old/marker/inner_door{
+ dir = 2
+ },
+/turf/open/floor/iron,
+/area/station/medical/virology)
"yct" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
@@ -38329,6 +38332,17 @@
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/turf/open/floor/iron/white,
/area/station/medical/storage)
+"yeh" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Maintenance Hatch"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
"yeD" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/machinery/atmospherics/components/binary/passive_gate/layer4{
@@ -38458,17 +38472,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"ylF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/obj/structure/closet/l3closet/virology,
-/obj/effect/turf_decal/siding/green{
- dir = 6
- },
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
"ylH" = (
/obj/effect/turf_decal/siding/dark_green{
dir = 4
@@ -59176,7 +59179,7 @@ xgB
ram
aAg
aqz
-amF
+ddJ
anw
anO
aop
@@ -61459,7 +61462,7 @@ amm
nbs
ckM
adz
-abT
+vUM
mNO
yct
fCX
@@ -63005,7 +63008,7 @@ aem
ayf
oDu
aAd
-cbF
+xuT
swG
ayf
iYT
@@ -63321,7 +63324,7 @@ bku
aUN
aqo
bfH
-aWL
+cpU
aZB
bPb
aTW
@@ -63575,9 +63578,9 @@ aRj
xZL
aUo
aMG
-fcU
+oXd
aqo
-aUK
+ycc
aKV
bea
aKV
@@ -63835,7 +63838,7 @@ bku
jer
aqo
aWI
-aYz
+pEn
jxR
aZD
aYD
@@ -64090,9 +64093,9 @@ aSs
aUl
aKm
ayM
-mlz
-aWJ
-bfM
+ntM
+bEM
+idu
bea
aYA
aZJ
@@ -64349,7 +64352,7 @@ aTU
jXv
bxN
aWM
-ylF
+hST
aKV
sMP
sMP
@@ -64592,7 +64595,7 @@ aVo
sKd
aVO
hvG
-tXd
+muJ
aXL
aYx
aZv
@@ -64605,7 +64608,7 @@ aKm
aKm
yeO
bxN
-aXd
+php
bxN
bxN
ptF
@@ -64863,7 +64866,7 @@ aKm
yeO
hXj
aXe
-aXN
+lJg
iwN
aYC
aYG
@@ -65104,7 +65107,7 @@ aRW
pvN
dWJ
aCx
-xSr
+dVl
aWD
iUq
sMv
@@ -65351,7 +65354,7 @@ aEt
aIy
aJH
aKO
-aMd
+uHm
aNg
aqo
bbm
@@ -66405,12 +66408,12 @@ fcs
aVW
uNy
bgC
-bhp
+lmL
bia
bhv
bhu
bjy
-bjJ
+qUm
nng
sdX
aaa
@@ -66605,7 +66608,7 @@ adC
afb
agL
ahx
-ajR
+mMr
jtU
ajg
aRQ
@@ -66899,12 +66902,12 @@ aOf
avb
aQa
aRa
-aVP
+bAO
aRU
-aUj
+tvl
aVb
aVX
-aWG
+iRS
aQW
buV
aOg
@@ -67118,7 +67121,7 @@ afQ
aes
afm
afN
-ahE
+vBW
agI
abU
kBP
@@ -67138,7 +67141,7 @@ apI
awQ
pHH
mUJ
-rFA
+tXM
qJa
bbx
aCO
@@ -67671,7 +67674,7 @@ aEi
aGd
aGl
aHJ
-aJf
+iyZ
aJv
aLq
aLx
@@ -67898,7 +67901,7 @@ iGT
alV
amQ
fmq
-aoD
+mjV
apI
aqV
arS
@@ -68411,7 +68414,7 @@ aOc
iGT
alX
amS
-qRz
+wnf
aoE
apI
aqX
@@ -68700,7 +68703,7 @@ wiK
aEM
beG
aHc
-aKk
+crH
aNM
aOB
aNQ
@@ -68962,7 +68965,7 @@ aNN
aOR
aOA
aXn
-aXT
+gFg
hRu
omj
bay
@@ -69174,7 +69177,7 @@ adI
aev
agc
afZ
-agQ
+veG
ahJ
abw
ndg
@@ -69219,7 +69222,7 @@ aTp
aRf
aRf
aXp
-aXU
+sGJ
uAB
aZK
baF
@@ -69246,13 +69249,13 @@ aae
aae
aae
bgU
-tbZ
+hCA
bgU
bgP
bgU
bgP
bgU
-tbZ
+hCA
bgU
aae
aae
@@ -69689,7 +69692,7 @@ aew
bar
nuv
nuv
-ahL
+vGH
abw
wFO
ako
@@ -69990,7 +69993,7 @@ aVn
aWj
aRf
aXs
-aXX
+tXr
uAB
aZK
baF
@@ -70227,7 +70230,7 @@ sMX
aBW
aCQ
aDK
-aET
+gXK
sIB
bcf
awe
@@ -70247,9 +70250,9 @@ aVm
aWi
aTp
aXr
-aOY
+hok
hRu
-bkk
+xKY
ajO
dYy
bcj
@@ -70531,13 +70534,13 @@ aae
aae
aae
bgU
-tbZ
+hCA
bgU
bgP
bgU
bgP
bgU
-tbZ
+hCA
bgU
aae
aae
@@ -70988,11 +70991,11 @@ sIB
awe
sIB
aub
-ave
+vye
sIf
sIf
awj
-ayI
+wJU
azI
aAL
aAL
@@ -71222,7 +71225,7 @@ aaq
aaC
aaP
adO
-abm
+pcV
abB
acg
stg
@@ -71244,7 +71247,7 @@ apS
awe
wOe
aov
-xZz
+rEO
asg
rUy
asg
@@ -71256,13 +71259,13 @@ aBY
tiy
pRh
aLA
-aFN
+epO
aLA
aHR
jHe
ubG
-bNe
-cpo
+psu
+rEN
ara
all
aPi
@@ -71276,7 +71279,7 @@ teW
avU
teW
avU
-tlw
+fGX
avU
baH
avU
@@ -71526,14 +71529,14 @@ aPj
aQn
wvy
tWh
-aTy
+oqe
aUx
aVp
ieT
aWP
tWh
aha
-flE
+oSd
byo
byo
beb
@@ -71790,7 +71793,7 @@ aUy
aWQ
tWh
bfv
-uuX
+wji
sKB
smp
qiW
@@ -72018,18 +72021,18 @@ auc
pcN
avg
awl
-mtl
+wAp
gpG
rdB
eZj
aAP
-tgp
+wZx
aBZ
eZj
oTd
aFO
kcP
-mtl
+wAp
sAA
pcN
auc
@@ -72312,7 +72315,7 @@ bcp
bdg
asR
byo
-oCw
+ebp
vBc
sEG
pyC
@@ -72547,7 +72550,7 @@ vPL
vPL
asg
hDi
-rMs
+cNr
arb
aOq
aPn
@@ -72558,7 +72561,7 @@ aTC
aUz
avC
bOo
-aWT
+rfC
tWh
aoc
aql
@@ -72569,7 +72572,7 @@ hUN
beb
byo
sKB
-mmR
+fQn
dBv
tWh
uOK
@@ -72800,10 +72803,10 @@ caz
wgI
aOW
aGQ
-aHU
-aIQ
-aJX
-aLg
+ivx
+qBu
+hrj
+nne
sJn
ara
aOr
@@ -72826,7 +72829,7 @@ bcq
bfJ
aDE
bfJ
-tVj
+nmE
qks
rJx
bhH
@@ -73046,7 +73049,7 @@ ayP
aJF
awp
cZS
-awX
+nDp
axR
ayN
ubG
@@ -73055,7 +73058,7 @@ aCe
aCe
aDR
aEY
-aFQ
+tpt
aCe
aCb
aCb
@@ -73340,7 +73343,7 @@ bcs
bdk
aZa
aZa
-wdt
+pbj
lXk
tWh
bgX
@@ -73597,7 +73600,7 @@ baX
baX
beg
sJL
-tkU
+yeh
sJL
bfP
bfP
@@ -73854,7 +73857,7 @@ bcu
bdm
beh
sKP
-wAa
+pSb
sJL
pej
hrd
@@ -74111,7 +74114,7 @@ bcu
bdm
jXX
sJL
-aTS
+jjn
sKP
oeg
bgZ
@@ -74568,7 +74571,7 @@ abs
acq
adi
adU
-aeL
+iyw
bxy
agq
abs
@@ -74827,7 +74830,7 @@ adi
adU
aeM
afy
-agr
+inE
ahg
adW
ahX
@@ -75343,7 +75346,7 @@ aeO
afA
agt
swz
-ajV
+uhq
tZR
wPY
akI
@@ -76148,7 +76151,7 @@ qMO
aMy
bgV
hTo
-aEa
+duc
aQA
pMh
sOU
@@ -76617,7 +76620,7 @@ bbY
bbY
bdB
sLZ
-aFB
+nPf
bcP
xYD
adZ
@@ -76650,8 +76653,8 @@ sEl
eFi
aRz
aRz
-veL
-mJn
+iTy
+ler
aRz
iIb
bsE
@@ -76874,7 +76877,7 @@ wkG
wkG
wkG
sLZ
-bcK
+cKT
bdE
bhI
aea
@@ -76906,9 +76909,9 @@ sMQ
jrO
sJt
aRz
-aNS
+lgX
jRu
-sHf
+tUj
eMV
sIb
bsD
@@ -77163,7 +77166,7 @@ oyD
sME
sEL
aRz
-aNS
+lgX
dIn
sLM
bzm
@@ -77176,7 +77179,7 @@ sPk
sIU
aae
ata
-atr
+pCB
atu
pMh
auo
@@ -77392,7 +77395,7 @@ wkG
wkG
bhI
sMT
-sMd
+gnM
adu
aed
lMw
@@ -77422,7 +77425,7 @@ sEN
aRz
aRz
blx
-aPa
+edW
hfb
blZ
rfL
@@ -77436,7 +77439,7 @@ ata
ats
atv
pMh
-atC
+eJP
atG
aLz
bfr
@@ -77915,7 +77918,7 @@ aRP
ahp
adn
aiO
-ajM
+lZF
akP
alF
amB
@@ -79463,7 +79466,7 @@ aaa
aae
amD
aol
-qQo
+ulP
aqu
amD
aae
@@ -79497,7 +79500,7 @@ aaa
aiQ
aiQ
ajP
-aTn
+vPp
beD
ajP
aTa
@@ -79773,7 +79776,7 @@ eBJ
pMh
pMh
kMb
-cgi
+oRt
pMh
xAQ
uTo
@@ -80030,7 +80033,7 @@ eBJ
aiQ
pMh
pMh
-mdS
+uIH
pMh
uTo
aaa
@@ -81275,7 +81278,7 @@ nYa
agS
azW
ghL
-aBe
+jBC
bxM
aEc
sIe
@@ -81283,7 +81286,7 @@ aGa
aJY
aIa
aJb
-aKi
+mbs
sOY
aIa
aNH
@@ -82559,17 +82562,17 @@ rel
aae
aae
azb
-uAP
+llk
azb
-uAP
+llk
azb
aae
aae
aae
azb
-uAP
+llk
azb
-uAP
+llk
azb
aae
rel
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 3091f52612ab..1e888f93d972 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2684,11 +2684,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/large,
/area/station/security)
-"ajp" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/turf/open/floor/iron/large,
-/area/station/security)
"ajq" = (
/obj/effect/landmark/start/security_officer,
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
@@ -3941,10 +3936,6 @@
/turf/open/floor/plating,
/area/station/maintenance/department/security/brig)
"any" = (
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_x = -32
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -6174,10 +6165,6 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_y = 32
- },
/turf/open/floor/iron/edge{
dir = 1
},
@@ -7980,11 +7967,6 @@
/obj/machinery/computer/cargo/request,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
-"aBC" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"aBD" = (
/obj/structure/filingcabinet/chestdrawer{
pixel_y = 2
@@ -9781,10 +9763,6 @@
/turf/open/floor/iron/large,
/area/station/hallway/primary/central)
"aHK" = (
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_y = 32
- },
/obj/structure/cable,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/edge,
@@ -9889,10 +9867,6 @@
/turf/open/floor/iron/edge,
/area/station/hallway/primary/central)
"aIc" = (
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_y = 32
- },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -10459,22 +10433,6 @@
},
/turf/open/floor/iron,
/area/station/commons/storage/art)
-"aLz" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/art)
"aLA" = (
/obj/structure/table,
/obj/item/food/friedegg,
@@ -15582,10 +15540,6 @@
/area/station/hallway/primary/central)
"bgi" = (
/obj/machinery/vending/cola,
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_y = 32
- },
/obj/effect/turf_decal/tile/purple{
dir = 4
},
@@ -18029,6 +17983,11 @@
},
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"bqU" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/turf/open/floor/iron/large,
+/area/station/security)
"bqV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -21109,19 +21068,6 @@
/obj/effect/turf_decal/trimline/yellow/line,
/turf/open/floor/iron/white,
/area/station/medical/chemistry)
-"bDw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/light_switch/directional/east{
- name = "Light Switch"
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
"bDy" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -21375,7 +21321,7 @@
/obj/structure/table/optable,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/blue/full,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/surgery)
"bEx" = (
@@ -22871,7 +22817,7 @@
/obj/structure/table/optable,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/blue/full,
-/obj/machinery/computer/vitals_reader/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/surgery)
"bLG" = (
@@ -26377,10 +26323,6 @@
c_tag = "Engineering Port Fore";
dir = 1
},
-/obj/structure/sign/map{
- icon_state = "map-pubby";
- pixel_y = 32
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -28282,11 +28224,6 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/department/chapel/monastery)
-"ckl" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/library/lounge)
"cko" = (
/obj/structure/bookcase/random/religion,
/turf/open/floor/iron/dark/textured_large,
@@ -29187,6 +29124,22 @@
},
/turf/open/floor/iron/large,
/area/station/cargo/storage)
+"coO" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/art)
"coV" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/smooth_large,
@@ -29960,7 +29913,7 @@
/obj/effect/turf_decal/tile/blue/full,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/medical/cryo)
"ctr" = (
@@ -33004,13 +32957,6 @@
},
/turf/open/floor/plating,
/area/station/security/execution/transfer)
-"dVK" = (
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/dark,
-/area/station/cargo/sorting)
"dWk" = (
/obj/item/food/meat/slab/monkey,
/turf/open/floor/iron/smooth,
@@ -35492,6 +35438,11 @@
},
/turf/open/floor/iron/large,
/area/station/hallway/primary/fore)
+"fFI" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/service/library/lounge)
"fFL" = (
/obj/structure/cable,
/turf/open/floor/plating,
@@ -38522,6 +38473,14 @@
dir = 1
},
/area/station/medical/medbay/central)
+"hQq" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/siding/wood/corner{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/qm)
"hQz" = (
/obj/structure/closet/emcloset/anchored,
/turf/open/floor/plating,
@@ -40115,14 +40074,6 @@
},
/turf/open/floor/iron/large,
/area/station/cargo/storage)
-"jdj" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/qm)
"jdA" = (
/obj/structure/cable,
/turf/open/floor/iron/dark,
@@ -41052,7 +41003,7 @@
/obj/effect/turf_decal/tile/blue/full,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/computer/vitals_reader/directional/north,
+/obj/machinery/vitals_reader/directional/north,
/obj/structure/extinguisher_cabinet/directional/north{
pixel_x = -28
},
@@ -42591,20 +42542,6 @@
},
/turf/open/floor/grass,
/area/station/science/genetics)
-"lfS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/yellow/half{
- dir = 4
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/edge{
- dir = 4
- },
-/area/station/engineering/lobby)
"lgj" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -42978,10 +42915,6 @@
/obj/structure/statue/petrified,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
-"lui" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/grimy,
-/area/station/security/detectives_office)
"luA" = (
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
@@ -45991,6 +45924,19 @@
/obj/machinery/holopad,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"nwZ" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/light_switch/directional/east{
+ name = "Light Switch"
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/cmo)
"nxG" = (
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/iron/large,
@@ -46869,6 +46815,11 @@
dir = 8
},
/area/station/command/heads_quarters/rd)
+"oeX" = (
+/obj/machinery/sleeper/stasis/cryo,
+/obj/structure/sign/warning/cold_temp/directional/north,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/commons/fitness/recreation)
"ofj" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -47690,7 +47641,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/machinery/computer/vitals_reader/directional/west,
+/obj/machinery/vitals_reader/directional/west,
/obj/structure/frame/computer{
dir = 4
},
@@ -48067,7 +48018,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
-/obj/machinery/computer/vitals_reader/no_hand/directional/south,
+/obj/machinery/vitals_reader/one_beep/directional/south,
/turf/open/floor/iron,
/area/station/medical/medbay/lobby)
"oWw" = (
@@ -48298,6 +48249,23 @@
dir = 4
},
/area/station/hallway/primary/central)
+"pet" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron,
+/area/station/medical/medbay/central)
"pfF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -52218,6 +52186,15 @@
},
/turf/open/floor/plating,
/area/station/cargo/sorting)
+"rMs" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/sleeper/stasis/cryo{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/station/security/prison)
"rMI" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -52674,7 +52651,7 @@
dir = 8;
name = "Robotics Operating Computer"
},
-/obj/machinery/computer/vitals_reader/directional/south,
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white/smooth_large,
/area/station/science/robotics)
"sdb" = (
@@ -53018,6 +52995,13 @@
/obj/item/shard,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
+"ssJ" = (
+/obj/effect/turf_decal/trimline/brown/filled/line,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/dark,
+/area/station/cargo/sorting)
"ssU" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random/structure/steam_vent,
@@ -53058,10 +53042,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/department/engine)
-"sum" = (
-/obj/machinery/sleeper/cryo,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/commons/fitness/recreation)
"sut" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/space/basic,
@@ -53161,6 +53141,23 @@
},
/turf/open/floor/plating,
/area/station/medical/cryo)
+"syg" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/iron,
+/area/station/medical/medbay/central)
"syn" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -53514,6 +53511,11 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
+"sID" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"sJp" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/smart/simple/brown/visible,
@@ -57708,6 +57710,20 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"vhM" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/yellow/half{
+ dir = 4
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/edge{
+ dir = 4
+ },
+/area/station/engineering/lobby)
"vhQ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -58105,21 +58121,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/storage/tech)
-"vyL" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/stasis,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/medical/medbay/central)
"vzg" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -58730,6 +58731,12 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"vWU" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"vXd" = (
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/yellow{
@@ -58814,23 +58821,6 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/showroomfloor,
/area/station/service/kitchen/coldroom)
-"vZw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/stasis{
- dir = 1
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
-/area/station/medical/medbay/central)
"vZJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -59404,12 +59394,6 @@
/obj/machinery/holopad,
/turf/open/floor/iron/dark/smooth_edge,
/area/station/command/heads_quarters/rd)
-"wrU" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"wst" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -60197,6 +60181,10 @@
dir = 8
},
/area/station/medical/virology)
+"wMz" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/grimy,
+/area/station/security/detectives_office)
"wMB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
@@ -60494,6 +60482,10 @@
},
/turf/open/floor/iron/dark,
/area/station/cargo/office)
+"wTK" = (
+/obj/machinery/sleeper/stasis/cryo,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/commons/fitness/recreation)
"wTO" = (
/obj/structure/frame/computer,
/obj/machinery/light/small/directional/north,
@@ -61729,11 +61721,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/disposal)
-"xFB" = (
-/obj/machinery/sleeper/cryo,
-/obj/structure/sign/warning/cold_temp/directional/north,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/commons/fitness/recreation)
"xFF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/cafeteria,
@@ -61749,7 +61736,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/machinery/computer/vitals_reader/directional/east,
+/obj/machinery/vitals_reader/directional/east,
/obj/structure/frame/computer{
dir = 8
},
@@ -62234,15 +62221,6 @@
},
/turf/open/floor/iron/smooth_half,
/area/station/engineering/storage_shared)
-"xTt" = (
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/machinery/sleeper/cryo{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/security/prison)
"xTY" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -77855,7 +77833,7 @@ wyu
cvJ
cwe
jCo
-ckl
+fFI
ckD
ckS
clg
@@ -82124,7 +82102,7 @@ ebD
sbY
xFS
pXT
-wrU
+vWU
mpy
aiu
gue
@@ -84919,7 +84897,7 @@ aem
nud
iTv
agd
-xTt
+rMs
ahp
agM
asA
@@ -84948,7 +84926,7 @@ mCg
qNG
ioZ
aBe
-lui
+wMz
aDq
aEn
aFp
@@ -88011,7 +87989,7 @@ gKm
fQN
aip
agP
-ajp
+bqU
ajY
lyd
alF
@@ -88042,7 +88020,7 @@ ocd
ble
eIv
aKK
-aLz
+coO
aMX
aOv
aKT
@@ -88581,7 +88559,7 @@ ble
mwo
bjc
rxp
-vZw
+pet
oGN
iGJ
bjQ
@@ -90392,7 +90370,7 @@ uBc
qzz
pac
hHJ
-bDw
+nwZ
bEF
bub
bEz
@@ -90637,7 +90615,7 @@ ble
mwo
bjc
ixX
-vyL
+syg
xFQ
qib
nUb
@@ -96255,7 +96233,7 @@ oMD
iTo
qNS
aAH
-aBC
+sID
hQV
cat
aEN
@@ -96833,7 +96811,7 @@ mJk
qSd
bRq
pwa
-lfS
+vhM
bSP
pps
bUo
@@ -100645,7 +100623,7 @@ hFV
lWZ
nDP
pvZ
-dVK
+ssJ
tQi
hNd
tYn
@@ -102953,7 +102931,7 @@ aEj
aPa
aRp
abg
-jdj
+hQq
scK
anQ
aVz
@@ -103442,7 +103420,7 @@ aiT
aiS
aiS
aiS
-sum
+wTK
icK
pfF
dvJ
@@ -103699,7 +103677,7 @@ sFK
sFK
sFK
aiS
-xFB
+oeX
fVJ
lFK
lFK
@@ -103956,7 +103934,7 @@ aiT
aiS
sFK
aiS
-sum
+wTK
eHq
wKP
bHx
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 7f5b3f748fc9..b763adc81f83 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -2582,6 +2582,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white/corner,
/area/station/medical/medbay)
"SK" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 3930eb7343ea..433cb743fe87 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -5537,22 +5537,11 @@
/turf/open/floor/iron,
/area/centcom/central_command_areas/control)
"zH" = (
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/circular_saw,
-/obj/item/retractor{
- pixel_x = 4
- },
-/obj/item/hemostat{
- pixel_x = -4
- },
-/obj/item/clothing/gloves/latex,
-/obj/item/clothing/mask/surgical,
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
+/obj/item/surgery_tray/full/advanced,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"zI" = (
@@ -5662,7 +5651,6 @@
/area/centcom/central_command_areas/control)
"Aq" = (
/obj/structure/table/optable,
-/obj/item/surgical_drapes,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
@@ -5708,10 +5696,10 @@
/obj/machinery/computer/operating{
dir = 4
},
-/obj/machinery/status_display/ai/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
+/obj/machinery/vitals_reader/directional/west,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"AV" = (
@@ -5870,7 +5858,6 @@
"BF" = (
/obj/item/defibrillator/loaded,
/obj/structure/table/reinforced,
-/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
@@ -5911,6 +5898,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"BH" = (
@@ -5924,7 +5912,6 @@
/area/centcom/central_command_areas/control)
"BI" = (
/obj/machinery/light/directional/south,
-/obj/structure/noticeboard/directional/south,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -5949,6 +5936,7 @@
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
+/obj/machinery/vitals_reader/directional/south,
/turf/open/floor/iron/white,
/area/centcom/central_command_areas/control)
"BL" = (
@@ -6852,7 +6840,6 @@
/area/centcom/central_command_areas/evacuation/ship)
"Fg" = (
/obj/structure/closet/crate/bin,
-/obj/machinery/status_display/evac/directional/south,
/obj/machinery/status_display/evac/directional/west,
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 8
@@ -57207,9 +57194,9 @@ zI
nq
Ar
BG
-iu
+io
Sg
-iu
+io
iC
io
iu
@@ -58235,9 +58222,9 @@ zJ
nq
Ar
BK
-iu
+io
Ns
-iu
+io
iC
io
io
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index f38086a022e1..abddcd674e38 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -6240,14 +6240,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"bbM" = (
-/obj/machinery/photocopier/prebuilt{
- pixel_y = 3
- },
-/obj/structure/sign/clock/directional/west,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/wood/large,
-/area/station/service/library)
"bck" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -6719,11 +6711,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/atmos/pumproom)
-"bnh" = (
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/wood,
-/area/station/service/lawoffice)
"bnY" = (
/obj/structure/table,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -8028,8 +8015,8 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 10
},
-/obj/item/radio/intercom/directional/west,
/obj/machinery/light/directional/west,
+/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"bLk" = (
@@ -14526,17 +14513,11 @@
"dXo" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/chem_pack{
- pixel_x = 10;
- pixel_y = 10
- },
-/obj/item/storage/box/rxglasses{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/stack/medical/wrap/gauze{
- pixel_x = 8
+ pixel_x = 6;
+ pixel_y = 9
},
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/reagent_containers/chem_pack,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"dXA" = (
@@ -15050,6 +15031,14 @@
/obj/item/radio/intercom/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"ejj" = (
+/obj/machinery/photocopier/prebuilt{
+ pixel_y = 3
+ },
+/obj/structure/sign/clock/directional/west,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood/large,
+/area/station/service/library)
"ejm" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -19876,13 +19865,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/arrivals)
-"gbn" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
"gbp" = (
/obj/structure/filingcabinet,
/obj/structure/window/reinforced/spawner/directional/west,
@@ -21233,8 +21215,8 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/storage/box/bodybags,
/obj/machinery/light/cold/directional/south,
+/obj/item/storage/box/syringes,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"gBL" = (
@@ -25138,6 +25120,21 @@
},
/turf/open/floor/iron/checker,
/area/station/service/kitchen)
+"ibp" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/obj/machinery/camera/directional/west{
+ c_tag = "Medical - Treatment North-West";
+ network = list("ss13","medbay")
+ },
+/obj/machinery/vitals_reader/directional/west,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"ibs" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/box,
@@ -25151,6 +25148,14 @@
},
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"iby" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"ibW" = (
/obj/effect/spawner/xmastree,
/turf/open/floor/carpet,
@@ -27037,16 +27042,6 @@
},
/turf/open/floor/iron,
/area/station/security/processing)
-"iOc" = (
-/obj/machinery/stasis{
- dir = 8
- },
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"iOh" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
@@ -29917,17 +29912,13 @@
/area/station/commons/fitness)
"jKi" = (
/obj/structure/table/glass,
-/obj/item/storage/box/beakers,
-/obj/item/storage/box/bodybags{
- pixel_x = 5;
- pixel_y = 5
- },
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/item/radio/intercom/directional/east,
-/obj/machinery/status_display/evac/directional/north,
/obj/machinery/light/directional/east,
+/obj/item/stack/medical/mesh,
+/obj/item/stack/medical/wrap/gauze,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"jKq" = (
@@ -32482,6 +32473,10 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
+"kEu" = (
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/grimy,
+/area/station/service/library/lounge)
"kEN" = (
/obj/structure/stairs/north,
/turf/open/floor/iron/stairs/right,
@@ -32794,6 +32789,9 @@
dir = 1
},
/obj/machinery/light/directional/south,
+/obj/machinery/vitals_reader/directional/south{
+ id_tag = "lowersurgery"
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/aft)
"kIi" = (
@@ -34624,6 +34622,11 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/checkpoint/escape)
+"lpb" = (
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/wood,
+/area/station/service/lawoffice)
"lpg" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -36476,6 +36479,17 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"lTE" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/defibrillator_mount/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 5
+ },
+/obj/machinery/vitals_reader/directional/east,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
"lTP" = (
/obj/structure/stairs/south,
/turf/open/floor/iron/stairs/medium{
@@ -39021,10 +39035,6 @@
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
-"mNV" = (
-/obj/machinery/photocopier/prebuilt,
-/turf/open/floor/iron/grimy,
-/area/station/service/library/lounge)
"mOi" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -39359,7 +39369,9 @@
/turf/open/floor/iron,
/area/station/security/prison)
"mXd" = (
-/obj/structure/table/optable,
+/obj/structure/table/optable{
+ id_tag = "uppersurgery"
+ },
/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
@@ -39784,7 +39796,9 @@
/turf/open/floor/glass/reinforced,
/area/station/security/brig)
"neE" = (
-/obj/structure/table/optable,
+/obj/structure/table/optable{
+ id_tag = "lowersurgery"
+ },
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
@@ -43829,6 +43843,14 @@
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
+"oAt" = (
+/obj/effect/turf_decal/trimline/dark_green/filled/corner{
+ dir = 1
+ },
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/science/research)
"oAG" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/stripes{
@@ -45290,6 +45312,13 @@
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
+"pgL" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/obj/machinery/photocopier/prebuilt,
+/turf/open/floor/iron/white,
+/area/station/science/lower)
"pgS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
@@ -49805,6 +49834,11 @@
},
/turf/open/space/openspace,
/area/station/solars/starboard/fore)
+"qKo" = (
+/obj/machinery/photocopier/prebuilt,
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"qKE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -50044,6 +50078,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/dorms)
+"qPO" = (
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/photocopier/prebuilt,
+/obj/effect/turf_decal/tile/brown/fourcorners,
+/turf/open/floor/iron,
+/area/station/cargo/sorting)
"qPV" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
@@ -50907,8 +50947,6 @@
/area/station/security/processing)
"rdJ" = (
/obj/structure/table/glass,
-/obj/item/stack/medical/mesh,
-/obj/item/stack/medical/wrap/gauze,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
@@ -50919,8 +50957,12 @@
c_tag = "Medical - Treatment South-East";
network = list("ss13","medbay")
},
-/obj/machinery/vending/wallmed/directional/east,
/obj/machinery/light/directional/east,
+/obj/machinery/vending/wallmed/directional/south,
+/obj/item/storage/box/bodybags{
+ pixel_x = 5;
+ pixel_y = 5
+ },
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"rdN" = (
@@ -51978,11 +52020,6 @@
},
/turf/open/floor/iron,
/area/station/commons/dorms)
-"rxN" = (
-/obj/machinery/photocopier/prebuilt,
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"rxO" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth,
@@ -52673,20 +52710,6 @@
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron/dark,
/area/station/security/courtroom/holding)
-"rNl" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/machinery/camera/directional/west{
- c_tag = "Medical - Treatment North-West";
- network = list("ss13","medbay")
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
"rNt" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 6
@@ -55053,6 +55076,13 @@
"sDZ" = (
/turf/closed/wall,
/area/station/maintenance/disposal/incinerator)
+"sEe" = (
+/obj/machinery/cryo_cell{
+ dir = 4
+ },
+/obj/machinery/status_display/ai/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/medical/treatment_center)
"sEh" = (
/obj/effect/turf_decal/trimline/white/corner{
dir = 1
@@ -61263,12 +61293,6 @@
"uGW" = (
/turf/closed/wall,
/area/station/cargo/miningdock)
-"uHb" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/brown/fourcorners,
-/turf/open/floor/iron,
-/area/station/cargo/sorting)
"uHj" = (
/obj/machinery/duct,
/obj/machinery/light/directional/west,
@@ -64252,6 +64276,9 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/light/directional/north,
+/obj/machinery/vitals_reader/directional/north{
+ id_tag = "uppersurgery"
+ },
/turf/open/floor/iron/white,
/area/station/medical/surgery/fore)
"vGd" = (
@@ -65710,9 +65737,9 @@
/area/station/security/prison/mess)
"whF" = (
/obj/structure/table/glass,
-/obj/item/storage/box/beakers,
-/obj/item/clothing/neck/stethoscope,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/storage/medkit/regular,
+/obj/item/clothing/neck/stethoscope,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"whI" = (
@@ -66262,14 +66289,6 @@
/obj/structure/cable/multilayer/connected,
/turf/open/floor/engine,
/area/station/engineering/supermatter)
-"wtw" = (
-/obj/effect/turf_decal/trimline/dark_green/filled/corner{
- dir = 1
- },
-/obj/machinery/photocopier/prebuilt,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/research)
"wtK" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark/herringbone,
@@ -100592,7 +100611,7 @@ fez
fez
cMB
iTz
-bnh
+lpb
xgh
fKv
vGd
@@ -119670,7 +119689,7 @@ xiA
bXI
jwZ
szb
-gbn
+pgL
byw
uyZ
otC
@@ -149976,7 +149995,7 @@ aUh
mdY
mpw
ckM
-bbM
+ejj
puN
jPY
wFq
@@ -150764,7 +150783,7 @@ rAS
rfR
gsT
uJk
-mNV
+kEu
tdx
tdx
abM
@@ -152267,7 +152286,7 @@ aBV
utk
aBV
wHT
-rxN
+qKo
xSr
lRr
uVb
@@ -167971,7 +167990,7 @@ dyI
tDP
txD
jtr
-rNl
+ibp
dkM
pIk
pIk
@@ -167981,7 +168000,7 @@ aMG
xdx
gBt
uVW
-gBt
+sEe
jtr
dSZ
aOO
@@ -169513,7 +169532,7 @@ dyI
gMT
bNX
jtr
-iOc
+lTE
rWJ
aLy
aLy
@@ -169523,7 +169542,7 @@ brx
uem
dqe
dlN
-dqe
+iby
jtr
dSZ
aOO
@@ -183614,7 +183633,7 @@ eVn
eCw
urf
pRM
-uHb
+qPO
aAN
aBe
vCv
@@ -184423,7 +184442,7 @@ kvt
dpB
nZO
kvt
-wtw
+oAt
iKY
syv
hrh
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm
index 810c29dd0f28..0a64b2fb581d 100644
--- a/_maps/shuttles/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency_asteroid.dmm
@@ -332,7 +332,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bz" = (
-/obj/machinery/stasis,
+/obj/,
/obj/machinery/vending/wallmed/directional/east{
use_power = 0
},
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index 108480e8a1ec..983c6bfa449e 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -333,7 +333,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"br" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bs" = (
@@ -509,7 +511,9 @@
/area/shuttle/escape)
"cb" = (
/obj/machinery/light/small/directional/east,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"en" = (
diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm
index b369f185c6b2..f1fe687e2ef6 100644
--- a/_maps/shuttles/emergency_bballhooper.dmm
+++ b/_maps/shuttles/emergency_bballhooper.dmm
@@ -585,7 +585,7 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"Ia" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/south,
@@ -837,7 +837,7 @@
/turf/open/floor/mineral/titanium/purple,
/area/shuttle/escape)
"Sd" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/north,
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index f4ff8389665c..743396b3f9b4 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -251,7 +251,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"aX" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/turf/open/floor/mineral/titanium/white,
diff --git a/_maps/shuttles/emergency_birdshot.dmm b/_maps/shuttles/emergency_birdshot.dmm
index 4bd9d33683f1..13cf673b6435 100644
--- a/_maps/shuttles/emergency_birdshot.dmm
+++ b/_maps/shuttles/emergency_birdshot.dmm
@@ -366,8 +366,8 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"qd" = (
-/obj/machinery/stasis{
- dir = 8
+/obj/machinery/sleeper/stasis{
+ dir = 4
},
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/mineral/titanium/white,
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index c95fa4ef69b3..f551125b0700 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -241,7 +241,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bd" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"be" = (
diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm
index c339e32d9c29..5166b98ddbce 100644
--- a/_maps/shuttles/emergency_casino.dmm
+++ b/_maps/shuttles/emergency_casino.dmm
@@ -120,7 +120,9 @@
/turf/open/floor/carpet/green,
/area/shuttle/escape)
"el" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ep" = (
@@ -955,7 +957,9 @@
/turf/open/floor/carpet/green,
/area/shuttle/escape)
"Eh" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/vending/wallmed/directional/east,
/obj/machinery/light/directional/north,
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 8fbcd462b5f0..ed16f2aafb01 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -673,7 +673,9 @@
/area/shuttle/escape)
"cu" = (
/obj/machinery/light/directional/east,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/vending/wallmed/directional/north{
use_power = 0
},
@@ -735,7 +737,9 @@
/turf/open/floor/iron/white,
/area/shuttle/escape)
"cD" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
@@ -829,7 +833,9 @@
/turf/open/floor/iron/white,
/area/shuttle/escape)
"cN" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/white,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index d20e518ddb2b..7f3f71fdbd9a 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -224,7 +224,9 @@
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"aX" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"aY" = (
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index 2ba9388cd8b7..4abb9fc1d788 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -247,22 +247,6 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"fo" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/blue/mid_joiner{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/surgery,
-/obj/item/stack/medical/mesh/advanced,
-/obj/item/stack/medical/wrap/gauze/twelve,
-/obj/item/stack/medical/suture/medicated,
-/turf/open/floor/iron/white/smooth_large,
-/area/shuttle/escape)
"fA" = (
/mob/living/basic/drone/snowflake/bardrone,
/turf/open/floor/wood/parquet,
@@ -534,6 +518,22 @@
/obj/structure/railing,
/turf/open/floor/iron,
/area/shuttle/escape)
+"lR" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 9
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/table/reinforced,
+/obj/item/book/manual/wiki/surgery,
+/obj/item/stack/medical/mesh/advanced,
+/obj/item/stack/medical/wrap/gauze/twelve,
+/obj/item/stack/medical/suture/medicated,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
"lZ" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/corner{
dir = 4
@@ -1325,16 +1325,6 @@
},
/turf/open/floor/plating/elevatorshaft,
/area/shuttle/escape)
-"CE" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/blue/mid_joiner{
- dir = 1
- },
-/obj/machinery/stasis,
-/turf/open/floor/iron/white/smooth_large,
-/area/shuttle/escape)
"CJ" = (
/obj/machinery/sleeper{
dir = 8
@@ -1875,6 +1865,18 @@
/obj/machinery/light/directional/south,
/turf/open/floor/carpet/red,
/area/shuttle/escape)
+"Oy" = (
+/obj/effect/turf_decal/trimline/blue/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/blue/mid_joiner{
+ dir = 1
+ },
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/escape)
"OJ" = (
/turf/open/floor/light/colour_cycle/dancefloor_a,
/area/shuttle/escape)
@@ -3100,7 +3102,7 @@ Aq
jt
uJ
QH
-CE
+Oy
GT
jt
zx
@@ -3146,7 +3148,7 @@ sf
jt
yQ
tg
-fo
+lR
SN
sY
YZ
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 341f1a6f721f..133cca16f903 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -378,7 +378,9 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aQ" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
@@ -1087,8 +1089,8 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"WX" = (
-/obj/machinery/stasis{
- dir = 4
+/obj/machinery/sleeper/stasis{
+ dir = 8
},
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
@@ -1509,7 +1511,7 @@ ay
aE
aE
aL
-WX
+aQ
af
aY
ba
@@ -1602,7 +1604,7 @@ aB
aG
aJ
aN
-aQ
+WX
aP
aZ
bd
diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm
index ad0d749aef74..41efd496a4d1 100644
--- a/_maps/shuttles/emergency_donut.dmm
+++ b/_maps/shuttles/emergency_donut.dmm
@@ -294,7 +294,9 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"bf" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bg" = (
@@ -446,8 +448,8 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ea" = (
-/obj/machinery/stasis{
- dir = 4
+/obj/machinery/sleeper/stasis{
+ dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -465,7 +467,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"VF" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/light/directional/north,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
@@ -723,7 +727,7 @@ aW
aX
aZ
ac
-bf
+ea
bg
bo
ab
@@ -759,7 +763,7 @@ aW
aX
aZ
ac
-ea
+bf
bg
bp
ab
diff --git a/_maps/shuttles/emergency_fame.dmm b/_maps/shuttles/emergency_fame.dmm
index c4eeb98834bf..eecdd6c60481 100644
--- a/_maps/shuttles/emergency_fame.dmm
+++ b/_maps/shuttles/emergency_fame.dmm
@@ -92,7 +92,9 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"el" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"et" = (
diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency_fish.dmm
index 21f47b22034d..aacc0fb55103 100644
--- a/_maps/shuttles/emergency_fish.dmm
+++ b/_maps/shuttles/emergency_fish.dmm
@@ -542,7 +542,7 @@
/turf/open/floor/wood/tile,
/area/shuttle/escape)
"FA" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm
index 3d124848a716..f3bf38c1044d 100644
--- a/_maps/shuttles/emergency_goon.dmm
+++ b/_maps/shuttles/emergency_goon.dmm
@@ -75,7 +75,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"q" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/turf/open/floor/mineral/titanium/white,
diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency_hugcage.dmm
index 4b500f7bdbd4..19cd1d197bcd 100644
--- a/_maps/shuttles/emergency_hugcage.dmm
+++ b/_maps/shuttles/emergency_hugcage.dmm
@@ -159,7 +159,9 @@
/obj/machinery/defibrillator_mount/loaded{
pixel_x = 32
},
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"oY" = (
@@ -364,7 +366,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"Rg" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/light/dim/directional/south{
brightness = 5;
nightshift_brightness = 4
diff --git a/_maps/shuttles/emergency_humpback.dmm b/_maps/shuttles/emergency_humpback.dmm
index 946a53f7decc..ae3ad285f11d 100644
--- a/_maps/shuttles/emergency_humpback.dmm
+++ b/_maps/shuttles/emergency_humpback.dmm
@@ -701,7 +701,9 @@
/turf/open/floor/wood/large,
/area/shuttle/escape)
"Pt" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/iron/showroomfloor,
/area/shuttle/escape)
"PS" = (
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm
index 1ebea3cbcf90..196baaaa8cf3 100644
--- a/_maps/shuttles/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency_kilo.dmm
@@ -992,7 +992,9 @@
/area/shuttle/escape)
"cu" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"cv" = (
@@ -1203,8 +1205,8 @@
/area/shuttle/escape)
"lI" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/stasis{
- dir = 4
+/obj/machinery/sleeper/stasis{
+ dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
@@ -1473,7 +1475,7 @@ mo
bK
cg
cm
-lI
+cu
cE
cN
cW
@@ -1581,7 +1583,7 @@ bD
bK
ci
cm
-cu
+lI
cI
cQ
da
diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm
index 618baef53432..7cd217992862 100644
--- a/_maps/shuttles/emergency_lance.dmm
+++ b/_maps/shuttles/emergency_lance.dmm
@@ -1071,6 +1071,15 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"Jd" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/shuttle/escape)
"JN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners{
@@ -1114,6 +1123,15 @@
/obj/machinery/power/shuttle_engine/large,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
+"Lb" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/turf/open/floor/iron/dark/side{
+ dir = 1
+ },
+/area/shuttle/escape)
"Ld" = (
/obj/item/storage/medkit/fire{
pixel_x = -2
@@ -1399,13 +1417,6 @@
},
/turf/open/floor/plating,
/area/shuttle/escape)
-"RO" = (
-/obj/machinery/stasis,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/shuttle/escape)
"So" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
@@ -1483,24 +1494,7 @@
dir = 6
},
/area/shuttle/escape)
-"Vf" = (
-/obj/machinery/shieldgen,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/escape)
-"VA" = (
-/obj/machinery/stasis{
- dir = 1
- },
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/shuttle/escape)
-"Wg" = (
+"Va" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/rack,
/obj/item/stack/medical/wrap/gauze,
@@ -1511,6 +1505,14 @@
/obj/item/stack/medical/bone_gel,
/turf/open/floor/iron/dark/textured,
/area/shuttle/escape)
+"Vf" = (
+/obj/machinery/shieldgen,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/escape)
"WI" = (
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/turf/open/floor/iron,
@@ -1942,7 +1944,7 @@ UG
WQ
Pe
WQ
-VA
+Lb
WI
WI
WI
@@ -2063,7 +2065,7 @@ qH
bV
WQ
WQ
-Wg
+Va
kN
So
iy
@@ -2358,7 +2360,7 @@ kz
yB
Ao
WQ
-RO
+Jd
WI
WI
WI
diff --git a/_maps/shuttles/emergency_lima.dmm b/_maps/shuttles/emergency_lima.dmm
index a66b5238e722..5d736544175b 100644
--- a/_maps/shuttles/emergency_lima.dmm
+++ b/_maps/shuttles/emergency_lima.dmm
@@ -510,7 +510,9 @@
/turf/open/floor/mineral/titanium/purple,
/area/shuttle/escape)
"Ja" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"Jb" = (
@@ -700,7 +702,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"Un" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"Uq" = (
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index 50667dd11d4d..16da2b21cce8 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -323,13 +323,6 @@
/obj/item/bikehorn/rubberducky,
/turf/open/floor/holofloor/beach/water,
/area/shuttle/escape/luxury)
-"nC" = (
-/obj/item/food/sandwich/grilled_cheese{
- pixel_y = 11
- },
-/obj/structure/table/wood/fancy/black,
-/turf/open/floor/carpet/red,
-/area/shuttle/escape/luxury)
"od" = (
/obj/item/food/honkdae{
pixel_y = 8
@@ -337,10 +330,6 @@
/obj/structure/table/wood/fancy/black,
/turf/open/floor/carpet/red,
/area/shuttle/escape/luxury)
-"on" = (
-/obj/machinery/stasis,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape/luxury)
"ot" = (
/obj/structure/chair/wood{
dir = 8
@@ -351,6 +340,16 @@
"oA" = (
/turf/open/floor/carpet/green,
/area/shuttle/escape/luxury)
+"oL" = (
+/obj/structure/closet/crate/freezer,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/reagent_containers/cup/glass/bottle/whiskey,
+/obj/item/reagent_containers/cup/bottle/ethanol,
+/obj/item/stack/medical/wrap/gauze/improvised,
+/obj/item/bot_assembly/medbot,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/shuttle/escape)
"oP" = (
/obj/structure/musician/piano,
/turf/open/floor/carpet/green,
@@ -666,6 +665,13 @@
"CQ" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
+"CY" = (
+/obj/item/food/sandwich/grilled_cheese{
+ pixel_y = 11
+ },
+/obj/structure/table/wood/fancy/black,
+/turf/open/floor/carpet/red,
+/area/shuttle/escape/luxury)
"CZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/glass,
@@ -941,6 +947,12 @@
},
/turf/open/floor/carpet/green,
/area/shuttle/escape/luxury)
+"MN" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape/luxury)
"Na" = (
/obj/item/food/spaghetti/pastatomato{
pixel_y = 5
@@ -1197,16 +1209,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/shuttle/escape/luxury)
-"XK" = (
-/obj/structure/closet/crate/freezer,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/reagent_containers/cup/glass/bottle/whiskey,
-/obj/item/reagent_containers/cup/bottle/ethanol,
-/obj/item/stack/medical/wrap/gauze/improvised,
-/obj/item/bot_assembly/medbot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/escape)
"XU" = (
/obj/item/stack/tile/iron/base,
/obj/effect/decal/cleanable/dirt,
@@ -1327,7 +1329,7 @@ gM
RU
JV
md
-XK
+oL
RM
CQ
"}
@@ -1590,7 +1592,7 @@ xY
Ka
PY
We
-nC
+CY
xK
PY
Ex
@@ -1866,10 +1868,10 @@ Ek
cV
vH
Ex
-on
-on
-on
-on
+MN
+MN
+MN
+MN
Ex
YV
YV
diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm
index a92e7ee2dbe7..ef041c5da704 100644
--- a/_maps/shuttles/emergency_medisim.dmm
+++ b/_maps/shuttles/emergency_medisim.dmm
@@ -330,7 +330,9 @@
/turf/open/floor/mineral/titanium/tiled/blue,
/area/shuttle/escape)
"nD" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/tiled/blue,
/area/shuttle/escape)
"oK" = (
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index 3782a27232bb..09a773abf820 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -280,13 +280,6 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
-"aT" = (
-/obj/structure/table,
-/obj/item/stack/medical/wrap/gauze,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/ointment,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/escape)
"aW" = (
/obj/machinery/door/airlock/command{
name = "Emergency Recovery Airlock"
@@ -356,10 +349,6 @@
/obj/machinery/shower/directional/south,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
-"bl" = (
-/obj/machinery/stasis,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
"bm" = (
/obj/structure/rack,
/obj/item/crowbar,
@@ -711,6 +700,21 @@
/obj/machinery/light/directional/north,
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
+"At" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"JY" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/machinery/camera/autoname{
+ dir = 4
+ },
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
"Lk" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
@@ -721,13 +725,6 @@
"LY" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
-"QL" = (
-/obj/machinery/stasis,
-/obj/machinery/camera/autoname{
- dir = 4
- },
-/turf/open/floor/mineral/titanium,
-/area/shuttle/escape)
"QU" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/autoname{
@@ -769,6 +766,13 @@
"Vs" = (
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
+"Wn" = (
+/obj/structure/table,
+/obj/item/stack/medical/wrap/gauze,
+/obj/item/stack/medical/bruise_pack,
+/obj/item/stack/medical/ointment,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -1036,8 +1040,8 @@ ar
LY
aE
ac
-QL
-bl
+JY
+At
Vs
bK
ad
@@ -1146,7 +1150,7 @@ at
LY
aN
LY
-aT
+Wn
ag
bq
bp
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index 7a137ddc75f6..aff57eb75748 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -34,7 +34,9 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"g" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"h" = (
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm
index d6c48664e08e..721914f8de2a 100644
--- a/_maps/shuttles/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency_narnar.dmm
@@ -254,7 +254,9 @@
/turf/open/floor/cult,
/area/shuttle/escape)
"Z" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/cult,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_nebula.dmm b/_maps/shuttles/emergency_nebula.dmm
index 7b729f72167f..b6418868395d 100644
--- a/_maps/shuttles/emergency_nebula.dmm
+++ b/_maps/shuttles/emergency_nebula.dmm
@@ -1232,7 +1232,9 @@
/area/shuttle/escape)
"Bm" = (
/obj/machinery/status_display/evac/directional/east,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/item/radio/intercom/directional/north,
/obj/machinery/camera/autoname{
dir = 9
@@ -1693,7 +1695,9 @@
/area/shuttle/escape)
"Ho" = (
/obj/machinery/status_display/evac/directional/east,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/iron/white/herringbone,
/area/shuttle/escape)
"HL" = (
diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency_northstar.dmm
index 798a4d9671a4..9a99e6a52dcd 100644
--- a/_maps/shuttles/emergency_northstar.dmm
+++ b/_maps/shuttles/emergency_northstar.dmm
@@ -189,7 +189,9 @@
/turf/open/floor/catwalk_floor/iron_white,
/area/shuttle/escape)
"qK" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/anticorner,
/turf/open/floor/iron/white/smooth_corner{
dir = 1
@@ -253,7 +255,9 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape)
"xe" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/anticorner{
dir = 4
},
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index 86e5aba69a55..fac1645deeb9 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -441,7 +441,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"ba" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/obj/machinery/vending/wallmed/directional/west{
@@ -460,7 +460,9 @@
/area/shuttle/escape)
"bc" = (
/obj/item/radio/intercom/directional/east,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index 7d0255eab769..103f5b5b45f0 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -310,7 +310,7 @@
/turf/open/floor/iron/cafeteria,
/area/shuttle/escape)
"aX" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/obj/effect/turf_decal/tile/blue/opposingcorners{
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index 2e158332d284..e68c6d5b8971 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -401,13 +401,6 @@
dir = 4
},
/area/shuttle/escape)
-"bh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/stasis,
-/turf/open/floor/iron/white/side{
- dir = 5
- },
-/area/shuttle/escape)
"bi" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -473,14 +466,6 @@
dir = 8
},
/area/shuttle/escape)
-"bq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/stasis,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/shuttle/escape)
"br" = (
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
@@ -1341,17 +1326,6 @@
/obj/item/radio/off,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
-"dx" = (
-/obj/effect/turf_decal/bot_white,
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/medical/wrap/gauze,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/ointment{
- pixel_x = 5
- },
-/turf/open/floor/iron/dark,
-/area/shuttle/escape)
"dy" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/rack,
@@ -1643,6 +1617,36 @@
},
/turf/open/floor/iron/dark,
/area/shuttle/escape)
+"gL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/turf/open/floor/iron/white/side{
+ dir = 4
+ },
+/area/shuttle/escape)
+"rT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/turf/open/floor/iron/white/side{
+ dir = 5
+ },
+/area/shuttle/escape)
+"BL" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/medical/wrap/gauze,
+/obj/item/stack/medical/bruise_pack,
+/obj/item/stack/medical/ointment{
+ pixel_x = 5
+ },
+/turf/open/floor/iron/dark,
+/area/shuttle/escape)
"Of" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/light/floor,
@@ -2157,7 +2161,7 @@ bO
br
dg
cr
-dx
+BL
dB
dK
dJ
@@ -2242,8 +2246,8 @@ aa
aa
aN
ax
-bh
-bq
+rT
+gL
bB
bM
ax
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index 693a4de4a1ce..c3ada447c145 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency_russiafightpit.dmm
@@ -435,7 +435,9 @@
/area/shuttle/escape)
"bD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
/area/shuttle/escape)
@@ -508,7 +510,7 @@
/area/shuttle/escape)
"dp" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/turf/open/floor/iron,
diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm
index 20b7bc7c817d..3803559c5201 100644
--- a/_maps/shuttles/emergency_shadow.dmm
+++ b/_maps/shuttles/emergency_shadow.dmm
@@ -314,7 +314,9 @@
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/escape)
"mw" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/turf/open/floor/iron/dark/smooth_large,
/area/shuttle/escape)
"np" = (
@@ -541,7 +543,9 @@
/turf/open/floor/iron/dark/small,
/area/shuttle/escape/engine)
"Bm" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/opposingcorners,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm
index ed7e86d8f00b..9edcd1e3cf8e 100644
--- a/_maps/shuttles/emergency_tram.dmm
+++ b/_maps/shuttles/emergency_tram.dmm
@@ -269,7 +269,9 @@
/turf/open/floor/mineral/titanium/white,
/area/shuttle/escape)
"bb" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/item/radio/intercom/directional/north,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm
index 091fd07142ba..e13f249138cd 100644
--- a/_maps/shuttles/emergency_tranquility.dmm
+++ b/_maps/shuttles/emergency_tranquility.dmm
@@ -1063,7 +1063,9 @@
/area/shuttle/escape)
"ts" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -1106,7 +1108,9 @@
/area/shuttle/escape)
"uK" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/structure/sign/poster/official/moth_epi/directional/north,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/effect/turf_decal/stripes/line{
diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency_venture.dmm
index 23200c2e84cb..0b62fda41b97 100644
--- a/_maps/shuttles/emergency_venture.dmm
+++ b/_maps/shuttles/emergency_venture.dmm
@@ -176,7 +176,9 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"iJ" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
/turf/open/floor/iron/white,
/area/shuttle/escape)
@@ -341,7 +343,9 @@
/turf/open/floor/iron,
/area/shuttle/escape)
"qo" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 4
},
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index df665874f9cc..8f1fbf8fcc5e 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -192,7 +192,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aK" = (
-/obj/machinery/stasis{
+/obj/machinery/sleeper/stasis{
dir = 4
},
/turf/open/floor/mineral/titanium/white,
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index afd59914fad3..3d40b65fdb58 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -5347,7 +5347,9 @@
/turf/open/floor/iron/dark,
/area/shuttle/sbc_starfury)
"Ri" = (
-/obj/machinery/stasis,
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
/obj/machinery/defibrillator_mount/loaded{
pixel_y = 28
},
diff --git a/_maps/templates/holodeck_medicalsim.dmm b/_maps/templates/holodeck_medicalsim.dmm
index 6d0255e88045..b332c453d75a 100644
--- a/_maps/templates/holodeck_medicalsim.dmm
+++ b/_maps/templates/holodeck_medicalsim.dmm
@@ -51,13 +51,6 @@
icon_state = "white"
},
/area/template_noop)
-"cO" = (
-/obj/machinery/stasis,
-/obj/effect/turf_decal/tile/green/anticorner/contrasted,
-/turf/open/floor/holofloor{
- icon_state = "white"
- },
-/area/template_noop)
"cR" = (
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 4
@@ -148,6 +141,15 @@
icon_state = "white"
},
/area/template_noop)
+"jG" = (
+/obj/machinery/sleeper/stasis{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green/anticorner/contrasted,
+/turf/open/floor/holofloor{
+ icon_state = "white"
+ },
+/area/template_noop)
"kJ" = (
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
dir = 1
@@ -156,6 +158,15 @@
icon_state = "white"
},
/area/template_noop)
+"kS" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green/half/contrasted,
+/turf/open/floor/holofloor{
+ icon_state = "white"
+ },
+/area/template_noop)
"lU" = (
/obj/structure/table,
/obj/item/storage/box/syringes,
@@ -468,7 +479,7 @@
icon_state = "white"
},
/area/template_noop)
-"Qu" = (
+"PU" = (
/obj/structure/table/glass,
/obj/item/stack/medical/wrap/gauze,
/obj/item/cautery,
@@ -520,15 +531,6 @@
icon_state = "white"
},
/area/template_noop)
-"Tt" = (
-/obj/machinery/stasis{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green/half/contrasted,
-/turf/open/floor/holofloor{
- icon_state = "white"
- },
-/area/template_noop)
"TI" = (
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
dir = 4
@@ -600,7 +602,7 @@ NV
Ke
BT
tI
-Tt
+kS
"}
(3,1,1) = {"
Sb
@@ -624,10 +626,10 @@ NV
GN
TI
cR
-cO
+jG
"}
(5,1,1) = {"
-Qu
+PU
tI
xf
hK
diff --git a/_maps/virtual_domains/heretic_hunt.dmm b/_maps/virtual_domains/heretic_hunt.dmm
index a51e22662646..e65d42cc1f92 100644
--- a/_maps/virtual_domains/heretic_hunt.dmm
+++ b/_maps/virtual_domains/heretic_hunt.dmm
@@ -77,21 +77,20 @@
},
/turf/template_noop,
/area/virtual_domain/safehouse)
-"eT" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/virtual_domain)
-"eV" = (
-/obj/machinery/stasis{
- dir = 1
- },
+"eB" = (
+/obj/machinery/defibrillator_mount/directional/west,
+/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/stack/medical/wrap/gauze/improvised,
/obj/effect/turf_decal/siding/blue{
- dir = 6
+ dir = 4
},
-/obj/structure/cable,
/turf/open/floor/plastic,
/area/virtual_domain)
+"eT" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/virtual_domain)
"fd" = (
/obj/structure/frame/computer{
dir = 1;
@@ -379,18 +378,6 @@
/obj/item/storage/belt/unfathomable_curio,
/turf/open/floor/iron,
/area/virtual_domain)
-"oD" = (
-/mob/living/basic/fake_crewman/assistant,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/item/restraints/handcuffs/cable/yellow{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/stack/medical/wrap/gauze/improvised{
- pixel_y = -2
- },
-/turf/open/floor/plating,
-/area/virtual_domain)
"oL" = (
/obj/effect/turf_decal/tile/yellow,
/obj/structure/cable,
@@ -438,6 +425,17 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/virtual_domain)
+"qS" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/turf_decal/siding/blue{
+ dir = 5
+ },
+/obj/structure/cable,
+/turf/open/floor/plastic,
+/area/virtual_domain)
"rq" = (
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/machinery/suit_storage_unit,
@@ -569,16 +567,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/virtual_domain)
-"vO" = (
-/obj/machinery/defibrillator_mount/directional/west,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/item/stack/medical/wrap/gauze/improvised,
-/obj/effect/turf_decal/siding/blue{
- dir = 4
- },
-/turf/open/floor/plastic,
-/area/virtual_domain)
"vP" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -614,17 +602,6 @@
},
/turf/open/floor/plating/heretic_rust,
/area/virtual_domain)
-"xa" = (
-/obj/machinery/stasis{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/turf_decal/siding/blue{
- dir = 5
- },
-/obj/structure/cable,
-/turf/open/floor/plastic,
-/area/virtual_domain)
"xg" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -862,6 +839,16 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron,
/area/virtual_domain)
+"GI" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/turf_decal/siding/blue/end{
+ dir = 1
+ },
+/obj/item/stack/medical/wrap/gauze/improvised,
+/obj/structure/cable,
+/turf/open/floor/plastic,
+/area/virtual_domain)
"GO" = (
/obj/structure/frame/computer{
pixel_y = 0;
@@ -1109,17 +1096,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/heretic_rust,
/area/virtual_domain)
-"NN" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/glass,
-/obj/item/stack/medical/wrap/gauze{
- pixel_y = 4
- },
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/turf/open/floor/plastic,
-/area/virtual_domain)
"NO" = (
/mob/living/basic/fake_crewman/md,
/turf/open/floor/plastic,
@@ -1146,16 +1122,6 @@
"Pr" = (
/turf/closed/indestructible/binary,
/area/virtual_domain)
-"PB" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/turf_decal/siding/blue/end{
- dir = 1
- },
-/obj/item/stack/medical/wrap/gauze/improvised,
-/obj/structure/cable,
-/turf/open/floor/plastic,
-/area/virtual_domain)
"PJ" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/old,
@@ -1228,6 +1194,18 @@
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/plating,
/area/virtual_domain)
+"RP" = (
+/mob/living/basic/fake_crewman/assistant,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/item/restraints/handcuffs/cable/yellow{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/stack/medical/wrap/gauze/improvised{
+ pixel_y = -2
+ },
+/turf/open/floor/plating,
+/area/virtual_domain)
"RQ" = (
/obj/effect/turf_decal/tile/blue,
/obj/structure/cable,
@@ -1330,6 +1308,17 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating/heretic_rust,
/area/virtual_domain)
+"VU" = (
+/obj/machinery/sleeper/stasis{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/turf_decal/siding/blue{
+ dir = 6
+ },
+/obj/structure/cable,
+/turf/open/floor/plastic,
+/area/virtual_domain)
"VW" = (
/obj/effect/turf_decal/tile/yellow/fourcorners,
/obj/structure/tank_dispenser,
@@ -1430,6 +1419,17 @@
},
/turf/open/floor/plastic,
/area/virtual_domain)
+"YC" = (
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/table/glass,
+/obj/item/stack/medical/wrap/gauze{
+ pixel_y = 4
+ },
+/obj/effect/turf_decal/siding/blue{
+ dir = 8
+ },
+/turf/open/floor/plastic,
+/area/virtual_domain)
"YL" = (
/mob/living/basic/fake_crewman/sec,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1825,7 +1825,7 @@ ge
Vh
rC
rt
-oD
+RP
Zu
JG
MF
@@ -2062,10 +2062,10 @@ JG
Zu
Zu
FH
-eV
+VU
sT
-xa
-vO
+qS
+eB
Zu
iL
oa
@@ -2161,7 +2161,7 @@ dh
uS
uj
uj
-PB
+GI
vt
JA
KR
@@ -2267,7 +2267,7 @@ Wo
Zu
VX
Yy
-NN
+YC
Zu
Zt
Pr
diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
index ed3ba0553bf9..d4d78c24667b 100644
--- a/code/__DEFINES/dcs/signals/signals_object.dm
+++ b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -587,6 +587,9 @@
/// Item has been unequipped from a mob as a prosthetic limb
#define COMSIG_ITEM_DROPPED_FROM_PROSTHETIC "item_dropped_from_prosthetic"
+/// Sent from /obj/machinery/vitals_monitor/proc/set_patient() : (mob/living/old_patient, mob/living/new_patient)
+#define COMSIG_VITALS_SET_PATIENT "vitals_set_patient"
+
/// Sent from /obj/item/bodypart/limb/proc/apply_item(): (obj/item/bodypart/limb)
#define COMSIG_ITEM_APPLIED_TO_LIMB "item_applied_to_limb"
/// Sent from /obj/item/bodypart/limb/proc/Exited(): (obj/item/bodypart/limb)
@@ -597,7 +600,6 @@
#define COMPONENT_SACRIFICE_SUCCESSFUL (1<<0)
/// Send to items that have been unwrapped from a gift
-#define COMSIG_ITEM_OPENED_FROM_GIFT "gift_opened"
/// From /obj/machinery/vending/ui_interact(): (mob/user, datum/vending_ui/ui)
#define COMSIG_VENDING_UI_INTERACT "vending_ui_interact"
diff --git a/code/__DEFINES/dcs/signals/signals_operating_computer.dm b/code/__DEFINES/dcs/signals/signals_operating_computer.dm
index 8974bb99db86..3517b0d01ebf 100644
--- a/code/__DEFINES/dcs/signals/signals_operating_computer.dm
+++ b/code/__DEFINES/dcs/signals/signals_operating_computer.dm
@@ -1,5 +1,7 @@
-// /obj/machinery/computer/operating signals
-
/// Fired when a autopsy surgery completes.
/// (mob/living/target)
#define COMSIG_OPERATING_COMPUTER_AUTOPSY_COMPLETE "operating_computer_autopsy_complete"
+
+/// Fired when the patient on the operating table is changed.
+/// (mob/living/target)
+#define COMSIG_OPERATING_TABLE_SET_PATIENT "operating_table_set_patient"
diff --git a/code/__DEFINES/devices.dm b/code/__DEFINES/devices.dm
index 8c62710a1d92..f6d95500f8cc 100644
--- a/code/__DEFINES/devices.dm
+++ b/code/__DEFINES/devices.dm
@@ -13,3 +13,13 @@
#define INSPECTOR_TIME_MODE_SLOW 1
#define INSPECTOR_TIME_MODE_FAST 2
#define INSPECTOR_TIME_MODE_HONK 3
+
+// Health analyzer stuff
+// Describes the three modes of scanning available for health analyzers
+#define SCANMODE_HEALTH 0
+#define SCANMODE_WOUND 1
+#define SCANMODE_COUNT 2 // Update this to be the number of scan modes if you add more
+#define SCANNER_CONDENSED 0
+#define SCANNER_VERBOSE 1
+// Not updating above count because you're not meant to switch to this mode.
+#define SCANNER_NO_MODE -1
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
index 9888efbd355f..47acc47ea329 100644
--- a/code/controllers/subsystem/research.dm
+++ b/code/controllers/subsystem/research.dm
@@ -203,42 +203,42 @@ SUBSYSTEM_DEF(research)
for(var/n in techweb_nodes)
var/datum/techweb_node/N = techweb_nodes[n]
if(!istype(N))
- WARNING("Invalid research node with ID [n] detected and removed.")
+ stack_trace("Invalid research node with ID [n] detected and removed.")
techweb_nodes -= n
research_node_id_error(n)
. = FALSE
for(var/p in N.prereq_ids)
var/datum/techweb_node/P = techweb_nodes[p]
if(!istype(P))
- WARNING("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
+ stack_trace("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
N.prereq_ids -= p
research_node_id_error(p)
. = FALSE
for(var/d in N.design_ids)
var/datum/design/D = techweb_designs[d]
if(!istype(D))
- WARNING("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
+ stack_trace("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
N.design_ids -= d
design_id_error(d)
. = FALSE
for(var/u in N.unlock_ids)
var/datum/techweb_node/U = techweb_nodes[u]
if(!istype(U))
- WARNING("Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
+ stack_trace("Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
N.unlock_ids -= u
research_node_id_error(u)
. = FALSE
for(var/p in N.required_items_to_unlock)
if(!ispath(p))
N.required_items_to_unlock -= p
- WARNING("[p] is not a valid path.")
+ stack_trace("[p] is not a valid path.")
node_boost_error(N.id, "[p] is not a valid path.")
. = FALSE
var/list/points = N.required_items_to_unlock[p]
if(!isnull(points))
N.required_items_to_unlock -= p
node_boost_error(N.id, "No valid list.")
- WARNING("No valid list.")
+ stack_trace("No valid list.")
. = FALSE
CHECK_TICK
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index 7fa35a0c6ba1..59b876b18722 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -4,7 +4,7 @@
/datum/looping_sound
/// (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end. In a list, path must have also be assigned a value or it will be assigned 0 and not play.
var/mid_sounds
- /// The length of time to wait between playing mid_sounds.
+ /// The length of time to wait between playing mid_sounds. WARNING: Continuously looping sounds like the microwave, grav gen and fan sounds don't work very well with this, just don't set this if you are doing a continuous loop of machinery.
var/mid_length
/// Amount of time to add/take away from the mid length, randomly
var/mid_length_vary = 0
diff --git a/code/datums/looping_sounds/vents.dm b/code/datums/looping_sounds/vents.dm
index 2d0a3443631d..16da6dde08e8 100644
--- a/code/datums/looping_sounds/vents.dm
+++ b/code/datums/looping_sounds/vents.dm
@@ -1,7 +1,6 @@
-/datum/looping_sound/vent_pump_overclock
- start_sound = 'sound/machines/fan_start.ogg'
+/datum/looping_sound/fan
+ start_sound = 'sound/machines/fan/fan_start.ogg'
start_length = 1.5 SECONDS
- end_sound = 'sound/machines/fan_stop.ogg'
+ end_sound = 'sound/machines/fan/fan_stop.ogg'
end_sound = 1.5 SECONDS
- mid_sounds = 'sound/machines/fan_loop.ogg'
- mid_length = 2 SECONDS
+ mid_sounds = 'sound/machines/fan/fan_loop.ogg'
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index 10eaa4f2af4b..1fc5546b8103 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -1,6 +1,3 @@
-#define MENU_OPERATION 1
-#define MENU_SURGERIES 2
-
/obj/machinery/computer/operating
name = "operating computer"
desc = "Monitors patient vitals and displays surgery steps. Can be loaded with surgery disks to perform experimental procedures. Automatically syncs to operating tables within its line of sight for surgical tech advancement."
@@ -58,6 +55,7 @@
table = locate(/obj/structure/table/optable) in get_step(src, direction)
if(table && table.computer == src)
table.computer = null
+ table.update_appearance() // NON-MODULE CHANGE
QDEL_NULL(experiment_handler)
return ..()
@@ -104,16 +102,18 @@
// NON-MODULE CHANGE
/obj/machinery/computer/operating/on_set_is_operational(old_value)
update_static_data_for_all_viewers()
+ table?.update_appearance(UPDATE_OVERLAYS)
if(is_operational)
return
// Losing power / getting broken will auto disable anesthesia
- table.safety_disable()
+ table?.safety_disable()
/obj/machinery/computer/operating/proc/find_table()
for(var/direction in GLOB.alldirs)
table = locate(/obj/structure/table/optable) in get_step(src, direction)
if(table)
table.computer = src
+ table.update_appearance() // NON-MODULE CHANGE
break
/obj/machinery/computer/operating/ui_status(mob/user, datum/ui_state/state)
@@ -221,13 +221,14 @@
data["patient"]["heartratestate"] = patient_bpm >= 140 ? "bad" : (patient_bpm >= 120 ? "average" : (patient_bpm >= 60 ? "good" : (patient_bpm >= 40 ? "average" : "bad")))
// We can also show pain and stuff here if we want.
- var/tank_exists = !isnull(table.attached_tank)
+ var/anesthetic_exists = !isnull(table.attached_anesthetic)
var/patient_exists = !isnull(table.patient)
data["anesthesia"] = list(
- "has_tank" = tank_exists,
- "open" = tank_exists && patient_exists && table.patient.external == table.attached_tank,
- "can_open_tank" = tank_exists && patient_exists && table.can_have_tank_opened(table.patient),
+ "has_tank" = anesthetic_exists,
+ "open" = anesthetic_exists && patient_exists && table.patient_set_at != -1,
+ "can_open_tank" = anesthetic_exists && patient_exists && table.can_have_anesthetic(table.patient),
"failsafe" = table.failsafe_time == INFINITY ? -1 : (table.failsafe_time / 10),
+ "is_tank" = istype(table.attached_anesthetic, /obj/item/tank/internals),
)
// NON-MODULE CHANGE END
return data
@@ -303,13 +304,12 @@
// NON-MODULE CHANGE START
if("toggle_anesthesia")
- if(iscarbon(usr))
- var/mob/living/carbon/toggler = usr
- if(toggler == table.patient && table.patient_set_at == -1 && table.failsafe_time >= 5 MINUTES)
- to_chat(toggler, span_warning("You feel as if you know better than to do that."))
- return FALSE
+ var/mob/living/toggler = ui.user
+ if(toggler == table.patient && table.patient_set_at == -1 && table.failsafe_time >= 5 MINUTES)
+ to_chat(toggler, span_warning("You feel as if you know better than to do that."))
+ return FALSE
- table.toggle_anesthesia()
+ table.toggle_anesthesia(toggler)
return TRUE
if("set_failsafe")
@@ -346,6 +346,3 @@
SIGNAL_HANDLER
addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data_for_all_viewers)), 0.1 SECONDS, TIMER_UNIQUE)
-
-#undef MENU_OPERATION
-#undef MENU_SURGERIES
diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm
index bfd77a4b80d2..9d37193e4ae0 100644
--- a/code/game/machinery/sleepers.dm
+++ b/code/game/machinery/sleepers.dm
@@ -4,12 +4,13 @@
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
base_icon_state = "sleeper"
- density = FALSE
+ density = TRUE
obj_flags = BLOCKS_CONSTRUCTION
state_open = TRUE
interaction_flags_mouse_drop = NEED_DEXTERITY
circuit = /obj/item/circuitboard/machine/sleeper
examine_feedback_on_ui = TRUE
+ processing_flags = NONE
payment_department = ACCOUNT_MED
fair_market_price = 5
@@ -24,15 +25,17 @@
var/deconstructable = FALSE
///Message sent when a user enters the machine.
var/enter_message = span_boldnotice("You feel cool air surround you. You go numb as your senses turn inward.")
-
+ /// Time it takes to exit the sleeper on resist
var/resist_time = 0 SECONDS
+ /// Time it takes to enter the sleeper
+ var/time_to_enter = 1 SECONDS
///List of currently available chems.
var/list/available_chems = list()
///Used when emagged to scramble which chem is used, eg: mutadone -> morphine
var/list/chem_buttons
///All chems this sleeper will get, depending on the parts inside.
- var/list/possible_chems = list(
+ var/list/list/possible_chems = list(
list(
/datum/reagent/medicine/epinephrine,
/datum/reagent/medicine/painkiller/morphine, // NON-MODULE CHANGE
@@ -74,11 +77,11 @@
/obj/machinery/sleeper/RefreshParts()
. = ..()
- var/matterbin_rating
+ var/matterbin_rating = 0
for(var/datum/stock_part/matter_bin/matterbins in component_parts)
matterbin_rating += matterbins.tier
- efficiency = initial(efficiency) * matterbin_rating
- min_health = initial(min_health) * matterbin_rating
+ efficiency = initial(efficiency) * max(matterbin_rating, 1)
+ min_health = initial(min_health) * max(matterbin_rating, 1)
available_chems.Cut()
for(var/datum/stock_part/servo/servos in component_parts)
@@ -94,7 +97,7 @@
/obj/machinery/sleeper/container_resist_act(mob/living/user)
if(resist_time > 0)
to_chat(user, span_notice("You pull at the release lever."))
- if(!do_after(user, resist_time, src))
+ if(!do_after(user, resist_time * (is_operational ? 1 : 0.5), src))
return
user.visible_message(
span_notice("[occupant] emerges from [src]!"),
@@ -112,18 +115,34 @@
if (!state_open)
container_resist_act(user)
-/obj/machinery/sleeper/open_machine(drop = TRUE, density_to_set = FALSE)
+/obj/machinery/sleeper/open_machine(drop = TRUE, density_to_set = TRUE)
if(!state_open && !panel_open)
flick("[initial(icon_state)]-anim", src)
- return ..()
-/obj/machinery/sleeper/close_machine(mob/user, density_to_set = TRUE)
- if((isnull(user) || istype(user)) && state_open && !panel_open)
- flick("[initial(icon_state)]-anim", src)
- ..()
+ var/mob/living/old_occupant = occupant
+ . = ..()
+ if(density_to_set && old_occupant)
+ // Tries to move us to the tile in front
+ old_occupant.Move(get_step(src, dir))
+
+/obj/machinery/sleeper/close_machine(atom/movable/target, density_to_set = TRUE)
+ if(!state_open || panel_open)
+ return
+
+ flick("[initial(icon_state)]-anim", src)
+ . = ..()
+ var/mob/living/new_occupant = occupant
+ if(new_occupant && new_occupant.stat != DEAD && is_operational)
+ to_chat(new_occupant, enter_message)
+
+/obj/machinery/sleeper/set_occupant(atom/movable/new_occupant)
+ if(isliving(occupant))
+ REMOVE_TRAIT(occupant, TRAIT_FLOORED, REF(src))
+ . = ..()
+ if(isliving(occupant))
var/mob/living/mob_occupant = occupant
- if(mob_occupant && mob_occupant.stat != DEAD)
- to_chat(mob_occupant, "[enter_message]")
+ mob_occupant.set_body_position(LYING_DOWN)
+ ADD_TRAIT(occupant, TRAIT_FLOORED, REF(src))
/obj/machinery/sleeper/emp_act(severity)
. = ..()
@@ -133,17 +152,79 @@
open_machine()
/obj/machinery/sleeper/mouse_drop_receive(atom/target, mob/user, params)
+ if(DOING_INTERACTION_WITH_TARGET(user, src))
+ return
if(!iscarbon(target))
return
- close_machine(target)
+
+ try_close_machine(target, user)
+
+/obj/machinery/sleeper/proc/try_close_machine(mob/living/carbon/target, mob/living/user)
+ . = FALSE
+
+ if(!insert_check(target, user))
+ return .
+
+ user.face_atom(src)
+ if(user == target)
+ user.visible_message(
+ span_notice("[user] starts climbing into [src]."),
+ span_notice("You start climbing into [src]."),
+ )
+ else
+ user.visible_message(
+ span_notice("[user] starts placing [target] into [src]."),
+ span_notice("You start placing [target] into [src]."),
+ )
+
+ if(time_to_enter > 0)
+ . = do_after(user, time_to_enter * (user == target ? 0.5 : 1), src, extra_checks = CALLBACK(src, PROC_REF(insert_check), target, user))
+
+ if(.)
+ close_machine(target)
+
+ if(occupant == target)
+ if(user == target)
+ user.visible_message(
+ span_notice("[user] climbs into [src]."),
+ span_notice("You climb into [src]."),
+ )
+ else
+ user.visible_message(
+ span_notice("[user] places [target] into [src]."),
+ span_notice("You place [target] into [src]."),
+ )
+
+ else
+ if(user == target)
+ user.visible_message(
+ span_warning("[user] fails to climb into [src]."),
+ span_warning("You fail to climb into [src]."),
+ )
+ else
+ user.visible_message(
+ span_warning("[user] fails to place [target] into [src]."),
+ span_warning("You fail to place [target] into [src]."),
+ )
+
+ return .
+
+/obj/machinery/sleeper/proc/insert_check(atom/movable/dropping, mob/user)
+ if(!state_open || panel_open || !isnull(occupant))
+ return FALSE
+ if(!user.Adjacent(dropping) || !Adjacent(dropping))
+ return FALSE
+ if(!user.can_perform_action(src, NEED_DEXTERITY|ALLOW_SILICON_REACH|FORBID_TELEKINESIS_REACH))
+ return FALSE
+ return TRUE
/obj/machinery/sleeper/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
if(occupant)
- to_chat(user, span_warning("[src] is currently occupied!"))
+ balloon_alert(user, "occupied!")
return TRUE
if(state_open)
- to_chat(user, span_warning("[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!"))
+ balloon_alert(user, "close it first!")
return TRUE
if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I))
return TRUE
@@ -182,8 +263,18 @@
ui.open()
/obj/machinery/sleeper/click_alt(mob/user)
+ if(DOING_INTERACTION_WITH_TARGET(user, src))
+ return CLICK_ACTION_BLOCKING
+ if(user.loc == loc)
+ return CLICK_ACTION_BLOCKING
+ if(!user.can_perform_action(src, NEED_DEXTERITY|ALLOW_SILICON_REACH|FORBID_TELEKINESIS_REACH))
+ return CLICK_ACTION_BLOCKING
if(state_open)
- close_machine()
+ var/mob/living/carbon/scooped = locate() in loc
+ if(scooped)
+ try_close_machine(scooped, user)
+ else
+ close_machine()
else
open_machine()
return CLICK_ACTION_SUCCESS
@@ -192,9 +283,6 @@
. = ..()
. += span_notice("Alt-click [src] to [state_open ? "close" : "open"] it.")
-/obj/machinery/sleeper/process()
- use_energy(idle_power_usage)
-
/obj/machinery/sleeper/nap_violation(mob/violator)
. = ..()
open_machine()
@@ -212,12 +300,13 @@
"name" = R.name,
"id" = R.type,
"allowed" = chem_allowed(chem),
+ "volume" = reagents?.get_reagent_amount(chem) || 0,
),
)
- data["occupant"] = list()
var/mob/living/mob_occupant = occupant
if(mob_occupant)
+ data["occupant"] = list()
data["occupant"]["name"] = mob_occupant.name
switch(mob_occupant.stat)
if(CONSCIOUS)
@@ -274,7 +363,7 @@
return
if(mob_occupant.health < min_health && !ispath(chem, /datum/reagent/medicine/epinephrine))
return
- if(inject_chem(chem, usr))
+ if(inject_chem(chem, usr, params["amount"]))
. = TRUE
if((obj_flags & EMAGGED) && prob(5))
to_chat(usr, span_warning("Chemical system re-route detected, results may not be as expected!"))
@@ -385,37 +474,302 @@
return TRUE
return ..()
-GLOBAL_LIST_INIT(cryo_sleepers, list())
+/obj/machinery/sleeper/stasis
+ name = "stasis pod"
+ desc = "An enclosed machine used stabilize patients and keep them in a state of stasis."
+ icon = 'maplestation_modules/icons/obj/machines/sleeper.dmi'
+ icon_state = "stasis"
+ base_icon_state = "stasis"
+ deconstructable = TRUE
+ min_health = -INFINITY
+ circuit = /obj/item/circuitboard/machine/sleeper/stasis
+ resist_time = 1 SECONDS
+ time_to_enter = 2 SECONDS
+ enter_message = span_boldnotice("You feel a cold chill as you enter the pod. \
+ You feel your body go numb as you enter stasis.")
+ processing_flags = START_PROCESSING_ON_INIT
+ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 3
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 3
+ possible_chems = list(
+ list(),
+ list(),
+ list(),
+ list(),
+ )
+ /// Cooldown to prevent sound spam / instantly jumping out of a pod
+ COOLDOWN_DECLARE(open_close_cd)
+ /// Cooldown for how long it must be closed before fog particles are made
+ COOLDOWN_DECLARE(fog_cd)
+ /// If TRUE we can inject chems into the patient
+ var/allow_storing_injecting_chems = TRUE
+ /// If TRUE we process medicine reagents despite stasis
+ var/metabolize_medicines_in_stasis = TRUE
+ /// Max consciousness set while inside the pod
+ var/max_consciousness_inside = 50
+ /// Fan sfx looping sound
+ VAR_FINAL/datum/looping_sound/fan/fan_loop
+
+/obj/machinery/sleeper/stasis/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "_StasisPod", name)
+ ui.open()
+
+/obj/machinery/sleeper/stasis/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("toggle_medicine_metab")
+ metabolize_medicines_in_stasis = !metabolize_medicines_in_stasis
+ . = TRUE
+
+/obj/machinery/sleeper/stasis/ui_data()
+ . = ..()
+ .["metabolize_medicines_in_stasis"] = metabolize_medicines_in_stasis
+
+/obj/machinery/sleeper/stasis/update_icon_state()
+ . = ..()
+ if(occupant && is_operational && base_icon_state == "stasis")
+ icon_state += "-working"
+
+/obj/machinery/sleeper/stasis/Initialize(mapload)
+ fan_loop = new(src, start_immediately = FALSE)
+ fan_loop.volume = 20
+ fan_loop.ignore_walls = FALSE
+ fan_loop.extra_range = SHORT_RANGE_SOUND_EXTRARANGE
+ fan_loop.falloff_exponent = 4
+ if(!allow_storing_injecting_chems)
+ return ..()
+
+ create_reagents(50, OPENCONTAINER) // init this before we refreshparts
+ . = ..()
+ RegisterSignals(reagents, list(
+ COMSIG_REAGENTS_ADD_REAGENT,
+ COMSIG_REAGENTS_NEW_REAGENT,
+ COMSIG_REAGENTS_DEL_REAGENT,
+ COMSIG_REAGENTS_CLEAR_REAGENTS,
+ ), PROC_REF(update_chems))
+
+ if(mapload)
+ reagents.add_reagent(/datum/reagent/medicine/epinephrine, 40)
+ reagents.add_reagent(/datum/reagent/medicine/coagulant, 10)
+
+/obj/machinery/sleeper/stasis/proc/update_chems(...)
+ SIGNAL_HANDLER
+
+ possible_chems[1].Cut()
+ if(!allow_storing_injecting_chems)
+ return
+
+ for(var/datum/reagent/med as anything in reagents.reagent_list)
+ if(istype(med, /datum/reagent/medicine) || (obj_flags & EMAGGED))
+ possible_chems[1] |= med.type
+ RefreshParts()
+
+/obj/machinery/sleeper/stasis/RefreshParts()
+ . = ..()
+ if(!allow_storing_injecting_chems)
+ return
+ if(!reagents)
+ CRASH("Stasis pod with allow_storing_injecting_chems set to TRUE has no reagent holder.")
+
+ var/new_max = 0
+ for(var/obj/item/reagent_containers/cup/beaker/cup in component_parts)
+ new_max = cup.reagents.maximum_volume
+
+ if(reagents.total_volume > new_max)
+ reagents.remove_all(reagents.total_volume - new_max)
+
+ reagents.maximum_volume = new_max
+
+/obj/machinery/sleeper/stasis/on_deconstruction(disassembled)
+ . = ..()
+ for(var/obj/item/reagent_containers/cup/beaker/cup in component_parts)
+ reagents.trans_to(cup, reagents.total_volume)
+
+/obj/machinery/sleeper/stasis/chem_allowed(chem)
+ if(!allow_storing_injecting_chems)
+ return FALSE
+
+ return occupant?.reagents?.get_reagent_amount(chem) <= 5 && reagents.get_reagent_amount(chem) > 0
+
+/obj/machinery/sleeper/stasis/inject_chem(chem, mob/user, amount = 10)
+ if(!(chem in available_chems) || !chem_allowed(chem))
+ return FALSE
+ amount = clamp(amount, 0, 10)
+ if(amount <= 0)
+ return FALSE
+ if(amount > reagents.get_reagent_amount(chem))
+ return FALSE
+
+ return reagents.trans_to(
+ target = occupant,
+ amount = amount,
+ target_id = chem_buttons[chem],
+ transferred_by = user,
+ methods = TOUCH,
+ )
+
+/obj/machinery/sleeper/stasis/proc/freeze_mob(mob/living/to_freeze)
+ to_freeze.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
+ to_freeze.add_traits(list(
+ TRAIT_BLOCK_HEADSET_USE,
+ TRAIT_SOFTSPOKEN,
+ TRAIT_RADSTORM_IMMUNE,
+ ), REF(src))
+ to_freeze.add_max_consciousness_value(REF(src), max_consciousness_inside)
+ to_freeze.extinguish_mob()
+ RegisterSignal(to_freeze, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(stasis_move_eject))
+ fan_loop.start()
+ update_use_power(ACTIVE_POWER_USE)
+ playsound(src, 'sound/effects/spray.ogg', 25, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE, frequency = 0.4)
+
+/obj/machinery/sleeper/stasis/proc/unfreeze_mob(mob/living/to_unfreeze)
+ to_unfreeze.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
+ to_unfreeze.remove_traits(list(
+ TRAIT_BLOCK_HEADSET_USE,
+ TRAIT_SOFTSPOKEN,
+ TRAIT_RADSTORM_IMMUNE,
+ ), REF(src))
+ to_unfreeze.remove_max_consciousness_value(REF(src))
+ UnregisterSignal(to_unfreeze, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE)
+ fan_loop.stop()
+ update_use_power(IDLE_POWER_USE)
+ playsound(src, 'sound/effects/spray.ogg', 25, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE, frequency = 0.5)
+
+/obj/machinery/sleeper/stasis/on_set_is_operational(old_value)
+ . = ..()
+ update_appearance()
+ if(!isliving(occupant))
+ return
+ if(is_operational)
+ if(!HAS_TRAIT_FROM(occupant, TRAIT_STASIS, REF(src)))
+ freeze_mob(occupant)
+ else
+ if(HAS_TRAIT_FROM(occupant, TRAIT_STASIS, REF(src)))
+ unfreeze_mob(occupant)
+
+/obj/machinery/sleeper/stasis/set_occupant(atom/movable/new_occupant)
+ if(isliving(occupant))
+ unfreeze_mob(occupant)
+
+ . = ..()
+ if(isliving(occupant) && is_operational)
+ freeze_mob(occupant)
+
+ update_appearance()
+
+/obj/machinery/sleeper/stasis/proc/stasis_move_eject(mob/source, atom/new_loc, direct)
+ SIGNAL_HANDLER
+ if(!source.can_resist() || DOING_INTERACTION_WITH_TARGET(source, src))
+ return NONE
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, relaymove), source, direct)
+ return COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE
+
+/obj/machinery/sleeper/stasis/open_machine(drop, density_to_set)
+ if(!COOLDOWN_FINISHED(src, open_close_cd))
+ return
+
+ . = ..()
+ if(!is_operational)
+ return
+ COOLDOWN_START(src, open_close_cd, 2 SECONDS)
+ if(!(dir & NORTH) && COOLDOWN_STARTED(src, fog_cd) && COOLDOWN_FINISHED(src, fog_cd))
+ particles = new /particles/cryo_fog(dir)
+
+/obj/machinery/sleeper/stasis/close_machine(user, density_to_set)
+ if(!COOLDOWN_FINISHED(src, open_close_cd))
+ return
+
+ . = ..()
+ if(!is_operational)
+ return
+ COOLDOWN_START(src, open_close_cd, 2 SECONDS)
+ COOLDOWN_START(src, fog_cd, 10 SECONDS)
+ QDEL_NULL(particles)
+
+/obj/machinery/sleeper/stasis/process(seconds_per_tick)
+ if(metabolize_medicines_in_stasis && isliving(occupant) && HAS_TRAIT(occupant, TRAIT_STASIS) && is_operational)
+ var/update = FALSE
+ var/mob/living/patient = occupant
+ for(var/datum/reagent/reagent as anything in patient.reagents?.reagent_list)
+ if(!istype(reagent, /datum/reagent/medicine) && !(obj_flags & EMAGGED))
+ continue
+ update ||= patient.reagents.metabolize_reagent(patient, reagent, seconds_per_tick, SSmobs.times_fired, can_overdose = TRUE)
+ if(update)
+ patient.updatehealth()
+
+ if(istype(particles, /particles/cryo_fog))
+ if(particles.count == round(initial(particles.count) * 0.5, 6))
+ particles.spawning = 1
+
+ if(particles.count <= 0)
+ QDEL_NULL(particles)
+ else
+ particles.count -= 6
+
+/particles/cryo_fog
+ icon = 'maplestation_modules/icons/effects/particles.dmi'
+ icon_state = list("chill_1" = 2, "chill_2" = 2, "chill_3" = 1)
+ count = 48
+ spawning = 3
+ lifespan = 1.5 SECONDS
+ fade = 0.5 SECONDS
+ gravity = list(0, -0.1, 0)
+ spin = 0.25
+ grow = 0.05
+ color = "#cafaff77"
+
+/particles/cryo_fog/New(dir)
+ switch(dir)
+ if(SOUTH)
+ position = generator(GEN_VECTOR, list(-8, -10, 0), list(6, -10, 0), NORMAL_RAND)
+ if(EAST)
+ position = generator(GEN_VECTOR, list(-10, -10, 0), list(16, -10, 0), NORMAL_RAND)
+ if(WEST)
+ position = generator(GEN_VECTOR, list(-16, -10, 0), list(10, -10, 0), NORMAL_RAND)
+
+/// List of crew storage pods
+GLOBAL_LIST_EMPTY(cryo_sleepers)
#define IS_SPAWNING "spawning"
-/obj/machinery/sleeper/cryo
+/obj/machinery/sleeper/stasis/cryo
name = "long-term crew storage pod"
desc = "An enclosed machine designed to put subjects in a state of suspended animation for long-term storage."
- icon = 'maplestation_modules/icons/obj/machines/sleeper.dmi'
icon_state = "cryopod"
base_icon_state = "cryopod"
- // circuit = /obj/item/circuitboard/machine/sleeper/cryo
+ circuit = /obj/item/circuitboard/machine/sleeper/cryo
enter_message = span_boldnotice("You feel a cold chill as you enter the pod. \
You feel your body go numb as you enter a state of suspended animation.")
possible_chems = null
state_open = FALSE
density = TRUE
resist_time = 0.5 SECONDS
-
+ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION
+ allow_storing_injecting_chems = FALSE
+ metabolize_medicines_in_stasis = FALSE
+ max_consciousness_inside = 75
+ /// If TRUE we throw an alert allowing occupants to despawn
var/throw_alert = TRUE
-/obj/machinery/sleeper/cryo/Initialize(mapload)
+/obj/machinery/sleeper/stasis/cryo/Initialize(mapload)
. = ..()
AddElement(/datum/element/empprotection, EMP_PROTECT_ALL)
GLOB.cryo_sleepers += src
open_machine()
-/obj/machinery/sleeper/cryo/Destroy()
+/obj/machinery/sleeper/stasis/cryo/ui_interact(mob/user, datum/tgui/ui)
+ return
+
+/obj/machinery/sleeper/stasis/cryo/Destroy()
GLOB.cryo_sleepers -= src
return ..()
-/obj/machinery/sleeper/cryo/examine(mob/user)
+/obj/machinery/sleeper/stasis/cryo/examine(mob/user)
. = ..()
if(isliving(occupant) && user != occupant)
var/mob/living/occupant_l = occupant
@@ -425,59 +779,29 @@ GLOBAL_LIST_INIT(cryo_sleepers, list())
. += span_info(span_slightly_smaller("You can enter the pod to be put into stasis temporarily, or to despawn your character."))
. += span_info(span_slightly_smaller("This machine is not intended to be used medicinally. Avoid placing wounded patients inside, even in emergencies."))
-/obj/machinery/sleeper/cryo/set_occupant(atom/movable/new_occupant)
- var/mob/living/old_occupant = occupant
+/obj/machinery/sleeper/stasis/cryo/freeze_mob(mob/living/to_freeze)
. = ..()
- var/mob/living/new_occupant_l = new_occupant
- var/skey = REF(src)
- if(istype(old_occupant))
- old_occupant.remove_status_effect(/datum/status_effect/grouped/stasis, skey)
- REMOVE_TRAIT(old_occupant, TRAIT_BLOCK_HEADSET_USE, skey)
- REMOVE_TRAIT(old_occupant, TRAIT_SOFTSPOKEN, skey)
- REMOVE_TRAIT(old_occupant, TRAIT_RADSTORM_IMMUNE, skey)
- UnregisterSignal(old_occupant, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE)
- if(throw_alert)
- old_occupant.clear_alert(skey)
- if(istype(new_occupant_l))
- new_occupant_l.apply_status_effect(/datum/status_effect/grouped/stasis, skey)
- ADD_TRAIT(new_occupant_l, TRAIT_BLOCK_HEADSET_USE, skey)
- ADD_TRAIT(new_occupant_l, TRAIT_SOFTSPOKEN, skey)
- ADD_TRAIT(new_occupant_l, TRAIT_RADSTORM_IMMUNE, skey)
- RegisterSignal(new_occupant_l, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(early_move_check))
- if(throw_alert)
- new_occupant_l.throw_alert(skey, /atom/movable/screen/alert/cryosleep)
- // if they have a mind, we can consider despawning them, however:
- // ...if the mind is active, they are being forced to be "here", so we should be on the safe side and leave them
- // ...if they have a key, but no client, they're just disconnected. leave them in the pod for if they return
- // ...if they have a client, they're actively in the game, definitely don't despawn them
- // ...if they have an ai controller, then it's probably just an NPC, so it doesn't need to be despawned
- if(new_occupant_l.mind && !new_occupant_l.mind.active && !new_occupant_l.key && !new_occupant_l.client && !new_occupant_l.ai_controller)
- addtimer(CALLBACK(src, PROC_REF(auto_despawn), new_occupant_l), 5 MINUTES)
-
-/obj/machinery/sleeper/cryo/proc/early_move_check(mob/living/mob_occupant, new_loc, direct)
- SIGNAL_HANDLER
-
- if(mob_occupant.incapacitated(IGNORE_STASIS) || DOING_INTERACTION_WITH_TARGET(mob_occupant, src))
- return NONE
- INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, relaymove), mob_occupant, direct)
- return COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE
+ if(!throw_alert)
+ return
+ to_freeze.throw_alert(REF(src), /atom/movable/screen/alert/cryosleep)
+ // if they have a mind, we can consider despawning them, however:
+ // ...if the mind is active, they are being forced to be "here", so we should be on the safe side and leave them
+ // ...if they have a key, but no client, they're just disconnected. leave them in the pod for if they return
+ // ...if they have a client, they're actively in the game, definitely don't despawn them
+ // ...if they have an ai controller, then it's probably just an NPC, so it doesn't need to be despawned
+ if(to_freeze.mind && !to_freeze.mind.active && !to_freeze.key && !to_freeze.client && !to_freeze.ai_controller)
+ addtimer(CALLBACK(src, PROC_REF(auto_despawn), to_freeze), 5 MINUTES)
+
+/obj/machinery/sleeper/stasis/cryo/unfreeze_mob(mob/living/to_unfreeze)
+ . = ..()
+ to_unfreeze.clear_alert(REF(src))
-/obj/machinery/sleeper/cryo/proc/auto_despawn(mob/living/mob_occupant)
+/obj/machinery/sleeper/stasis/cryo/proc/auto_despawn(mob/living/mob_occupant)
if(QDELETED(mob_occupant) || occupant != mob_occupant)
return
despawn_occupant()
-/obj/machinery/sleeper/cryo/close_machine(mob/user, density_to_set)
- . = ..()
- if(isliving(occupant))
- playsound(src, 'sound/effects/spray.ogg', 5, TRUE, frequency = 0.5)
-
-/obj/machinery/sleeper/cryo/close_machine(mob/user, density_to_set)
- . = ..()
- if(isliving(occupant))
- playsound(src, 'sound/machines/fan_stop.ogg', 50, TRUE)
-
-/obj/machinery/sleeper/cryo/JoinPlayerHere(mob/living/joining_mob, buckle)
+/obj/machinery/sleeper/stasis/cryo/JoinPlayerHere(mob/living/joining_mob, buckle)
if(occupant || !ishuman(joining_mob))
return ..()
throw_alert = FALSE
@@ -490,24 +814,24 @@ GLOBAL_LIST_INIT(cryo_sleepers, list())
addtimer(CALLBACK(src, PROC_REF(finish_joining_player), joining_mob), rand(8, 12) SECONDS)
throw_alert = TRUE
-/obj/machinery/sleeper/cryo/proc/finish_joining_player(mob/living/joining_mob)
+/obj/machinery/sleeper/stasis/cryo/proc/finish_joining_player(mob/living/joining_mob)
REMOVE_TRAITS_IN(joining_mob, IS_SPAWNING)
-/obj/machinery/sleeper/cryo/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel = 0, custom_deconstruct = FALSE)
+/obj/machinery/sleeper/stasis/cryo/default_deconstruction_crowbar(obj/item/crowbar, ignore_panel = 0, custom_deconstruct = FALSE)
return FALSE
-/obj/machinery/sleeper/cryo/default_deconstruction_screwdriver(mob/living/user, icon_state, base_icon_state, obj/item/screwdriver)
+/obj/machinery/sleeper/stasis/cryo/default_deconstruction_screwdriver(mob/living/user, icon_state, base_icon_state, obj/item/screwdriver)
return FALSE
-/obj/machinery/sleeper/cryo/default_change_direction_wrench(mob/living/user, obj/item/wrench)
+/obj/machinery/sleeper/stasis/cryo/default_change_direction_wrench(mob/living/user, obj/item/wrench)
return FALSE
-/obj/machinery/sleeper/cryo/open_machine(drop = TRUE, density_to_set = FALSE)
+/obj/machinery/sleeper/stasis/cryo/open_machine(drop = TRUE, density_to_set = FALSE)
density_to_set = TRUE
return ..()
/// Checks if this can generically be used as a latejoin spawnpoint
-/obj/machinery/sleeper/cryo/proc/can_latejoin(datum/job/joining)
+/obj/machinery/sleeper/stasis/cryo/proc/can_latejoin(datum/job/joining)
if(!isnull(occupant))
return FALSE
if(istype(joining, /datum/job/prisoner))
@@ -519,14 +843,14 @@ GLOBAL_LIST_INIT(cryo_sleepers, list())
return TRUE
/// Checks if the passed item should avoid deletion when being despawned
-/obj/machinery/sleeper/cryo/proc/saveable_item(obj/item/save_me)
+/obj/machinery/sleeper/stasis/cryo/proc/saveable_item(obj/item/save_me)
if(save_me.resistance_flags & INDESTRUCTIBLE)
return TRUE
if(GLOB.steal_item_handler.objectives_by_path[save_me.type])
return TRUE
return FALSE
-/obj/machinery/sleeper/cryo/proc/despawn_occupant()
+/obj/machinery/sleeper/stasis/cryo/proc/despawn_occupant()
if(!isliving(occupant))
return
var/drop_loc = drop_location()
@@ -568,7 +892,7 @@ GLOBAL_LIST_INIT(cryo_sleepers, list())
. = ..()
if(!.)
return .
- var/obj/machinery/sleeper/cryo/sleeper = owner.loc
+ var/obj/machinery/sleeper/stasis/cryo/sleeper = owner.loc
if(!istype(sleeper))
stack_trace("[type] was clicked by [usr] without being in a sleeper.")
return FALSE
diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm
index bbaafba1793b..83c1d5f5e4fb 100644
--- a/code/game/machinery/stasis.dm
+++ b/code/game/machinery/stasis.dm
@@ -150,13 +150,11 @@
var/freq = rand(24750, 26550)
playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 2, frequency = freq)
target.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
- // ADD_TRAIT(target, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC) // NON-MODULE CHANGE
target.extinguish_mob()
update_use_power(ACTIVE_POWER_USE)
/obj/machinery/stasis/proc/thaw_them(mob/living/target)
target.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
- // REMOVE_TRAIT(target, TRAIT_TUMOR_SUPPRESSED, TRAIT_GENERIC) // NON-MODULE CHANGE
if(target == occupant)
update_use_power(IDLE_POWER_USE)
diff --git a/code/game/machinery/wall_vitals.dm b/code/game/machinery/wall_vitals.dm
new file mode 100644
index 000000000000..badc1d10d0a3
--- /dev/null
+++ b/code/game/machinery/wall_vitals.dm
@@ -0,0 +1,770 @@
+/obj/item/wallframe/status_display/vitals
+ name = "vitals display frame"
+ desc = "Used to build vitals displays. Secure on a wall nearby a stasis bed, operating table, \
+ or another machine that can hold patients such as cryo cells or sleepers."
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
+ result_path = /obj/machinery/vitals_reader
+
+/obj/item/wallframe/status_display/vitals/advanced
+ name = "advanced vitals display frame"
+ desc = "Used to build advanced vitals displays. Performs a more detailed scan of the patient than the basic display."
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
+ result_path = /obj/machinery/vitals_reader/advanced
+
+/// Beeps every few seconds
+#define BEEP_FULL_BEEP 0
+/// Beeps on first scan, then no other time
+#define BEEP_ONE_BEEP 1
+/// No beeps at all
+#define BEEP_NO_BEEP 2
+
+/// A wall mounted screen that showcases the vitals of a patient nearby.
+/obj/machinery/vitals_reader
+ name = "vitals display"
+ desc = "A screen that displays the vitals of a patient."
+ icon = 'icons/obj/machines/vitals_monitor.dmi'
+ icon_state = "frame"
+ verb_say = "beeps"
+ verb_ask = "beeps"
+ verb_exclaim = "beeps"
+ density = FALSE
+ layer = ABOVE_WINDOW_LAYER
+ interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON
+ use_power = NO_POWER_USE
+ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.1
+ processing_flags = START_PROCESSING_MANUALLY
+ max_integrity = 150
+ payment_department = ACCOUNT_MED
+ armor_type = /datum/armor/obj_machinery/vitals_reader
+ light_range = 1.5
+ light_power = 0.75
+ light_color = LIGHT_COLOR_FAINT_CYAN
+
+ /// Whether we perform an advanced scan on examine or not
+ var/advanced = FALSE
+ /// If TRUE, also append a chemical scan to the readout
+ var/chemscan = TRUE
+ /// Typepath to spawn when deconstructed
+ var/frame = /obj/item/wallframe/status_display/vitals
+ /// Range which we can connect to machines, don't go crazy ok?
+ var/connection_range = 3
+ /// Static typecache of things the vitals display can connect to.
+ var/static/list/connectable_typecache = typecacheof(list(
+ /obj/machinery/abductor/experiment,
+ /obj/machinery/cryo_cell,
+ /obj/machinery/dna_scannernew,
+ /obj/machinery/gulag_teleporter,
+ /obj/machinery/hypnochair,
+ /obj/machinery/implantchair,
+ /obj/machinery/sleeper,
+ /obj/machinery/stasis,
+ /obj/machinery/vital_floor_scanner,
+ /obj/structure/table/optable,
+ ))
+ /// The last stat we beeped about
+ VAR_FINAL/last_reported_stat = null
+ /// Whether we go beep beep
+ var/beeps = BEEP_FULL_BEEP
+ /// Number of beeps on this patient
+ VAR_FINAL/beep_count = 0
+ /// CD between beeps
+ COOLDOWN_DECLARE(beep_cd)
+ /// Reference to the mob that is being tracked / scanned
+ VAR_FINAL/mob/living/patient
+ /// What machine are we talking to
+ VAR_FINAL/obj/machinery/connected
+ /// Tracks if power was setup so we can avoid double setup
+ VAR_PRIVATE/power_setup = FALSE
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/vitals_reader, 32)
+
+/obj/machinery/vitals_reader/advanced
+ name = "advanced vitals display"
+ desc = "A screen that displays the vitals of a patient. \
+ Performs a more detailed scan of the patient than a basic display."
+ frame = /obj/item/wallframe/status_display/vitals/advanced
+ advanced = TRUE
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/vitals_reader/advanced, 32)
+
+/datum/armor/obj_machinery/vitals_reader
+ melee = 30
+ bullet = 20
+ laser = 20
+ energy = 30
+ bomb = 10
+ fire = 50
+ acid = 80
+
+/obj/machinery/vitals_reader/Initialize(mapload, obj/item/circuitboard/C)
+ . = ..()
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/vitals_monitor), only_root_path = TRUE))
+ register_context()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/vitals_reader/post_machine_initialize()
+ if(isnull(connected))
+ find_machine(prioritize_by_id = TRUE) // mappers can set an id tag to connect it to specific machines
+ if(is_operational)
+ set_light_on(TRUE)
+ . = ..()
+ power_setup = TRUE
+
+/obj/machinery/vitals_reader/Destroy(force)
+ set_connection(null)
+ set_patient(null) // unset connection also unsets patient, but just in case
+ return ..()
+
+/obj/machinery/vitals_reader/proc/comsig_unset_connected(...)
+ SIGNAL_HANDLER
+ set_connection(null)
+
+/obj/machinery/vitals_reader/proc/connected_occupant_changed(datum/source, mob/living/new_patient)
+ SIGNAL_HANDLER
+
+ // snowflake behavior for floor scanners to only show after a delay
+ if(istype(source, /obj/machinery/vital_floor_scanner) && !isnull(new_patient))
+ addtimer(CALLBACK(src, PROC_REF(set_patient_on_delay), source, new_patient), /obj/effect/temp_visual/vitals_scan_effect::duration, TIMER_DELETE_ME|TIMER_OVERRIDE|TIMER_UNIQUE)
+ return
+
+ set_patient(new_patient)
+
+/obj/machinery/vitals_reader/proc/set_patient_on_delay(datum/source, mob/living/new_patient)
+ if(QDELETED(connected) || connected != source || QDELETED(new_patient) || connected.occupant != new_patient)
+ return
+
+ set_patient(new_patient)
+
+/obj/machinery/vitals_reader/proc/connected_moved(...)
+ SIGNAL_HANDLER
+ if(get_dist(src, connected) > connection_range)
+ set_connection(null)
+
+/// Sets the machine as connected to this vitals reader
+/// If there is already a connection, it will be unset first.
+/obj/machinery/vitals_reader/proc/set_connection(obj/new_connected)
+ if(connected == new_connected)
+ return
+ if(!isnull(connected))
+ UnregisterSignal(connected, COMSIG_QDELETING)
+ UnregisterSignal(connected, list(COMSIG_OPERATING_TABLE_SET_PATIENT, COMSIG_MACHINERY_SET_OCCUPANT))
+ UnregisterSignal(connected, COMSIG_MOVABLE_MOVED)
+ connected = null
+ set_patient(null)
+ if(power_setup)
+ update_use_power(NO_POWER_USE)
+ else
+ use_power = NO_POWER_USE
+ if(isnull(new_connected))
+ return
+
+ connected = new_connected
+ RegisterSignal(connected, COMSIG_QDELETING, PROC_REF(comsig_unset_connected))
+ RegisterSignals(connected, list(COMSIG_OPERATING_TABLE_SET_PATIENT, COMSIG_MACHINERY_SET_OCCUPANT), PROC_REF(connected_occupant_changed))
+ RegisterSignal(connected, COMSIG_MOVABLE_MOVED, PROC_REF(connected_moved))
+ if(power_setup)
+ update_use_power(IDLE_POWER_USE)
+ else
+ use_power = IDLE_POWER_USE
+
+ if(ismachinery(connected))
+ var/obj/machinery/connected_machine = connected
+ set_patient(connected_machine.occupant)
+ else if(istype(connected, /obj/structure/table/optable))
+ var/obj/structure/table/optable/connected_table = connected
+ set_patient(connected_table.patient)
+
+/obj/machinery/vitals_reader/wrench_act(mob/living/user, obj/item/tool)
+ balloon_alert(user, "detaching...")
+ if(tool.use_tool(src, user, 6 SECONDS, volume = 50))
+ playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
+ deconstruct(TRUE)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/vitals_reader/multitool_act(mob/living/user, obj/item/tool)
+ if(!is_operational)
+ return NONE
+
+ if(isnull(connected))
+ if(find_machine())
+ balloon_alert(user, "connected to [connected.name]")
+ else
+ balloon_alert(user, "no connectable machines nearby!")
+ return ITEM_INTERACT_SUCCESS
+
+ balloon_alert(user, "disconnecting...")
+ if(!do_after(user, 2 SECONDS, target = src))
+ return ITEM_INTERACT_BLOCKING
+
+ balloon_alert(user, "disconnected from [connected.name]")
+ set_connection(null)
+ return ITEM_INTERACT_SUCCESS
+
+/// Find and connects to a nearby machine
+/// If prioritize_by_id is TRUE, will first try to find a machine with the same id_tag as this vitals reader
+/obj/machinery/vitals_reader/proc/find_machine(prioritize_by_id = FALSE)
+ for(var/obj/nearby_thing in view(connection_range, src))
+ if(prioritize_by_id && nearby_thing.id_tag != src.id_tag)
+ continue
+ if(!is_type_in_typecache(nearby_thing, connectable_typecache))
+ continue
+
+ set_connection(nearby_thing)
+ return nearby_thing
+
+ if(prioritize_by_id)
+ return find_machine(prioritize_by_id = FALSE)
+ return null
+
+/obj/machinery/vitals_reader/on_deconstruction(disassembled)
+ var/atom/drop_loc = drop_location()
+ if(disassembled)
+ new frame(drop_loc)
+ else
+ new /obj/item/stack/sheet/iron(drop_loc, 2)
+ new /obj/item/shard(drop_loc)
+ new /obj/item/shard(drop_loc)
+ qdel(src)
+
+/obj/machinery/vitals_reader/examine(mob/user)
+ . = ..()
+ if(!is_operational)
+ return
+
+ if(isnull(connected))
+ . += span_notice("The display is currently not connected to anything. \
+ Use a [EXAMINE_HINT("multitool")] to connect it to a neighboring machine.")
+ return
+
+ if(isnull(patient) || user.is_blind())
+ return
+
+ if(machine_stat & EMPED)
+ . += span_warning("The display is flickering erratically!")
+ return
+
+ if(!issilicon(user) && !isobserver(user) && get_dist(src, user) > 2)
+ . += span_notice("You are too far away to read the display.")
+ else if(HAS_TRAIT(user, TRAIT_DUMB) || !user.can_read(src, reading_check_flags = READING_CHECK_LITERACY, silent = TRUE))
+ . += span_warning("You try to comprehend the display, but it's too complex for you to understand.")
+ else
+ . += healthscan(user, patient, mode = SCANNER_CONDENSED, advanced = src.advanced, tochat = FALSE)
+ . += chemscan(user, patient, tochat = FALSE)
+
+/obj/machinery/vitals_reader/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(held_item?.tool_behaviour == TOOL_WRENCH)
+ context[SCREENTIP_CONTEXT_LMB] = "Detach"
+ . = CONTEXTUAL_SCREENTIP_SET
+ if(is_operational)
+ if(isnull(connected) && held_item?.tool_behaviour == TOOL_MULTITOOL)
+ context[SCREENTIP_CONTEXT_LMB] = "Connect to nearby machine"
+ . = CONTEXTUAL_SCREENTIP_SET
+ if(!isnull(patient))
+ context[SCREENTIP_CONTEXT_SHIFT_LMB] = "Examine vitals"
+ . = CONTEXTUAL_SCREENTIP_SET
+ return .
+
+#define LOWER_BAR_OFFSET -3
+
+/**
+ * Returns all overlays to be shown when a simple / basic animal patient is detected
+ *
+ * * hp_color - color being used for general, overrall health
+ */
+/obj/machinery/vitals_reader/proc/get_simple_mob_overlays(hp_color)
+ return list(
+ construct_overlay("mob", hp_color),
+ construct_overlay("blood", COLOR_GRAY),
+ construct_overlay("bar9", COLOR_GRAY),
+ construct_overlay("bar9", COLOR_GRAY, LOWER_BAR_OFFSET),
+ )
+
+/**
+ * Returns all overlays to be shown when a humanoid patient is detected
+ *
+ * * hp_color - color being used for general, overrall health
+ */
+/obj/machinery/vitals_reader/proc/get_humanoid_overlays(hp_color)
+ var/list/returned_overlays = list()
+
+ for(var/body_zone in GLOB.all_body_zones)
+ var/obj/item/bodypart/real_part = patient.get_bodypart(body_zone)
+ var/bodypart_color = isnull(real_part) ? COLOR_GRAY : percent_to_color((real_part.brute_dam + real_part.burn_dam) / real_part.max_damage)
+ returned_overlays += construct_overlay("human_[body_zone]", bodypart_color)
+
+ if(!HAS_TRAIT(patient, TRAIT_NOBLOOD))
+ var/blood_color = "#a51919"
+ switch((patient.blood_volume - BLOOD_VOLUME_SURVIVE) / (BLOOD_VOLUME_NORMAL - BLOOD_VOLUME_SURVIVE))
+ if(-INFINITY to 0.2)
+ blood_color = "#a1a1a1"
+ if(0.2 to 0.4)
+ blood_color = "#a18282"
+ if(0.4 to 0.6)
+ blood_color = "#a16363"
+ if(0.6 to 0.8)
+ blood_color = "#a14444"
+ if(0.8 to INFINITY)
+ blood_color = "#a51919"
+
+ returned_overlays += construct_overlay("blood", blood_color)
+ else
+ returned_overlays += construct_overlay("blood", COLOR_GRAY)
+
+ if(HAS_TRAIT(patient, TRAIT_NOBREATH))
+ returned_overlays += construct_overlay("bar9", COLOR_GRAY)
+ else
+ var/oxy_percent = patient.getOxyLoss() / patient.maxHealth
+ returned_overlays += construct_overlay(percent_to_bar(oxy_percent), "#2A72AA")
+
+ if(HAS_TRAIT(patient, TRAIT_TOXIMMUNE))
+ returned_overlays += construct_overlay("bar9", COLOR_GRAY, LOWER_BAR_OFFSET)
+ else
+ var/tox_percent = patient.getToxLoss() / patient.maxHealth
+ returned_overlays += construct_overlay(percent_to_bar(tox_percent), "#5d9c11", LOWER_BAR_OFFSET)
+
+ return returned_overlays
+
+/**
+ * Returns the EKG and Respiration overlays
+ *
+ * * hp_color - color being used for general, overrall health
+ */
+/obj/machinery/vitals_reader/proc/get_ekg_and_resp(hp_color)
+ var/ekg_icon_state = "ekg"
+ var/resp_icon_state = (patient.losebreath || HAS_TRAIT(patient, TRAIT_NOBREATH)) ? "resp_flat" : "resp"
+ if(!patient.appears_alive())
+ ekg_icon_state = "ekg_flat"
+ resp_icon_state = "resp_flat"
+ else if(ishuman(patient))
+ var/mob/living/carbon/human/human_patient = patient
+ switch(human_patient.get_bpm())
+ if(0)
+ ekg_icon_state = "ekg_flat"
+ resp_icon_state = "resp_flat"
+ if(FAST_HEARTBEAT_THRESHOLD to INFINITY)
+ ekg_icon_state = "ekg_fast"
+
+ return list(
+ construct_overlay(ekg_icon_state, hp_color),
+ construct_overlay(resp_icon_state, "#00f7ff"),
+ )
+
+/obj/machinery/vitals_reader/update_overlays()
+ . = ..()
+ if(!is_operational)
+ return
+
+ . += emissive_appearance(icon, "outline", src, alpha = src.alpha)
+ if(isnull(patient))
+ return
+
+ . += "buttons"
+
+ var/hp_color = percent_to_color((patient.maxHealth - patient.health) / patient.maxHealth)
+ . += get_ekg_and_resp(hp_color)
+ if(ishuman(patient))
+ . += get_humanoid_overlays(hp_color)
+ else
+ . += get_simple_mob_overlays(hp_color)
+
+/// Converts a percentage to a color
+/obj/machinery/vitals_reader/proc/percent_to_color(percent)
+ if(machine_stat & (EMPED|EMAGGED))
+ percent = rand(1, 100) * 0.01
+
+ if(percent == 0)
+ return "#2A72AA"
+
+ switch(percent)
+ if(0 to 0.125)
+ return "#A6BD00"
+ if(0.125 to 0.25)
+ return "#BDA600"
+ if(0.25 to 0.375)
+ return "#BD7E00"
+ if(0.375 to 0.5)
+ return "#BD4200"
+
+ return "#BD0600"
+
+/// Converts a percentage to a bar icon state
+/obj/machinery/vitals_reader/proc/percent_to_bar(percent)
+ if(machine_stat & (EMPED|EMAGGED))
+ percent = rand(1, 100) * 0.01
+
+ if(percent >= 1)
+ return "bar9"
+ if(percent <= 0)
+ return "bar1"
+
+ switch(percent)
+ if(0 to 0.125)
+ return "bar1"
+ if(0.125 to 0.25)
+ return "bar2"
+ if(0.25 to 0.375)
+ return "bar3"
+ if(0.375 to 0.5)
+ return "bar4"
+ if(0.5 to 0.625)
+ return "bar5"
+ if(0.625 to 0.75)
+ return "bar6"
+ if(0.75 to 0.875)
+ return "bar7"
+ if(0.875 to 1)
+ return "bar8"
+
+ return "bar9" // ??
+
+/**
+ * Helper to construct an overlay for the vitals display
+ *
+ * * state_to_use - icon state to use, required
+ * * color_to_use - color to use, optional
+ * * y_offset - offset to apply to the y position of the overlay, defaults to 0
+ */
+/obj/machinery/vitals_reader/proc/construct_overlay(state_to_use, color_to_use, y_offset = 0)
+ var/mutable_appearance/overlay = mutable_appearance(icon, state_to_use, alpha = src.alpha)
+ overlay.appearance_flags |= RESET_COLOR
+ overlay.color = color_to_use
+ overlay.pixel_z += 32
+ overlay.pixel_y += -32 + y_offset
+ return overlay
+
+#undef LOWER_BAR_OFFSET
+
+/obj/machinery/vitals_reader/on_set_is_operational(old_value)
+ update_appearance()
+ set_light_on(is_operational)
+
+/obj/machinery/vitals_reader/process()
+ if(isnull(patient))
+ stack_trace("[src] has no patient but is still processing!")
+ end_processing()
+ return
+
+ beep()
+
+/obj/machinery/vitals_reader/proc/beep()
+ if(!COOLDOWN_FINISHED(src, beep_cd) || !is_operational)
+ return
+ switch(beeps)
+ if(BEEP_NO_BEEP)
+ return
+ if(BEEP_ONE_BEEP)
+ if(beep_count > 0)
+ return
+
+ beep_count += 1
+ var/patient_stat = patient.stat
+ if(machine_stat & (EMPED|EMAGGED))
+ patient_stat = pick(CONSCIOUS, SOFT_CRIT, HARD_CRIT, DEAD, DEAD, DEAD)
+
+ var/beepsound
+ switch(patient_stat)
+ if(DEAD)
+ beepsound = 'maplestation_modules/sound/healthscanner_dead.ogg'
+ COOLDOWN_START(src, beep_cd, 11 SECONDS)
+ if(last_reported_stat != DEAD)
+ beep_message("lets out a droning beep.")
+ last_reported_stat = DEAD
+ if(HARD_CRIT)
+ beepsound = 'maplestation_modules/sound/healthscanner_danger.ogg'
+ COOLDOWN_START(src, beep_cd, 5 SECONDS)
+ if(last_reported_stat != HARD_CRIT)
+ beep_message("lets out an alternating beep.")
+ last_reported_stat = HARD_CRIT
+ if(SOFT_CRIT)
+ beepsound = 'maplestation_modules/sound/healthscanner_critical.ogg'
+ COOLDOWN_START(src, beep_cd, 7 SECONDS)
+ if(last_reported_stat != SOFT_CRIT)
+ beep_message("lets out a high pitch beep.")
+ last_reported_stat = SOFT_CRIT
+ else
+ beepsound = 'maplestation_modules/sound/healthscanner_stable.ogg'
+ COOLDOWN_START(src, beep_cd, 7 SECONDS)
+ if(last_reported_stat != CONSCIOUS)
+ beep_message("lets out a beep.")
+ last_reported_stat = CONSCIOUS
+
+ playsound(src, beepsound, 15, FALSE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+/obj/machinery/vitals_reader/proc/beep_message(message)
+ for(var/mob/viewer as anything in viewers(src))
+ if(isnull(viewer.client) || !viewer.can_hear())
+ continue
+ if(!viewer.runechat_prefs_check(viewer, EMOTE_MESSAGE))
+ continue
+ viewer.create_chat_message(
+ speaker = src,
+ raw_message = message,
+ runechat_flags = EMOTE_MESSAGE,
+ )
+
+/obj/machinery/vitals_reader/click_alt(mob/user)
+ if(initial(beeps) != BEEP_FULL_BEEP)
+ return CLICK_ACTION_BLOCKING
+
+ switch(beeps)
+ if(BEEP_FULL_BEEP)
+ beeps = BEEP_NO_BEEP
+ balloon_alert(user, "beeps disabled")
+ if(BEEP_NO_BEEP)
+ beeps = BEEP_ONE_BEEP
+ balloon_alert(user, "beeps minimized")
+ if(BEEP_ONE_BEEP)
+ beeps = BEEP_FULL_BEEP
+ balloon_alert(user, "beeps enabled")
+
+ playsound(src, 'sound/machines/click.ogg', 50)
+ return CLICK_ACTION_SUCCESS
+
+/// Sets the passed mob as the active patient
+/// If there is already a patient, it will be unset first.
+/obj/machinery/vitals_reader/proc/set_patient(mob/living/new_patient)
+ if(patient == new_patient)
+ return
+ SEND_SIGNAL(src, COMSIG_VITALS_SET_PATIENT, patient, new_patient)
+ if(!isnull(patient))
+ UnregisterSignal(patient, list(
+ COMSIG_QDELETING,
+ COMSIG_CARBON_POST_REMOVE_LIMB,
+ COMSIG_CARBON_POST_ATTACH_LIMB,
+ COMSIG_LIVING_HEALTH_UPDATE,
+ SIGNAL_ADDTRAIT(TRAIT_NOBLOOD),
+ SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD),
+ SIGNAL_ADDTRAIT(TRAIT_NOBREATH),
+ SIGNAL_REMOVETRAIT(TRAIT_NOBREATH),
+ ))
+
+ patient = null
+ end_processing()
+ if(!QDELING(src))
+ if(power_setup)
+ update_use_power(IDLE_POWER_USE)
+ else
+ use_power = IDLE_POWER_USE
+ update_appearance()
+ if(isnull(new_patient))
+ return
+ if(QDELING(src))
+ CRASH("[src] is qdeleting but tried to set a new patient ([new_patient])!")
+
+ patient = new_patient
+ RegisterSignal(patient, COMSIG_QDELETING, PROC_REF(comsig_unset_patient))
+ RegisterSignals(patient, list(
+ COMSIG_CARBON_POST_REMOVE_LIMB,
+ COMSIG_CARBON_POST_ATTACH_LIMB,
+ COMSIG_LIVING_HEALTH_UPDATE,
+ SIGNAL_ADDTRAIT(TRAIT_NOBLOOD),
+ SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD),
+ SIGNAL_ADDTRAIT(TRAIT_NOBREATH),
+ SIGNAL_REMOVETRAIT(TRAIT_NOBREATH),
+ ), PROC_REF(update_overlay_on_signal))
+ update_appearance()
+ begin_processing()
+ if(power_setup)
+ update_use_power(ACTIVE_POWER_USE)
+ else
+ use_power = ACTIVE_POWER_USE
+ last_reported_stat = null
+ beep_count = 0
+ if(!(machine_stat & (EMPED|EMAGGED)))
+ COOLDOWN_RESET(src, beep_cd)
+ beep()
+
+/obj/machinery/vitals_reader/proc/comsig_unset_patient(...)
+ SIGNAL_HANDLER
+ set_patient(null)
+
+/// Signal proc to update the display when a signal is received.
+/obj/machinery/vitals_reader/proc/update_overlay_on_signal(...)
+ SIGNAL_HANDLER
+ update_appearance()
+
+/obj/machinery/vitals_reader/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+
+ COOLDOWN_START(src, beep_cd, 1 SECONDS * rand(10, (severity == EMP_HEAVY ? 120 : 60)))
+ set_machine_stat(machine_stat | EMPED)
+ addtimer(CALLBACK(src, PROC_REF(fix_emp)), (severity == EMP_HEAVY ? 150 SECONDS : 75 SECONDS), TIMER_DELETE_ME)
+
+/obj/machinery/vitals_reader/proc/fix_emp()
+ set_machine_stat(machine_stat & ~EMPED)
+
+/obj/machinery/vitals_reader/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(machine_stat & BROKEN)
+ playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, TRUE)
+ else
+ playsound(src, 'sound/effects/glasshit.ogg', 75, TRUE)
+ if(BURN)
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+
+/obj/machinery/vitals_reader/no_beep
+ desc = parent_type::desc + " This one has no speakers."
+ beeps = BEEP_NO_BEEP
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/vitals_reader/no_beep, 32)
+
+/obj/machinery/vitals_reader/one_beep
+ desc = parent_type::desc + " This one has a single speaker."
+ beeps = BEEP_ONE_BEEP
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/vitals_reader/one_beep, 32)
+
+#undef BEEP_FULL_BEEP
+#undef BEEP_ONE_BEEP
+#undef BEEP_NO_BEEP
+
+/obj/item/circuit_component/vitals_monitor
+ display_name = "Vitals Monitor"
+ desc = "Allows you to interface with a vitals monitor to read a patient's status."
+
+ /// Reference to the linked vitals monitor
+ var/obj/machinery/vitals_reader/linked_monitor
+
+ /// Cooldown length between patient stat reads
+ var/read_cooldown_period = 4 SECONDS
+ /// Cooldown for reading patient stats
+ COOLDOWN_DECLARE(read_cooldown)
+
+ /// Outputs a signal when the vitals have been updated
+ var/datum/port/output/status_updated
+ /// Outputs a signal when the patient being monitored has changed
+ var/datum/port/output/patient_changed
+
+ /// Outputs the patient being monitored
+ var/datum/port/output/patient_entity
+ /// Outputs a string corresponding to how defibbing would go
+ var/datum/port/output/defib_state
+
+ /// Outputs total brute damage
+ var/datum/port/output/patient_brute_damage
+ /// Outputs total burn damage
+ var/datum/port/output/patient_burn_damage
+ /// Outputs total oxyloss damage
+ var/datum/port/output/patient_oxy_loss
+ /// Outputs total toxin damage
+ var/datum/port/output/patient_tox_loss
+ /// Outputs overall health
+ var/datum/port/output/patient_overall_health
+ /// Outputs brain damage
+ var/datum/port/output/patient_brain_damage
+ /// Outputs blood level
+ var/datum/port/output/patient_blood_level
+
+
+/obj/item/circuit_component/vitals_monitor/Destroy()
+ STOP_PROCESSING(SSclock_component, src)
+ return ..()
+
+/obj/item/circuit_component/vitals_monitor/populate_ports()
+ status_updated = add_output_port("Status Updated", PORT_TYPE_SIGNAL)
+ patient_changed = add_output_port("Patient Changed", PORT_TYPE_SIGNAL)
+
+ patient_entity = add_output_port("Patient", PORT_TYPE_ATOM)
+ defib_state = add_output_port("Defib Status", PORT_TYPE_STRING)
+
+ patient_overall_health = add_output_port("Overall Health", PORT_TYPE_NUMBER)
+ patient_brute_damage = add_output_port("Brute Damage", PORT_TYPE_NUMBER)
+ patient_burn_damage = add_output_port("Burn Damage", PORT_TYPE_NUMBER)
+ patient_oxy_loss = add_output_port("Suffocation Damage", PORT_TYPE_NUMBER)
+ patient_tox_loss = add_output_port("Toxin Damage", PORT_TYPE_NUMBER)
+ patient_brain_damage = add_output_port("Brain Damage", PORT_TYPE_NUMBER)
+ patient_blood_level = add_output_port("Blood Level", PORT_TYPE_NUMBER)
+
+/obj/item/circuit_component/vitals_monitor/register_usb_parent(atom/movable/shell)
+ . = ..()
+ linked_monitor = shell
+ RegisterSignal(shell, COMSIG_VITALS_SET_PATIENT, PROC_REF(handle_patient_change))
+
+ var/obj/machinery/vitals_reader/monitor = shell
+ if(!isnull(monitor.patient))
+ START_PROCESSING(SSclock_component, src)
+
+/obj/item/circuit_component/vitals_monitor/unregister_usb_parent(atom/movable/shell)
+ . = ..()
+ linked_monitor = null
+ UnregisterSignal(shell, COMSIG_VITALS_SET_PATIENT)
+ STOP_PROCESSING(SSclock_component, src)
+
+/obj/item/circuit_component/vitals_monitor/get_ui_notices()
+ . = ..()
+ . += create_ui_notice("Initial Delay: [DisplayTimeText(1 SECONDS)]", "orange", "clock")
+ . += create_ui_notice("Update Interval: [DisplayTimeText(read_cooldown_period)]", "orange", "clock")
+
+/obj/item/circuit_component/vitals_monitor/proc/handle_patient_change(datum/source, mob/living/old_patient, mob/living/new_patient)
+ SIGNAL_HANDLER
+ if(isnull(new_patient))
+ STOP_PROCESSING(SSclock_component, src)
+ else
+ START_PROCESSING(SSclock_component, src)
+ patient_entity.set_output(new_patient)
+ patient_changed.set_output(COMPONENT_SIGNAL)
+ // wait a small amount (arbitrary) to provide initial data
+ COOLDOWN_START(src, read_cooldown, 1 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(delayed_reading)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME)
+
+/// Reads a patient value and applies a random amount of error if the monitor is emped or emagged
+#define GET_PATIENT_VALUE(monitor, value_to_get) \
+ round(monitor.patient.##value_to_get * ((monitor.machine_stat & (EMPED|EMAGGED)) ? rand(0, 100) * 0.01 : 1), DAMAGE_PRECISION)
+
+/obj/item/circuit_component/vitals_monitor/process(seconds_per_tick)
+ if(isnull(linked_monitor?.patient))
+ return PROCESS_KILL
+ if(!COOLDOWN_FINISHED(src, read_cooldown))
+ return
+ update_output_stats()
+
+/obj/item/circuit_component/vitals_monitor/proc/delayed_reading()
+ if(isnull(linked_monitor?.patient))
+ return
+ update_output_stats()
+
+/obj/item/circuit_component/vitals_monitor/proc/update_output_stats()
+ COOLDOWN_START(src, read_cooldown, read_cooldown_period)
+ status_updated.set_output(COMPONENT_SIGNAL)
+
+ patient_overall_health.set_output(GET_PATIENT_VALUE(linked_monitor, health))
+ patient_brute_damage.set_output(GET_PATIENT_VALUE(linked_monitor, getBruteLoss()))
+ patient_burn_damage.set_output(GET_PATIENT_VALUE(linked_monitor, getFireLoss()))
+ patient_oxy_loss.set_output(GET_PATIENT_VALUE(linked_monitor, getOxyLoss()))
+ patient_tox_loss.set_output(GET_PATIENT_VALUE(linked_monitor, getToxLoss()))
+ patient_brain_damage.set_output(GET_PATIENT_VALUE(linked_monitor, get_organ_loss(ORGAN_SLOT_BRAIN)))
+ patient_blood_level.set_output(GET_PATIENT_VALUE(linked_monitor, blood_volume))
+
+ var/is_defib_possible = DEFIB_POSSIBLE
+ if(iscarbon(linked_monitor.patient))
+ var/mob/living/carbon/carbo_patient = linked_monitor.patient
+ is_defib_possible = carbo_patient.can_defib()
+
+ switch(is_defib_possible)
+ if(DEFIB_POSSIBLE)
+ defib_state.set_output("Possible")
+ if(DEFIB_FAIL_SUICIDE, DEFIB_FAIL_BLACKLISTED, DEFIB_FAIL_NO_INTELLIGENCE)
+ defib_state.set_output("Impossible")
+ if(DEFIB_FAIL_HUSK)
+ defib_state.set_output("Husked")
+ if(DEFIB_FAIL_CON)
+ defib_state.set_output("Damaged")
+ if(DEFIB_FAIL_FAILING_HEART, DEFIB_FAIL_NO_HEART)
+ defib_state.set_output("Heart Failure")
+ if(DEFIB_FAIL_FAILING_BRAIN, DEFIB_FAIL_NO_BRAIN)
+ defib_state.set_output("Brain Failure")
+
+#undef GET_PATIENT_VALUE
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index 7f290b93178d..6ffd7b467d9a 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -918,6 +918,24 @@
name = "Party Pod"
build_path = /obj/machinery/sleeper/party
+/obj/item/circuitboard/machine/sleeper/stasis
+ name = "Stasis Pod"
+ build_path = /obj/machinery/sleeper/stasis
+ req_components = list(
+ /datum/stock_part/matter_bin = 1,
+ /datum/stock_part/micro_laser = 1,
+ /datum/stock_part/scanning_module = 1,
+ /datum/stock_part/servo = 1,
+ /obj/item/stack/cable_coil = 2,
+ /obj/item/stack/sheet/glass = 2,
+ /obj/item/reagent_containers/cup/beaker = 1,
+ )
+
+/obj/item/circuitboard/machine/sleeper/cryo
+ name = "Long-term Crew Storage Pod"
+ build_path = /obj/machinery/sleeper/stasis/cryo
+ req_components = list()
+
/obj/item/circuitboard/machine/smoke_machine
name = "Smoke Machine"
greyscale_colors = CIRCUIT_COLOR_MEDICAL
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 6b4f8d160386..995ccf8ddcbe 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -275,17 +275,17 @@
set_broadcasting(FALSE, actual_setting = FALSE)//fake set them to off
set_listening(FALSE, actual_setting = FALSE)
-/obj/item/radio/talk_into(atom/movable/talking_movable, message, channel, list/spans, datum/language/language, list/message_mods)
- if(SEND_SIGNAL(talking_movable, COMSIG_MOVABLE_USING_RADIO, src) & COMPONENT_CANNOT_USE_RADIO)
+/obj/item/radio/talk_into(atom/movable/speaker, message, channel, list/spans, datum/language/language, list/message_mods)
+ if(SEND_SIGNAL(speaker, COMSIG_MOVABLE_USING_RADIO, src) & COMPONENT_CANNOT_USE_RADIO)
return NONE
- if(SEND_SIGNAL(src, COMSIG_RADIO_NEW_MESSAGE, talking_movable, message, channel) & COMPONENT_CANNOT_USE_RADIO)
+ if(SEND_SIGNAL(src, COMSIG_RADIO_NEW_MESSAGE, speaker, message, channel) & COMPONENT_CANNOT_USE_RADIO)
return NONE
if(!spans)
- spans = list(talking_movable.speech_span)
+ spans = list(speaker.speech_span)
if(!language)
- language = talking_movable.get_selected_language()
- INVOKE_ASYNC(src, PROC_REF(talk_into_impl), talking_movable, message, channel, LAZYLISTDUPLICATE(spans), language, LAZYLISTDUPLICATE(message_mods))
+ language = speaker.get_selected_language()
+ INVOKE_ASYNC(src, PROC_REF(talk_into_impl), speaker, message, channel, LAZYLISTDUPLICATE(spans), language, LAZYLISTDUPLICATE(message_mods))
return ITALICS | REDUCE_RANGE
/**
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index 4ce0ea1b9be9..deee7de2f403 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -1,12 +1,3 @@
-// Describes the three modes of scanning available for health analyzers
-#define SCANMODE_HEALTH 0
-#define SCANMODE_WOUND 1
-#define SCANMODE_COUNT 2 // Update this to be the number of scan modes if you add more
-#define SCANNER_CONDENSED 0
-#define SCANNER_VERBOSE 1
-// Not updating above count because you're not meant to switch to this mode.
-#define SCANNER_NO_MODE -1
-
/obj/item/healthanalyzer
name = "health analyzer"
icon = 'icons/obj/devices/scanner.dmi'
@@ -148,9 +139,6 @@
* tochat - Whether to immediately post the result into the chat of the user, otherwise it will return the results.
*/
/proc/healthscan(mob/user, mob/living/target, mode = SCANNER_VERBOSE, advanced = FALSE, tochat = TRUE)
- if(user.incapacitated())
- return
-
// the final list of strings to render
var/list/render_list = list()
@@ -513,9 +501,6 @@
scanner_busy = FALSE
/proc/chemscan(mob/living/user, mob/living/target, tochat = TRUE) // NON-MODULE CHANGE
- if(user.incapacitated())
- return
-
if(istype(target) && target.reagents)
var/list/render_list = list() //The master list of readouts, including reagents in the blood/stomach, addictions, quirks, etc.
var/list/render_block = list() //A second block of readout strings. If this ends up empty after checking stomach/blood contents, we give the "empty" header.
@@ -574,13 +559,11 @@
render_list += "Subject is extremely allergic to the following chemicals:
"
render_list += "[allergies]
"
- // NON-MODULE CHANGE
+ // we handled the last
so we don't need handholding
if(tochat)
- // we handled the last
so we don't need handholding
to_chat(user, custom_boxed_message("blue_box", jointext(render_list, "")), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO)
else
return jointext(render_list, "")
- // NON-MODULE CHANGE END
/obj/item/healthanalyzer/click_alt(mob/user)
if(mode == SCANNER_NO_MODE)
@@ -793,13 +776,6 @@
scanner.emotion = AID_EMOTION_WARN
playsound(scanner, 'sound/machines/twobeep.ogg', 50, FALSE)
-#undef SCANMODE_HEALTH
-#undef SCANMODE_WOUND
-#undef SCANMODE_COUNT
-#undef SCANNER_CONDENSED
-#undef SCANNER_VERBOSE
-#undef SCANNER_NO_MODE
-
#undef AID_EMOTION_NEUTRAL
#undef AID_EMOTION_HAPPY
#undef AID_EMOTION_WARN
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index f6e8544458a9..fdb8c03200d5 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -807,6 +807,7 @@
computer = locate(/obj/machinery/computer/operating) in get_step(src, direction)
if(computer)
computer.table = src
+ update_appearance()
break
var/static/list/loc_connections = list(
@@ -939,6 +940,7 @@
COMSIG_LIVING_UPDATING_SURGERY_STATE,
))
+ SEND_SIGNAL(src, COMSIG_OPERATING_TABLE_SET_PATIENT, new_patient)
patient = new_patient
update_appearance()
computer?.update_static_data_for_all_viewers()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 0ef993e30918..5fd40999952b 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -48,7 +48,7 @@
var/examine_condition
/// Datum for managing the overclock sound loop
- var/datum/looping_sound/vent_pump_overclock/sound_loop
+ var/datum/looping_sound/fan/sound_loop
/obj/machinery/atmospherics/components/unary/vent_pump/Initialize(mapload)
if(!id_tag)
@@ -230,7 +230,7 @@
fan_overclocked = !fan_overclocked
if(from_break)
- playsound(src, 'sound/machines/fan_break.ogg', 100)
+ playsound(src, 'sound/machines/fan/fan_break.ogg', 100)
fan_overclocked = FALSE
if(fan_overclocked)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index d9a257859846..0fd1e1f27fcc 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -543,7 +543,7 @@
return pick(GLOB.jobspawn_overrides[title])
if(prefs?.read_preference(/datum/preference/choiced/preferred_latejoin_spawn) == SPAWNPOINT_CRYO)
var/list/common_sleepers = list()
- for(var/obj/machinery/sleeper/cryo/sleeper as anything in GLOB.cryo_sleepers)
+ for(var/obj/machinery/sleeper/stasis/cryo/sleeper as anything in GLOB.cryo_sleepers)
if(sleeper.can_latejoin(src))
common_sleepers += sleeper
if(length(common_sleepers))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 8624b45f0550..20e7293b6191 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -966,6 +966,7 @@
return TRUE
/mob/living/carbon/proc/can_defib()
+ SHOULD_BE_PURE(TRUE)
if (HAS_TRAIT(src, TRAIT_SUICIDED))
return DEFIB_FAIL_SUICIDE
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index c086e94ea559..bb2ab786df4b 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -62,18 +62,25 @@
// NON-MODULE CHANGE
if(isnull(ears))
return NONE
+
+ var/using_common = message_mods[MODE_HEADSET]
+ var/using_department = message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT
+ var/using_specific = GLOB.radiochannels[message_mods[RADIO_EXTENSION]]
+ if(!using_common && !using_department && !using_specific)
+ return NONE
+
if(HAS_TRAIT(src, TRAIT_BLOCK_HEADSET_USE))
// adding a to-chat as well as a balloon alert, as they might have split attention
to_chat(src, span_warning("You can't use your headset right now!"))
balloon_alert(src, "can't use headset!")
- return ITALICS | REDUCE_RANGE
- if(message_mods[MODE_HEADSET])
- ears.talk_into(src, message, , spans, language, message_mods)
- return ITALICS | REDUCE_RANGE
- else if(message_mods[RADIO_EXTENSION] == MODE_DEPARTMENT)
- ears.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
- return ITALICS | REDUCE_RANGE
- else if(GLOB.radiochannels[message_mods[RADIO_EXTENSION]])
- ears.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
- return ITALICS | REDUCE_RANGE
- return NONE
+ return ITALICS
+
+ ears.talk_into(
+ speaker = src,
+ message = message,
+ channel = (using_common ? null : message_mods[RADIO_EXTENSION]),
+ spans = spans,
+ language = language,
+ message_mods = message_mods,
+ )
+ return ITALICS | REDUCE_RANGE
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 4c206c4be3f1..938ceb574b2c 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -931,6 +931,12 @@
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+/datum/design/board/stasis/pod
+ name = "Lifeform Stasis Pod Board"
+ desc = "The circuit board for a stasis pod."
+ id = "stasis_pod"
+ build_path = /obj/item/circuitboard/machine/sleeper/stasis
+
/datum/design/board/medical_kiosk
name = "Medical Kiosk Board"
desc = "The circuit board for a Medical Kiosk."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index ac672e4043d6..74900e87f2fa 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -1264,3 +1264,31 @@
id = "surgery_oldstation_dissection"
surgery = /datum/surgery_operation/basic/dissection
research_icon_state = "surgery_chest"
+
+/datum/design/vitals_monitor
+ name = "Vitals Monitor"
+ desc = "A wall mounted computer that displays the vitals of a patient nearby. \
+ Links to stasis beds, operating tables, and other machines that can hold patients \
+ such as cryo cells, sleepers, and more."
+ id = "vitals_monitor"
+ build_type = PROTOLATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
+ build_path = /obj/item/wallframe/status_display/vitals
+ category = list(RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_MEDICAL)
+ departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+
+/datum/design/vitals_monitor/advanced
+ name = "Advanced Vitals Monitor"
+ desc = "An updated vitals display which performs a more detailed scan of the patient than the basic display."
+ id = "vitals_monitor_advanced"
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
+ build_path = /obj/item/wallframe/status_display/vitals/advanced
diff --git a/code/modules/research/techweb/__techweb_helpers.dm b/code/modules/research/techweb/__techweb_helpers.dm
index d1d3b6ecfded..a7b1e937dc66 100644
--- a/code/modules/research/techweb/__techweb_helpers.dm
+++ b/code/modules/research/techweb/__techweb_helpers.dm
@@ -7,7 +7,7 @@
return L.len
/proc/node_boost_error(id, message)
- WARNING("Invalid boost information for node \[[id]\]: [message]")
+ stack_trace("Invalid boost information for node \[[id]\]: [message]")
SSresearch.invalid_node_boost[id] = message
///Returns an associative list of techweb node datums with values of the nodes it unlocks.
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
index 499efdcfde9f..97693a791eee 100644
--- a/code/modules/research/techweb/nodes/medbay_nodes.dm
+++ b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -4,32 +4,36 @@
display_name = "Medbay Equipment"
description = "Essential medical tools to patch you up while medbay is still intact."
design_ids = list(
- "operating",
- "medicalbed",
- "defibmountdefault",
- "defibrillator",
- "surgical_drapes",
- "scalpel",
- "retractor",
- "hemostat",
+ "beaker",
+ "blood_filter",
+ "blood_pack",
+ // "blood_scanner", // melbert todo
+ "bonesetter",
"cautery",
+ "chem_pack",
"circular_saw",
- "surgicaldrill",
- "bonesetter",
- "blood_filter",
- "surgical_tape",
+ "defibmountdefault",
+ "defibrillator", // revisit later
+ "dropper",
+ "hemostat",
+ // "jerrycan", // melbert todo
+ "large_beaker",
+ "medicalbed",
+ "operating",
+ // "organ_jar", // melbert todo
"penlight",
"penlight_paramedic",
+ "pillbottle",
+ // "reflex_hammer", // melbert todo
+ "retractor",
+ "scalpel",
"stethoscope",
- "beaker",
- "large_beaker",
- "chem_pack",
- "blood_pack",
+ "surgical_drapes",
+ "surgical_tape",
+ "surgicaldrill",
"syringe",
- "dropper",
- "pillbottle",
+ "vitals_monitor",
"xlarge_beaker",
- "medical_scissors",
)
experiments_to_unlock = list(
/datum/experiment/autopsy/human,
@@ -71,16 +75,16 @@
description = "State-of-the-art medical gear for keeping the crew in one piece — mostly."
prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
- "smoke_machine",
"chem_mass_spec",
- "healthanalyzer_advanced",
- "mod_health_analyzer",
"crewpinpointer",
- "defibrillator_compact",
"defibmount",
+ "defibrillator_compact",
+ "healthanalyzer_advanced",
"medicalbed_emergency",
+ "mod_health_analyzer",
"piercesyringe",
- "medical_scissors_trauma",
+ "smoke_machine",
+ "vitals_monitor_advanced",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
discount_experiments = list(/datum/experiment/scanning/reagent/haloperidol = TECHWEB_TIER_3_POINTS)
diff --git a/code/modules/surgery/operations/operation_healing.dm b/code/modules/surgery/operations/operation_healing.dm
index 0ac5a92b34cb..3919b6ec571f 100644
--- a/code/modules/surgery/operations/operation_healing.dm
+++ b/code/modules/surgery/operations/operation_healing.dm
@@ -174,7 +174,7 @@
/datum/surgery_operation/basic/tend_wounds/proc/show_stats(mob/living/surgeon, mob/living/patient)
if(surgeon.is_holding_item_of_type(/obj/item/healthanalyzer))
return TRUE
- for(var/obj/machinery/computer/vitals_reader/vitals in view(4, patient))
+ for(var/obj/machinery/vitals_reader/vitals in view(4, patient))
if(vitals.patient == patient)
return TRUE
for(var/obj/machinery/computer/operating/op_pc in range(1, patient))
diff --git a/code/modules/wiremod/components/atom/health.dm b/code/modules/wiremod/components/atom/health.dm
index 49798930d976..1f126d6e40fc 100644
--- a/code/modules/wiremod/components/atom/health.dm
+++ b/code/modules/wiremod/components/atom/health.dm
@@ -37,7 +37,7 @@
burn = add_output_port("Burn Damage", PORT_TYPE_NUMBER)
toxin = add_output_port("Toxin Damage", PORT_TYPE_NUMBER)
oxy = add_output_port("Suffocation Damage", PORT_TYPE_NUMBER)
- health = add_output_port("Health", PORT_TYPE_NUMBER)
+ health = add_output_port("Overall Health", PORT_TYPE_NUMBER)
/obj/item/circuit_component/health/input_received(datum/port/input/port)
@@ -57,4 +57,3 @@
toxin.set_output(organism.getToxLoss())
oxy.set_output(organism.getOxyLoss())
health.set_output(organism.health)
-
diff --git a/icons/obj/machines/vitals_monitor.dmi b/icons/obj/machines/vitals_monitor.dmi
new file mode 100644
index 000000000000..d402e7f0b3e4
Binary files /dev/null and b/icons/obj/machines/vitals_monitor.dmi differ
diff --git a/maplestation.dme b/maplestation.dme
index 37e4499c977c..70e1c16cd720 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -2091,6 +2091,7 @@
#include "code\game\machinery\teambuilder.dm"
#include "code\game\machinery\teleporter.dm"
#include "code\game\machinery\transformer.dm"
+#include "code\game\machinery\wall_vitals.dm"
#include "code\game\machinery\washing_machine.dm"
#include "code\game\machinery\wishgranter.dm"
#include "code\game\machinery\camera\camera.dm"
@@ -6404,7 +6405,6 @@
#include "maplestation_modules\code\game\objects\structures\surgery_table.dm"
#include "maplestation_modules\code\game\objects\structures\tables_racks.dm"
#include "maplestation_modules\code\game\objects\structures\vital_floor_scanner.dm"
-#include "maplestation_modules\code\game\objects\structures\vital_reader.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\crates.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\asset_protection.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\bridge_officer.dm"
diff --git a/maplestation_modules/code/game/objects/structures/surgery_table.dm b/maplestation_modules/code/game/objects/structures/surgery_table.dm
index 063fe49bb623..42d3448f8bf4 100644
--- a/maplestation_modules/code/game/objects/structures/surgery_table.dm
+++ b/maplestation_modules/code/game/objects/structures/surgery_table.dm
@@ -1,32 +1,48 @@
/obj/structure/table/optable
/// Internals tank clamped onto the table.
/// Allows an operating computer to easily attach it to the mob and use it for anesthesia.
- VAR_FINAL/obj/item/tank/internals/attached_tank
+ VAR_FINAL/obj/item/attached_anesthetic
/// World time when the patient was set onto the tank
VAR_FINAL/patient_set_at = -1
/// Time after which the anesthesia will be automatically disabled
/// Can be set to INFINITY to never auto-disable
var/failsafe_time = 6 MINUTES
-/obj/structure/table/optable/Initialize(mapload)
- . = ..()
- update_appearance(UPDATE_OVERLAYS)
-
/obj/structure/table/optable/examine(mob/user)
. = ..()
- if(isnull(attached_tank))
+ if(isnull(attached_anesthetic))
. += span_notice("It has a clamp on the side for attaching a breath tank.")
else
- . += span_notice("It has \a [attached_tank] attached to it.")
+ . += span_notice("It has \a [attached_anesthetic] attached to it.")
+
+/obj/structure/table/optable/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
/obj/structure/table/optable/update_overlays()
. = ..()
- if(!isnull(attached_tank))
+ if(istype(attached_anesthetic, /obj/item/tank/internals))
+ . += mutable_appearance(
+ icon = 'maplestation_modules/icons/obj/surgery_table_overlay.dmi',
+ icon_state = "surgery_[attached_anesthetic.icon_state]",
+ alpha = src.alpha,
+ )
+ else if(istype(attached_anesthetic, /obj/item/surgery_neural_suppressor))
. += mutable_appearance(
icon = 'maplestation_modules/icons/obj/surgery_table_overlay.dmi',
- icon_state = "surgery_[attached_tank.icon_state]",
+ icon_state = "suppressor_[computer?.is_operational ? (patient_set_at == -1 ? "idle" : "active") : "nopower"]",
alpha = src.alpha,
)
+ if(computer?.is_operational)
+ . += emissive_appearance(
+ icon = 'maplestation_modules/icons/obj/surgery_table_overlay.dmi',
+ icon_state = "suppressor_emissive",
+ offset_spokesman = src,
+ alpha = src.alpha,
+ )
+
+ if(isnull(computer) || !computer.is_operational)
+ return
. += mutable_appearance(
icon = 'maplestation_modules/icons/obj/surgery_table_overlay.dmi',
@@ -50,52 +66,66 @@
/obj/structure/table/optable/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
- if(isnull(attached_tank))
- if(istype(held_item, /obj/item/tank/internals))
- context[SCREENTIP_CONTEXT_LMB] = "Attach tank"
+ if(isnull(attached_anesthetic))
+ if(istype(held_item, /obj/item/tank/internals) || istype(held_item, /obj/item/surgery_neural_suppressor))
+ context[SCREENTIP_CONTEXT_LMB] = "Attach [LOWER_TEXT(held_item.name)]"
. = CONTEXTUAL_SCREENTIP_SET
else
if(isnull(held_item))
- context[SCREENTIP_CONTEXT_RMB] = "Remove tank"
+ context[SCREENTIP_CONTEXT_RMB] = "Remove [LOWER_TEXT(attached_anesthetic.name)]"
. = CONTEXTUAL_SCREENTIP_SET
/obj/structure/table/optable/atom_deconstruct(disassembled, wrench_disassembly)
- attached_tank?.forceMove(drop_location())
+ attached_anesthetic?.forceMove(drop_location())
return ..()
/obj/structure/table/optable/Exited(atom/movable/gone, direction)
. = ..()
- if(gone == attached_tank)
+ if(gone == attached_anesthetic)
disable_anesthesia(patient)
- attached_tank = null
+ attached_anesthetic = null
if(!QDELING(src))
update_appearance(UPDATE_OVERLAYS)
/obj/structure/table/optable/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(!istype(tool, /obj/item/tank/internals))
- return NONE
- else if(!isnull(attached_tank))
- balloon_alert(user, "already has a tank!")
+ if(istype(tool, /obj/item/tank/internals))
+ if(!isnull(attached_anesthetic))
+ balloon_alert(user, "already has \a [attached_anesthetic]!")
+ return ITEM_INTERACT_BLOCKING
+ if(user.transferItemToLoc(tool, src, silent = FALSE))
+ attached_anesthetic = tool
+ update_appearance(UPDATE_OVERLAYS)
+ balloon_alert_to_viewers("tank attached")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE)
+ return ITEM_INTERACT_SUCCESS
+ balloon_alert(user, "can't attach tank!")
return ITEM_INTERACT_BLOCKING
- else if(user.transferItemToLoc(tool, src, silent = FALSE))
- attached_tank = tool
- update_appearance(UPDATE_OVERLAYS)
- balloon_alert_to_viewers("tank attached")
- playsound(src, 'sound/machines/click.ogg', 50, TRUE)
- return ITEM_INTERACT_SUCCESS
- balloon_alert(user, "can't attach tank!")
- return ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/surgery_neural_suppressor))
+ if(!isnull(attached_anesthetic))
+ balloon_alert(user, "already has \a [attached_anesthetic]!")
+ return ITEM_INTERACT_BLOCKING
+ if(user.transferItemToLoc(tool, src, silent = FALSE))
+ attached_anesthetic = tool
+ update_appearance(UPDATE_OVERLAYS)
+ balloon_alert_to_viewers("neural suppressor attached")
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE)
+ return ITEM_INTERACT_SUCCESS
+ balloon_alert(user, "can't attach neural suppressor!")
+ return ITEM_INTERACT_BLOCKING
+
+ return NONE
/obj/structure/table/optable/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return .
- if(isnull(attached_tank))
+ if(isnull(attached_anesthetic))
return .
- user.put_in_hands(attached_tank)
- balloon_alert(user, "tank removed")
+ user.put_in_hands(attached_anesthetic)
+ balloon_alert(user, "[LOWER_TEXT(attached_anesthetic.name)] removed")
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/obj/structure/table/optable/recheck_patient(mob/living/carbon/potential_patient)
@@ -103,28 +133,24 @@
. = ..()
update_appearance(UPDATE_OVERLAYS)
if(patient == potential_patient && patient != old_patient)
- START_PROCESSING(SSobj, src)
return
- STOP_PROCESSING(SSobj, src)
if(old_patient == potential_patient)
disable_anesthesia(old_patient)
/obj/structure/table/optable/process(seconds_per_tick)
- if(isnull(patient))
+ if(isnull(patient) || isnull(attached_anesthetic))
return PROCESS_KILL
- if(isnull(attached_tank))
- return
- if(!can_have_tank_opened(patient))
+ if(!can_have_anesthetic(patient))
disable_anesthesia(patient)
- return
+ return // PROCESS_KILL // this happens anyways
if(computer?.is_operational && patient_set_at + failsafe_time < world.time)
safety_disable()
- return
+ return // PROCESS_KILL // this happens anyways
/// Checks if the passed mob is in a valid state to start breathing out of the attached tank.
/obj/structure/table/optable/proc/can_have_tank_opened(mob/living/carbon/who)
- if(!isnull(who.external) && who.external != attached_tank)
+ if(!isnull(who.external) && who.external != attached_anesthetic)
return FALSE
if(who.internal)
return FALSE
@@ -132,9 +158,19 @@
return FALSE
return TRUE
+/// Check if the passed mob can have the attached anesthetic, whether it's a tank or a neural suppressor.
+/obj/structure/table/optable/proc/can_have_anesthetic(mob/living/carbon/who)
+ if(istype(attached_anesthetic, /obj/item/tank/internals))
+ return can_have_tank_opened(who)
+ if(istype(attached_anesthetic, /obj/item/surgery_neural_suppressor))
+ return computer?.is_operational
+ return FALSE
+
/// Called when the safety triggers and attempts to unhook the patient from the tank.
/obj/structure/table/optable/proc/safety_disable()
- if(isnull(attached_tank) || patient.external != attached_tank)
+ if(isnull(attached_anesthetic))
+ return
+ if(istype(attached_anesthetic, /obj/item/tank/internals) && patient?.external != attached_anesthetic)
return
if(computer?.obj_flags & EMAGGED)
return
@@ -144,38 +180,92 @@
playsound(src, 'sound/machines/doorclick.ogg', 50, vary = FALSE)
/// Enables the patient to start breathing out of the attached tank.
-/obj/structure/table/optable/proc/enable_anesthesia(mob/living/carbon/new_patient)
+/obj/structure/table/optable/proc/enable_anesthesia(mob/living/carbon/new_patient, mob/living/toggler)
PRIVATE_PROC(TRUE)
- if(isnull(attached_tank) || !can_have_tank_opened(new_patient))
+ if(isnull(attached_anesthetic) || !can_have_anesthetic(new_patient))
return
- ASSERT(istype(new_patient.wear_mask))
- if (new_patient.wear_mask.up)
- new_patient.wear_mask.adjust_visor(src)
- new_patient.open_internals(attached_tank, TRUE)
+ if(istype(attached_anesthetic, /obj/item/tank/internals))
+ ASSERT(istype(new_patient.wear_mask))
+ if (new_patient.wear_mask.up)
+ new_patient.wear_mask.adjust_visor(toggler)
+ new_patient.open_internals(attached_anesthetic, TRUE)
+
+ if(istype(attached_anesthetic, /obj/item/surgery_neural_suppressor))
+ computer?.update_use_power(ACTIVE_POWER_USE)
+ new_patient.add_traits(list(
+ TRAIT_BLOCK_HEADSET_USE,
+ TRAIT_IMMOBILIZED,
+ TRAIT_HANDS_BLOCKED,
+ TRAIT_SOFTSPOKEN,
+ ), REF(src))
+ new_patient.set_pain_mod(REF(src), 0.1)
+ new_patient.add_max_consciousness_value(REF(src), 40)
+ to_chat(new_patient, span_notice("You feel your body go completely numb and non-responsive!"))
+
patient_set_at = world.time
update_appearance(UPDATE_OVERLAYS)
+ START_PROCESSING(SSobj, src)
/// Disables the patient from breathing out of the attached tank.
/obj/structure/table/optable/proc/disable_anesthesia(mob/living/carbon/old_patient)
PRIVATE_PROC(TRUE)
- if(isnull(attached_tank) || old_patient?.external != attached_tank)
+ if(isnull(attached_anesthetic))
return
- old_patient.close_externals()
+ if(!isnull(old_patient))
+ if(istype(attached_anesthetic, /obj/item/tank/internals) && old_patient.external == attached_anesthetic)
+ old_patient.close_externals()
+
+ if(istype(attached_anesthetic, /obj/item/surgery_neural_suppressor))
+ computer?.update_use_power(IDLE_POWER_USE)
+ REMOVE_TRAITS_IN(old_patient, REF(src))
+ old_patient.unset_pain_mod(REF(src))
+ old_patient.remove_max_consciousness_value(REF(src))
+ to_chat(old_patient, span_notice("You feel sensation return to your body."))
+
patient_set_at = -1
update_appearance(UPDATE_OVERLAYS)
+ STOP_PROCESSING(SSobj, src)
/// Toggles the tank on and off, playing a sound as well.
-/obj/structure/table/optable/proc/toggle_anesthesia()
- if(isnull(patient) || isnull(attached_tank))
+/obj/structure/table/optable/proc/toggle_anesthesia(mob/living/toggler)
+ if(isnull(patient) || isnull(attached_anesthetic))
return
- if(patient.external == attached_tank)
- disable_anesthesia(patient)
- playsound(src, 'sound/machines/doorclick.ogg', 50, vary = FALSE)
+ if(istype(attached_anesthetic, /obj/item/tank/internals))
+ if(patient.external == attached_anesthetic)
+ disable_anesthesia(patient)
+ playsound(src, 'sound/machines/doorclick.ogg', 50, vary = FALSE)
+
+ else if(isnull(patient.external))
+ enable_anesthesia(patient, toggler)
+ playsound(src, 'sound/machines/doorclick.ogg', 50, vary = FALSE)
+ playsound(src, 'sound/machines/hiss.ogg', 25, vary = TRUE, frequency = 1.5)
- else if(isnull(patient.external))
- enable_anesthesia(patient)
+ if(istype(attached_anesthetic, /obj/item/surgery_neural_suppressor))
+ if(patient_set_at == -1)
+ enable_anesthesia(patient, toggler)
+ else
+ disable_anesthesia(patient)
playsound(src, 'sound/machines/doorclick.ogg', 50, vary = FALSE)
- playsound(src, 'sound/machines/hiss.ogg', 25, vary = TRUE, frequency = 1.5)
+
+/obj/item/surgery_neural_suppressor
+ name = "neural suppressor"
+ desc = "A device designed to shut down a patient's nervous system. \
+ Designed as a more modern replacement for traditional anesthesia in surgical operations."
+ w_class = WEIGHT_CLASS_SMALL
+ resistance_flags = FIRE_PROOF
+ icon = 'icons/obj/devices/artefacts.dmi'
+ icon_state = "prototype2"
+ drop_sound = 'sound/items/handling/multitool_drop.ogg'
+ pickup_sound = 'sound/items/handling/multitool_pickup.ogg'
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT,
+ )
+
+/obj/item/surgery_neural_suppressor/examine(mob/user)
+ . = ..()
+ . += span_info("When attached to an operating table, functions as an alternative to anesthetic, requiring nothing but power to use.")
diff --git a/maplestation_modules/code/game/objects/structures/vital_floor_scanner.dm b/maplestation_modules/code/game/objects/structures/vital_floor_scanner.dm
index b67bd0541620..30ab6cfbe729 100644
--- a/maplestation_modules/code/game/objects/structures/vital_floor_scanner.dm
+++ b/maplestation_modules/code/game/objects/structures/vital_floor_scanner.dm
@@ -55,6 +55,15 @@
AddComponent(/datum/component/simple_rotation, ROTATION_REQUIRE_WRENCH|ROTATION_IGNORE_ANCHORED)
update_appearance(UPDATE_OVERLAYS)
register_context()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/vital_floor_scanner/post_machine_initialize()
+ for(var/obj/machinery/vitals_reader/vitals_reader in view(src, LINK_RANGE))
+ if(isnull(vitals_reader.connected))
+ vitals_reader.find_machine(prioritize_by_id = TRUE) // mappers can set an id tag to connect it to specific machines
+ if(is_operational)
+ set_light_on(TRUE)
+ return ..()
/obj/machinery/vital_floor_scanner/examine(mob/user)
. = ..()
@@ -97,49 +106,8 @@
return
set_occupant(null)
-/obj/machinery/vital_floor_scanner/proc/enable_vitals_nearby()
- if(!is_operational || QDELETED(occupant))
- return
-
- for(var/obj/machinery/computer/vitals_reader/reader in range(LINK_RANGE, src))
- if(!reader.is_operational)
- continue
-
- if(!reader.active)
- reader.toggle_active()
-
- else if(isnull(reader.patient))
- reader.set_patient(occupant)
-
- if(isnull(reader.patient)) // It failed I guess
- continue
-
- reader.beeps = FALSE
- var/scansound = 'maplestation_modules/sound/healthscanner_stable.ogg'
- switch(reader.patient.stat)
- if(DEAD)
- scansound = 'maplestation_modules/sound/healthscanner_dead.ogg'
- reader.beep_message("lets out a droning beep.")
- if(HARD_CRIT)
- scansound = 'maplestation_modules/sound/healthscanner_danger.ogg'
- reader.beep_message("lets out an alternating beep.")
- if(SOFT_CRIT)
- scansound = 'maplestation_modules/sound/healthscanner_critical.ogg'
- reader.beep_message("lets out a high pitch beep.")
- else
- reader.beep_message("lets out a beep.")
-
- playsound(reader, scansound, 15, FALSE, MEDIUM_RANGE_SOUND_EXTRARANGE)
- return
-
-/obj/machinery/vital_floor_scanner/proc/disable_vitals_nearby(mob/leaving = occupant)
- for(var/obj/machinery/computer/vitals_reader/reader in range(LINK_RANGE, src))
- if(reader.active && reader.patient == leaving)
- reader.toggle_active()
- return
-
/obj/machinery/vital_floor_scanner/proc/can_scan(mob/living/who)
- if(who.mob_biotypes & MOB_ROBOTIC)
+ if((who.mob_biotypes & MOB_ROBOTIC) && !ishuman(who))
return FALSE
if(who.body_position != STANDING_UP)
return FALSE
@@ -166,11 +134,9 @@
if(QDELING(src))
return
if(!isnull(occupant))
- addtimer(CALLBACK(src, PROC_REF(enable_vitals_nearby)), /obj/effect/temp_visual/vitals_scan_effect::duration, TIMER_UNIQUE)
scan_effect()
else if(!isnull(old_occupant))
- disable_vitals_nearby(old_occupant)
for(var/obj/effect/temp_visual/vitals_scan_effect/effect in old_occupant)
animate(effect, alpha = 0, time = 0.2 SECONDS, flags = ANIMATION_PARALLEL)
diff --git a/maplestation_modules/code/game/objects/structures/vital_reader.dm b/maplestation_modules/code/game/objects/structures/vital_reader.dm
deleted file mode 100644
index eb0f96532e35..000000000000
--- a/maplestation_modules/code/game/objects/structures/vital_reader.dm
+++ /dev/null
@@ -1,560 +0,0 @@
-/datum/design/vitals_monitor
- name = "Vitals Monitor"
- desc = "A wall mounted computer that displays the vitals of a patient nearby. \
- Links to stasis beds, operating tables, and other machines that can hold patients \
- such as cryo cells, sleepers, and more."
- id = "vitals_monitor"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
- )
- build_path = /obj/item/wallframe/status_display/vitals
- category = list(RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_MEDICAL)
- departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
-
-/datum/design/vitals_monitor/advanced
- name = "Advanced Vitals Monitor"
- desc = "An updated vitals display which performs a more detailed scan of the patient than the basic display."
- id = "vitals_monitor_advanced"
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
- )
- build_path = /obj/item/wallframe/status_display/vitals/advanced
-
-/obj/item/wallframe/status_display/vitals
- name = "vitals display frame"
- desc = "Used to build vitals displays. Secure on a wall nearby a stasis bed, operating table, \
- or another machine that can hold patients such as cryo cells or sleepers."
- custom_materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
- )
- result_path = /obj/machinery/computer/vitals_reader
-
-/obj/item/wallframe/status_display/vitals/after_attach(obj/machinery/computer/vitals_reader/attached_to)
- . = ..()
- if(istype(attached_to))
- attached_to.beeps = FALSE
-
-/obj/item/wallframe/status_display/vitals/advanced
- name = "advanced vitals display frame"
- desc = "Used to build advanced vitals displays. Performs a more detailed scan of the patient than the basic display."
- custom_materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
- )
- result_path = /obj/machinery/computer/vitals_reader/advanced
-
-/// A wall mounted screen that showcases the vitals of a patient nearby.
-/obj/machinery/computer/vitals_reader
- name = "vitals display"
- desc = "A small screen that displays the vitals of a patient."
- icon = 'maplestation_modules/icons/obj/status_display.dmi'
- icon_state = "frame"
- verb_say = "beeps"
- verb_ask = "beeps"
- verb_exclaim = "beeps"
- density = FALSE
- layer = ABOVE_WINDOW_LAYER
- interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_REQUIRES_DEXTERITY
- interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON
- interaction_flags_click = ALLOW_SILICON_REACH | NEED_DEXTERITY
- use_power = IDLE_POWER_USE
- idle_power_usage = 0
- active_power_usage = BASE_MACHINE_IDLE_CONSUMPTION
- icon_keyboard = null
- icon_screen = null
- processing_flags = START_PROCESSING_MANUALLY
-
- /// Whether we perform an advanced scan on examine or not
- var/advanced = FALSE
- /// If TRUE, also append a chemical scan to the readout
- var/chemscan = TRUE
- /// Typepath to spawn when deconstructed
- var/frame = /obj/item/wallframe/status_display/vitals
- /// How many attempts at scanning for a patient do we try before we turn ourself off
- var/max_scan_attempts = 6
- /// Whether we are on or off
- VAR_FINAL/active = FALSE
- /// Reference to the mob that is being tracked / scanned
- VAR_FINAL/mob/living/patient
- /// Static typecache of things the vitals display can connect to.
- /// By default it will connect to these and grab their occupant to display as a patient.
- var/static/list/connectable_typecache = typecacheof(list(
- /obj/machinery/abductor/experiment,
- /obj/machinery/computer/operating, // Snowflaked
- /obj/machinery/cryo_cell,
- /obj/machinery/dna_scannernew,
- /obj/machinery/gulag_teleporter,
- /obj/machinery/hypnochair,
- /obj/machinery/implantchair,
- /obj/machinery/sleeper,
- /obj/machinery/stasis,
- /obj/machinery/vital_floor_scanner,
- ))
- /// Whether we go beep beep
- var/beeps = TRUE
- /// The last stat we beeped about
- var/last_reported_stat = null
- /// Cooldown between beeps
- COOLDOWN_DECLARE(beep_cd)
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/vitals_reader, 32)
-
-/obj/machinery/computer/vitals_reader/advanced
- name = "advanced vitals display"
- desc = "A small screen that displays the vitals of a patient. \
- Performs a more detailed scan of the patient than the basic display."
- frame = /obj/item/wallframe/status_display/vitals/advanced
- advanced = TRUE
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/vitals_reader/advanced, 32)
-
-/obj/machinery/computer/vitals_reader/no_hand
- name = "automatic vitals display"
- desc = "A small screen that displays the vitals of a patient. \
- It has no button to toggle it manually."
- interaction_flags_atom = NONE
- interaction_flags_machine = NONE
- max_scan_attempts = 1
- beeps = FALSE
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/vitals_reader/no_hand, 32)
-
-/obj/machinery/computer/vitals_reader/Initialize(mapload, obj/item/circuitboard/C)
- . = ..()
- register_context()
-
-/obj/machinery/computer/vitals_reader/Destroy(force)
- unset_patient()
- return ..()
-
-/obj/machinery/computer/vitals_reader/attackby(obj/item/weapon, mob/living/user, params)
- if(!istype(user) || user.combat_mode)
- return ..()
- if((interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND) && (weapon.item_flags & SURGICAL_TOOL))
- // You can flick it on while doing surgery
- return interact(user)
- return ..()
-
-/obj/machinery/computer/vitals_reader/wrench_act(mob/living/user, obj/item/tool)
- if(user.combat_mode)
- return FALSE
- balloon_alert(user, "detaching...")
- if(tool.use_tool(src, user, 6 SECONDS, volume = 50))
- playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
- deconstruct(TRUE)
- return TRUE
-
-/obj/machinery/computer/vitals_reader/on_deconstruction(disassembled)
- var/atom/drop_loc = drop_location()
- if(disassembled)
- new frame(drop_loc)
- else
- new /obj/item/stack/sheet/iron(drop_loc, 2)
- new /obj/item/shard(drop_loc)
- new /obj/item/shard(drop_loc)
- qdel(src)
-
-/obj/machinery/computer/vitals_reader/examine(mob/user)
- . = ..()
- if(!is_operational || !active || user.is_blind())
- return
-
- if(isnull(patient))
- . += span_notice("The display is currently scanning for a patient.")
- else if(!issilicon(user) && !isobserver(user) && get_dist(patient, user) > 2)
- . += span_notice("You are too far away to read the display.")
- else if(HAS_TRAIT(user, TRAIT_DUMB) || !user.can_read(src, reading_check_flags = READING_CHECK_LITERACY, silent = TRUE))
- . += span_warning("You try to comprehend the display, but it's too complex for you to understand.")
- else
- . += healthscan(user, patient, mode = /*SCANNER_CONDENSED*/0, advanced = advanced, tochat = FALSE)
- . += chemscan(user, patient, tochat = FALSE)
-
-/obj/machinery/computer/vitals_reader/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- if(isnull(held_item) || (held_item.item_flags & SURGICAL_TOOL))
- if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
- context[SCREENTIP_CONTEXT_LMB] = "Toggle readout"
- else if(held_item.tool_behaviour == TOOL_WRENCH)
- context[SCREENTIP_CONTEXT_LMB] = "Detach"
- if(!isnull(patient))
- context[SCREENTIP_CONTEXT_SHIFT_LMB] = "Examine vitals"
- if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Toggle beeps"
- return CONTEXTUAL_SCREENTIP_SET
-
-/obj/machinery/computer/vitals_reader/AIShiftClick(mob/user)
- // Lets AIs perform healthscans on people indirectly (they can't examine)
- if(is_operational && !isnull(patient))
- var/entire_printout = ""
- entire_printout += healthscan(user, patient, mode = /*SCANNER_CONDENSED*/0, advanced = advanced, tochat = FALSE)
- entire_printout += chemscan(user, patient, tochat = FALSE)
- to_chat(user, boxed_message(entire_printout), trailing_newline = FALSE, type = MESSAGE_TYPE_INFO)
-
-#define LOWER_BAR_OFFSET -3
-
-/// Returns overlays to be used when active but without a patient detected
-/obj/machinery/computer/vitals_reader/proc/get_scanning_overlays()
- return list(
- construct_overlay("unknown"),
- construct_overlay("scanning"),
- )
-
-/**
- * Returns all overlays to be shown when a simple / basic animal patient is detected
- *
- * * hp_color - color being used for general, overrall health
- */
-/obj/machinery/computer/vitals_reader/proc/get_simple_mob_overlays(hp_color)
- return list(
- construct_overlay("mob", hp_color),
- construct_overlay("blood", COLOR_GRAY),
- construct_overlay("bar9", COLOR_GRAY),
- construct_overlay("bar9", COLOR_GRAY, LOWER_BAR_OFFSET),
- )
-
-/**
- * Returns all overlays to be shown when a humanoid patient is detected
- *
- * * hp_color - color being used for general, overrall health
- */
-/obj/machinery/computer/vitals_reader/proc/get_humanoid_overlays(hp_color)
- var/list/returned_overlays = list()
-
- for(var/body_zone in BODY_ZONES_ALL)
- var/obj/item/bodypart/real_part = patient.get_bodypart(body_zone)
- var/bodypart_color = isnull(real_part) ? COLOR_GRAY : percent_to_color((real_part.brute_dam + real_part.burn_dam) / real_part.max_damage)
- returned_overlays += construct_overlay("human_[body_zone]", bodypart_color)
-
- if(HAS_TRAIT(patient, TRAIT_NOBLOOD))
- returned_overlays += construct_overlay("blood", COLOR_GRAY)
- else
- var/blood_color = "#a51919"
- switch((patient.blood_volume - BLOOD_VOLUME_SURVIVE) / (BLOOD_VOLUME_NORMAL - BLOOD_VOLUME_SURVIVE))
- if(-INFINITY to 0.2)
- blood_color = "#a1a1a1"
- if(0.2 to 0.4)
- blood_color = "#a18282"
- if(0.4 to 0.6)
- blood_color = "#a16363"
- if(0.6 to 0.8)
- blood_color = "#a14444"
- if(0.8 to INFINITY)
- blood_color = "#a51919"
-
- returned_overlays += construct_overlay("blood", blood_color)
-
- if(HAS_TRAIT(patient, TRAIT_NOBREATH))
- returned_overlays += construct_overlay("bar9", COLOR_GRAY)
- else
- var/oxy_percent = patient.getOxyLoss() / patient.maxHealth
- returned_overlays += construct_overlay(percent_to_bar(oxy_percent), "#2A72AA")
-
- if(HAS_TRAIT(patient, TRAIT_TOXIMMUNE))
- returned_overlays += construct_overlay("bar9", COLOR_GRAY, LOWER_BAR_OFFSET)
- else
- var/tox_percent = patient.getToxLoss() / patient.maxHealth
- returned_overlays += construct_overlay(percent_to_bar(tox_percent), "#5d9c11", LOWER_BAR_OFFSET)
-
- return returned_overlays
-
-/obj/machinery/computer/vitals_reader/update_overlays()
- . = ..()
- if(!active || !is_operational)
- return
-
- if(isnull(patient))
- . += get_scanning_overlays()
-
- else
- var/ekg_icon_state = "ekg"
- var/resp_icon_state = (patient.losebreath || HAS_TRAIT(patient, TRAIT_NOBREATH)) ? "resp_flat" : "resp"
- if(!patient.appears_alive())
- ekg_icon_state = "ekg_flat"
- resp_icon_state = "resp_flat"
- else if(ishuman(patient))
- var/mob/living/carbon/human/human_patient = patient
- switch(human_patient.get_bpm())
- if(0)
- ekg_icon_state = "ekg_flat"
- resp_icon_state = "resp_flat"
- if(FAST_HEARTBEAT_THRESHOLD to INFINITY)
- ekg_icon_state = "ekg_fast"
-
- var/hp_color = percent_to_color((patient.maxHealth - patient.health) / patient.maxHealth)
- . += construct_overlay(ekg_icon_state, hp_color)
- . += construct_overlay(resp_icon_state, "#00f7ff")
-
- if(ishuman(patient))
- . += get_humanoid_overlays(hp_color)
- else
- . += get_simple_mob_overlays(hp_color)
-
- . += emissive_appearance(icon, "outline", src, alpha = src.alpha)
-
-/// Converts a percentage to a color
-/obj/machinery/computer/vitals_reader/proc/percent_to_color(percent)
- if(machine_stat & (EMPED|EMAGGED|BROKEN))
- percent = rand(1, 100) * 0.01
-
- if(percent == 0)
- return "#2A72AA"
-
- switch(percent)
- if(0 to 0.125)
- return "#A6BD00"
- if(0.125 to 0.25)
- return "#BDA600"
- if(0.25 to 0.375)
- return "#BD7E00"
- if(0.375 to 0.5)
- return "#BD4200"
-
- return "#BD0600"
-
-/// Converts a percentage to a bar icon state
-/obj/machinery/computer/vitals_reader/proc/percent_to_bar(percent)
- if(machine_stat & (EMPED|EMAGGED|BROKEN))
- percent = rand(1, 100) * 0.01
-
- if(percent >= 1)
- return "bar9"
- if(percent <= 0)
- return "bar1"
-
- switch(percent)
- if(0 to 0.125)
- return "bar1"
- if(0.125 to 0.25)
- return "bar2"
- if(0.25 to 0.375)
- return "bar3"
- if(0.375 to 0.5)
- return "bar4"
- if(0.5 to 0.625)
- return "bar5"
- if(0.625 to 0.75)
- return "bar6"
- if(0.75 to 0.875)
- return "bar7"
- if(0.875 to 1)
- return "bar8"
-
- return "bar9" // ??
-
-/**
- * Helper to construct an overlay for the vitals display
- *
- * * state_to_use - icon state to use, required
- * * color_to_use - color to use, optional
- * * y_offset - offset to apply to the y position of the overlay, defaults to 0
- */
-/obj/machinery/computer/vitals_reader/proc/construct_overlay(state_to_use, color_to_use, y_offset = 0)
- var/mutable_appearance/overlay = mutable_appearance(icon, state_to_use, alpha = src.alpha)
- overlay.appearance_flags |= RESET_COLOR
- overlay.color = color_to_use
- overlay.pixel_z += 32
- overlay.pixel_y += -32 + y_offset
- return overlay
-
-#undef LOWER_BAR_OFFSET
-
-/obj/machinery/computer/vitals_reader/interact(mob/user, special_state)
- . = ..()
- if(.)
- return .
- if(!is_operational)
- return .
-
- toggle_active()
- balloon_alert(user, "readout [active ? "" : "de"]activated")
- playsound(src, 'sound/machines/click.ogg', 50)
- return TRUE
-
-/obj/machinery/computer/vitals_reader/on_set_is_operational(old_value)
- if(is_operational)
- return
- if(active)
- toggle_active()
- return
- update_appearance(UPDATE_OVERLAYS)
-
-/// Toggles whether the display is active or not
-/obj/machinery/computer/vitals_reader/proc/toggle_active()
- if(active)
- active = FALSE
- update_use_power(IDLE_POWER_USE)
- unset_patient()
- else
- active = TRUE
- update_use_power(ACTIVE_POWER_USE)
- find_active_patient()
- update_appearance(UPDATE_OVERLAYS)
-
-/**
- * Recursively checks all nearby machines to find a patient to track.
- *
- * This can (and should be) signal driven in the future, but machines don't have a set_occupant proc yet,
- * so this will do for the moment.
- *
- * * scan_attempts - number of times this has been called, used to prevent infinite loops
- */
-/obj/machinery/computer/vitals_reader/proc/find_active_patient(scan_attempts = 0)
- if(!active || !isnull(patient) || QDELETED(src))
- return
-
- for(var/obj/machinery/nearby_thing in view(3, src))
- if(!is_type_in_typecache(nearby_thing, connectable_typecache))
- continue
-
- var/mob/living/patient = nearby_thing.occupant
- if(istype(nearby_thing, /obj/machinery/computer/operating))
- var/obj/machinery/computer/operating/op = nearby_thing
- patient = op.table?.patient
-
- if(!istype(patient))
- continue
- // skips bots, borgs, and drones - not synths and androids
- if((patient.mob_biotypes & MOB_ROBOTIC) && !(patient.mob_biotypes & MOB_HUMANOID))
- continue
-
- set_patient(patient)
- return
-
- if(scan_attempts > max_scan_attempts)
- toggle_active()
- return
-
- addtimer(CALLBACK(src, PROC_REF(find_active_patient), scan_attempts + 1), 5 SECONDS)
-
-/obj/machinery/computer/vitals_reader/process()
- if(!COOLDOWN_FINISHED(src, beep_cd))
- return
- if(isnull(patient) || !is_operational || !active)
- stack_trace("Vitals reader processing without a patient, not operational, or not active.")
- end_processing()
- return
- if(!beeps)
- return
-
- var/beepsound
- switch(patient.stat)
- if(DEAD)
- beepsound = 'maplestation_modules/sound/healthscanner_dead.ogg'
- COOLDOWN_START(src, beep_cd, 11 SECONDS)
- if(last_reported_stat != DEAD)
- beep_message("lets out a droning beep.")
- last_reported_stat = DEAD
- if(HARD_CRIT)
- beepsound = 'maplestation_modules/sound/healthscanner_danger.ogg'
- COOLDOWN_START(src, beep_cd, 5 SECONDS)
- if(last_reported_stat != HARD_CRIT)
- beep_message("lets out an alternating beep.")
- last_reported_stat = HARD_CRIT
- if(SOFT_CRIT)
- beepsound = 'maplestation_modules/sound/healthscanner_critical.ogg'
- COOLDOWN_START(src, beep_cd, 7 SECONDS)
- if(last_reported_stat != SOFT_CRIT)
- beep_message("lets out a high pitch beep.")
- last_reported_stat = SOFT_CRIT
- else
- beepsound = 'maplestation_modules/sound/healthscanner_stable.ogg'
- COOLDOWN_START(src, beep_cd, 7 SECONDS)
- if(last_reported_stat != CONSCIOUS)
- beep_message("lets out a beep.")
- last_reported_stat = CONSCIOUS
-
- playsound(src, beepsound, 15, FALSE, SHORT_RANGE_SOUND_EXTRARANGE)
-
-/obj/machinery/computer/vitals_reader/proc/beep_message(message)
- for(var/mob/viewer as anything in viewers(src))
- if(isnull(viewer.client) || !viewer.can_hear())
- continue
- if(!viewer.runechat_prefs_check(viewer, EMOTE_MESSAGE))
- continue
- viewer.create_chat_message(
- speaker = src,
- raw_message = message,
- runechat_flags = EMOTE_MESSAGE,
- )
-
-/obj/machinery/computer/vitals_reader/click_alt(mob/user)
- if(!(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND))
- return CLICK_ACTION_BLOCKING
- beeps = !beeps
- balloon_alert(user, "beeps [beeps ? "enabled" : "disabled"]")
- playsound(src, 'sound/machines/click.ogg', 50)
- return CLICK_ACTION_SUCCESS
-
-/// Sets the passed mob as the active patient
-/// If there is already a patient, it will be unset first.
-/obj/machinery/computer/vitals_reader/proc/set_patient(mob/living/new_patient)
- if(istype(new_patient, /mob/living/carbon/human/consistent))
- // This is A CARDINAL SIN but I am tired of the random hard delete test failure I'll fix it for real LATER
- return
- if(!isnull(patient))
- unset_patient()
-
- patient = new_patient
- RegisterSignals(patient, list(
- COMSIG_QDELETING,
- COMSIG_MOVABLE_MOVED,
- ), PROC_REF(unset_patient))
- RegisterSignals(patient, list(
- COMSIG_CARBON_POST_REMOVE_LIMB,
- COMSIG_CARBON_POST_ATTACH_LIMB,
- COMSIG_LIVING_HEALTH_UPDATE,
- ), PROC_REF(update_overlay_on_signal))
- update_appearance(UPDATE_OVERLAYS)
- begin_processing()
- last_reported_stat = null
-
-/// Unset the current patient.
-/obj/machinery/computer/vitals_reader/proc/unset_patient(...)
- SIGNAL_HANDLER
- if(isnull(patient))
- return
-
- UnregisterSignal(patient, list(
- COMSIG_QDELETING,
- COMSIG_MOVABLE_MOVED,
- COMSIG_CARBON_POST_REMOVE_LIMB,
- COMSIG_CARBON_POST_ATTACH_LIMB,
- COMSIG_LIVING_HEALTH_UPDATE,
- ))
-
- patient = null
- end_processing()
- if(QDELING(src))
- return
-
- update_appearance(UPDATE_OVERLAYS)
- if(active)
- find_active_patient()
-
-/// Signal proc to update the display when a signal is received.
-/obj/machinery/computer/vitals_reader/proc/update_overlay_on_signal(...)
- SIGNAL_HANDLER
- update_appearance(UPDATE_OVERLAYS)
-
-/obj/machinery/computer/vitals_reader/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
-
- if(beeps)
- beeps = prob(50)
- COOLDOWN_START(src, beep_cd, 1 SECONDS + (1 SECONDS * rand(0, (severity == EMP_HEAVY ? 60 : 30))))
- set_machine_stat(machine_stat | EMPED)
- addtimer(CALLBACK(src, PROC_REF(fix_emp)), (severity == EMP_HEAVY ? 150 SECONDS : 75 SECONDS))
-
-/obj/machinery/computer/vitals_reader/proc/fix_emp()
- set_machine_stat(machine_stat & ~EMPED)
diff --git a/maplestation_modules/code/modules/research/designs/medical_designs.dm b/maplestation_modules/code/modules/research/designs/medical_designs.dm
index 79df1db0d3d1..534f33bc7af6 100644
--- a/maplestation_modules/code/modules/research/designs/medical_designs.dm
+++ b/maplestation_modules/code/modules/research/designs/medical_designs.dm
@@ -27,6 +27,22 @@
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+/datum/design/neural_suppressor
+ name = "Surgical Neural Suppressor"
+ desc = "A device that suppresses the nervous system - a more advanced form of anesthetic."
+ id = "neural_suppressor"
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/surgery_neural_suppressor
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+
/datum/design/plastic_medkit
name = "Plastic Medkit"
id = "plasticmedkit"
diff --git a/maplestation_modules/code/modules/research/techweb/all_nodes.dm b/maplestation_modules/code/modules/research/techweb/all_nodes.dm
index 1ee58394cbe8..4746d69969c5 100644
--- a/maplestation_modules/code/modules/research/techweb/all_nodes.dm
+++ b/maplestation_modules/code/modules/research/techweb/all_nodes.dm
@@ -21,18 +21,27 @@
id_additions = list(
"scanning_pad",
"triage_zone_projector",
- "vitals_monitor",
)
/datum/techweb_node/medbay_equip_adv
id_additions = list(
"auto_cpr_device",
- "vitals_monitor_advanced",
+ "neural_suppressor",
+ "medical_scissors_trauma",
)
/datum/techweb_node/cryostasis
+ id_removals = list(
+ "stasis",
+ )
id_additions = list(
"stasis_bodybag",
+ "stasis_pod",
+ )
+
+/datum/techweb_node/alien_surgery
+ id_additions = list(
+ "stasis",
)
/datum/techweb_node/surgery_exp
@@ -97,4 +106,5 @@
/datum/techweb_node/medbay_equip
id_additions = list(
"plasticmedkit",
+ "medical_scissors",
)
diff --git a/maplestation_modules/icons/effects/particles.dmi b/maplestation_modules/icons/effects/particles.dmi
new file mode 100644
index 000000000000..0c308fd08ff5
Binary files /dev/null and b/maplestation_modules/icons/effects/particles.dmi differ
diff --git a/maplestation_modules/icons/obj/machines/sleeper.dmi b/maplestation_modules/icons/obj/machines/sleeper.dmi
index 27388313bf1e..9d80a6cd7806 100644
Binary files a/maplestation_modules/icons/obj/machines/sleeper.dmi and b/maplestation_modules/icons/obj/machines/sleeper.dmi differ
diff --git a/maplestation_modules/icons/obj/surgery_table_overlay.dmi b/maplestation_modules/icons/obj/surgery_table_overlay.dmi
index 5d559fbd9e58..fe4cd8746500 100644
Binary files a/maplestation_modules/icons/obj/surgery_table_overlay.dmi and b/maplestation_modules/icons/obj/surgery_table_overlay.dmi differ
diff --git a/sound/machines/fan/fan_break.ogg b/sound/machines/fan/fan_break.ogg
new file mode 100644
index 000000000000..a122b3c8ea51
Binary files /dev/null and b/sound/machines/fan/fan_break.ogg differ
diff --git a/sound/machines/fan/fan_loop.ogg b/sound/machines/fan/fan_loop.ogg
new file mode 100644
index 000000000000..8588f1c9ab4e
Binary files /dev/null and b/sound/machines/fan/fan_loop.ogg differ
diff --git a/sound/machines/fan/fan_start.ogg b/sound/machines/fan/fan_start.ogg
new file mode 100644
index 000000000000..008c249f20b2
Binary files /dev/null and b/sound/machines/fan/fan_start.ogg differ
diff --git a/sound/machines/fan/fan_stop.ogg b/sound/machines/fan/fan_stop.ogg
new file mode 100644
index 000000000000..beebbacb6664
Binary files /dev/null and b/sound/machines/fan/fan_stop.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 9e265b2977b8..90710db7a252 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2100,6 +2100,7 @@
#include "code\game\machinery\teambuilder.dm"
#include "code\game\machinery\teleporter.dm"
#include "code\game\machinery\transformer.dm"
+#include "code\game\machinery\wall_vitals.dm"
#include "code\game\machinery\washing_machine.dm"
#include "code\game\machinery\wishgranter.dm"
#include "code\game\machinery\camera\camera.dm"
diff --git a/tgui/packages/tgui/interfaces/OperatingComputer/PatientStateView.tsx b/tgui/packages/tgui/interfaces/OperatingComputer/PatientStateView.tsx
index 83718d86ad1c..f611a79e91f0 100644
--- a/tgui/packages/tgui/interfaces/OperatingComputer/PatientStateView.tsx
+++ b/tgui/packages/tgui/interfaces/OperatingComputer/PatientStateView.tsx
@@ -389,19 +389,25 @@ const PatientStateAnesthesiaView = () => {
return (
- {!anesthesia.has_tank && No anesthesia tank attached.}
+ {!anesthesia.has_tank && No anesthetic attached.}
act('toggle_anesthesia')}
>
- {anesthesia.open ? 'Close Tank' : 'Open Tank'}
+ {anesthesia.open
+ ? anesthesia.is_tank
+ ? 'Close Tank'
+ : 'Deactivate Suppressor'
+ : anesthesia.is_tank
+ ? 'Open Tank'
+ : 'Activate Suppressor'}
@@ -413,7 +419,9 @@ const PatientStateAnesthesiaView = () => {
icon={failsafe_enabled ? 'square-check-o' : 'square-o'}
tooltip={
failsafe_enabled
- ? 'Automatically closes the attached tank if a set amount of time has elapsed.'
+ ? anesthesia.is_tank
+ ? 'Automatically closes the attached tank if a set amount of time has elapsed.'
+ : 'Automatically deactivates the neural suppressor if a set amount of time has elapsed.'
: ''
}
onClick={() =>
diff --git a/tgui/packages/tgui/interfaces/OperatingComputer/types.ts b/tgui/packages/tgui/interfaces/OperatingComputer/types.ts
index efbec658632c..56b79112bff6 100644
--- a/tgui/packages/tgui/interfaces/OperatingComputer/types.ts
+++ b/tgui/packages/tgui/interfaces/OperatingComputer/types.ts
@@ -54,6 +54,7 @@ type AnesthesiaStatus = {
open: BooleanLike;
failsafe: number;
can_open_tank: BooleanLike;
+ is_tank: BooleanLike;
};
export type damageType = {
diff --git a/tgui/packages/tgui/interfaces/_StasisPod.tsx b/tgui/packages/tgui/interfaces/_StasisPod.tsx
new file mode 100644
index 000000000000..14721107a57d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/_StasisPod.tsx
@@ -0,0 +1,163 @@
+import {
+ Box,
+ Button,
+ LabeledList,
+ NoticeBox,
+ ProgressBar,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+import type { BooleanLike } from 'tgui-core/react';
+import { useBackend } from '../backend';
+import { Window } from '../layouts';
+
+type typePath = string;
+
+type Chem = {
+ id: typePath;
+ name: string;
+ allowed: boolean;
+ volume: number;
+};
+
+type Occupant = {
+ reagents: Chem[];
+};
+
+type PodData = {
+ open: BooleanLike;
+ occupied: BooleanLike;
+ chems: Chem[];
+ occupant: Occupant | null;
+ metabolize_medicines_in_stasis: BooleanLike;
+};
+
+const InjectButtons = (props: { chem: Chem }) => {
+ const { act, data } = useBackend();
+ const { occupied } = data;
+ const chem = props.chem;
+
+ return [5, 10].map((amount) => (
+