From fd131b4f431bb3a1da9fec9ccfbab8621916d0cf Mon Sep 17 00:00:00 2001 From: ClownMoff Date: Sat, 20 Jul 2024 18:55:41 +0100 Subject: [PATCH] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 14229 ++++++++------------ 1 file changed, 5572 insertions(+), 8657 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c5703c19e2a08..60f1746693ed9 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -95,17 +95,14 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "abV" = ( +/obj/machinery/vending/wardrobe/chem_wardrobe, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/apothecary) "abY" = ( @@ -123,14 +120,8 @@ /turf/closed/wall, /area/security/prison) "aci" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = 30 - }, -/obj/machinery/hydroponics/constructable, -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 }, /turf/open/floor/iron, /area/hydroponics) @@ -144,11 +135,21 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "acw" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/machinery/light/small, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "acx" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -425,17 +426,6 @@ }, /turf/open/space/basic, /area/space) -"afq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "afs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -449,9 +439,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/aft) "afA" = ( @@ -534,15 +521,33 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "agQ" = ( +/obj/structure/closet, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/item/clothing/shoes/sneakers/white, +/obj/effect/turf_decal/tile/blue, /obj/machinery/light_switch{ pixel_y = -26 }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/camera/autoname{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "agZ" = ( /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, @@ -550,13 +555,6 @@ "ahn" = ( /turf/closed/wall, /area/maintenance/fore/secondary) -"ahp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "ahB" = ( /obj/effect/spawner/room/tenxten, /turf/open/floor/plating, @@ -570,21 +568,9 @@ /turf/open/floor/noslip/standard, /area/crew_quarters/toilet) "ahD" = ( -/obj/structure/sign/poster/contraband/clown{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/effect/turf_decal/bot, -/obj/item/knife, -/obj/item/paint/green, -/obj/item/pushbroom, -/obj/item/reagent_containers/glass/bucket, +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/book/manual/wiki/sopservice, /turf/open/floor/iron, /area/hallway/secondary/service) "ahF" = ( @@ -683,20 +669,13 @@ "aiX" = ( /turf/closed/wall/r_wall, /area/security/brig) -"aja" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white/corner{ - dir = 8 +"ajb" = ( +/obj/machinery/clonepod/prefilled, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/white, +/area/medical/genetics) "ajn" = ( /turf/open/floor/iron, /area/security/courtroom) @@ -773,36 +752,21 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"akK" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/medical/chemistry) "akL" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Medbay Security Post"; - req_access_txt = "63" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" + dir = 1 }, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) -"akO" = ( -/obj/structure/sign/departments/minsky/medical/clone/cloning2{ - pixel_x = 32 + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/medical/sleeper) "akW" = ( /obj/machinery/computer/atmos_control/tank/oxygen_tank{ dir = 1 @@ -884,13 +848,6 @@ }, /turf/open/floor/iron, /area/storage/tools) -"alX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "alZ" = ( /obj/structure/closet/toolcloset, /turf/open/floor/iron, @@ -980,18 +937,12 @@ /turf/open/floor/iron/white, /area/medical/virology) "amQ" = ( -/obj/machinery/door/window/brigdoor/westleft{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/effect/landmark/start/paramedic, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "amY" = ( /obj/structure/chair{ dir = 1 @@ -1028,8 +979,9 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ant" = ( -/obj/structure/flora/grass/jungle, -/turf/open/floor/plating/dirt/jungle, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, /area/medical/genetics) "anw" = ( /obj/effect/turf_decal/tile/red{ @@ -1125,22 +1077,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/maintenance/port/fore) -"apg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/grille, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "aph" = ( /turf/closed/wall, /area/lawoffice) @@ -1177,12 +1113,6 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/space, /area/space/nearstation) -"apY" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "aqx" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -1254,11 +1184,10 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "ask" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/table/optable, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/sleeper) "asw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1284,26 +1213,21 @@ /turf/open/floor/plating, /area/construction/mining/aux_base) "asK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/landmark/start/clown, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "asO" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port/fore) "asT" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -1315,8 +1239,8 @@ icon_state = "0-2" }, /obj/machinery/vending/wardrobe/medi_wardrobe, -/turf/closed/wall, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "asY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1339,16 +1263,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "atd" = ( -/obj/machinery/door/airlock/medical{ - name = "Observation" - }, -/obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/medical/surgery) +/area/medical/cryo) "atl" = ( /mob/living/simple_animal/butterfly, /obj/machinery/light{ @@ -1404,17 +1322,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "atN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table, /obj/machinery/microwave{ pixel_x = -3; @@ -1426,7 +1333,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/iron/checker, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "atR" = ( /obj/effect/landmark/carpspawn, @@ -1645,16 +1552,14 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "awq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/chemistry) "awr" = ( /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -1745,27 +1650,19 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "axm" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/wood, -/area/medical/break_room) -"axx" = ( +/obj/structure/table, /obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/computer/operating{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/effect/loot_jobscale/medical/first_aid_kit, +/turf/open/floor/iron/white, +/area/medical/storage) "axy" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -1787,6 +1684,12 @@ }, /turf/open/floor/prison/dark, /area/security/execution/transfer) +"axP" = ( +/obj/structure/table/wood/poker, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/toy/cards/deck, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "axV" = ( /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/dark, @@ -1881,19 +1784,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"azo" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "azv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -2120,10 +2010,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/atmos) -"aCM" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) "aCP" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, @@ -2287,17 +2173,6 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/iron, /area/engine/engineering) -"aFi" = ( -/obj/machinery/holopad{ - pixel_y = 16 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "aFm" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2422,6 +2297,26 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /turf/open/floor/iron/grid/steel, /area/storage/tech) +"aGK" = ( +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/sleeper) +"aGM" = ( +/obj/structure/table, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/fax/service, +/turf/open/floor/iron, +/area/hallway/secondary/service) "aGZ" = ( /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; @@ -2568,19 +2463,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/crew_quarters/fitness) -"aIj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "aIp" = ( /turf/closed/wall, /area/hydroponics) @@ -2923,6 +2805,15 @@ "aMr" = ( /turf/open/floor/wood, /area/crew_quarters/theatre) +"aML" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "aMM" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -30 @@ -2936,6 +2827,12 @@ }, /turf/open/floor/iron, /area/security/checkpoint/science) +"aMV" = ( +/obj/structure/closet, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "aMW" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/iron/dark, @@ -3086,12 +2983,17 @@ /turf/open/floor/iron/dark, /area/chapel/main) "aOb" = ( -/obj/structure/chair/fancy/bench{ - dir = 8; - pixel_x = 6 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "aOd" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -3481,13 +3383,17 @@ /turf/open/floor/wood, /area/library) "aRP" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "aRQ" = ( /obj/machinery/door/morgue{ name = "Private Study"; @@ -3672,6 +3578,12 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"aTy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "aTz" = ( /obj/structure/table, /turf/open/floor/iron, @@ -3718,18 +3630,6 @@ /turf/closed/wall, /area/bridge) "aTR" = ( -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -3737,7 +3637,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "aUi" = ( /obj/machinery/photocopier, @@ -4134,15 +4034,15 @@ /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) "aYL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/chair/fancy/sofa/old/right{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "aYV" = ( /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -4255,13 +4155,6 @@ "aZK" = ( /turf/closed/wall, /area/quartermaster/sorting) -"aZL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/surgery) "aZM" = ( /turf/closed/wall/r_wall, /area/bridge/meeting_room) @@ -4271,16 +4164,6 @@ "aZV" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) -"bab" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "bag" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -4406,16 +4289,20 @@ dir = 1 }, /area/hallway/secondary/entry) -"bbg" = ( -/obj/structure/curtain/directional{ - dir = 8 +"bbe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/structure/curtain/directional{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/surgery) +/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"bbg" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/cryo) "bbp" = ( /obj/structure/chair/office{ dir = 4 @@ -4465,19 +4352,6 @@ dir = 1 }, /area/hallway/secondary/exit) -"bbJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/item/cigbutt/cigarbutt, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "bbK" = ( /obj/machinery/atmospherics/components/binary/valve, /turf/open/floor/plating, @@ -4498,23 +4372,14 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "bbT" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/vending/cigarette, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, /obj/machinery/camera/autoname/directional/west{ network = list("ss13, engine") }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "bbV" = ( /obj/machinery/firealarm{ dir = 4; @@ -4559,10 +4424,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"bcr" = ( -/obj/machinery/camera/autoname, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "bcs" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -4611,6 +4472,10 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"bdf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/medbay/central) "bdi" = ( /obj/effect/spawner/randomarcade, /turf/open/floor/wood, @@ -4620,12 +4485,6 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"bds" = ( -/obj/machinery/camera/autoname{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "bdv" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=HOP2"; @@ -4648,10 +4507,6 @@ icon_state = "1-2" }, /obj/structure/cable/yellow, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoprivacy"; - name = "Office Privacy Shutters" - }, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "bdJ" = ( @@ -4685,16 +4540,6 @@ /obj/item/clothing/under/color/rainbow, /turf/open/floor/plating, /area/maintenance/port) -"bed" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -27 - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "beo" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Stbd"; @@ -4903,9 +4748,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -5006,19 +4850,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"bgl" = ( -/obj/structure/closet/crate/wooden/toy, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/requests_console{ - department = "Theatre"; - name = "theatre RC"; - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "bgr" = ( /obj/machinery/door/airlock{ name = "Unit 4" @@ -5048,12 +4879,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/quartermaster/sorting) -"bgK" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "bgN" = ( /turf/open/floor/iron/dark, /area/engine/gravity_generator) @@ -5280,7 +5105,10 @@ /area/science/research) "bii" = ( /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -5411,10 +5239,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/brig) -"biY" = ( -/obj/effect/spawner/lootdrop/glowstick, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "bja" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -5522,12 +5346,8 @@ /obj/item/book/manual/wiki/medical_cloning{ pixel_y = 6 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "bjz" = ( /turf/closed/wall/r_wall, /area/maintenance/central) @@ -5551,6 +5371,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"bjT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "bjX" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -5899,6 +5725,13 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"bnA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "bnG" = ( /obj/machinery/computer/bounty, /turf/open/floor/iron, @@ -6192,6 +6025,10 @@ "bqH" = ( /turf/closed/wall/r_wall, /area/teleporter) +"bqO" = ( +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "brc" = ( /obj/structure/chair, /turf/open/floor/iron/white, @@ -6323,9 +6160,16 @@ }, /area/science/research) "bsY" = ( -/obj/machinery/vending/cola, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/machinery/iv_drip, +/obj/structure/bed/roller, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "bta" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -6357,22 +6201,6 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"btx" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/grille/broken, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "bty" = ( /obj/structure/chair{ dir = 8 @@ -6718,16 +6546,15 @@ /area/security/checkpoint/science) "byj" = ( /obj/machinery/holopad, -/obj/effect/landmark/start/geneticist, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/landmark/start/geneticist, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "byk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -6773,14 +6600,6 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"byB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "byE" = ( /turf/open/floor/iron, /area/quartermaster/miningdock) @@ -6802,22 +6621,22 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "byO" = ( -/obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - pixel_y = 1; - req_access_txt = "9"; - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/genetics) "byT" = ( -/obj/effect/turf_decal/trimline/dark_red/line, -/obj/effect/turf_decal/trimline/white/corner{ - dir = 4 +/obj/machinery/door/airlock/medical{ + name = "Autopsy Room A"; + req_access_txt = "6;5" }, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "byU" = ( /obj/machinery/light, /turf/open/floor/iron, @@ -6923,14 +6742,9 @@ /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "bzU" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "bAb" = ( /obj/structure/chair/office{ dir = 8 @@ -7019,19 +6833,7 @@ }, /area/science/research) "bBP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/iron/white, /area/medical/genetics) "bBS" = ( @@ -7158,14 +6960,26 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"bCD" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ +"bCB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) +"bCR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "bDb" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) @@ -7187,11 +7001,29 @@ /turf/open/floor/iron, /area/science/storage) "bDi" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479" +/obj/structure/table, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 }, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/glass/bottle/morphine{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "bDk" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -7324,19 +7156,12 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bEL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/computer/scan_consolenew{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics) "bEO" = ( @@ -7443,14 +7268,12 @@ /turf/open/floor/iron/white, /area/science/mixing) "bGD" = ( -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "bGQ" = ( @@ -7532,6 +7355,15 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/aft) +"bHV" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Main Hall"; + req_access_txt = "5" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/sleeper) "bIe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/status_display/evac{ @@ -7543,26 +7375,14 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "bIn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" - }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, /area/medical/medbay/lobby) "bIr" = ( /turf/closed/wall, /area/medical/cryo) -"bIs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/item/cigbutt{ - pixel_x = 9; - pixel_y = -3 - }, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) "bIx" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -7619,10 +7439,14 @@ /turf/open/floor/plating, /area/science/xenobiology) "bIV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/open/floor/carpet/grimy, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "bIW" = ( /obj/effect/turf_decal/stripes/line{ @@ -7850,9 +7674,9 @@ /area/quartermaster/miningdock) "bKz" = ( /obj/machinery/dna_scannernew, -/obj/machinery/light, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics) "bKN" = ( @@ -8148,16 +7972,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"bMJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) "bMK" = ( /turf/closed/wall, /area/engine/atmos) @@ -8764,16 +8578,13 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "bPZ" = ( +/obj/structure/closet/secure_closet/freezer/cream_pie, +/obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/vending/autodrobe, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron, +/area/crew_quarters/theatre) "bQa" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -8976,13 +8787,7 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "bRN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, +/obj/machinery/chem_dispenser/mutagensaltpetersmall, /turf/open/floor/iron, /area/hydroponics) "bRO" = ( @@ -9279,16 +9084,15 @@ /turf/open/floor/catwalk_floor, /area/engine/atmos) "bTm" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/iron, /area/hydroponics) @@ -10319,14 +10123,20 @@ /turf/open/floor/iron/white, /area/medical/virology) "bYZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/table, +/obj/machinery/vending/wallmed{ + pixel_x = 28 }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/glove_box, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 8 + }, /turf/open/floor/iron/white, /area/medical/surgery) "bZb" = ( @@ -10642,20 +10452,16 @@ /turf/open/floor/iron, /area/hallway/primary/central) "cai" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 + dir = 5 }, -/turf/open/floor/carpet/blue, -/area/medical/break_room) +/obj/effect/landmark/start/paramedic, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/storage) "caj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10686,12 +10492,12 @@ /turf/open/floor/plating, /area/engine/atmos) "caq" = ( -/obj/item/broken_bottle, -/obj/effect/decal/cleanable/glass, -/obj/machinery/light/small{ +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/open/floor/plating/rust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "car" = ( /obj/structure/cable/yellow{ @@ -11230,14 +11036,12 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "cdE" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/machinery/sleeper, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/chair/fancy/bench{ - pixel_y = 13 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "cdR" = ( /obj/machinery/atmospherics/components/unary/tank/air, /turf/open/floor/plating, @@ -11474,12 +11278,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ceV" = ( -/obj/structure/holohoop{ - dir = 8 - }, -/turf/open/floor/wood/big, -/area/maintenance/aft) "ceW" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -11519,16 +11317,13 @@ /turf/closed/wall, /area/maintenance/disposal/incinerator) "cfl" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/obj/structure/curtain, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/sleeper) "cfr" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -11862,15 +11657,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"chD" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) "chG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11976,6 +11762,17 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/space, /area/space/nearstation) +"ciw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "cix" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/closed/wall/r_wall, @@ -11986,6 +11783,15 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"ciI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "ciL" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -12171,12 +11977,9 @@ /turf/open/space/basic, /area/space/nearstation) "ckf" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/obj/machinery/smartfridge/chemistry, +/turf/closed/wall, +/area/medical/sleeper) "cki" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -12442,16 +12245,15 @@ /turf/open/floor/iron, /area/engine/engineering) "cmH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/central) "cmU" = ( @@ -12566,6 +12368,18 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"coc" = ( +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "coe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -12592,21 +12406,6 @@ }, /turf/open/floor/carpet/green, /area/security/detectives_office) -"coq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "cos" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12662,6 +12461,15 @@ }, /turf/open/space, /area/solar/starboard/aft) +"cpn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "cpq" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -12903,17 +12711,6 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/closed/wall/r_wall, /area/engine/supermatter) -"cqG" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 18 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "cqN" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -13119,19 +12916,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"crO" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/stool/directional/west, -/turf/closed/wall, -/area/crew_quarters/bar) "crR" = ( /obj/structure/transit_tube, /obj/effect/turf_decal/stripes/line{ @@ -13352,6 +13136,18 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) +"cth" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "cti" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -13556,18 +13352,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/aft) -"cwB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) "cwG" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -13576,6 +13360,10 @@ /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) +"cwS" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/medical/morgue) "cwV" = ( /obj/docking_port/stationary/random{ dir = 8; @@ -13709,10 +13497,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"cyC" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/apothecary) "cyF" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -13905,15 +13689,8 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "cAA" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/holopad{ - pixel_x = 16 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/iron/white, /area/medical/genetics) @@ -14171,6 +13948,16 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"cCk" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/eastleft{ + name = "Hydroponics Desk"; + req_access_txt = "35" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/kitchen) "cCo" = ( /obj/machinery/gateway{ dir = 6 @@ -14262,16 +14049,8 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "cCX" = ( -/obj/machinery/power/apc/auto_name/south{ - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/structure/closet/secure_closet/security/science, -/obj/structure/cable/yellow, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "cDe" = ( /obj/structure/closet/radiation, /turf/open/floor/iron, @@ -15003,24 +14782,41 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "cGl" = ( -/obj/structure/curtain/directional{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/medical/surgery) -"cGt" = ( -/obj/structure/chair/stool/bar{ - dir = 8 +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "cGx" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /obj/machinery/meter, /turf/open/floor/engine, /area/engine/engineering) +"cGy" = ( +/obj/machinery/door/airlock/medical{ + name = "Morgue"; + req_access_txt = "6;5" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "cGC" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -15105,17 +14901,9 @@ /turf/open/floor/plating, /area/engine/engineering) "cHh" = ( -/obj/structure/closet/crate/wooden, -/obj/item/clothing/under/costume/gondola, -/obj/item/clothing/under/costume/jabroni, -/obj/item/clothing/under/costume/mech_suit/blue, -/obj/item/clothing/under/costume/mech_suit/white, -/obj/item/clothing/under/costume/villain, -/obj/item/clothing/suit/hooded/ian_costume, -/obj/item/clothing/suit/costume/pirate/captain, -/obj/item/clothing/head/costume/rabbitears, -/obj/item/clothing/suit/costume/madsci, -/obj/item/clothing/under/costume/russian_officer, +/obj/structure/chair/stool{ + pixel_y = 8 + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "cHj" = ( @@ -15340,9 +15128,20 @@ /turf/open/floor/iron, /area/quartermaster/office) "cJn" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance"; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "cJv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -15441,11 +15240,30 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"cMa" = ( +"cLt" = ( +/obj/structure/table, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/clothing/neck/stethoscope, +/obj/item/storage/box/bodybags, /obj/item/radio/intercom{ - pixel_x = 26 + pixel_y = 20 }, /turf/open/floor/iron/white, +/area/medical/storage) +"cMa" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/mob/living/carbon/monkey, +/turf/open/floor/iron, /area/medical/genetics) "cMm" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -15458,15 +15276,16 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "cMB" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/structure/dresser, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron, +/area/crew_quarters/theatre) "cMD" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) @@ -15501,11 +15320,12 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "cNw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/chair{ dir = 1 }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "cNy" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ @@ -15513,13 +15333,6 @@ }, /turf/open/space/basic, /area/engine/atmos) -"cNB" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/iron, -/area/hydroponics) "cNG" = ( /turf/open/floor/iron, /area/quartermaster/sorting) @@ -15538,7 +15351,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOh" = ( -/obj/machinery/airalarm/directional/east, +/obj/machinery/door/window{ + dir = 4; + name = "Theatre Stage" + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "cOl" = ( @@ -16005,21 +15821,15 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"cWX" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/ore_box, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +"cWP" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "cXc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"cXr" = ( -/turf/open/floor/wood/big, -/area/maintenance/aft) "cXG" = ( /obj/machinery/door/airlock/maintenance{ name = "Air Supply Maintenance"; @@ -16046,6 +15856,13 @@ }, /turf/open/floor/iron/dark, /area/security/prison) +"cZL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "cZO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -16101,11 +15918,8 @@ }, /obj/item/storage/box/bodybags, /obj/item/pen, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "dao" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -16145,21 +15959,15 @@ /turf/open/floor/plating, /area/security/courtroom) "dbe" = ( +/obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/dark_blue{ dir = 8 }, /obj/effect/turf_decal/tile/dark_blue{ dir = 8 }, -/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/hallway/primary/central) -"dbl" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "dbN" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -16176,19 +15984,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) -"dbS" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/bar/atrium) "dcB" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -16205,32 +16000,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"dcK" = ( -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) "dcN" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -16279,6 +16048,24 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"ddG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/security/checkpoint/medical) "ded" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -16293,29 +16080,11 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "dev" = ( -/obj/structure/closet, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/shoes/sneakers/white, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, -/obj/item/clothing/under/color/random, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "deB" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -16384,19 +16153,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) -"dfT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/mopbucket, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "dfV" = ( /obj/machinery/button/door{ id = "quarantineshutters"; @@ -16445,16 +16201,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/central) -"dhk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) "dhE" = ( /obj/structure/chair/office/light{ dir = 1 @@ -16508,15 +16254,6 @@ }, /turf/open/floor/iron/tech, /area/ai_monitored/storage/eva) -"dje" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/chair/stool/bar{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "djk" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -16559,15 +16296,12 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "djG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 +/obj/machinery/newscaster{ + pixel_y = -28 }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "djN" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -16588,13 +16322,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"dko" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "dkp" = ( /obj/effect/turf_decal/bot_white/left, /turf/open/floor/engine/light, @@ -16604,7 +16331,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, /area/hallway/primary/starboard) "dlw" = ( @@ -16653,6 +16379,14 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"dmc" = ( +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "dmo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16666,13 +16400,18 @@ /turf/open/floor/iron/dark, /area/security/brig) "dmX" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/table/optable, -/obj/machinery/light_switch{ - pixel_y = -22 +/obj/structure/sign/poster/official/random{ + pixel_y = -32 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/structure/disposalpipe/sorting/mail{ + dir = 8; + sortType = 9 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "dnl" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -16785,16 +16524,6 @@ }, /turf/open/floor/engine/n2, /area/engine/atmos) -"dpF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/landmark/start/assistant, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 8 - }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) "dqA" = ( /obj/structure/table/glass, /obj/item/reagent_containers/syringe/antiviral{ @@ -16836,9 +16565,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"dqU" = ( -/turf/open/floor/carpet/grimy, -/area/hallway/primary/starboard) "drh" = ( /obj/machinery/computer/cryopod{ pixel_y = 25 @@ -16846,14 +16572,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/prison/dark, /area/security/prison) -"drp" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/white, -/area/medical/chemistry) "dry" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -16896,6 +16614,13 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"dtl" = ( +/obj/machinery/door/window/southright{ + name = "Bar Door"; + req_one_access_txt = "25;28" + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "dts" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -16908,21 +16633,6 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) -"dtA" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/wood, -/obj/structure/chair/fancy/comfy{ - color = "#666666"; - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "dtC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -16990,15 +16700,16 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "duf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 1 +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/sleeper) "dun" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/machinery/light/small{ @@ -17033,10 +16744,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) -"duE" = ( -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/wood/big, -/area/maintenance/aft) "duR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -17076,11 +16783,11 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "dvT" = ( -/obj/machinery/vending/wardrobe/bar_wardrobe, -/obj/effect/turf_decal/siding/wood{ - layer = 1 +/obj/structure/sink/kitchen{ + pixel_y = 28 }, -/turf/open/floor/wood/big, +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood, /area/crew_quarters/bar) "dvV" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -17132,13 +16839,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"dwq" = ( -/obj/machinery/smartfridge/organ, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/surgery) "dwA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17156,23 +16856,8 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "dwM" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = 28 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/directional/north, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "dwU" = ( /obj/effect/landmark/event_spawn, @@ -17240,13 +16925,30 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) +"dyt" = ( +/obj/structure/table, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 13; + pixel_y = 5 + }, +/obj/item/watertank, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/turf/open/floor/iron, +/area/hydroponics) "dyy" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/chair/fancy/sofa/corp{ - dir = 1 +/obj/structure/sign/plaques/deempisi{ + pixel_y = -28 }, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "dyE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -17267,16 +16969,30 @@ }, /turf/open/floor/iron, /area/science/explab) -"dyV" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 +"dyU" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/structure/filingcabinet, -/turf/open/floor/wood, -/area/medical/exam_room) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"dyV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "dzG" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17366,32 +17082,15 @@ /turf/open/floor/wood, /area/vacant_room/office) "dBg" = ( -/obj/machinery/holopad, -/obj/machinery/button/door{ - desc = "A remote control switch for the medbay foyer."; - id = "MedbayFoyer"; - name = "Medbay Left Doors Control"; - normaldoorcontrol = 1; - pixel_x = 25; - pixel_y = -24; - req_access_txt = "5" - }, -/obj/machinery/button/door{ - id = "medbay_front_door"; - name = "Medbay Right Doors Control"; - normaldoorcontrol = 1; - req_access_txt = "5"; - dir = 4; - pixel_y = -24; - pixel_x = 39 - }, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/light{ dir = 4 }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "dBh" = ( @@ -17410,19 +17109,6 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "dBk" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/landmark/start/mime, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, @@ -17432,11 +17118,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) -"dBu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/theatre) "dBA" = ( /obj/machinery/suit_storage_unit/captain, /turf/open/floor/wood, @@ -17463,6 +17145,10 @@ }, /turf/open/floor/iron, /area/security/brig) +"dCE" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "dCJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17470,6 +17156,11 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron, /area/hallway/primary/port) +"dCL" = ( +/obj/structure/table, +/obj/item/kitchen/fork, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "dCN" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -17559,21 +17250,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"dDT" = ( -/obj/structure/table/wood, -/obj/item/storage/box/beanbag{ - pixel_y = 9 - }, -/obj/item/storage/box/beanbag{ - pixel_y = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "dEo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/spawner/structure/window/reinforced, @@ -17641,11 +17317,6 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"dFb" = ( -/obj/effect/spawner/lootdrop/gloves, -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "dFp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -17680,12 +17351,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = -25 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/item/radio/intercom{ - pixel_y = -29 - }, /turf/open/floor/iron, /area/crew_quarters/fitness) "dGB" = ( @@ -17701,7 +17372,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -17714,6 +17384,15 @@ /obj/structure/bookcase/random, /turf/open/floor/iron, /area/quartermaster/exploration_prep) +"dGZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "dHJ" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -17847,11 +17526,6 @@ /turf/open/floor/iron/white, /area/science/research) "dJQ" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/bodycontainer/crematorium{ id = "crematoriumChapel" }, @@ -17904,13 +17578,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"dKt" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "dLe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17981,12 +17648,15 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "dMw" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 8; + pixel_y = 6 }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/item/storage/box/medsprays, +/obj/item/hand_labeler, +/turf/open/floor/iron/white, +/area/medical/chemistry) "dMB" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18042,23 +17712,15 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/white, /area/science/mixing) -"dNd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar/half/contrasted{ +"dNp" = ( +/obj/machinery/sleeper{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"dNp" = ( -/obj/item/radio/intercom{ - pixel_x = -29; - pixel_y = -2 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "dNs" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -18100,29 +17762,16 @@ /obj/structure/bed, /turf/open/floor/iron/white, /area/medical/virology) -"dOd" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "dOw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" + dir = 9 }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/effect/landmark/start/paramedic, +/turf/open/floor/iron/dark, +/area/medical/surgery) "dOz" = ( /obj/effect/turf_decal/pool/corner, /turf/open/floor/iron, @@ -18251,6 +17900,12 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) +"dRt" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "dRx" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; @@ -18273,9 +17928,12 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hop) "dRW" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/iron/checker, -/area/crew_quarters/bar/atrium) +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/machinery/light, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "dSm" = ( /obj/machinery/conveyor{ dir = 4; @@ -18289,22 +17947,24 @@ /turf/open/floor/plating, /area/quartermaster/storage) "dSV" = ( -/obj/structure/chair{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "dTj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 +/obj/structure/table/optable, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/surgery) "dTo" = ( +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33" + }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -18320,25 +17980,12 @@ /turf/open/floor/iron/dark, /area/teleporter) "dTB" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/door/window/eastright{ - name = "Hydroponics Delivery"; - req_access_txt = "35" +/obj/structure/sink{ + pixel_y = 30 }, -/obj/structure/window/reinforced, /turf/open/floor/iron, /area/hydroponics) "dTD" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/closet/emcloset, /obj/machinery/camera/autoname/directional/west{ network = list("ss13, engine") @@ -18347,7 +17994,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "dTK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -18451,12 +18098,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"dVe" = ( -/obj/structure/sign/plaques/deempisi{ - pixel_x = -32 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "dVk" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -18481,17 +18122,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "dWx" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/chair/fancy/bench{ - pixel_y = 13 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/iv_drip, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -18500,8 +18130,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "dWV" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -18513,19 +18143,14 @@ /area/bridge) "dXy" = ( /obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" +/obj/item/folder/white, +/obj/item/pen, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/medical/medbay/lobby) "dXA" = ( /obj/machinery/status_display/evac{ @@ -18604,6 +18229,24 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"dYR" = ( +/obj/machinery/button/door{ + id = "Toilet2"; + name = "Lock Control"; + normaldoorcontrol = 1; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "dYW" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -18619,12 +18262,16 @@ /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "dYX" = ( -/obj/structure/holohoop{ - dir = 4 +/obj/structure/table/glass, +/obj/item/storage/box/bodybags, +/obj/machinery/camera/autoname{ + dir = 5 }, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "dZe" = ( /obj/item/radio/intercom{ pixel_y = -29 @@ -18643,10 +18290,6 @@ "dZF" = ( /turf/closed/wall, /area/crew_quarters/kitchen/coldroom) -"dZH" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/medical/genetics/cloning) "dZI" = ( /obj/effect/turf_decal/siding/thinplating_new, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -18717,21 +18360,6 @@ }, /turf/open/floor/iron, /area/science/research) -"eas" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Bar Storage Maintenance"; - req_access_txt = "25" - }, -/turf/open/floor/plating, -/area/crew_quarters/bar) "eaC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -18806,24 +18434,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"ebD" = ( -/obj/structure/table/wood, -/obj/machinery/camera{ - c_tag = "Bar - Backroom" - }, -/obj/item/gun/ballistic/shotgun/doublebarrel, -/obj/item/stack/spacecash/c1{ - pixel_y = 11 - }, -/obj/item/stack/spacecash/c100{ - pixel_y = 10 - }, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "ecx" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -18898,12 +18508,12 @@ }, /turf/open/floor/iron/dark, /area/hallway/primary/port) +"edy" = ( +/turf/closed/wall, +/area/crew_quarters/heads/cmo) "edz" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/blue, -/obj/machinery/newscaster{ - pixel_y = -32 - }, /turf/open/floor/iron, /area/hallway/primary/starboard) "edD" = ( @@ -18969,6 +18579,19 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/warden) +"eeV" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 30 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "eeW" = ( /obj/machinery/door/airlock/security{ name = "Equipment Room"; @@ -19013,21 +18636,6 @@ /turf/open/floor/grass, /area/security/prison) "efx" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/landmark/start/clown, /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -19035,7 +18643,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "efz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -19071,6 +18679,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"egM" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -3 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "egN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -19109,7 +18728,13 @@ /turf/open/floor/iron, /area/quartermaster/qm) "eiN" = ( -/turf/open/floor/plating/dirt/jungle, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/iron, /area/medical/genetics) "eja" = ( /obj/effect/turf_decal/bot, @@ -19119,8 +18744,17 @@ /turf/open/floor/iron/dark, /area/science/nanite) "ejy" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/chair/fancy/corp, +/obj/structure/chair, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "ejB" = ( @@ -19130,20 +18764,19 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "ejG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/vending/wardrobe/chef_wardrobe, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) +"ejI" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ejP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -19151,12 +18784,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ejR" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "ejT" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, @@ -19270,31 +18906,22 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/vending/medical{ pixel_x = -2 }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/digital_clock/directional/east, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "elL" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"elM" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/chair/fancy/sofa/old/left{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "elQ" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -19431,21 +19058,19 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "enT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/button/door{ + id = "kitchen"; + name = "Kitchen Shutters Control"; + pixel_x = -1; + pixel_y = -24; + req_access_txt = "28" }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "eoj" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -19454,8 +19079,8 @@ /obj/machinery/light_switch{ pixel_y = -26 }, -/turf/open/floor/wood, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "eoN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -19503,8 +19128,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) @@ -19601,18 +19226,6 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "erN" = ( -/obj/machinery/camera/autoname{ - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) @@ -19625,6 +19238,15 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"erY" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "esa" = ( /obj/structure/chair/stool/directional/west, /obj/structure/cable/yellow{ @@ -19675,10 +19297,10 @@ /obj/machinery/camera/autoname{ dir = 9 }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "esR" = ( /obj/structure/closet/bombcloset, @@ -19872,30 +19494,13 @@ /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "evS" = ( -/obj/structure/table, -/obj/item/food/piedough, -/obj/item/food/dough{ - pixel_y = 1 - }, -/obj/item/food/dough{ - pixel_x = -4 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/gibber, /obj/machinery/airalarm/kitchen_cold_room{ pixel_x = 22; dir = 4 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "ewc" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -20009,7 +19614,9 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "exK" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/computer/operating{ + dir = 8 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -20070,26 +19677,25 @@ /turf/open/floor/plating, /area/maintenance/central) "ezk" = ( -/obj/machinery/door/firedoor, -/obj/structure/curtain, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes{ - dir = 4 +/turf/open/floor/iron/white, +/area/medical/sleeper) +"ezr" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) -"ezr" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 5 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "ezu" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -20122,6 +19728,15 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/hallway/secondary/entry) +"ezT" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "kitchen shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "eAd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20201,7 +19816,23 @@ /turf/open/floor/wood, /area/vacant_room/office) "eBs" = ( -/obj/effect/turf_decal/tile/yellow, +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "eBz" = ( @@ -20214,18 +19845,27 @@ /turf/open/floor/catwalk_floor, /area/maintenance/starboard/aft) "eBB" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_x = -30 +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/light{ +/turf/open/floor/iron/white, +/area/medical/sleeper) +"eBH" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/vending/wardrobe/sec_wardrobe, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "eBT" = ( /obj/machinery/portable_atmospherics/pump, /turf/open/floor/iron, @@ -20273,16 +19913,6 @@ }, /turf/open/floor/iron, /area/hydroponics/garden) -"eCu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/crew_quarters/kitchen) "eCM" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/fullgrass, @@ -20299,7 +19929,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/medical/apothecary) "eCU" = ( @@ -20329,12 +19958,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"eDc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "eDu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -20397,15 +20020,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"eFs" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "eFB" = ( /obj/machinery/computer/station_alert, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -20432,22 +20046,19 @@ /turf/open/floor/engine, /area/gateway) "eFP" = ( -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) -"eFY" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer, -/obj/item/radio/intercom{ - pixel_y = 26 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/camera/autoname, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"eFY" = ( +/obj/machinery/computer/slot_machine, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "eGt" = ( @@ -20632,14 +20243,26 @@ }, /turf/open/floor/engine, /area/gateway) +"eJd" = ( +/mob/living/carbon/monkey/punpun, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "eJg" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "eJl" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -20776,6 +20399,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/maintenance/fore/secondary) +"eMT" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "eMU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20800,12 +20432,9 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "eNh" = ( -/obj/machinery/light{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /turf/open/floor/wood, /area/crew_quarters/theatre) "eNp" = ( @@ -20832,18 +20461,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"eNs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "eOa" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -20933,6 +20550,10 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"eQl" = ( +/obj/machinery/rnd/production/techfab/department/medical, +/turf/open/floor/iron/white, +/area/medical/storage) "eQz" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical{ @@ -20967,10 +20588,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "eRh" = ( @@ -21018,9 +20635,11 @@ /turf/open/floor/iron/dark, /area/security/prison) "eRP" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "eRQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -21086,18 +20705,18 @@ /turf/open/floor/catwalk_floor/iron, /area/maintenance/aft) "eSV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = 30 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "eTq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -21110,20 +20729,9 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "eTy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, +/obj/machinery/biogenerator, /turf/open/floor/iron, /area/hydroponics) -"eTG" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "eTK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21166,11 +20774,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"eUk" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) "eUt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -21210,12 +20813,6 @@ "eWC" = ( /turf/closed/wall, /area/maintenance/central) -"eWY" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "eXl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/engineering{ @@ -21228,29 +20825,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) -"eXr" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +"eXv" = ( +/obj/item/kirbyplants/random, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"eXv" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/bodycontainer/morgue, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "eXx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -21325,12 +20910,6 @@ /turf/open/floor/iron/white, /area/science/mixing/chamber) "eYy" = ( -/obj/effect/spawner/structure/window, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table/reinforced, /obj/item/wrench/medical, /obj/machinery/computer/med_data/laptop, @@ -21339,7 +20918,7 @@ pixel_x = 1; pixel_y = -26 }, -/turf/open/floor/plating, +/turf/open/floor/iron/white, /area/medical/medbay/lobby) "eYL" = ( /obj/structure/cable/yellow{ @@ -21393,15 +20972,6 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) -"eZo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "eZA" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -21471,20 +21041,9 @@ /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) "fbl" = ( -/obj/structure/chair/fancy/sofa/old/left{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/stool/directional/south, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "fbE" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -21609,15 +21168,18 @@ /turf/open/floor/iron/dark, /area/bridge) "fdS" = ( -/obj/effect/turf_decal/tile/white{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "few" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21721,14 +21283,11 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "fgX" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "fha" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -21817,28 +21376,11 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/entry) "fiJ" = ( -/obj/machinery/biogenerator, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/black/opposingcorners{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 }, /turf/open/floor/iron, /area/hydroponics) -"fiP" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/structure/bodycontainer/crematorium{ - id = "crematoriumChapel" - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/iron/dark, -/area/chapel/office) "fiU" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, @@ -21962,19 +21504,14 @@ /turf/open/floor/iron/white, /area/science/mixing) "flj" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"flr" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) +/turf/open/floor/wood, +/area/crew_quarters/theatre) "flF" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -22038,19 +21575,6 @@ }, /turf/open/floor/iron/white, /area/security/brig) -"fnN" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "fnS" = ( /obj/machinery/door/airlock/security/glass{ name = "Anti Radiation shielded room" @@ -22097,6 +21621,17 @@ /obj/item/bedsheet/red, /turf/open/floor/plating, /area/maintenance/fore) +"foF" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "foO" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -22117,16 +21652,20 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "fpi" = ( -/obj/machinery/light_switch{ - pixel_y = 28 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/icecream_vat, -/obj/effect/turf_decal/bot/right, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fpM" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -22179,19 +21718,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"fqf" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "fqi" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -22234,12 +21760,11 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "fqK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +/obj/structure/chair{ + dir = 4 }, -/obj/structure/disposalpipe/junction, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "fqQ" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -22256,12 +21781,16 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "frd" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = -31 +/obj/machinery/door/airlock/public/glass{ + name = "Hydroponics"; + req_access_txt = "35" }, -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/turf_decal/tile/green/anticorner/contrasted, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hydroponics) "frr" = ( @@ -22283,10 +21812,11 @@ /turf/open/floor/wood, /area/library) "frY" = ( -/obj/item/reagent_containers/glass/bucket, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, /area/hydroponics) "fsG" = ( /obj/structure/bed/roller, @@ -22327,6 +21857,19 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/security/prison) +"ftu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"ftC" = ( +/obj/structure/window/reinforced, +/obj/structure/table/wood, +/obj/item/instrument/violin, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "ftG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22334,6 +21877,23 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/virology) +"ftW" = ( +/obj/machinery/door/window/eastleft{ + dir = 2; + name = "Medical Delivery"; + req_access_txt = "5" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "ful" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22399,6 +21959,18 @@ }, /turf/open/floor/prison, /area/security/prison) +"fvB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "fvX" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -22456,19 +22028,16 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"fxi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 +"fxm" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/turf/open/floor/iron/white, +/area/medical/genetics) "fyh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22541,10 +22110,9 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "fAD" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, /area/hydroponics) "fAK" = ( /obj/machinery/porta_turret/ai{ @@ -22568,7 +22136,6 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "fBg" = ( @@ -22585,16 +22152,12 @@ /turf/open/floor/grass, /area/hallway/secondary/command) "fBH" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/bed/roller, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/chair/fancy/corp, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/medical/sleeper) "fBK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -22671,19 +22234,6 @@ /obj/structure/disposalpipe/segment, /turf/open/space, /area/space/nearstation) -"fDd" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "fDt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22706,6 +22256,20 @@ }, /turf/open/floor/iron/grid/steel, /area/gateway) +"fEb" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = 25 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "fEh" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -22756,21 +22320,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"fFh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "fFz" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -22912,26 +22461,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/exit) -"fJA" = ( -/obj/structure/sign/poster/official/help_others{ - pixel_y = 32 - }, -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "fJP" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_x = 26; + req_access_txt = "5" }, -/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "fJY" = ( @@ -23001,25 +22539,14 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "fLU" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 9 - }, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/wood/big, -/area/maintenance/aft) -"fMc" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/computer/operating{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "fMn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -23043,17 +22570,9 @@ /turf/open/floor/iron/white, /area/science/explab) "fMz" = ( -/obj/structure/table/wood, -/obj/item/toy/cards/deck, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/structure/closet/secure_closet/medical3, +/turf/open/floor/iron/white, +/area/medical/storage) "fMC" = ( /obj/effect/landmark/start/shaft_miner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -23072,10 +22591,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/maintenance/port/fore) -"fNc" = ( -/obj/structure/fluff/hedge/opaque, -/turf/open/floor/wood/big, -/area/crew_quarters/bar/atrium) +"fNe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "fNt" = ( /obj/structure/closet/secure_closet/security/sec, /obj/item/clothing/mask/balaclava, @@ -23101,23 +22632,11 @@ /turf/open/floor/iron, /area/quartermaster/office) "fNG" = ( -/obj/item/grown/bananapeel, -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/carbon/monkey, -/turf/open/floor/grass/no_border, -/area/medical/genetics) -"fOb" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/medical/genetics) "fOA" = ( /obj/structure/bed/dogbed/runtime, /obj/structure/cable/yellow{ @@ -23126,12 +22645,29 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) +"fOI" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "fPa" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 @@ -23140,18 +22676,14 @@ /turf/open/floor/iron/dark, /area/bridge/meeting_room) "fPd" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "fPr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -23172,17 +22704,14 @@ /turf/open/floor/iron, /area/security/brig) "fPu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/light_switch{ + pixel_y = 28 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Theatre Stage"; - req_one_access_txt = "46" +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/wood, +/area/crew_quarters/theatre) "fPz" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -23216,20 +22745,12 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "fPM" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" +/obj/structure/table, +/obj/machinery/smartfridge/disks{ + pixel_y = 2 }, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/hydroponics) -"fQg" = ( -/obj/machinery/vending/custom, -/obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "fQu" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, @@ -23238,38 +22759,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"fQC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Plumbing Factory"; - req_access_txt = "5; 33" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/storage) -"fQL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/cryo) "fRa" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted, /obj/structure/cable/yellow{ @@ -23343,6 +22832,21 @@ /obj/item/book/manual/wiki/sopcommand, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"fSO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fSS" = ( /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -23387,21 +22891,6 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"fTJ" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "fTL" = ( /obj/machinery/light/small{ dir = 4 @@ -23449,13 +22938,6 @@ }, /turf/open/floor/iron/dark, /area/tcommsat/computer) -"fTU" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/table/glass, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "fUp" = ( /obj/machinery/light{ dir = 1 @@ -23598,16 +23080,11 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "fVW" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/north{ pixel_y = 24 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "fWn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23718,20 +23195,8 @@ /obj/machinery/plumbing/pill_press{ dir = 4 }, -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33"; - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/open/floor/iron/white, -/area/medical/storage) +/area/medical/chemistry) "fYS" = ( /turf/open/floor/iron/dark/side{ dir = 4 @@ -23854,21 +23319,14 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "gcr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/sleeper) "gcC" = ( /obj/machinery/newscaster{ pixel_x = -30 @@ -23905,10 +23363,6 @@ "gdk" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoprivacy"; - name = "Office Privacy Shutters" - }, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "gdq" = ( @@ -23989,22 +23443,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "gey" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks, -/obj/machinery/requests_console{ - department = "Bar Counter"; - name = "Bar RC"; - pixel_y = 32; - receive_ore_updates = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, @@ -24013,15 +23451,14 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "geE" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/mob/living/simple_animal/hostile/retaliate/goat{ + name = "Pete" }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "geG" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, @@ -24043,26 +23480,16 @@ /turf/open/floor/iron/dark, /area/teleporter) "gfz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/cable/yellow, +/obj/machinery/power/apc/highcap/fifteen_k{ + name = "Medbay Central APC"; + pixel_y = -24 }, +/obj/item/storage/box/gloves, +/obj/structure/table, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "gfW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24104,24 +23531,12 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "ghy" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/item/storage/box/masks, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/table, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "ghL" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table, @@ -24179,21 +23594,6 @@ }, /turf/open/space, /area/space/nearstation) -"gis" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "chemistry_shutters"; - name = "Chemistry shutters" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/northleft{ - dir = 4; - icon_state = "right"; - name = "Chemistry Desk"; - req_access_txt = "5; 33" - }, -/turf/open/floor/plating, -/area/medical/apothecary) "giD" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -24221,6 +23621,17 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"gjz" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "gjG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -24280,9 +23691,6 @@ /obj/structure/disposalpipe/junction/flip{ dir = 2 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "gkL" = ( @@ -24295,23 +23703,13 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"gkN" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "gkP" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/turf/open/floor/iron, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/security/checkpoint/medical) "gkT" = ( /obj/machinery/door/airlock/public/glass{ name = "Visitation" @@ -24452,11 +23850,6 @@ /turf/open/floor/iron, /area/science/nanite) "gof" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/bed/roller, /obj/machinery/camera/autoname/directional/west{ network = list("ss13, engine") @@ -24467,8 +23860,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/closed/wall, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "gop" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; @@ -24620,6 +24013,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"gqT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "grf" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 4 @@ -24694,6 +24094,10 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) +"gsX" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "gto" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -24759,15 +24163,15 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "gup" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "guI" = ( @@ -24791,20 +24195,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"gwq" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/camera/autoname{ +"gvw" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/vending/wardrobe/chem_wardrobe, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"gwq" = ( /obj/structure/chair, /obj/machinery/airalarm/directional/east{ pixel_x = 24 @@ -24866,25 +24264,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"gxt" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) -"gxv" = ( -/obj/structure/barricade/wooden/crude, -/obj/structure/grille/broken, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Forbidden Dunking Zone Airlock"; - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "gxA" = ( /obj/structure/closet/wardrobe/white, /turf/open/floor/iron, @@ -24917,17 +24296,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"gya" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +"gyv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) -"gyv" = ( -/obj/structure/aquarium, -/turf/open/floor/wood, -/area/medical/exam_room) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "gzc" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -24940,17 +24317,12 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "gzk" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/directional/north, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/closed/wall, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "gzH" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -24979,8 +24351,17 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "gzO" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, +/obj/machinery/computer/operating{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/medical/surgery) "gzS" = ( /obj/structure/sign/warning/securearea{ @@ -25005,15 +24386,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "gAd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25052,24 +24427,29 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "gAZ" = ( -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" +/obj/machinery/shower{ + dir = 8 }, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" +/obj/structure/sign/poster/official/random{ + pixel_x = 32 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) +/turf/open/floor/noslip/white, +/area/medical/sleeper) +"gBy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gBM" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -25090,14 +24470,11 @@ /turf/open/floor/iron/white, /area/medical/virology) "gCa" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "gCm" = ( @@ -25108,19 +24485,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"gCo" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 37 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "gCt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -25242,25 +24606,12 @@ /turf/open/floor/iron/dark, /area/security/warden) "gFh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, +/obj/effect/landmark/event_spawn, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "gFw" = ( /turf/open/floor/prison/dark, /area/security/prison) -"gFA" = ( -/obj/structure/chair/fancy/sofa/old/right{ - color = "#742925"; - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/carpet/green, -/area/medical/exam_room) "gGm" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -25283,8 +24634,12 @@ /turf/open/floor/iron/dark, /area/storage/tech) "gGE" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/iron, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, /area/hallway/primary/starboard) "gGK" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -25362,6 +24717,10 @@ }, /turf/open/floor/iron/dark, /area/security/execution/transfer) +"gIM" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gJg" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -25446,13 +24805,24 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"gKR" = ( +/obj/structure/displaycase{ + desc = "A display case with a pestle straight from a museum. You might be in a big trouble if you need to use this."; + name = "archaic tool display case"; + start_showpiece_type = /obj/item/pestle + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "gKT" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "gLd" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25495,9 +24865,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "gLU" = ( @@ -25563,22 +24930,13 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "gOo" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/food/drinks/britcup{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/storage/box/matches{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/machinery/newscaster{ - pixel_y = -32 +/obj/machinery/light, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "gOp" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold, @@ -25609,10 +24967,6 @@ }, /turf/open/floor/iron/grid/steel, /area/teleporter) -"gPi" = ( -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) "gPp" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/item/pool/pool_noodle, @@ -25625,51 +24979,15 @@ "gQd" = ( /turf/closed/wall, /area/quartermaster/exploration_dock) -"gQK" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "gQS" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"gRt" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/bartender, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "gRG" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 +/obj/effect/landmark/start/botanist, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 }, /turf/open/floor/iron, /area/hydroponics) @@ -25684,19 +25002,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"gSI" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) "gSK" = ( /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, @@ -25749,23 +25054,9 @@ /obj/effect/spawner/randomvend/snack, /turf/open/floor/iron, /area/hallway/primary/central) -"gUA" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = null; - req_one_access = "28;25" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/crew_quarters/bar) "gUE" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/item/storage/box/disks{ - pixel_x = 1; - pixel_y = 2 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/genetics) @@ -25778,16 +25069,23 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/hallway/primary/fore) -"gVc" = ( -/obj/structure/table, +"gVb" = ( +/obj/structure/chair, +/obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"gVc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/bedsheetbin{ - pixel_x = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, /area/medical/surgery) "gVg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -25811,11 +25109,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/turf/open/floor/plating, +/area/maintenance/aft) +"gVm" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/plating, -/area/maintenance/aft) +/area/maintenance/starboard/fore) "gVW" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -25992,10 +25299,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"haD" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft) "hbe" = ( /obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/bot, @@ -26023,7 +25326,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "hbA" = ( @@ -26095,6 +25400,21 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/r_wall, /area/hallway/secondary/entry) +"hcT" = ( +/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = 26 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "hdf" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /obj/structure/cable/yellow{ @@ -26120,14 +25440,8 @@ /turf/open/floor/iron/white, /area/science/mixing/chamber) "hdI" = ( -/obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; - pixel_y = 30 - }, -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 1 }, /turf/open/floor/iron, /area/hydroponics) @@ -26180,13 +25494,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) -"heV" = ( -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/obj/effect/turf_decal/tile/dark_green, -/turf/open/floor/iron, -/area/hydroponics) "hff" = ( /obj/machinery/button/door{ id = "Dorm6"; @@ -26236,21 +25543,17 @@ /turf/open/floor/iron, /area/storage/primary) "hfM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "hfS" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -26287,16 +25590,10 @@ /turf/open/floor/iron, /area/storage/tools) "hgg" = ( -/obj/machinery/camera/autoname, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, +/obj/effect/landmark/start/geneticist, /turf/open/floor/iron/white, /area/medical/genetics) "hgh" = ( @@ -26306,28 +25603,23 @@ }, /turf/open/floor/iron/white, /area/medical/surgery) +"hgz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "hgO" = ( -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/wood, /area/crew_quarters/theatre) "hgW" = ( -/obj/item/hand_labeler{ - pixel_x = -9; - pixel_y = 13 - }, -/obj/structure/table/glass, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 4 - }, /turf/open/floor/iron/white, /area/medical/apothecary) "hha" = ( @@ -26335,12 +25627,6 @@ /turf/closed/wall, /area/hallway/secondary/exit) "hhg" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table/glass, /obj/item/storage/box/rxglasses, /obj/item/radio/intercom{ @@ -26350,7 +25636,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/grass/no_border, +/turf/open/floor/iron/white, /area/medical/genetics) "hhh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -26359,18 +25645,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/crew_quarters/locker) -"hhs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hig" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -26416,14 +25690,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"hiW" = ( -/obj/machinery/biogenerator, -/obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" +"hiU" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/plating, -/area/hydroponics) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hjj" = ( /obj/machinery/vending/medical, /turf/open/floor/iron/white, @@ -26504,11 +25776,6 @@ /turf/open/floor/prison/dark, /area/security/prison) "hlt" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/west{ pixel_x = -23 }, @@ -26518,7 +25785,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/turf/closed/wall, +/turf/open/floor/iron, /area/hallway/secondary/service) "hlD" = ( /obj/structure/cable/yellow{ @@ -26550,26 +25817,6 @@ /obj/item/stack/rods/fifty, /turf/open/floor/iron, /area/storage/tools) -"hmh" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/crew_quarters/kitchen/coldroom) "hmQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -26587,18 +25834,6 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) -"hnh" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/table, -/obj/machinery/reagentgrinder, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "hnp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26637,19 +25872,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"hon" = ( -/obj/machinery/computer/crew{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hos" = ( /obj/structure/chair/office{ dir = 4 @@ -26722,6 +25944,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) +"hpT" = ( +/obj/machinery/light_switch{ + pixel_y = 28 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hydroponics) "hqh" = ( /turf/open/floor/iron/white, /area/medical/virology) @@ -26818,13 +26049,12 @@ /turf/open/floor/iron/dark, /area/storage/tech) "hsw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "hsH" = ( @@ -26879,12 +26109,11 @@ /turf/open/floor/iron, /area/quartermaster/storage) "htY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "hua" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; @@ -26904,6 +26133,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"hui" = ( +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "hup" = ( /obj/effect/turf_decal/tile/yellow, /obj/machinery/light_switch{ @@ -26918,31 +26159,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"huU" = ( -/obj/structure/table/glass, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -6 - }, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = -6 - }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 8; - pixel_y = -2 - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "hvd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26972,16 +26188,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"hvK" = ( -/obj/machinery/computer/cloning{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/white, -/area/medical/genetics/cloning) "hvR" = ( /obj/machinery/airalarm/directional/west{ pixel_x = -22 @@ -27084,6 +26290,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"hyX" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Autopsy"; + req_access_txt = "5" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "hzb" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, @@ -27103,12 +26319,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = -30 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -27140,6 +26352,10 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/prison/dark, /area/security/prison) +"hAe" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/hydroponics) "hAh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27181,23 +26397,13 @@ /turf/open/floor/wood, /area/lawoffice) "hBo" = ( -/obj/structure/table, -/obj/machinery/plantgenes{ - pixel_y = 6 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, +/obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron, /area/hydroponics) "hBt" = ( -/obj/structure/table/reinforced, -/obj/item/food/pie/cream, -/turf/open/floor/iron, -/area/crew_quarters/bar) +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "hBv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27287,6 +26493,18 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"hCO" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/turf/open/floor/iron, +/area/hydroponics) "hDc" = ( /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; @@ -27337,10 +26555,19 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "hDn" = ( -/obj/effect/spawner/structure/window, -/obj/structure/curtain, -/turf/open/floor/plating, -/area/medical/cryo) +/obj/machinery/door/airlock/medical/glass{ + name = "Main Hall"; + req_access_txt = "5" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/sleeper) "hDp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -27402,15 +26629,12 @@ /turf/open/floor/plating, /area/maintenance/central) "hEU" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) -"hFa" = ( +/obj/structure/bed/roller, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, /turf/open/floor/iron/white, -/area/medical/surgery) +/area/medical/medbay/central) "hFx" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -27434,10 +26658,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/break_room) -"hGj" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, -/turf/open/floor/iron/white, -/area/medical/chemistry) "hGn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -27477,14 +26697,11 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "hHp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 + dir = 4 }, -/turf/open/floor/carpet/blue, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "hHC" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -27497,31 +26714,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"hHR" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "barcounter"; - name = "Bar Counter Shutters" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"hHU" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "hIb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27739,16 +26931,9 @@ /turf/open/floor/iron/techmaint, /area/storage/tech) "hLo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/autoname/directional/south, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "hLy" = ( /obj/machinery/firealarm{ dir = 4; @@ -27794,30 +26979,24 @@ /turf/open/floor/iron, /area/quartermaster/miningdock) "hML" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/computer/arcade/orion_trail{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/light{ dir = 8 }, /obj/structure/chair/stool/directional/south, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "hMS" = ( -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/obj/machinery/holopad{ - pixel_x = 16 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "hNp" = ( /obj/machinery/computer/security{ dir = 4; @@ -28057,14 +27236,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, /area/security/prison) -"hQG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "hQH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -28095,6 +27266,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/maintenance/aft) "hRz" = ( @@ -28169,13 +27343,15 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/hallway/primary/fore) -"hTp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) +"hSN" = ( +/obj/effect/landmark/blobstart, +/obj/item/toy/beach_ball/holoball, +/turf/open/floor/plating, +/area/crew_quarters/bar) +"hSR" = ( +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "hTX" = ( /obj/structure/bed/dogbed/walter, /mob/living/simple_animal/pet/dog/bullterrier/walter, @@ -28405,21 +27581,12 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "hXZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/holopad{ - pixel_x = 16 +/obj/machinery/computer/operating{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/sleeper) "hYi" = ( /obj/item/radio/intercom{ pixel_y = 24 @@ -28480,7 +27647,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "hYV" = ( /obj/structure/sign/departments/minsky/engineering/atmospherics{ @@ -28499,11 +27669,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "hZz" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -28512,7 +27677,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/surgery) "hZG" = ( /obj/structure/disposalpipe/segment{ @@ -28583,24 +27748,23 @@ /area/hallway/secondary/exit) "ibg" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"ibx" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "ibG" = ( /obj/machinery/nanite_programmer, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/science/nanite) +"ich" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "ict" = ( /obj/machinery/light_switch{ pixel_x = -22 @@ -28614,6 +27778,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron/white, /area/medical/apothecary) "icS" = ( @@ -28631,10 +27798,15 @@ /turf/open/floor/prison, /area/security/prison) "idr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable/yellow, -/turf/open/floor/plating, -/area/security/checkpoint/medical) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "idO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28680,16 +27852,22 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"ieu" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = 1; + pixel_y = 26 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "ieA" = ( /obj/machinery/light/small{ dir = 4 }, /turf/open/floor/engine, /area/science/xenobiology) -"ieB" = ( -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "ieX" = ( /obj/machinery/power/compressor{ comp_id = "incineratorturbine"; @@ -28836,34 +28014,17 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"igN" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "igO" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron, +/area/crew_quarters/theatre) "igW" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -28880,23 +28041,9 @@ /turf/open/floor/iron, /area/security/brig) "ihf" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/sleeper) "ihk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -28909,18 +28056,9 @@ /turf/open/floor/plating, /area/maintenance/fore) "ihl" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/depsec/medical, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/sleeper) "ihm" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 1 @@ -29011,9 +28149,9 @@ /area/storage/tools) "iiQ" = ( /obj/machinery/chem_heater, -/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -29258,19 +28396,15 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "ilX" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - name = "Connector Port (Air Supply)" - }, -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 + pixel_x = -27 }, -/obj/machinery/light{ - dir = 1 +/obj/structure/curtain, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/sleeper) "img" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29343,15 +28477,12 @@ /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) "iou" = ( -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "ioE" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -29359,32 +28490,15 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ioH" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/light_switch{ - pixel_x = 28 +"ioM" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 }, /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/crayons{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/storage/crayons{ - pixel_x = -1; - pixel_y = 1 + icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron/white, +/area/medical/cryo) "ioN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29395,12 +28509,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) -"ioP" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 10 +"ioQ" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = 5; + pixel_y = -2 }, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ips" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29464,6 +28584,16 @@ dir = 4 }, /area/engine/atmos) +"iqq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "iri" = ( /obj/machinery/door/airlock{ id_tag = "Dorm2"; @@ -29480,17 +28610,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/dorms) -"irH" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "irX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 9 @@ -29501,12 +28620,12 @@ /turf/open/floor/prison/dark, /area/security/execution/transfer) "isb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/effect/turf_decal/pool{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, /turf/open/floor/iron, /area/crew_quarters/fitness) "isc" = ( @@ -29514,18 +28633,19 @@ /turf/open/floor/iron/dark, /area/science/nanite) "isq" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/structure/table/wood, +/obj/structure/mirror{ + pixel_x = -28 }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/item/flashlight/lamp/bananalamp{ + pixel_y = 3 }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron, +/area/crew_quarters/theatre) "isy" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/red{ @@ -29593,15 +28713,26 @@ /obj/effect/turf_decal/bot_white/right, /turf/open/floor/engine/light, /area/engine/gravity_generator) -"iuJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +"iuC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) +"iuJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 1 }, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "iuQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29742,18 +28873,15 @@ /turf/open/floor/iron/dark, /area/security/prison) "iwd" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -29776,41 +28904,14 @@ /obj/item/bedsheet/brown, /turf/open/floor/iron/tech, /area/security/prison/shielded) -"iwn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"iwt" = ( -/obj/machinery/button/door{ - id = "barcounter"; - name = "Bar Counter Shutters"; - pixel_y = -24; - req_access_txt = "25"; - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "iwM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -29855,27 +28956,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) -"ixE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/book/manual/wiki/sopmedical{ - pixel_x = 10 - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "ixO" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -29962,19 +29042,15 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "iBf" = ( -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; - pixel_y = 30 - }, -/obj/machinery/microwave, -/obj/structure/table, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "iBE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/end{ @@ -30070,10 +29146,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "iCE" = ( /obj/effect/turf_decal/siding/wideplating/dark{ @@ -30227,12 +29303,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/item/book/manual/wiki/sopcommand, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, +/obj/item/book/manual/wiki/sopcommand, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "iHL" = ( /obj/structure/disposalpipe/segment{ @@ -30278,12 +29353,24 @@ pixel_y = -24 }, /obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) +"iIt" = ( +/obj/machinery/light/small, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/crew_quarters/heads/cmo) +/area/medical/morgue) "iIx" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, /obj/structure/closet/toolcloset, @@ -30292,6 +29379,9 @@ }, /turf/open/floor/iron/dark, /area/storage/tech) +"iIA" = ( +/turf/open/floor/wood, +/area/crew_quarters/bar) "iIE" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -30414,19 +29504,14 @@ /area/security/prison) "iMs" = ( /obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "iMu" = ( -/obj/item/gun/syringe, -/obj/structure/closet/secure_closet/medicaldanger{ - anchored = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, -/turf/open/floor/iron/dark, +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/iron/white, /area/medical/surgery) "iMv" = ( /obj/item/kirbyplants/random, @@ -30448,11 +29533,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"iMP" = ( -/obj/machinery/gibber, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "iMY" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -30481,28 +29561,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"iNh" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/open/floor/iron/white/corner, -/area/crew_quarters/kitchen) -"iNm" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "iNG" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -30575,14 +29633,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"iPc" = ( -/obj/structure/table/wood, -/obj/item/taperecorder{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/open/floor/carpet/green, -/area/medical/exam_room) "iPs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30672,14 +29722,15 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "iRh" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "iRk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -30742,17 +29793,14 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "iTg" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_y = -30 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron, /area/medical/genetics) "iTO" = ( /obj/machinery/holopad, @@ -30925,6 +29973,21 @@ dir = 1 }, /area/hallway/secondary/exit) +"iXu" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Bar Storage Maintenance"; + req_access_txt = "25" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "iXG" = ( /obj/machinery/modular_computer/console/preset/curator{ dir = 1 @@ -31043,7 +30106,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "iZV" = ( @@ -31127,11 +30192,14 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "jcb" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/light{ dir = 8 }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "jcc" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate" @@ -31201,18 +30269,21 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) "jcQ" = ( -/obj/structure/chair/wood{ +/obj/structure/chair/stool, +/obj/effect/landmark/start/mime, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/machinery/door/window/eastright{ - name = "Theatre Stage"; - dir = 2 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/structure/window/reinforced/tinted{ - dir = 8 +/turf/open/floor/iron/white/side{ + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "jcS" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -31274,8 +30345,15 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "jdx" = ( -/turf/open/floor/carpet/green, -/area/medical/exam_room) +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light_switch{ + pixel_y = -26 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "jdT" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -31384,9 +30462,9 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) "jfU" = ( -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/machinery/light, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "jfW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -31612,13 +30690,6 @@ /obj/item/pen, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"jkY" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/white/line, -/turf/open/floor/wood/big, -/area/maintenance/aft) "jlw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -31681,14 +30752,21 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) "jmR" = ( -/obj/machinery/holopad{ - pixel_y = 16 +/obj/structure/table, +/obj/item/storage/box/syringes{ + pixel_y = 5 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/item/reagent_containers/syringe{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/white, +/area/medical/chemistry) "jmU" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -31705,15 +30783,8 @@ }, /area/engine/atmos) "jnp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet/blue, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "jnu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -31815,37 +30886,12 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "joW" = ( -/obj/machinery/rnd/production/techfab/department/service, -/obj/effect/turf_decal/stripes/box, -/obj/structure/sign/poster/contraband/fun_police{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/hallway/secondary/service) -"jpd" = ( -/obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop{ - pixel_x = -2; - pixel_y = 3; - dir = 8 - }, -/turf/open/floor/wood, -/area/medical/exam_room) "jpp" = ( /obj/structure/railing{ dir = 4 @@ -31871,20 +30917,11 @@ /turf/open/floor/iron, /area/security/brig) "jpB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "jpE" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -31925,11 +30962,7 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "jrW" = ( -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "jsF" = ( /obj/machinery/firealarm{ @@ -31979,18 +31012,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jtG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/sign/directions/medical{ - pixel_y = 37; - dir = 8 - }, -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = 28 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "jui" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -32014,6 +31035,14 @@ }, /turf/open/floor/prison, /area/security/prison) +"juv" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/northleft{ + name = "Hydroponics Desk"; + req_access_txt = "35" + }, +/turf/open/floor/iron, +/area/hydroponics) "juw" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/sign/poster/official/cleanliness{ @@ -32118,14 +31147,14 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hos) "jwg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "jwy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -32324,6 +31353,18 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/vacant_room/commissary) +"jAK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) "jAL" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -32363,16 +31404,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"jAX" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/digital_clock/directional/north, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "jBp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Office"; @@ -32391,25 +31422,18 @@ /turf/open/floor/iron, /area/quartermaster/office) "jBD" = ( -/obj/machinery/camera/autoname{ - dir = 9 - }, -/obj/structure/table/wood, -/obj/machinery/newscaster{ - pixel_x = 30 +/obj/structure/closet/secure_closet/medical3, +/obj/machinery/light{ + dir = 4 }, -/turf/open/floor/wood, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "jBO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"jCi" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "jCm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -32443,36 +31467,30 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) "jDe" = ( -/obj/effect/spawner/structure/window, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/directional/north, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) -"jDu" = ( -/obj/machinery/vending/cola, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"jDG" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479"; +/turf/open/floor/iron/white/corner{ dir = 1 }, -/turf/open/floor/wood, -/area/medical/break_room) -"jDJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/area/hallway/primary/starboard) +"jDu" = ( +/turf/open/floor/iron/white/corner{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/area/hallway/primary/starboard) +"jDG" = ( +/obj/structure/table, +/obj/item/hand_labeler, +/obj/item/gun/syringe, +/obj/structure/extinguisher_cabinet{ + pixel_y = -31 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/item/crowbar, +/obj/item/book/manual/wiki/sopmedical, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/storage) "jDW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -32490,16 +31508,7 @@ /turf/open/floor/iron/dark, /area/gateway) "jEN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, +/obj/machinery/seed_extractor, /turf/open/floor/iron, /area/hydroponics) "jFF" = ( @@ -32617,33 +31626,42 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "jIC" = ( -/obj/machinery/anesthetic_machine, -/obj/machinery/newscaster{ - pixel_y = -32 +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/surgery) -"jIJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) "jIS" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"jJk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ +"jIT" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/turf/open/floor/iron/white, +/area/medical/genetics) +"jJk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "jJp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, @@ -32728,21 +31746,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"jLb" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sign/barsign{ - pixel_y = 32 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "jLx" = ( /obj/effect/landmark/blobstart, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -32774,15 +31777,6 @@ }, /turf/open/floor/plating, /area/security/prison) -"jLL" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "jLO" = ( /obj/machinery/light_switch{ pixel_x = 27 @@ -32901,24 +31895,6 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, /area/engine/engineering) -"jNA" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/glove_box{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/machinery/camera/autoname{ - dir = 6; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "jNY" = ( /obj/machinery/computer/station_alert, /obj/item/radio/intercom{ @@ -32937,15 +31913,11 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "jOy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "jOD" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -32960,13 +31932,8 @@ /turf/open/floor/engine/light, /area/engine/engineering) "jOE" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/turf/open/floor/wood/big, +/obj/machinery/vending/wardrobe/bar_wardrobe, +/turf/open/floor/wood, /area/crew_quarters/bar) "jOR" = ( /obj/effect/turf_decal/stripes/corner{ @@ -33048,14 +32015,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "jQr" = ( -/obj/structure/chair/stool/bar{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "jQt" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=AIE"; @@ -33111,9 +32073,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "jSz" = ( @@ -33180,8 +32139,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "jTP" = ( /obj/item/kirbyplants/random, @@ -33255,7 +32216,10 @@ "jVx" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/chief_medical_officer, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "jVE" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -33272,10 +32236,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/decal/cleanable/glass, -/obj/item/shard, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "jWn" = ( /obj/structure/chair{ @@ -33330,14 +32295,11 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "jWI" = ( -/obj/machinery/button/door{ - id = "kitchencounter"; - name = "Kitchen Counter Shutters"; - pixel_x = -24; - pixel_y = -24; - req_access_txt = "28" +/obj/structure/sink/kitchen{ + pixel_y = 28 }, -/turf/open/floor/iron/checker, +/obj/machinery/food_cart, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "jWS" = ( /obj/structure/cable/yellow{ @@ -33354,17 +32316,11 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "jYj" = ( -/obj/structure/sign/poster/official/cleanliness, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/medbay/lobby) "jYq" = ( /obj/item/book/manual/wiki/detective{ @@ -33394,6 +32350,18 @@ }, /turf/open/floor/carpet/green, /area/security/detectives_office) +"jYA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "jYJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33444,20 +32412,23 @@ /turf/open/floor/plating, /area/quartermaster/miningdock) "kai" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 21 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/plating/rust, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "kak" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -33590,6 +32561,18 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"kcm" = ( +/obj/structure/table, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "kcC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/light{ @@ -33619,18 +32602,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/science/explab) -"kdk" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 7 - }, -/obj/item/storage/backpack/duffelbag/med/implant, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/surgery) "kdp" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33725,9 +32696,16 @@ }, /area/crew_quarters/dorms) "kfl" = ( -/obj/effect/landmark/start/medical_doctor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "kfB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -33735,39 +32713,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) -"kga" = ( -/obj/item/wrench, -/obj/item/stack/sheet/glass{ - amount = 30 - }, -/obj/item/stack/sheet/iron{ - amount = 30 - }, -/obj/item/stack/cable_coil/random, -/obj/item/stack/cable_coil/random, -/obj/structure/closet, -/obj/item/vending_refill/cigarette, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) -"kgf" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 6 - }, -/turf/open/floor/wood/big, -/area/maintenance/aft) "kgo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -33779,12 +32724,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"kgy" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "kgK" = ( /obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, @@ -33844,6 +32783,10 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"khW" = ( +/obj/machinery/food_cart/coffee, +/turf/open/floor/wood, +/area/crew_quarters/bar) "kiu" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -33857,9 +32800,15 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/central) +"kiX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/anesthetic_machine, +/turf/open/floor/iron/white, +/area/medical/surgery) "kjp" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -33894,18 +32843,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, -/area/medical/break_room) +/area/medical/storage) "kjL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -33986,25 +32929,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/quartermaster/warehouse) -"kmp" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/vending/wardrobe/medi_wardrobe, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) -"kms" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hydroponics) "kmA" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -34066,13 +32990,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"kmT" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "kno" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -34132,27 +33049,15 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) -"knM" = ( -/obj/machinery/light, -/turf/open/floor/iron/white/corner{ +"knR" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/area/crew_quarters/kitchen) -"knR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "koe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34164,18 +33069,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/aft) -"kog" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) "koq" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -34183,6 +33076,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "kos" = ( +/obj/item/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -34190,9 +33084,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -34270,18 +33163,9 @@ /turf/open/floor/prison/dark, /area/security/prison) "kqk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/obj/machinery/stasis, +/turf/open/floor/iron/white, +/area/medical/sleeper) "kqw" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -34301,19 +33185,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"krc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) "krd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -34349,20 +33220,6 @@ /obj/item/multitool, /turf/open/floor/iron/dark, /area/security/warden) -"krs" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, -/obj/item/reagent_containers/glass/rag, -/obj/structure/noticeboard{ - pixel_y = 29 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) -"kru" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "krN" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34465,6 +33322,18 @@ }, /turf/open/floor/prison, /area/security/prison) +"ksW" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/cable_coil, +/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp/green, +/obj/structure/table/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) "ktb" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -34504,12 +33373,14 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/dorms) "ktC" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/medical/sleeper) "ktF" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -34592,16 +33463,6 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/entry) -"kut" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) "kuC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34647,7 +33508,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "kwh" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -34762,24 +33623,14 @@ /turf/open/floor/iron/dark, /area/security/main) "kzl" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/chair/fancy/plastic{ - dir = 4 - }, -/obj/item/cigbutt{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/cigbutt{ - pixel_x = 10 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kzA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34808,10 +33659,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/detectives_office) -"kzZ" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "kAi" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -34849,18 +33696,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "kAW" = ( -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/iron/checker, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "kBL" = ( /obj/effect/turf_decal/siding/wideplating_new{ @@ -34895,21 +33734,9 @@ pixel_y = -6; req_one_access_txt = "5; 33" }, -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_y = 13; - pixel_x = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/item/storage/box/medsprays{ - pixel_y = 13; - pixel_x = -6 - }, -/obj/item/storage/box/pillbottles{ - pixel_x = -6 - }, -/obj/item/storage/box/syringes{ - pixel_x = 7 +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -34983,24 +33810,9 @@ /area/teleporter) "kDX" = ( /obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "barcounter"; - name = "Bar Counter Shutters" - }, +/obj/item/lighter, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) -"kDY" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/structure/dresser, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "kEj" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Distro to Waste" @@ -35060,14 +33872,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"kFk" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/chapel/office) "kFm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -35173,11 +33977,14 @@ /turf/open/floor/plating, /area/maintenance/port) "kIy" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "kIF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -35239,25 +34046,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/quartermaster/exploration_prep) -"kJf" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "kJu" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -35361,6 +34149,15 @@ }, /turf/open/floor/iron/white, /area/science/research) +"kMy" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "kMB" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/effect/turf_decal/delivery, @@ -35390,15 +34187,6 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"kNi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "kNn" = ( /obj/machinery/light{ dir = 4 @@ -35440,24 +34228,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"kNU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) -"kOg" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/donkpockets, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "kOu" = ( /obj/structure/chair{ dir = 1 @@ -35513,20 +34283,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, /area/hallway/secondary/command) -"kPw" = ( -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/surgery) "kPB" = ( /obj/machinery/camera/directional/north{ network = list("minisat") @@ -35536,6 +34292,9 @@ "kPJ" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "kPV" = ( @@ -35593,10 +34352,6 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) -"kRo" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "kRq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -35627,13 +34382,6 @@ "kRI" = ( /turf/open/floor/carpet/grimy, /area/chapel/office) -"kRW" = ( -/obj/machinery/clonepod/prefilled, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/genetics/cloning) "kSb" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/loading_area{ @@ -35669,8 +34417,14 @@ }, /area/crew_quarters/dorms) "kSp" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/turf/open/floor/iron/freezer, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + freq = 1400; + location = "Kitchen" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, /area/crew_quarters/kitchen/coldroom) "kSu" = ( /obj/structure/table/wood, @@ -35755,8 +34509,10 @@ pixel_y = -31 }, /obj/item/gun/syringe, -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "kUg" = ( /obj/effect/spawner/structure/window/reinforced, @@ -35780,6 +34536,11 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) +"kUv" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron, +/area/hydroponics) "kUw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/iron/dark/side{ @@ -35816,6 +34577,7 @@ /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -35826,7 +34588,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) "kVJ" = ( @@ -35978,17 +34739,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"kYn" = ( -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/table/glass, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "kYS" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "GeneticsDoor"; @@ -36008,12 +34758,8 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "kYY" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/bot, @@ -36197,12 +34943,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"lea" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "led" = ( /obj/machinery/computer/message_monitor{ dir = 4 @@ -36267,6 +35007,19 @@ "lfJ" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/ai_upload) +"lfZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/holopad, +/obj/structure/closet/secure_closet/medicaldanger{ + anchored = 1 + }, +/obj/item/gun/syringe, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "lgo" = ( /obj/machinery/computer/security, /obj/structure/reagent_dispensers/peppertank{ @@ -36318,6 +35071,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) +"lhk" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "lhM" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36371,12 +35130,29 @@ /turf/open/floor/iron, /area/hallway/primary/central) "lif" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/door/airlock{ + name = "Bar Storage"; + req_access_txt = "25" }, -/turf/open/floor/iron/cafeteria_red, +/obj/structure/disposalpipe/segment, +/turf/open/floor/wood, /area/crew_quarters/bar) +"lip" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = 1; + pixel_y = -24 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "liv" = ( /obj/structure/chair/stool, /obj/machinery/camera/autoname/directional/west{ @@ -36509,6 +35285,23 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"lkg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/medical/glass{ + name = "Plumbing Factory"; + req_access_txt = "5; 33" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/chemistry) "lkt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -36543,17 +35336,6 @@ /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, /area/engine/engineering) -"lkO" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/northleft{ - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "llb" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36561,24 +35343,11 @@ }, /turf/open/floor/wood, /area/security/detectives_office) -"llf" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/obj/machinery/camera{ - c_tag = "Bar - Backroom" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "lln" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/glass, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/starboard/fore) "llo" = ( @@ -36650,27 +35419,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"llH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"llJ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "lmn" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -36730,12 +35478,14 @@ }, /area/hallway/secondary/entry) "lni" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, +/obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) "lnj" = ( @@ -36855,14 +35605,9 @@ /turf/open/floor/iron, /area/hydroponics/garden) "lpk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/chair/fancy/sofa/corp/corner/concave{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "lpu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -36881,6 +35626,16 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"lpE" = ( +/obj/structure/table/wood, +/obj/item/instrument/guitar{ + pixel_x = -7 + }, +/obj/item/instrument/eguitar{ + pixel_x = 5 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "lpZ" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -36888,37 +35643,18 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "lqc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = 6 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/landmark/event_spawn, /obj/structure/chair/stool/bar/directional/south, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "lqg" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/secondary/entry) "lqj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/structure/chair, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "lqk" = ( /mob/living/carbon/monkey, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -36929,9 +35665,15 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"lqw" = ( -/turf/closed/wall, -/area/medical/genetics) +"lqs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/chemistry) "lqy" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -36993,16 +35735,11 @@ pixel_y = -10; req_access_txt = "39" }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) -"lrE" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/bounty, -/turf/open/floor/plating, -/area/crew_quarters/bar) "lrH" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -37067,6 +35804,11 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "ltW" = ( +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33" + }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -37076,6 +35818,12 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"luw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "lvc" = ( /obj/structure/reflector/double/anchored{ dir = 6 @@ -37100,14 +35848,6 @@ /turf/open/floor/iron/dark, /area/security/prison) "lvg" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/east{ pixel_x = 24 }, @@ -37156,6 +35896,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "lvU" = ( +/obj/item/radio/intercom{ + pixel_y = -29 + }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -37191,20 +35934,10 @@ /turf/open/floor/iron/dark, /area/storage/tech) "lwk" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, +/obj/machinery/light/small, +/obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron, /area/hydroponics) -"lwo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "lww" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -37232,10 +35965,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"lwT" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "lxj" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -37256,16 +35985,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"lxF" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/hydroponics) "lxL" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -37282,6 +36001,25 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"lxR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2; + sortType = 18 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "lyg" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; @@ -37312,7 +36050,6 @@ /obj/machinery/vending/medical{ pixel_x = -2 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -37328,9 +36065,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/aft) "lzi" = ( @@ -37371,33 +36105,10 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) -"lAh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "lAw" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) +/obj/structure/sign/barsign, +/turf/closed/wall, +/area/crew_quarters/bar) "lAC" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/white, @@ -37512,11 +36223,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/brig) -"lBo" = ( -/obj/structure/flora/grass/jungle, -/mob/living/carbon/monkey, -/turf/open/floor/plating/dirt/jungle, -/area/medical/genetics) "lBJ" = ( /obj/item/radio/intercom{ pixel_x = -25 @@ -37609,10 +36315,26 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"lCX" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "lDe" = ( -/obj/item/food/grown/banana, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/no_border, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/landmark/start/geneticist, +/turf/open/floor/iron/white, /area/medical/genetics) "lDj" = ( /obj/machinery/flasher/portable, @@ -37720,11 +36442,16 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "lGW" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 4 + }, /obj/effect/turf_decal/tile/yellow{ - dir = 1 + dir = 4 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -37792,9 +36519,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"lIc" = ( -/turf/open/floor/iron/checker, -/area/maintenance/starboard/fore) "lIF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -37812,12 +36536,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"lJm" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) "lJA" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, @@ -37864,9 +36582,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/aft) "lKG" = ( @@ -37878,7 +36593,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/carpet/grimy, +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/turf/open/floor/iron, /area/hallway/primary/starboard) "lKH" = ( /obj/structure/chair/office{ @@ -37903,11 +36621,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"lLV" = ( -/obj/structure/table/wood, -/obj/item/paicard, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lMa" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -38032,15 +36745,22 @@ /turf/open/space/basic, /area/space/nearstation) "lOQ" = ( -/obj/structure/window/reinforced, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) -"lPy" = ( -/obj/machinery/computer/arcade/battle{ +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +/area/crew_quarters/theatre) "lPH" = ( /obj/structure/dresser, /turf/open/floor/carpet/orange, @@ -38083,16 +36803,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"lQj" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "lQt" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -38119,10 +36829,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"lRB" = ( -/obj/item/cardboard_cutout/adaptive/chess/queen, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "lRF" = ( /obj/machinery/camera/motion/directional/west{ c_tag = "MiniSat Core Hallway"; @@ -38147,12 +36853,14 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "lRT" = ( -/obj/effect/turf_decal/trimline/white/corner{ - dir = 1 +/obj/machinery/door/airlock/medical{ + name = "Autopsy Room B"; + req_access_txt = "6;5" }, -/obj/effect/turf_decal/trimline/dark_red/line, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "lSa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -38230,32 +36938,20 @@ /turf/open/floor/iron/techmaint, /area/security/prison) "lVs" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/medical/storage) +"lWj" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/carpet/blue, -/area/medical/break_room) -"lVC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/bar/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"lWj" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/table_frame, /turf/open/floor/plating, /area/maintenance/starboard/fore) "lWq" = ( @@ -38296,14 +36992,16 @@ /turf/open/floor/iron/white, /area/science/lab) "lWG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 10 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "lWH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38321,19 +37019,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"lXx" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/cryo) "lXJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38372,8 +37064,29 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "lYC" = ( -/turf/closed/wall, -/area/crew_quarters/theatre/backstage) +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/machinery/button/door{ + id = "Toilet1"; + name = "Lock Control"; + normaldoorcontrol = 1; + pixel_x = -24; + specialfunctions = 4 + }, +/obj/machinery/button/door{ + id = "Toilet1"; + name = "Lock Control"; + normaldoorcontrol = 1; + pixel_y = 24; + specialfunctions = 4 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "lYS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -38415,6 +37128,13 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"lZJ" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "lZR" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -38502,9 +37222,14 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) "mcw" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/storage) "mcF" = ( /obj/machinery/door/airlock{ name = "Custodial Closet"; @@ -38521,36 +37246,12 @@ /turf/open/floor/iron, /area/janitor) "mcH" = ( -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) -"mcJ" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, -/turf/open/floor/iron, -/area/hydroponics) -"mdi" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/closet, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mdr" = ( /obj/machinery/nuclearbomb/beer, /turf/open/floor/plating, @@ -38570,9 +37271,15 @@ /turf/open/floor/iron, /area/quartermaster/qm) "mdw" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/medical/morgue) +/obj/effect/spawner/randomvend/snack, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mdH" = ( /obj/effect/turf_decal{ dir = 1 @@ -38599,17 +37306,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"mep" = ( -/obj/structure/reagent_dispensers/cooking_oil, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "met" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -38646,23 +37347,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"mfb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "Genie"; - sortType = 23 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "mfk" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -38685,10 +37369,6 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plating, /area/engine/atmos) -"mft" = ( -/obj/effect/turf_decal/tile/green/opposingcorners, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "mfX" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -38712,16 +37392,6 @@ }, /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) -"mgl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "mgt" = ( /turf/closed/wall, /area/crew_quarters/cryopods) @@ -38744,14 +37414,15 @@ /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness) "mhg" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 }, -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green{ - dir = 4 - }, /turf/open/floor/iron, /area/hydroponics) "mhi" = ( @@ -38776,6 +37447,18 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"mhC" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Morgue Maintenance"; + req_access_txt = "6" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/aft) "mhL" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -38797,22 +37480,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"mih" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"mij" = ( -/obj/effect/decal/cleanable/blood/footprints{ - dir = 4; - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "miy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38820,8 +37487,8 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "miC" = ( -/obj/structure/sign/departments/minsky/supply/hydroponics2, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/hydroponics) "miD" = ( /obj/effect/turf_decal/stripes/line, @@ -38867,6 +37534,19 @@ }, /turf/open/floor/engine/light, /area/engine/engineering) +"miY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mje" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38939,7 +37619,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/mail{ + sortType = 23 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron, /area/maintenance/aft) "mkw" = ( @@ -39013,27 +37698,6 @@ /obj/item/storage/crayons, /turf/open/floor/wood, /area/library) -"mlD" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, -/obj/structure/sign/poster/contraband/missing_gloves{ - pixel_x = -32 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "mlV" = ( /obj/machinery/telecomms/broadcaster/preset_right, /turf/open/floor/circuit/telecomms, @@ -39196,6 +37860,17 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"moO" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "mpg" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room"; @@ -39240,11 +37915,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"mpM" = ( -/obj/structure/table, -/obj/machinery/microwave, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "mqh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -39253,19 +37923,11 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "mqy" = ( -/obj/machinery/light_switch{ - pixel_x = -7; - pixel_y = 26 - }, -/obj/structure/disposalpipe/segment{ +/mob/living/carbon/monkey, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "CloningDoor"; - name = "Genetics Lab"; - req_access_txt = "9" - }, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/medical/genetics) "mrj" = ( /obj/machinery/door/airlock/public/glass{ @@ -39313,6 +37975,14 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/security/warden) +"mrQ" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Research"; + req_access_txt = "5; 9; 68" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/genetics) "mso" = ( /obj/structure/closet/secure_closet/lethalshots, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -39322,8 +37992,15 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "msr" = ( -/turf/closed/wall, -/area/medical/break_room) +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "msu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -39364,6 +38041,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"msV" = ( +/obj/structure/sink{ + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "msW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -39380,6 +38066,13 @@ }, /turf/open/floor/iron, /area/quartermaster/miningdock) +"mtf" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mth" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -39416,18 +38109,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"mtu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/bar/directional/west, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "mtv" = ( /obj/structure/chair/office{ dir = 4 @@ -39436,24 +38117,6 @@ /turf/open/floor/iron/dark, /area/security/warden) "mug" = ( -/obj/item/watertank, -/obj/structure/table, -/obj/item/book/manual/hydroponics_pod_people, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_y = 3 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 13; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/cable/yellow{ @@ -39477,17 +38140,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "muB" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/requests_console{ department = "Bar"; departmentType = 2; @@ -39499,31 +38151,8 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/east, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/bar/atrium) -"muC" = ( -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 28 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/stasis{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "muJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39553,16 +38182,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"mwZ" = ( -/obj/structure/table, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28; - use_power = 0 - }, -/obj/item/book/manual/wiki/surgery, -/turf/open/floor/iron/white, -/area/medical/surgery) "mxi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -39597,6 +38216,10 @@ }, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) +"mxY" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "myF" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/cable/yellow{ @@ -39728,14 +38351,13 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "mAq" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/obj/structure/chair{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/turf/open/floor/iron/dark, +/area/medical/morgue) "mBa" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -39779,31 +38401,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"mBF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/multitool{ - pixel_x = 7; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/hydroponics) "mBG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -39856,29 +38453,9 @@ /turf/open/floor/carpet/green, /area/chapel/main) "mCP" = ( -/obj/machinery/door/airlock{ - name = "Kitchen Coldroom"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/reagent_dispensers/cooking_oil, /obj/machinery/camera/directional/north, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "mCV" = ( /obj/machinery/airalarm/directional/north{ @@ -39943,11 +38520,12 @@ /turf/open/floor/iron/dark, /area/security/main) "mEG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/kitchenspike, +/obj/machinery/light/small{ + dir = 8 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "mFg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/light{ @@ -39962,12 +38540,14 @@ /turf/open/floor/iron/dark, /area/security/brig) "mFB" = ( -/obj/machinery/camera/autoname{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/door/window/westright{ + dir = 1; + name = "Hydroponics Desk"; + req_access_txt = "35" }, -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green{ - dir = 1 +/obj/structure/desk_bell{ + pixel_x = 8 }, /turf/open/floor/iron, /area/hydroponics) @@ -40039,6 +38619,18 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"mHp" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -40054,18 +38646,14 @@ /turf/open/floor/iron, /area/engine/atmos) "mIT" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) -"mIV" = ( -/obj/machinery/firealarm/directional/east, -/obj/structure/cable/yellow{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "mIZ" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -40097,6 +38685,11 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/starboard) +"mJJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/cryo) "mJR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40120,24 +38713,16 @@ /turf/open/floor/iron, /area/quartermaster/storage) "mKD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, /turf/open/floor/iron/white, /area/medical/chemistry) "mKG" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table/glass, /obj/item/storage/box/disks{ pixel_x = 2; @@ -40156,20 +38741,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/grass/no_border, +/turf/open/floor/iron/white, /area/medical/genetics) "mLw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/obj/machinery/iv_drip, +/turf/open/floor/iron/white, +/area/medical/sleeper) "mLN" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -40225,10 +38802,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"mNl" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/no_border, -/area/medical/genetics) "mNm" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -40254,19 +38827,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"mNx" = ( -/obj/machinery/holopad{ - pixel_y = -16 - }, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "mNB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40283,23 +38843,13 @@ /area/science/nanite) "mOq" = ( /obj/machinery/computer/med_data, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/effect/turf_decal/tile/dark_blue, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/computer/med_data, /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "mOs" = ( /obj/machinery/advanced_airlock_controller{ @@ -40336,6 +38886,27 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"mOJ" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/grenades, +/obj/item/screwdriver{ + pixel_x = 2; + pixel_y = 18 + }, +/obj/item/stack/cable_coil/random, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil/random, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "mOX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -40438,13 +39009,14 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "mQX" = ( -/obj/item/storage/pill_bottle/dice, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/structure/table/wood, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "mRc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -40476,20 +39048,6 @@ dir = 9 }, /area/science/research) -"mRI" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/vending/cola, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/hallway/primary/aft) "mRL" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ @@ -40527,6 +39085,15 @@ }, /turf/open/floor/carpet/green, /area/security/detectives_office) +"mSf" = ( +/obj/structure/window/reinforced, +/mob/living/carbon/monkey, +/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron, +/area/medical/genetics) "mSS" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40593,9 +39160,9 @@ /turf/open/floor/iron/white, /area/science/research) "mTC" = ( -/obj/machinery/camera/autoname, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mTL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40606,15 +39173,14 @@ /turf/open/floor/engine, /area/engine/engineering) "mTW" = ( -/obj/structure/table/wood, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/item/storage/box/donkpockets, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/structure/window/reinforced, +/obj/effect/loot_jobscale/medical/medkits, +/turf/open/floor/iron/white, +/area/medical/storage) "mTZ" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -40640,29 +39206,7 @@ /turf/open/floor/iron, /area/science/mixing) "mUk" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sopservice{ - pixel_x = 11; - pixel_y = 6 - }, -/obj/item/shovel/spade, -/obj/item/stack/sheet/mineral/copper{ - amount = 5 - }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/storage/toolbox/drone, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/iron, /area/hallway/secondary/service) "mUM" = ( @@ -40725,11 +39269,16 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "mVB" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ +/obj/structure/table/glass, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "mVC" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/effect/turf_decal/siding/dark_blue{ @@ -40762,15 +39311,12 @@ /turf/open/floor/iron, /area/engine/break_room) "mVL" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "mVY" = ( @@ -40783,15 +39329,13 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "mVZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/airlock/medical{ + name = "Medbay Reception"; + req_access_txt = "5" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/sleeper) "mWe" = ( /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, @@ -40839,51 +39383,20 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"mWv" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = -9; - pixel_y = 5 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_x = -9 - }, -/obj/item/storage/box/papersack{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 +"mWr" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "mWI" = ( /obj/machinery/power/terminal{ dir = 1 @@ -40893,13 +39406,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"mWQ" = ( -/obj/structure/curtain, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "mXe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -40927,13 +39433,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"mXq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "mXu" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -41011,22 +39510,6 @@ }, /turf/open/floor/iron, /area/science/explab) -"mYz" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/grille/broken, -/turf/open/floor/iron/checker, -/area/maintenance/starboard/fore) "mYB" = ( /obj/machinery/computer/teleporter{ dir = 1 @@ -41075,11 +39558,10 @@ /turf/open/floor/wood, /area/library) "mYX" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/medical/surgery) "mYY" = ( /obj/machinery/suit_storage_unit/exploration, @@ -41103,22 +39585,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"mZn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/medical{ - name = "Psychologist" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/medical/exam_room) "mZy" = ( /obj/structure/chair{ dir = 1 @@ -41160,8 +39626,8 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "mZQ" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/iron/dark, /area/hydroponics) "nad" = ( /obj/machinery/door/airlock/maintenance{ @@ -41231,6 +39697,13 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"nbk" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nbl" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, @@ -41240,15 +39713,16 @@ /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) "nbs" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/item/radio/intercom{ - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/processor, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "nbF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -41398,12 +39872,8 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "nel" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "neC" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -41463,41 +39933,22 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "nfy" = ( -/obj/machinery/food_cart/coffee, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/turf/open/floor/wood/big, +/obj/effect/spawner/randomvend/cola, +/turf/open/floor/wood, /area/crew_quarters/bar) -"nfP" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/door/airlock{ - id_tag = "Toilet2"; - name = "Toilet Unit #2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "nga" = ( -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "medbay_front_door"; - name = "Medbay"; - req_access_txt = "5" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) +/turf/open/floor/plating, +/area/security/checkpoint/medical) "ngb" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -41506,6 +39957,21 @@ /obj/structure/cable/yellow, /turf/open/floor/iron, /area/security/checkpoint/science) +"ngj" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 25 + }, +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "ngR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -41527,19 +39993,22 @@ }, /turf/open/floor/iron/white, /area/security/brig) -"nhe" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "nhs" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 8; + pixel_y = 2 }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "nhO" = ( /obj/structure/closet/wardrobe/grey, /obj/machinery/requests_console{ @@ -41556,12 +40025,17 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "nio" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "niE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -41640,16 +40114,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"nkB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/mob/living/carbon/monkey/punpun, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "nkE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/firealarm{ @@ -41741,26 +40205,10 @@ /turf/open/floor/iron/dark, /area/security/main) "nnt" = ( -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/table/glass, -/obj/item/storage/box/masks{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 5 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nnx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -41914,10 +40362,6 @@ }, /turf/open/floor/prison/dark, /area/security/execution/transfer) -"npT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "nqw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ @@ -41952,6 +40396,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"nqJ" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "nqM" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -41965,40 +40418,15 @@ /turf/open/floor/iron, /area/engine/engineering) "nqW" = ( -/obj/structure/table/wood, -/obj/item/lipstick/random{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/lipstick/random{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/flashlight/lamp/bananalamp{ - pixel_y = 3 - }, -/obj/item/toy/figure/clown{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/structure/mirror{ - pixel_y = 28 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/directional/north, /obj/structure/cable/yellow{ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/crew_quarters/theatre) "nre" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -42049,17 +40477,14 @@ /turf/open/floor/iron, /area/vacant_room/commissary) "nrR" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/machinery/vending/wallmed{ + pixel_x = -28 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/sleeper) "nso" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -42103,10 +40528,11 @@ /turf/open/floor/iron, /area/hydroponics/garden) "ntr" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "ntw" = ( /obj/structure/table, /obj/machinery/camera/autoname/directional/west{ @@ -42159,25 +40585,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"nuw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = -30; - pixel_y = -4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nuC" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, @@ -42213,13 +40625,6 @@ }, /turf/open/floor/iron, /area/vacant_room/commissary) -"nvD" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/sign/departments/minsky/research/genetics{ - pixel_x = 32 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "nvH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -42294,6 +40699,14 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"nxn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/medical{ + name = "Morgue"; + req_access_txt = "6" + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "nxu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -42400,6 +40813,12 @@ /obj/structure/closet/wardrobe/miner, /turf/open/floor/iron, /area/quartermaster/miningdock) +"nzB" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "nzC" = ( /obj/machinery/computer/atmos_control/tank/nitrogen_tank{ dir = 1 @@ -42418,10 +40837,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) -"nAS" = ( -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "nBo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42498,17 +40913,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"nCQ" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/turf/open/floor/plating, -/area/maintenance/aft) "nCV" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -42520,12 +40924,16 @@ /turf/open/floor/iron, /area/engine/break_room) "nDf" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/table, +/obj/machinery/door/window/northleft{ + dir = 4; + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/effect/loot_jobscale/medical/medkits, +/turf/open/floor/iron/white, +/area/medical/storage) "nDF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -42569,13 +40977,12 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "nEv" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 }, -/obj/effect/turf_decal/tile/dark_green, /turf/open/floor/iron, /area/hydroponics) "nEx" = ( @@ -42683,25 +41090,6 @@ }, /turf/open/floor/plating, /area/security/warden) -"nFU" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/stasis{ - dir = 1 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "nFW" = ( /obj/structure/window/reinforced{ dir = 1; @@ -42725,6 +41113,14 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"nGd" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "nGk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -42760,13 +41156,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"nGP" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "nHe" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -42775,26 +41164,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, /turf/open/space, /area/space/nearstation) -"nHi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/medbay/central) "nHm" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -42816,15 +41185,19 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "nIb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/start/bartender, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/button/door{ + id = "barShutters"; + name = "bar shutters"; + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/light_switch{ + pixel_x = -6; + pixel_y = 26 }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) @@ -42853,6 +41226,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hallway/primary/central) +"nIR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/surgery) "nJl" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -42896,6 +41276,12 @@ /obj/item/assembly/signaler, /turf/open/floor/iron/dark, /area/bridge) +"nKj" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "nKn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 @@ -42931,14 +41317,6 @@ dir = 8 }, /area/crew_quarters/dorms) -"nLm" = ( -/obj/effect/mapping_helpers/tile_breaker, -/obj/effect/turf_decal/trimline/dark_red/line, -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/wood/big, -/area/maintenance/aft) "nLn" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -42962,24 +41340,13 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"nMa" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/newscaster{ - pixel_x = -30; - pixel_y = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 +"nLY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/cryo) "nMf" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -43065,26 +41432,9 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "nOa" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/obj/machinery/vending/dinnerware, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) -"nOv" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) +/obj/machinery/icecream_vat, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "nOH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -43202,25 +41552,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"nRU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance{ - name = "Theatre Maintenance"; - req_access_txt = "46" - }, -/turf/open/floor/plating, -/area/crew_quarters/theatre/backstage) "nSk" = ( /obj/machinery/light/small, /obj/machinery/advanced_airlock_controller{ @@ -43349,21 +41680,15 @@ /turf/open/floor/carpet/grimy, /area/vacant_room/office) "nUR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) -"nUS" = ( -/obj/structure/bed, -/obj/item/bedsheet/mime, -/obj/effect/landmark/start/mime, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) +"nVk" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/bar) "nVG" = ( /obj/item/stack/ore/iron, /obj/effect/turf_decal/stripes/line{ @@ -43440,26 +41765,32 @@ /turf/open/floor/iron, /area/science/mixing) "nWN" = ( -/obj/item/bedsheet/medical, -/obj/structure/bed{ +/obj/structure/table, +/obj/machinery/vending/wallmed{ + pixel_x = -28 + }, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/iv_drip, -/turf/open/floor/iron/dark, +/obj/item/glove_box, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 8 + }, +/turf/open/floor/iron/white, /area/medical/surgery) "nWO" = ( -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/noslip/white, -/area/medical/patients_rooms) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "nWT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -43467,9 +41798,8 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -43530,6 +41860,12 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) +"nXx" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "nXF" = ( /obj/effect/turf_decal/delivery, /obj/structure/curtain, @@ -43538,17 +41874,16 @@ }, /turf/open/floor/noslip/standard, /area/security/prison) +"nXO" = ( +/obj/effect/landmark/start/bartender, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "nXP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, /area/medical/surgery) "nYz" = ( @@ -43613,6 +41948,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/prison, /area/security/prison) +"oan" = ( +/obj/machinery/door/window/westleft{ + name = "plumbing factory duct access"; + red_alert_access = 1; + req_access_txt = "5; 33" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "oax" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/status_display/ai{ @@ -43685,27 +42031,26 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "oco" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 8; + pixel_y = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/storage/firstaid/regular{ + pixel_x = -3; + pixel_y = -3 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/cryo) -"ocI" = ( -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 24 +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) +/turf/open/floor/iron/white, +/area/medical/sleeper) "oda" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -43747,16 +42092,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/tcommsat/computer) -"odn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "odH" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -43776,16 +42111,11 @@ /turf/open/floor/iron/dark, /area/storage/tech) "odJ" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/hydroponics/constructable, /obj/machinery/airalarm/directional/east{ pixel_x = 24 }, -/turf/closed/wall, +/turf/open/floor/iron/dark, /area/hydroponics) "oed" = ( /obj/structure/cable/yellow{ @@ -43813,6 +42143,13 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/construction/mining/aux_base) +"oez" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ofr" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -43820,24 +42157,6 @@ /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron, /area/hallway/secondary/entry) -"ofG" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) "ofL" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -43919,10 +42238,10 @@ name = "Chief Medical Officer RC"; pixel_y = 32 }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "ohG" = ( /obj/machinery/door/airlock{ @@ -43960,6 +42279,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"ohQ" = ( +/obj/structure/table, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/wiki/cooking_to_serve_man{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "ohW" = ( /obj/structure/railing{ dir = 8 @@ -43973,30 +42301,40 @@ /turf/open/floor/prison/dark, /area/security/prison) "oib" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "oic" = ( /obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /turf/open/floor/iron/white, /area/medical/medbay/central) "oje" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted, -/obj/effect/turf_decal/tile/dark_green{ - dir = 1 - }, +/obj/structure/chair/stool, +/obj/effect/landmark/start/botanist, /turf/open/floor/iron, /area/hydroponics) +"oji" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "ojA" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/shrink_cw{ @@ -44065,13 +42403,16 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "olp" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table, +/obj/machinery/door/window/northright{ + dir = 4; + name = "First-Aid Supplies"; + red_alert_access = 1; + req_access_txt = "5" }, -/obj/machinery/photocopier, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood, -/area/medical/break_room) +/obj/effect/loot_jobscale/medical/medkits, +/turf/open/floor/iron/white, +/area/medical/storage) "olu" = ( /obj/structure/railing/corner, /obj/structure/railing/corner{ @@ -44102,22 +42443,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"omP" = ( -/obj/machinery/vending/wallmed{ - pixel_x = -1; - pixel_y = -32 - }, -/obj/structure/closet/secure_closet/personal/patient, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "onj" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/layer_manifold{ @@ -44149,15 +42474,6 @@ /obj/item/gavelhammer, /turf/open/floor/iron, /area/security/courtroom) -"ooc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) "ool" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -44173,9 +42489,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/iron, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "oov" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -44277,18 +42594,9 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "oqV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/medical/surgery) "org" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -44303,11 +42611,31 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "orD" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, +/obj/machinery/door/airlock/research{ + name = "Genetics Research Access"; + req_access_txt = "9" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, /area/maintenance/aft) +"orG" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/noslip/white, +/area/medical/cryo) "orP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -44315,8 +42643,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/turf/open/floor/iron, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "osc" = ( /obj/machinery/newscaster{ @@ -44327,6 +42660,20 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"osd" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "osw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -44359,12 +42706,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"otq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) "otv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44460,10 +42801,6 @@ }, /turf/open/floor/iron/freezer, /area/medical/virology) -"ovi" = ( -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "ovo" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -44510,24 +42847,18 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"owt" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_red/line, -/turf/open/floor/wood/big, -/area/maintenance/aft) "owT" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -44556,39 +42887,11 @@ /turf/open/floor/iron, /area/science/explab) "oyo" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/north{ pixel_y = 24 }, -/turf/closed/wall, -/area/crew_quarters/theatre/backstage) -"oyF" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/cigarettes/cigars{ - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/toy/figure/bartender, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -5; - pixel_y = 30 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/turf/open/floor/wood, +/area/crew_quarters/theatre) "oyH" = ( /obj/structure/table, /obj/item/aiModule/reset, @@ -44644,18 +42947,11 @@ /turf/open/floor/engine, /area/science/mixing/chamber) "ozm" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "ozs" = ( /obj/structure/table/glass, /obj/item/storage/fancy/candle_box, @@ -44715,15 +43011,10 @@ /turf/open/floor/wood, /area/vacant_room/office) "oAb" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/directional/north, /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "oAh" = ( /obj/structure/rack, /obj/effect/turf_decal/stripes/line{ @@ -44734,6 +43025,14 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/grid/steel, /area/storage/tech) +"oAj" = ( +/obj/machinery/door/window/eastright{ + name = "Hydroponics Delivery"; + req_access_txt = "35" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/hydroponics) "oAt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -44819,20 +43118,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/engine/atmos) -"oCl" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/machinery/door/window/northleft{ - name = "Kitchen Delivery"; - req_access_txt = "28"; - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "oCv" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -44886,11 +43171,9 @@ /turf/open/floor/prison, /area/security/prison) "oDC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/glass, -/obj/machinery/light, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/effect/spawner/randomarcade, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "oDF" = ( /obj/machinery/light, /turf/open/floor/plating, @@ -44903,6 +43186,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/sign/departments/minsky/research/genetics{ + pixel_x = -32 + }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, @@ -44917,14 +43203,9 @@ /turf/open/floor/carpet/grimy, /area/chapel/office) "oFf" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/stool/directional/west, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "oFh" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -44978,17 +43259,19 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "oFL" = ( +/obj/item/radio/intercom{ + pixel_y = 20 + }, /obj/machinery/light{ dir = 1 }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/blue, -/obj/item/radio/intercom{ - pixel_y = 20 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "oFP" = ( /obj/docking_port/stationary{ dwidth = 2; @@ -45082,13 +43365,9 @@ /turf/open/floor/iron, /area/security/courtroom) "oJS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/starboard) "oJY" = ( @@ -45179,28 +43458,23 @@ /turf/open/floor/iron/cafeteria, /area/crew_quarters/heads/hor) "oKY" = ( -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, /area/medical/surgery) "oLz" = ( -/obj/structure/table/reinforced, -/obj/item/pen, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = -8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/item/folder/white, -/obj/machinery/door/window/brigdoor{ - dir = 8; - id = "medcell"; - name = "Medical Cell"; - req_access_txt = "63" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/door/window/southright{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "oLE" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -45245,16 +43519,13 @@ /turf/open/floor/iron, /area/science/nanite) "oNk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "oNw" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold4w/general/visible, @@ -45320,10 +43591,8 @@ /area/maintenance/fore/secondary) "oOT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -45387,22 +43656,21 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oQv" = ( -/obj/structure/bodycontainer/morgue, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "oRo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -45449,7 +43717,9 @@ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "oSi" = ( @@ -45553,15 +43823,13 @@ /turf/open/floor/iron, /area/science/mixing) "oUA" = ( -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/door/airlock/medical/glass{ + name = "Surgery Observation" }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/medical/surgery) "oUB" = ( /obj/structure/sign/poster/contraband/lusty_xenomorph{ pixel_x = -31 @@ -45681,20 +43949,6 @@ dir = 9 }, /area/science/research) -"oVB" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "oVC" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, @@ -45706,13 +43960,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"oWd" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "oWf" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -45744,16 +43991,10 @@ /area/engine/atmos) "oWP" = ( /obj/machinery/suit_storage_unit/cmo, -/obj/machinery/button/door{ - id = "cmoprivacy"; - name = "Privacy Shutters Toggle"; - pixel_y = 22 - }, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "oXj" = ( /obj/structure/disposalpipe/segment{ @@ -45799,6 +44040,13 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"oZj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/sleeper) "oZu" = ( /obj/structure/chair/fancy/comfy{ dir = 1 @@ -45810,8 +44058,17 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "oZx" = ( +/obj/machinery/button/door{ + id = "chemistry_shutters"; + name = "Chemistry shutters"; + pixel_x = -24; + pixel_y = 6; + req_one_access_txt = "5; 33" + }, /obj/machinery/chem_dispenser, -/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "oZC" = ( @@ -45940,16 +44197,15 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "pec" = ( -/obj/effect/turf_decal/trimline/white/line, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 1 +/obj/structure/frame/computer{ + dir = 4 }, -/obj/machinery/camera/autoname{ - dir = 5; - network = list("ss13","security") +/obj/item/circuitboard/computer/operating, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "pef" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -45977,6 +44233,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) +"pfi" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "pfr" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -46002,20 +44270,27 @@ /turf/open/floor/iron, /area/hallway/secondary/entry) "pgo" = ( -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 }, -/obj/machinery/power/apc/auto_name/west, -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/structure/table, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/fax/med, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "pgp" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "pgs" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "meetingshutter"; @@ -46041,6 +44316,10 @@ }, /turf/open/floor/iron, /area/science/explab) +"pgC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/white, +/area/medical/chemistry) "phr" = ( /obj/machinery/computer/secure_data, /obj/machinery/button/door{ @@ -46097,15 +44376,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/security/courtroom) -"pim" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/cell_charger, -/obj/structure/table, -/obj/item/stock_parts/cell/high/plus, -/turf/open/floor/iron/white, -/area/medical/chemistry) "piD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -46161,9 +44431,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -46199,15 +44468,26 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/genetics) +"pme" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "pmx" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -46260,10 +44540,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "pnq" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ @@ -46273,12 +44553,27 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "pns" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets, -/turf/open/floor/iron/cafeteria, +/obj/machinery/door/airlock{ + name = "Kitchen cold room"; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/freezer, /area/crew_quarters/kitchen) "pnx" = ( -/turf/open/floor/iron/checker, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "pnC" = ( /obj/structure/sign/warning/electricshock{ @@ -46390,21 +44685,6 @@ /mob/living/simple_animal/crab/Coffee, /turf/open/floor/iron/white, /area/science/lab) -"ppf" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/obj/machinery/door/window/eastright{ - name = "Hydroponics Desk"; - req_access_txt = "35" - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/turf/closed/wall, -/area/crew_quarters/kitchen) "pps" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -46529,9 +44809,9 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "prD" = ( -/obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/implant{ + pixel_y = 8 }, /turf/open/floor/iron/white, /area/medical/surgery) @@ -46616,33 +44896,18 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"ptb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ +"ptd" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 5 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = 6 +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = -31 }, -/obj/structure/table/glass, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) -"ptd" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /turf/open/floor/iron, /area/hydroponics) "ptl" = ( @@ -46658,6 +44923,10 @@ /obj/structure/chair/stool, /turf/open/floor/iron/white, /area/science/mixing) +"ptz" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "ptL" = ( /obj/machinery/telecomms/processor/preset_exploration, /obj/machinery/airalarm/server{ @@ -46714,11 +44983,6 @@ /obj/effect/spawner/structure/window/reinforced/prison, /turf/open/floor/plating, /area/security/prison) -"pva" = ( -/obj/effect/turf_decal/bot/left, -/obj/machinery/food_cart, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "pvv" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -46756,17 +45020,19 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "pwj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/enzyme{ + layer = 5 }, +/obj/item/stack/package_wrap, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "pwk" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/airlock/public/glass{ name = "Hydroponics"; - req_one_access_txt = "35;28" + req_access_txt = "35" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hydroponics) "pwt" = ( @@ -46897,12 +45163,15 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload) "pyC" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 1 +/obj/structure/table/optable, +/obj/item/radio/intercom{ + pixel_y = 20 }, -/obj/effect/turf_decal/trimline/white/corner, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "pyI" = ( /obj/structure/closet/secure_closet/hop, /obj/machinery/power/apc/auto_name/directional/east, @@ -47080,16 +45349,6 @@ /obj/effect/landmark/prisonspawn, /turf/open/floor/prison, /area/security/prison) -"pBG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/chair/fancy/sofa/old/left{ - dir = 8 - }, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) "pBH" = ( /obj/structure/table/wood, /obj/machinery/recharger{ @@ -47149,16 +45408,12 @@ dir = 4 }, /obj/effect/landmark/start/chemist, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/chair/office/light, /turf/open/floor/iron/white, /area/medical/apothecary) "pCl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen, +/obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "pCH" = ( @@ -47170,6 +45425,23 @@ /obj/effect/landmark/start/captain, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) +"pDf" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + dir = 4; + freq = 1400; + location = "Medbay" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/medical/storage) "pDu" = ( /obj/machinery/computer/nanite_cloud_controller, /obj/effect/turf_decal/bot, @@ -47204,8 +45476,14 @@ /turf/open/floor/engine, /area/science/xenobiology) "pEd" = ( -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/machinery/camera/autoname{ + dir = 5 + }, +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "pEv" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -47254,24 +45532,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"pEV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "CloningDoor"; - name = "Genetics Lab"; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/genetics) "pFn" = ( /obj/machinery/door/airlock/command{ name = "Teleport Access"; @@ -47331,12 +45591,7 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) "pHw" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/hydroponics) "pHH" = ( /obj/structure/disposalpipe/segment{ @@ -47371,21 +45626,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"pIh" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/bed/roller, -/obj/item/bedsheet/medical, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "pIv" = ( /obj/structure/dresser, /turf/open/floor/carpet/green, @@ -47529,12 +45769,8 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) "pKB" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Backroom"; - req_access_txt = "45" - }, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/medical/surgery) "pLb" = ( /obj/machinery/power/smes{ @@ -47546,8 +45782,12 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "pLl" = ( -/obj/structure/grille, -/turf/open/floor/plating/rust, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance/two, +/obj/item/stack/sheet/mineral/copper, +/obj/item/stack/sheet/mineral/copper, +/obj/item/stack/sheet/mineral/copper, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "pLn" = ( /obj/machinery/conveyor/inverted{ @@ -47629,21 +45869,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/crew_quarters/locker) -"pNT" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "pOb" = ( /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -47675,10 +45900,16 @@ /turf/open/floor/iron/freezer, /area/medical/virology) "pOo" = ( +/obj/machinery/light{ + dir = 8 + }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/iron/checker, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, /area/hallway/secondary/service) "pOu" = ( /obj/effect/turf_decal/bot, @@ -47698,11 +45929,15 @@ /turf/open/floor/iron, /area/hallway/primary/port) "pOK" = ( -/obj/effect/turf_decal/trimline/white/line{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "pPb" = ( /obj/machinery/firealarm{ dir = 1; @@ -47719,17 +45954,8 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"pPg" = ( -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/crew_quarters/kitchen) "pPy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line, @@ -47748,9 +45974,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engineering) -"pPN" = ( -/turf/open/floor/iron, -/area/maintenance/aft) "pPU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -47764,14 +45987,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/engineering) -"pQx" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/crew_quarters/kitchen) "pQE" = ( /obj/structure/chair/office, /obj/structure/extinguisher_cabinet{ @@ -47779,22 +45994,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"pRi" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "pRl" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -47834,26 +46033,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/vacant_room/office) -"pSd" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"pSi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "pSj" = ( /obj/structure/closet/wardrobe/black, /obj/item/clothing/shoes/jackboots, @@ -47874,6 +46053,24 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) +"pSQ" = ( +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_x = -26; + req_access_txt = "5" + }, +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/book/manual/wiki/security_space_law, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "pSR" = ( /obj/structure/tank_dispenser/oxygen{ pixel_x = -1; @@ -47929,17 +46126,6 @@ broken = 1 }, /area/maintenance/starboard/aft) -"pTg" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable/yellow, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "pTk" = ( /obj/machinery/light{ dir = 8 @@ -48050,6 +46236,12 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"pWh" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "pWi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -48093,17 +46285,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "pXi" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/wood, -/obj/structure/musician/piano{ - icon_state = "piano" +/obj/structure/table, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre) +/obj/item/clothing/head/utility/hardhat/cakehat, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -31 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "pXj" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral{ @@ -48124,12 +46324,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"pXo" = ( -/obj/machinery/iv_drip, -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) "pXM" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -48170,36 +46364,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/science/research) -"pYm" = ( -/obj/item/toy/cards/deck{ - pixel_x = 1; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/table/wood, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) "pYs" = ( -/obj/machinery/chem_master, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table/glass, /obj/item/assembly/igniter{ pixel_x = -2; @@ -48300,22 +46465,6 @@ }, /turf/open/space, /area/space/nearstation) -"pZE" = ( -/obj/machinery/digital_clock/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) -"pZL" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/machinery/fax/service, -/obj/structure/table, -/turf/open/floor/iron, -/area/hallway/secondary/service) "pZR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -48357,13 +46506,19 @@ /obj/machinery/light, /turf/open/floor/iron/techmaint, /area/gateway) -"qbF" = ( -/obj/structure/chair/fancy/plastic, -/obj/machinery/newscaster{ - pixel_x = 32 +"qbx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "qbL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -48376,11 +46531,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"qcH" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "qcK" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -48416,24 +46566,9 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron, /area/security/checkpoint/science) -"qen" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "qep" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue, -/obj/structure/sign/departments/medbay/alt{ - pixel_y = -31 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -48458,14 +46593,6 @@ dir = 5 }, /area/science/research) -"qfb" = ( -/obj/structure/chair/fancy/sofa/old/left{ - color = "#742925"; - dir = 1 - }, -/obj/item/toy/plush/moth/witchwing, -/turf/open/floor/carpet/green, -/area/medical/exam_room) "qfc" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -48477,11 +46604,6 @@ /turf/open/floor/iron/dark, /area/science/server) "qfy" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -48495,8 +46617,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/aft) +/turf/open/floor/iron/dark, +/area/medical/morgue) "qfD" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -48538,21 +46660,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/warden) -"qhD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "qia" = ( /obj/machinery/door/airlock/science{ name = "exploration shuttle dock"; @@ -48576,10 +46683,17 @@ /turf/open/floor/plating, /area/storage/tech) "qie" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/vending/medical, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/white, /area/medical/surgery) "qiN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -48654,13 +46768,15 @@ /turf/open/floor/iron/dark, /area/storage/tech) "qlc" = ( -/obj/machinery/camera/autoname, -/obj/structure/disposalpipe/trunk{ - dir = 2 +/obj/structure/table, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/item/storage/pill_bottle/dice, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "qlo" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -48699,6 +46815,15 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) +"qmG" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "qnn" = ( /obj/structure/rack, /obj/item/storage/box/teargas{ @@ -48832,18 +46957,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"qpl" = ( -/obj/machinery/light, -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/machinery/computer/cryopod{ - pixel_x = -31; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) "qpr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -48860,16 +46973,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"qpC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "qpS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48902,12 +47005,11 @@ /turf/open/floor/iron/white, /area/medical/virology) "qqG" = ( -/obj/structure/fluff/hedge/opaque, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 +/obj/structure/noticeboard{ + pixel_y = -27 }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "qqM" = ( /obj/effect/turf_decal/siding/dark_blue, /obj/structure/cable/yellow{ @@ -48946,15 +47048,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"qrG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "qrJ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -48975,6 +47068,22 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) +"qrS" = ( +/obj/machinery/computer/slot_machine, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "qsK" = ( /obj/machinery/light, /obj/structure/sign/warning/electricshock{ @@ -49054,16 +47163,10 @@ /turf/open/space/basic, /area/space/nearstation) "qvN" = ( -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "qvR" = ( @@ -49092,6 +47195,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"qwh" = ( +/obj/effect/landmark/start/paramedic, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "qwk" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -49306,23 +47416,6 @@ /turf/open/floor/iron/white, /area/medical/virology) "qAM" = ( -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/obj/machinery/camera/autoname, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/closet/crate/hydroponics, -/obj/item/reagent_containers/glass/bucket, -/obj/item/shovel/spade, -/obj/item/wirecutters, -/obj/item/wrench, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/north{ pixel_y = 24 }, @@ -49342,27 +47435,6 @@ }, /turf/open/floor/iron, /area/quartermaster/qm) -"qBh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/cell_charger, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/item/stock_parts/cell/high{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/hydroponics) "qBv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -49454,8 +47526,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "qCI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) @@ -49482,32 +47554,6 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"qDs" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/condiment/enzyme{ - pixel_x = 13; - pixel_y = 17 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) -"qDE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "qEl" = ( /obj/structure/table, /obj/item/stack/cable_coil/random, @@ -49572,14 +47618,6 @@ /obj/item/clothing/head/costume/cardborg, /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness) -"qFr" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron, -/area/security/checkpoint/medical) "qFt" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -49691,14 +47729,6 @@ "qIE" = ( /turf/open/floor/catwalk_floor, /area/engine/engineering) -"qJc" = ( -/obj/effect/landmark/start/botanist, -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hydroponics) "qJm" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -49780,22 +47810,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) -"qKp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "qKr" = ( /obj/effect/landmark/prisonspawn, /turf/open/floor/prison, @@ -49828,8 +47842,8 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "qLp" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) @@ -49902,6 +47916,14 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"qMv" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/preopen{ + id = "barShutters"; + name = "privacy shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/bar) "qMH" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -49936,20 +47958,11 @@ /turf/open/floor/engine, /area/science/explab) "qNk" = ( -/obj/effect/turf_decal/siding/wood, -/obj/item/kirbyplants/random, -/turf/open/floor/wood, -/area/medical/exam_room) -"qNu" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron, -/area/hydroponics) +/turf/open/floor/iron/white, +/area/medical/cryo) "qNw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -49974,7 +47987,8 @@ /turf/open/floor/iron, /area/quartermaster/warehouse) "qNX" = ( -/turf/open/floor/plating/rust, +/obj/structure/grille/broken, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "qNZ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -50038,16 +48052,29 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "qOZ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 +/obj/item/radio/intercom{ + pixel_x = -27 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = -7; + pixel_y = 2 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/obj/item/reagent_containers/glass/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/glass/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "qPq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -50147,18 +48174,30 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/fore) -"qSU" = ( -/obj/machinery/computer/cargo/request{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +"qSz" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/machinery/camera/autoname{ + dir = 5 }, /turf/open/floor/iron/dark, -/area/medical/storage) +/area/medical/morgue) "qTj" = ( -/turf/open/floor/grass/no_border, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/radio/headset/headset_med, +/obj/machinery/requests_console{ + department = "Genetics"; + name = "Genetics Requests Console"; + pixel_y = 30 + }, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/medical/genetics) "qTu" = ( /obj/structure/cable/yellow{ @@ -50169,10 +48208,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"qTA" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "qTH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -50320,11 +48355,34 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "qWA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 5 }, -/turf/open/floor/carpet/grimy, +/turf/open/floor/wood, /area/crew_quarters/bar) +"qXd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Theatre Maintenance"; + req_access_txt = "46" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qXk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -50388,30 +48446,15 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"qYq" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - name = "Genie"; - sortType = 23 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "qYz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/chair/fancy/sofa/old/left{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "qYK" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50437,10 +48480,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/construction/mining/aux_base) -"qZh" = ( -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/hallway/primary/starboard) +"qZD" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/checkpoint/medical) "qZE" = ( /obj/machinery/door/airlock/virology/glass{ name = "Monkey Pen"; @@ -50499,31 +48545,19 @@ "raG" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ - pixel_x = -8 + pixel_y = 8 }, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" +/obj/item/reagent_containers/food/drinks/britcup{ + desc = "Kingston's personal cup."; + pixel_x = 10; + pixel_y = -4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/medical/medbay/lobby) "raZ" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "rbK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -50779,71 +48813,13 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"rfr" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "rfs" = ( -/obj/item/clothing/glasses/science{ - pixel_x = 10; - pixel_y = 12 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/structure/table/glass, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/north{ +/obj/machinery/chem_heater, +/obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/clothing/glasses/science{ - pixel_x = 10; - pixel_y = 12 - }, -/obj/item/assembly/timer{ - pixel_x = 10; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/assembly/timer{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/assembly/igniter{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/item/assembly/igniter{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/item/assembly/igniter{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/item/assembly/igniter{ - pixel_x = -7; - pixel_y = -2 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -50916,6 +48892,16 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) +"rgH" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + pixel_x = 30 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "rgI" = ( /obj/structure/chair/fancy/comfy{ color = "#596479" @@ -50966,6 +48952,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/mixing/chamber) +"rhu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "rhv" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -51061,34 +49054,31 @@ /turf/open/floor/iron, /area/quartermaster/office) "rjC" = ( -/obj/machinery/shower{ - dir = 4; - name = "emergency shower" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/bot, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"rkb" = ( +/obj/structure/filingcabinet, +/obj/machinery/firealarm{ + pixel_y = 24 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/noslip/white, -/area/medical/patients_rooms) +/turf/open/floor/iron, +/area/security/checkpoint/medical) "rki" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rkk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51131,24 +49121,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "rkN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/west{ pixel_x = -22 }, @@ -51160,7 +49132,7 @@ name = "HoochMaster Deluxe"; pixel_x = -4 }, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "rkQ" = ( /obj/structure/cable/yellow{ @@ -51219,39 +49191,20 @@ /turf/open/floor/iron, /area/engine/break_room) "rlt" = ( -/obj/machinery/holopad, +/obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) -"rlv" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/machinery/smartfridge/disks{ - pixel_y = 2 - }, -/obj/structure/table, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /turf/open/floor/iron, +/area/crew_quarters/theatre) +"rlv" = ( +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/turf/open/floor/iron, /area/hydroponics) -"rlw" = ( -/obj/item/cigbutt{ - pixel_x = 9; - pixel_y = -3 - }, -/obj/item/chair/plastic, -/obj/item/coin/bananium{ - pixel_x = 6; - pixel_y = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rlB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -51267,11 +49220,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"rlW" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/gloves, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "rmh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -51338,6 +49286,13 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"rnq" = ( +/obj/machinery/door/airlock{ + id_tag = "Toilet2"; + name = "Toilet Unit #2" + }, +/turf/open/floor/iron/freezer, +/area/crew_quarters/toilet) "rns" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -51387,6 +49342,16 @@ dir = 1 }, /area/hallway/secondary/entry) +"roQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) "rpg" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -51407,27 +49372,22 @@ /turf/open/floor/carpet/green, /area/security/detectives_office) "rpu" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 +/obj/structure/grille/broken, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/effect/turf_decal/tile/green/half/contrasted{ +/obj/structure/window{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/beer{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/reagent_containers/food/drinks/beer, -/obj/item/toy/cards/deck{ - pixel_x = -10; - pixel_y = 6 +/obj/structure/window, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating{ + burnt = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/area/maintenance/starboard/fore) "rpN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -51440,6 +49400,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/light/small{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, @@ -51457,11 +49420,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/techmaint, /area/teleporter) -"rqs" = ( -/turf/open/floor/iron/white/side{ - dir = 5 +"rqA" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Surgery Maintenance"; + req_access_txt = "45" }, -/area/crew_quarters/kitchen) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "rqE" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible, @@ -51486,29 +49456,6 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) -"rqR" = ( -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "rqS" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -51519,14 +49466,6 @@ /turf/open/floor/iron, /area/engine/engineering) "rqV" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, @@ -51582,17 +49521,15 @@ /turf/open/floor/iron/dark, /area/security/prison) "rrt" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" + dir = 10 }, -/obj/machinery/light_switch{ - pixel_y = -25 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, /turf/open/floor/iron, /area/crew_quarters/fitness) @@ -51809,29 +49746,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"rvI" = ( -/obj/effect/turf_decal/box/corners{ - pixel_x = -16; - pixel_y = 16 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "rvO" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -51849,41 +49763,17 @@ /turf/open/floor/iron, /area/security/brig) "rwp" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/chair/fancy/sofa/corp/left{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/stool/bar/directional/south, /obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "rwB" = ( -/obj/item/reagent_containers/glass/bottle/salglu_solution{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/reagentgrinder{ - pixel_y = 6; - pixel_x = 3 + icon_state = "1-2" }, -/obj/item/reagent_containers/glass/bottle/epinephrine{ - pixel_x = -8; - pixel_y = 3 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -51954,17 +49844,17 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "rxI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/wood, -/area/medical/exam_room) +/turf/open/floor/iron/white, +/area/medical/cryo) "rxO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -51998,7 +49888,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "ryD" = ( @@ -52045,22 +49937,15 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "rAu" = ( -/obj/effect/turf_decal/trimline/white/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 1 +/obj/structure/table_frame, +/obj/item/radio/intercom{ + pixel_y = 20 }, -/turf/open/floor/wood/big, -/area/maintenance/aft) -"rAJ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/turf/open/floor/iron/dark, +/area/medical/morgue) "rBg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52077,10 +49962,11 @@ /turf/open/floor/iron/dark, /area/hallway/primary/port) "rBA" = ( -/obj/machinery/rnd/production/techfab/department/medical, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "rCa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -52102,6 +49988,13 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) +"rCd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rCs" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -52119,8 +50012,15 @@ /turf/open/floor/catwalk_floor, /area/maintenance/solars/port/aft) "rCx" = ( -/turf/open/floor/iron/white, -/area/medical/patients_rooms) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/landmark/start/depsec/medical, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "rCK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -52236,10 +50136,6 @@ }, /turf/open/floor/engine, /area/science/explab) -"rEo" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/bar/atrium) "rEE" = ( /obj/structure/table, /obj/item/razor, @@ -52251,15 +50147,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/locker) -"rEQ" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics"; - req_one_access_txt = "35;28" - }, -/turf/open/floor/iron, -/area/crew_quarters/kitchen) "rEX" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -52280,6 +50167,9 @@ "rFx" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "rFN" = ( @@ -52342,15 +50232,6 @@ }, /turf/open/floor/iron, /area/security/courtroom) -"rGt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "rGD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52434,10 +50315,10 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "rHy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -52535,8 +50416,14 @@ /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) "rJX" = ( -/turf/closed/wall, -/area/medical/exam_room) +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1; + name = "Connector Port (Air Supply)" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/cryo) "rKk" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -52561,26 +50448,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_dock) -"rKR" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/directional/west, -/turf/closed/wall, -/area/crew_quarters/bar) -"rKW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = -31; - pixel_y = -3 - }, -/turf/open/floor/iron/checker, -/area/hallway/secondary/service) "rLd" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright{ @@ -52757,38 +50624,13 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"rOu" = ( -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk"; - req_access_txt = "5" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "rOy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/item/radio/intercom{ pixel_y = 25 }, /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/camera/directional/north, -/turf/open/floor/iron/checker, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "rOJ" = ( /obj/machinery/door/airlock/atmos{ @@ -52798,12 +50640,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/engine/atmos) -"rOS" = ( -/mob/living/simple_animal/hostile/retaliate/goat{ - name = "Pete" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "rOW" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -52844,9 +50680,16 @@ /turf/open/floor/wood, /area/security/detectives_office) "rPA" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/dirt/jungle, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, /area/medical/genetics) "rPL" = ( /obj/machinery/porta_turret/ai{ @@ -52854,11 +50697,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"rPQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/curtain/bounty, -/turf/open/floor/plating, -/area/crew_quarters/theatre) "rPV" = ( /obj/structure/closet/masks, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -53048,39 +50886,27 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/science/mixing) -"rTU" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +"rUo" = ( +/obj/machinery/processor, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) +"rUx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) -"rUo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron/white/side{ - dir = 8 +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 20 }, -/area/crew_quarters/kitchen) -"rUx" = ( -/obj/machinery/airalarm{ - pixel_y = 24 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/obj/machinery/camera/autoname, -/obj/machinery/vending/wardrobe/chef_wardrobe, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rUC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53088,21 +50914,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "rUJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -53131,12 +50942,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"rWe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "rWw" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -53213,14 +51018,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"rXw" = ( -/obj/machinery/chem_dispenser/mutagensaltpetersmall, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "rXA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53229,36 +51026,20 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "rXJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /turf/open/floor/iron, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "rXR" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/structure/closet/crate/wooden, -/obj/item/clothing/under/costume/gangster, -/obj/item/clothing/under/costume/gangster/purple, -/obj/item/clothing/under/costume/geisha, -/obj/item/clothing/suit/hooded/renault_costume, -/obj/item/clothing/suit/hooded/carp_costume, -/obj/item/clothing/head/costume/santa, -/obj/item/clothing/under/costume/lobster, -/obj/item/clothing/head/costume/lobsterhat, -/obj/machinery/firealarm/directional/north, +/obj/structure/musician/piano{ + icon_state = "piano" + }, /turf/open/floor/wood, /area/crew_quarters/theatre) "rYj" = ( @@ -53361,12 +51142,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/security/execution/transfer) -"rZN" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "rZO" = ( /obj/machinery/button/door{ id = "atmos"; @@ -53418,10 +51193,8 @@ /turf/open/floor/carpet/green, /area/crew_quarters/dorms) "sbH" = ( +/obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 4 }, /turf/open/floor/iron, @@ -53459,17 +51232,12 @@ /turf/open/floor/iron, /area/quartermaster/storage) "sdf" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/item/radio/intercom{ pixel_y = 25 }, /obj/machinery/camera/directional/north, -/turf/closed/wall, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/wood, +/area/crew_quarters/theatre) "sdq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53527,6 +51295,12 @@ "sdX" = ( /turf/closed/wall, /area/quartermaster/office) +"sfb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/bar) "sfp" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -53627,16 +51401,12 @@ /turf/open/floor/catwalk_floor, /area/engine/engineering) "shE" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/chair/office/light{ +/obj/machinery/atmospherics/components/unary/cryo_cell, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/landmark/start/randommaint/psychiatrist, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/wood, -/area/medical/exam_room) +/turf/open/floor/iron/white, +/area/medical/cryo) "shI" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -53731,13 +51501,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"sji" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) "sjn" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/bin, @@ -53820,17 +51583,12 @@ /turf/open/floor/iron, /area/engine/atmos) "slJ" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/closet/secure_closet/freezer/meat, /obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/machinery/power/apc/auto_name/directional/north, -/turf/closed/wall, +/turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "slN" = ( /obj/machinery/power/solar{ @@ -53840,6 +51598,9 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/solar/starboard/fore) +"smk" = ( +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "smJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53908,28 +51669,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"sod" = ( -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/crew, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) -"som" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Service Maintenance"; - req_access_txt = null; - req_one_access_txt = "25;26;35;28;22;37;46;38" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "sou" = ( /obj/structure/closet/crate, /obj/item/clothing/under/color/lightpurple, @@ -53986,6 +51725,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/crew_quarters/fitness) "spf" = ( @@ -54052,18 +51792,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"spR" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Plumbing Factory Maintenance"; - req_access_txt = "5" - }, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/maintenance/aft) "spX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -54103,14 +51831,17 @@ /turf/open/floor/iron, /area/tcommsat/computer) "sqA" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/chair{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, /turf/open/floor/iron/dark, -/area/maintenance/aft) +/area/medical/morgue) "sqF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -54190,22 +51921,23 @@ /turf/open/floor/prison/dark, /area/security/prison) "stE" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/camera/autoname{ - dir = 1 +/obj/machinery/door/airlock{ + name = "Theatre Backstage"; + req_access_txt = "46" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 + dir = 1 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/theatre) "stH" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/structure/chair{ + dir = 8 + }, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -54214,6 +51946,21 @@ dir = 1 }, /area/science/research) +"suw" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "svw" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=AIW"; @@ -54339,16 +52086,19 @@ /turf/open/floor/wood, /area/lawoffice) "syv" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/machinery/vending/wallmed{ + pixel_x = -28 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/structure/closet/secure_closet/brig{ - id = "medcell"; - name = "Medical Cell Locker" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "syA" = ( /obj/effect/turf_decal/siding/wood{ layer = 1 @@ -54400,11 +52150,15 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "szp" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/chair, +/obj/structure/sign/warning/nosmoking{ + pixel_x = -28 }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/surgery) "szq" = ( /obj/structure/closet/wardrobe/green, /obj/machinery/light{ @@ -54419,29 +52173,33 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/quartermaster/exploration_dock) -"szT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +"szX" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/table, +/obj/item/reagent_containers/hypospray/medipen/dexalin{ + pixel_x = -5; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/item/reagent_containers/hypospray/medipen/dexalin{ + pixel_x = 6; + pixel_y = 8 }, -/turf/open/floor/iron/dark, -/area/medical/storage) -"szX" = ( -/obj/machinery/door/airlock/medical{ - name = "Autopsy Room A"; - req_access_txt = "5" +/obj/item/storage/pill_bottle/epinephrine{ + pixel_x = 10; + pixel_y = 5 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "sAj" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -54496,16 +52254,18 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sBy" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/newscaster{ + pixel_x = -30 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk"; - req_access_txt = "5" +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "sBN" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -54529,11 +52289,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) -"sCe" = ( -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable/yellow, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "sCg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -54596,17 +52351,6 @@ /obj/item/book/manual/wiki/sopsecurity, /turf/open/floor/iron/dark, /area/security/main) -"sDk" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/crew_quarters/kitchen) "sDm" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -54659,10 +52403,9 @@ /turf/open/floor/iron/dark, /area/chapel/main) "sEi" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron/white/side, +/obj/structure/table, +/obj/item/food/mint, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "sEj" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -54682,28 +52425,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"sEG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) -"sEL" = ( -/obj/structure/table, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "sER" = ( /obj/structure/railing, /obj/structure/railing{ @@ -54727,11 +52448,21 @@ /turf/open/floor/iron, /area/hallway/primary/central) "sEU" = ( +/obj/structure/table/glass, +/obj/item/storage/box/syringes, +/obj/item/clothing/glasses/science{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science, /obj/item/radio/intercom{ dir = 8; pixel_x = 28 }, -/obj/machinery/chem_heater, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "sEW" = ( @@ -54746,21 +52477,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"sFk" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/checker, -/area/maintenance/starboard/fore) "sFz" = ( /obj/machinery/door/poddoor/shutters{ id = "qm_warehouse"; @@ -54851,8 +52567,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "sGZ" = ( -/turf/closed/wall/r_wall, -/area/medical/genetics/cloning) +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/noslip/white, +/area/medical/genetics) "sHc" = ( /obj/machinery/gateway{ dir = 4 @@ -54944,9 +52663,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "sJs" = ( -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "sJt" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 @@ -55010,15 +52731,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "sKv" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/item/radio/intercom{ + pixel_x = -27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron/white, -/area/medical/patients_rooms) +/area/medical/medbay/central) "sKx" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -55030,16 +52751,18 @@ /turf/open/floor/iron, /area/hallway/primary/port) "sKN" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/eastright{ + name = "Chemistry Desk"; + req_access_txt = "33" + }, /obj/machinery/door/poddoor/preopen{ id = "chemistry_shutters"; name = "Chemistry shutters" }, +/obj/machinery/cell_charger, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "5; 33" - }, -/turf/open/floor/iron/white, +/turf/open/floor/plating, /area/medical/apothecary) "sKX" = ( /obj/structure/disposalpipe/segment{ @@ -55062,11 +52785,12 @@ /turf/open/floor/iron/dark, /area/security/main) "sLi" = ( -/obj/effect/turf_decal/siding/wood{ +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "sLn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55097,21 +52821,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"sMD" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "sMQ" = ( /obj/effect/decal/cleanable/oil, /obj/item/cigbutt, @@ -55172,7 +52881,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "sNN" = ( @@ -55217,9 +52928,11 @@ dir = 8 }, /mob/living/simple_animal/pet/cat/Runtime, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/item/book/manual/wiki/sopmedical, -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "sPc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -55416,17 +53129,14 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) "sRT" = ( -/obj/item/radio/intercom{ - pixel_y = 25 - }, -/obj/machinery/light{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "sRV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -55440,25 +53150,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/security/prison) -"sSh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "sSq" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -55555,14 +53246,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/prison) -"sUn" = ( -/obj/machinery/vending/hydronutrients, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "sUo" = ( /obj/structure/showcase/cyborg/old{ dir = 4; @@ -55648,8 +53331,11 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "sWL" = ( -/obj/machinery/vending/boozeomat, -/turf/closed/wall, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/wood, /area/crew_quarters/bar) "sWW" = ( /obj/machinery/telecomms/broadcaster/preset_exploration, @@ -55697,26 +53383,16 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "sXY" = ( -/obj/machinery/door/firedoor, -/obj/structure/curtain, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/sleeper) "sYk" = ( /obj/structure/table, /obj/item/gps/mining/exploration, @@ -55762,36 +53438,29 @@ /turf/open/floor/iron/dark, /area/bridge) "sYK" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "kitchencounter"; - name = "Kitchen Shutters" +/obj/effect/landmark/start/cook, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "sYS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/chair, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) "sYW" = ( -/obj/machinery/light, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/blindfold, -/obj/structure/table, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, /area/medical/surgery) "sYX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -55834,13 +53503,16 @@ /turf/open/floor/plating, /area/vacant_room/commissary) "sZN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/structure/table, +/obj/item/reagent_containers/glass/bucket, +/obj/item/stack/sheet/mineral/copper{ + amount = 5 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 }, -/turf/open/floor/iron/checker, +/obj/item/shovel/spade, +/turf/open/floor/iron, /area/hallway/secondary/service) "sZW" = ( /obj/effect/spawner/structure/window/reinforced, @@ -55858,15 +53530,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"taj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "tav" = ( /turf/closed/wall, /area/vacant_room/commissary) @@ -55913,33 +53576,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"tbc" = ( -/obj/machinery/light/small, -/obj/machinery/vending/wardrobe/hydro_wardrobe, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) -"tbH" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "tbO" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -55953,32 +53589,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"tce" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/northright{ - dir = 2; - name = "First-Aid Supplies"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/effect/loot_jobscale/medical/first_aid_kit{ - pixel_x = -5 - }, -/obj/effect/loot_jobscale/medical/medkits{ - pixel_x = 7; - pixel_y = 8 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "tcm" = ( /obj/structure/table, /obj/effect/turf_decal/tile/black/fourcorners, @@ -56012,6 +53622,30 @@ }, /turf/open/floor/plating, /area/security/brig) +"tcH" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) +"tcM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "tcO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -56110,22 +53744,6 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "tdJ" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage"; - req_access_txt = "5" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/closet/secure_closet/security/med, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -56138,8 +53756,8 @@ dir = 9 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron, +/area/security/checkpoint/medical) "tdQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/iron/dark/side{ @@ -56196,18 +53814,15 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"tei" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +"tek" = ( +/obj/machinery/computer/cloning{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/white, +/area/medical/genetics) "tep" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56517,19 +54132,18 @@ }, /turf/open/floor/iron/white, /area/science/mixing) +"tjE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/security/checkpoint/medical) "tjM" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/grenades, -/obj/item/screwdriver{ - pixel_x = 2; - pixel_y = 6 +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/item/stack/cable_coil/random, -/obj/item/grenade/chem_grenade, -/obj/item/stack/cable_coil/random, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, -/obj/item/grenade/chem_grenade, /turf/open/floor/iron/white, /area/medical/apothecary) "tjO" = ( @@ -56591,21 +54205,6 @@ /obj/effect/turf_decal/tile/black/fourcorners, /turf/open/floor/iron/grid/steel, /area/ai_monitored/storage/eva) -"tlN" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "tlO" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -56631,6 +54230,16 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"tmr" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "Chemistry Desk"; + req_access_txt = "33" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/medical/apothecary) "tmB" = ( /obj/machinery/firealarm{ dir = 8; @@ -56655,10 +54264,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 + icon_state = "1-4" }, /turf/open/floor/iron, /area/hydroponics) @@ -56774,20 +54380,20 @@ /area/hallway/secondary/command) "tpy" = ( /obj/structure/table/wood, -/obj/item/toy/dummy, -/obj/item/food/baguette, -/obj/item/toy/figure/mime{ - pixel_x = -10; - pixel_y = -1 +/obj/machinery/requests_console{ + department = "Theatre"; + name = "theatre RC"; + pixel_x = -32 }, -/obj/structure/mirror{ - pixel_y = 28 +/obj/item/food/baguette, +/obj/item/toy/dummy, +/obj/machinery/light_switch{ + pixel_y = 26 }, -/obj/structure/window/reinforced/tinted{ +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "tpA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -56830,20 +54436,13 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"tqr" = ( +"tqu" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/airlock{ - name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + icon_state = "0-2" }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "tqv" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56856,12 +54455,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"tqE" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/surgery) "tqF" = ( /turf/closed/wall/r_wall, /area/maintenance/fore/secondary) @@ -56913,14 +54506,6 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"tsz" = ( -/obj/effect/landmark/start/botanist, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "tsJ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -57067,13 +54652,6 @@ /obj/item/clothing/glasses/meson, /turf/open/floor/iron, /area/engine/engineering) -"tuT" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) "tuZ" = ( /obj/machinery/light/small, /obj/machinery/computer/turbine_computer{ @@ -57090,13 +54668,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/maintenance/disposal/incinerator) -"tvc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "tvf" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box{ @@ -57210,13 +54781,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"txv" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "txw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -57286,14 +54850,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"tyP" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/chair/fancy/corp, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "tyT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -57329,13 +54885,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"tzg" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, -/obj/machinery/smartfridge/chemistry, -/turf/closed/wall, -/area/medical/apothecary) "tzn" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow{ @@ -57358,22 +54907,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"tzw" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Service Maintenance"; - req_access_txt = null; - req_one_access_txt = "25;26;35;28;22;37;46;38" - }, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "tzz" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -57400,12 +54933,6 @@ /obj/machinery/light/small, /turf/open/floor/engine/o2, /area/engine/atmos) -"tAA" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "tAB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57432,13 +54959,14 @@ /turf/open/floor/grass, /area/hallway/secondary/command) "tAL" = ( -/obj/effect/turf_decal/trimline/dark_red/line{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/wood/big, -/area/maintenance/aft) +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/dark, +/area/medical/morgue) "tAM" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; sortType = 16 @@ -57509,16 +55037,6 @@ }, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"tCd" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/hallway/primary/aft) "tCH" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -57543,27 +55061,21 @@ /area/medical/virology) "tDm" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 + dir = 1 }, -/turf/open/floor/iron/checker, +/turf/open/floor/plating, /area/maintenance/starboard/fore) "tDn" = ( -/obj/item/radio/intercom{ - pixel_y = 23 +/obj/machinery/smartfridge/organ, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/closed/wall, +/turf/open/floor/iron/white, /area/medical/surgery) "tDp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -57590,19 +55102,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"tDz" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "tDA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -57780,16 +55279,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"tHE" = ( -/obj/structure/cable/yellow, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/machinery/power/apc/auto_name/east, -/obj/machinery/light, -/obj/machinery/vending/coffee, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "tHS" = ( /obj/item/paper_bin{ pixel_x = -4; @@ -57827,11 +55316,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"tId" = ( -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/mapping_helpers/tile_breaker, -/turf/open/floor/iron, -/area/maintenance/starboard/fore) "tIl" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -57845,14 +55329,17 @@ /turf/open/floor/wood, /area/security/detectives_office) "tIw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -57897,7 +55384,10 @@ /obj/machinery/computer/card/minor/cmo{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "tJV" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ @@ -57930,11 +55420,8 @@ /turf/open/floor/circuit/telecomms, /area/tcommsat/server) "tKs" = ( -/obj/structure/chair/office/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/medical/genetics) "tKA" = ( @@ -57966,6 +55453,16 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) +"tKW" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + freq = 1400; + location = "Bar" + }, +/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/crew_quarters/bar) "tKY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable/yellow{ @@ -58082,9 +55579,12 @@ /turf/open/floor/carpet/grimy, /area/security/brig) "tMZ" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 }, /turf/open/floor/iron, /area/hydroponics) @@ -58100,11 +55600,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "tNt" = ( -/obj/machinery/seed_extractor, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, +/obj/machinery/vending/hydronutrients, /turf/open/floor/iron, /area/hydroponics) "tNE" = ( @@ -58132,11 +55628,6 @@ /obj/item/clothing/gloves/artifact_pinchers, /turf/open/floor/iron/white, /area/science/explab) -"tOd" = ( -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/crew_quarters/kitchen) "tOl" = ( /obj/machinery/power/solar{ id = "auxsolareast"; @@ -58232,53 +55723,17 @@ /obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/storage) -"tQW" = ( -/obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/starboard/fore) -"tQZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/fancy/sofa/corp/right{ - dir = 8 - }, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) "tRh" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 + dir = 1 }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) -"tRj" = ( -/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/turf/open/floor/iron, +/area/crew_quarters/theatre) "tRI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58371,22 +55826,10 @@ /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain) "tTp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Bar Backroom"; +/obj/structure/closet/secure_closet/bar{ req_access_txt = "25" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "tTq" = ( /turf/open/floor/carpet, @@ -58413,32 +55856,6 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "tTW" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8; - pixel_x = 15; - pixel_y = 16 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -58447,17 +55864,14 @@ /obj/item/radio/intercom{ pixel_y = 20 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/turf/open/floor/iron/dark, +/area/medical/surgery) "tUf" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 8 }, -/turf/open/floor/wood, -/area/medical/exam_room) +/turf/open/floor/iron/white, +/area/medical/cryo) "tUj" = ( /obj/machinery/status_display/door_timer{ id = "cell"; @@ -58477,17 +55891,11 @@ /turf/open/floor/prison, /area/security/prison) "tUS" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "tVg" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/bed/roller, /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -58498,8 +55906,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/closed/wall, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "tVj" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 @@ -58515,36 +55923,10 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"tWb" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/structure/chair/stool/directional/south, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "tWd" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) -"tWj" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/bar) -"tWk" = ( -/obj/effect/landmark/start/botanist, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "tWm" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -58586,21 +55968,25 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ai_monitored/turret_protected/aisat_interior) "tWY" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/reagent_dispensers/watertank/high, /obj/machinery/camera/autoname/directional/east, -/turf/closed/wall, +/turf/open/floor/iron, /area/hydroponics) -"tXx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 +"tXt" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"tXx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) @@ -58665,6 +56051,13 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"tYf" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/theatre) "tYh" = ( /obj/machinery/light, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -58740,9 +56133,8 @@ dir = 4; pixel_x = -24 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -58862,12 +56254,7 @@ /turf/open/floor/iron/dark, /area/crew_quarters/fitness) "ucw" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +/obj/structure/window/reinforced, /turf/open/floor/wood, /area/crew_quarters/theatre) "ucY" = ( @@ -58943,14 +56330,6 @@ /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) "ueo" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/airalarm/directional/south{ pixel_y = -22 }, @@ -58964,8 +56343,8 @@ pixel_x = -24 }, /obj/item/storage/box/pillbottles, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "ueB" = ( /obj/vehicle/ridden/secway, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -58990,10 +56369,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/crew_quarters/toilet) -"ueP" = ( -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/turf/open/floor/iron/dark, -/area/medical/morgue) "ufg" = ( /obj/machinery/power/solar{ id = "auxsolareast"; @@ -59017,11 +56392,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ufm" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable/yellow, /obj/machinery/light, @@ -59040,8 +56410,8 @@ }, /obj/item/storage/pill_bottle/mannitol, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "ufu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -59122,15 +56492,9 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "ugv" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/carpet/grimy, +/obj/machinery/reagentgrinder, +/obj/structure/table/wood, +/turf/open/floor/wood, /area/crew_quarters/bar) "ugE" = ( /obj/machinery/newscaster{ @@ -59189,9 +56553,11 @@ /turf/open/floor/iron, /area/hallway/primary/fore) "uhH" = ( -/obj/effect/spawner/room/fivexfour, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "uhI" = ( /obj/machinery/requests_console{ department = "Security"; @@ -59269,16 +56635,13 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "ukj" = ( -/obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 }, -/turf/open/floor/carpet/blue, -/area/medical/break_room) +/obj/effect/landmark/start/medical_doctor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/storage) "ukk" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 4 @@ -59288,21 +56651,6 @@ /obj/item/multitool, /turf/open/floor/iron/dark, /area/bridge) -"ukz" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kitchencounter"; - name = "Kitchen Shutters" - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "ulp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59393,6 +56741,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"uno" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/cryo) "unI" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -59550,13 +56905,6 @@ }, /turf/open/floor/grass, /area/crew_quarters/dorms) -"urf" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "urz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59634,7 +56982,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tile/yellow{ - dir = 1 + dir = 8 }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -59659,6 +57007,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/fore) +"usK" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Research"; + req_access_txt = "5; 9; 68" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/genetics) "utF" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -59674,21 +57032,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"uuA" = ( -/obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_one_access_txt = "6;4;29" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "quarantineshutters"; - name = "Quarantine Shutters" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "uuT" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -59745,30 +57088,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"uvE" = ( -/obj/structure/table/reinforced, -/obj/effect/loot_jobscale/medical/medkits{ - pixel_x = -7 - }, -/obj/effect/loot_jobscale/medical/medkits{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/effect/loot_jobscale/medical/medkits{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/northright{ - dir = 2; - name = "First-Aid Supplies"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) "uvN" = ( /obj/item/radio/intercom{ pixel_y = 22 @@ -59802,15 +57121,6 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) -"uwX" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "uwZ" = ( /turf/closed/wall, /area/medical/medbay/lobby) @@ -59875,33 +57185,30 @@ }, /turf/open/floor/iron, /area/quartermaster/storage) -"uye" = ( +"uyg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) -"uyj" = ( -/obj/machinery/door/window/eastright{ - name = "Theatre Stage"; - dir = 2 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"uyI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 + dir = 8 }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood, -/area/crew_quarters/theatre) +/turf/open/floor/iron, +/area/security/checkpoint/medical) "uyT" = ( /obj/structure/chair/fancy, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -59940,12 +57247,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"uzw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) "uzz" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 @@ -59980,12 +57281,14 @@ /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) "uAg" = ( -/obj/effect/turf_decal/siding/wood{ - layer = 1 +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 }, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/wood, -/area/medical/exam_room) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "uAj" = ( /obj/structure/chair/fancy/sofa/old/left{ color = "#742925"; @@ -60097,6 +57400,18 @@ }, /turf/open/floor/prison, /area/security/prison) +"uDy" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Bar Maintenance"; + req_one_access_txt = "12;25;26;35;28;22;37;46;38" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "uDB" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -60109,6 +57424,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"uEq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "uEw" = ( /obj/structure/cable{ icon_state = "2-8" @@ -60136,17 +57461,8 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "uFd" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -27; - use_power = 0 - }, -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/surgery) "uFe" = ( @@ -60179,18 +57495,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"uFX" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/dark_green{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "uGA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -60201,6 +57505,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) +"uGG" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "kitchen shutters" + }, +/obj/structure/displaycase/forsale/kitchen, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "uGH" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -60240,14 +57553,11 @@ /turf/open/floor/iron/white, /area/medical/virology) "uHf" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes{ +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/medical/medbay/central) "uHL" = ( /obj/structure/table/reinforced, @@ -60322,8 +57632,7 @@ /turf/open/floor/engine, /area/science/explab) "uJx" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron, /area/hydroponics) "uJV" = ( @@ -60403,6 +57712,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "uKS" = ( @@ -60431,12 +57743,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"uMa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uMh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -60449,24 +57755,19 @@ /turf/open/floor/iron/dark, /area/engine/gravity_generator) "uMu" = ( -/obj/structure/bed, -/obj/item/bedsheet/clown, -/obj/effect/landmark/start/clown, -/obj/machinery/light/small{ +/obj/machinery/vending/autodrobe, +/turf/open/floor/iron/white/side{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/area/crew_quarters/theatre) "uMx" = ( -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "uMN" = ( @@ -60509,19 +57810,16 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "uNf" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/obj/machinery/fax/med, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "uNn" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron, /area/hydroponics) "uNx" = ( @@ -60585,12 +57883,32 @@ }, /turf/open/floor/iron, /area/quartermaster/office) +"uOY" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/genetics) "uPb" = ( -/obj/item/food/grown/banana, -/obj/structure/flora/ausbushes/fullgrass, -/mob/living/carbon/monkey, -/turf/open/floor/grass/no_border, +/obj/machinery/dna_scannernew, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/medical/genetics) +"uPt" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Recovery Room" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "uPC" = ( /obj/machinery/door/airlock/research{ name = "Toxins Lab"; @@ -60636,20 +57954,6 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) -"uQy" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue, -/obj/structure/sign/departments/medbay/alt{ - pixel_y = -31 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uQB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -60714,6 +58018,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/crew_quarters/locker) +"uSc" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "uSj" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -60729,27 +58040,27 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain) "uSx" = ( -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/white/side{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "kitchen shutters" }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "uSy" = ( -/obj/machinery/computer/crew{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"uSA" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "uSG" = ( -/obj/structure/toilet{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = "Toilet1"; + name = "Toilet Unit #1" }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) @@ -60773,13 +58084,11 @@ /area/hallway/primary/fore) "uUh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "uUy" = ( /turf/open/floor/iron, /area/science/mixing) @@ -61007,23 +58316,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"uZx" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/junglebush/b, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) -"uZH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "uZQ" = ( /obj/machinery/ai_slipper{ uses = 8 @@ -61129,8 +58421,13 @@ /turf/open/floor/iron, /area/hallway/primary/central) "vcv" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/genetics) "vcM" = ( @@ -61154,10 +58451,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"vdg" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "vdA" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -61362,21 +58655,16 @@ /turf/open/floor/prison, /area/security/prison) "vjn" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) -"vjq" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "vjz" = ( /obj/machinery/power/apc/auto_name/directional/west{ pixel_x = -24 @@ -61393,16 +58681,14 @@ /turf/open/floor/iron, /area/security/checkpoint/engineering) "vjG" = ( -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/table/optable, +/obj/item/radio/intercom{ + pixel_x = -27 }, -/obj/structure/bed{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/item/bedsheet/medical, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/medical/surgery) "vjK" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -61467,12 +58753,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"vkj" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "vkC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -61489,6 +58769,7 @@ /turf/open/floor/wood, /area/security/detectives_office) "vla" = ( +/obj/structure/table, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 @@ -61496,7 +58777,6 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/table, /turf/open/floor/iron/white, /area/medical/chemistry) "vlj" = ( @@ -61605,6 +58885,17 @@ /obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/iron, /area/science/xenobiology) +"vmg" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/spawner/xmastree, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "vmi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -61642,9 +58933,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plating, /area/maintenance/aft) "vmB" = ( @@ -61667,18 +58955,10 @@ /turf/open/floor/engine/light, /area/storage/tech) "vmH" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes{ - pixel_x = -1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 5; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/medical/surgery) "vmI" = ( @@ -61841,6 +59121,10 @@ }, /turf/open/floor/iron, /area/security/brig) +"vpr" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/medical/chemistry) "vpP" = ( /obj/machinery/door/poddoor{ id = "SecJusticeChamber"; @@ -61862,18 +59146,20 @@ /turf/open/floor/iron/dark, /area/bridge) "vpV" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "1-2" }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/medical/storage) +/turf/open/floor/iron/white, +/area/medical/chemistry) "vqJ" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -61949,17 +59235,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"vsf" = ( -/obj/structure/table/reinforced, -/obj/machinery/dish_drive{ - pixel_y = 5 - }, -/obj/machinery/door/poddoor/shutters{ - id = "barcounter"; - name = "Bar Counter Shutters" - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "vsg" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -61968,6 +59243,17 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/central) +"vsm" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "vsD" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -62102,8 +59388,21 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "vwy" = ( -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/machinery/door/airlock{ + name = "Kitchen"; + req_access_txt = "28" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/kitchen) +"vwz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "vwZ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62115,6 +59414,21 @@ }, /turf/open/floor/iron, /area/storage/tools) +"vyv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "vyz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -62142,6 +59456,13 @@ }, /turf/open/floor/iron, /area/science/nanite) +"vzb" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "vzi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -62160,25 +59481,17 @@ /turf/open/floor/iron, /area/hallway/secondary/exit) "vzv" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/landmark/start/assistant, -/obj/structure/chair/fancy/sofa/old/left{ - dir = 8 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "vAa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 }, -/turf/open/floor/iron/checker, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "vAh" = ( /obj/machinery/door/window{ @@ -62250,8 +59563,9 @@ /turf/open/floor/plating, /area/storage/tech) "vDk" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/digital_clock/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "vDl" = ( @@ -62289,21 +59603,6 @@ }, /turf/open/floor/iron/white, /area/science/explab) -"vEe" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - freq = 1400; - location = "Bar" - }, -/obj/structure/plasticflaps/opaque, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/crew_quarters/kitchen/coldroom) -"vEJ" = ( -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable/yellow, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "vES" = ( /obj/structure/plasticflaps, /turf/open/floor/plating, @@ -62455,21 +59754,8 @@ }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) -"vGW" = ( -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/fluff/hedge/opaque, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood/big, -/area/crew_quarters/bar/atrium) "vGY" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, /turf/open/floor/iron, @@ -62534,22 +59820,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vIR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"vIa" = ( +/obj/structure/displaycase{ + desc = "A display case with a mortar straight from a museum. You might be in a big trouble if you need to use this."; + name = "archaic tool display case"; + start_showpiece_type = /obj/item/reagent_containers/glass/mortar }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/iron, -/area/hydroponics) +/turf/open/floor/iron/white, +/area/medical/chemistry) "vIU" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light{ @@ -62693,18 +59974,14 @@ /turf/open/floor/iron, /area/hallway/primary/port) "vLl" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "vLp" = ( @@ -62728,6 +60005,10 @@ /area/maintenance/fore/secondary) "vLI" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Hydroponics Maintenance"; + req_access_txt = "35" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -62735,10 +60016,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - name = "Hydroponics Maintenance"; - req_access_txt = "35" - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vLM" = ( @@ -62843,28 +60120,13 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) -"vNZ" = ( -/obj/machinery/holopad{ - pixel_y = -16 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +"vOt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/medical/surgery) -"vOt" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/carpet/blue, -/area/medical/break_room) +/area/medical/storage) "vOw" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -62884,12 +60146,7 @@ /turf/open/floor/iron/dark, /area/security/courtroom) "vPo" = ( -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_green{ - dir = 4 - }, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/iron, /area/hydroponics) "vPu" = ( @@ -62934,13 +60191,6 @@ }, /turf/open/floor/iron/white, /area/science/mixing) -"vPG" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "vPI" = ( /obj/machinery/door/airlock/command/glass{ name = "Control Room"; @@ -62972,38 +60222,25 @@ /obj/item/kirbyplants/random, /turf/open/floor/prison, /area/security/prison) -"vQj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/tile/bar/half/contrasted{ +"vQo" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"vQo" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/holopad, -/turf/open/floor/wood, -/area/medical/exam_room) +/turf/open/floor/iron/white, +/area/medical/cryo) "vQx" = ( -/obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_one_access_txt = "5" - }, -/obj/machinery/door/firedoor, +/mob/living/simple_animal/bot/cleanbot/medbay, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) +"vQA" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" + dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vQY" = ( /obj/structure/chair{ dir = 4; @@ -63034,19 +60271,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/fore) -"vRp" = ( -/obj/effect/mapping_helpers/tile_breaker, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/wood/big, -/area/maintenance/aft) "vRI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/structure/table/reinforced, +/obj/item/food/pie/cream, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "vRS" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -63070,19 +60299,6 @@ /obj/structure/cable/yellow, /turf/open/floor/iron/white, /area/science/explab) -"vRZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "vSa" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -63104,11 +60320,6 @@ /turf/open/floor/iron/dark, /area/bridge) "vSv" = ( -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table, /obj/item/book/manual/wiki/medicine, /obj/item/clothing/glasses/hud/health, @@ -63125,8 +60336,8 @@ dir = 10 }, /obj/item/glove_box, -/turf/closed/wall, -/area/medical/break_room) +/turf/open/floor/iron/white, +/area/medical/storage) "vSG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -63141,6 +60352,13 @@ broken = 1 }, /area/vacant_room/office) +"vSO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "vSR" = ( /obj/machinery/light{ dir = 4 @@ -63243,15 +60461,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"vVu" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/cryo) "vVK" = ( /obj/structure/table, /obj/item/aiModule/supplied/quarantine, @@ -63265,15 +60474,15 @@ }, /turf/open/floor/iron/grid/steel, /area/ai_monitored/turret_protected/ai_upload) -"vVO" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +"vVL" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/structure/flora/junglebush/b, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass/no_border, -/area/crew_quarters/bar/atrium) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "vWb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ @@ -63290,8 +60499,12 @@ /turf/open/floor/plating, /area/hallway/secondary/command) "vWr" = ( -/turf/closed/wall, -/area/crew_quarters/bar/atrium) +/obj/machinery/door/airlock/public/glass{ + name = "Diner" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/bar) "vWy" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -63311,6 +60524,17 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/brig) +"vWK" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "vXe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63438,21 +60662,15 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "wad" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/filingcabinet, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - pixel_x = -30 - }, -/obj/machinery/camera/autoname{ - dir = 4; - network = list("ss13, engine") +/obj/machinery/light_switch{ + pixel_x = -28 }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "wag" = ( /obj/item/radio/intercom{ dir = 4; @@ -63469,12 +60687,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/security/checkpoint/engineering) -"wai" = ( -/obj/effect/turf_decal/tile/bar/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "waL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -63536,7 +60748,9 @@ /area/security/brig) "wbB" = ( /obj/machinery/chem_master, -/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/apothecary) "wbI" = ( @@ -63562,13 +60776,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"wcj" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/dark_green/half/contrasted, -/turf/open/floor/iron, -/area/hydroponics) "wcm" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -63593,11 +60800,14 @@ /turf/open/floor/iron/dark, /area/security/prison) "wdv" = ( -/obj/machinery/computer/operating{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wdw" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -63641,30 +60851,15 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/east, /turf/open/floor/plating, /area/maintenance/starboard/fore) "weA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ icon_state = "0-2" }, -/turf/open/floor/iron/checker, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "weG" = ( /obj/machinery/light, @@ -63731,19 +60926,12 @@ }, /turf/open/floor/iron, /area/science/mixing) -"wgc" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "wgg" = ( -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wgw" = ( /obj/machinery/door/airlock{ id_tag = "Dorm6"; @@ -63873,15 +61061,13 @@ /turf/open/floor/iron, /area/security/courtroom) "whR" = ( -/obj/machinery/door/airlock{ - name = "Bar"; - req_access_txt = "25" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/airlock/public/glass{ + name = "Kitchen"; + req_access_txt = "28" }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/crew_quarters/kitchen) "wid" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/turf_decal/caution{ @@ -63932,6 +61118,14 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"wjl" = ( +/obj/machinery/door/window/southleft{ + name = "Bar Delivery"; + req_access_txt = "25" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/crew_quarters/bar) "wjp" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -64004,7 +61198,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/iron/white, /area/medical/medbay/central) "wkN" = ( @@ -64044,26 +61240,8 @@ /obj/machinery/plumbing/output{ dir = 4 }, -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33"; - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/open/floor/iron/white, -/area/medical/storage) -"wlx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) +/area/medical/chemistry) "wlD" = ( /obj/structure/table, /obj/machinery/light, @@ -64106,8 +61284,10 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "wlY" = ( -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "wmF" = ( /obj/machinery/computer/rdservercontrol{ @@ -64182,12 +61362,30 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"wnV" = ( +"wnU" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Crematorium Maintenance"; + req_access_txt = "27" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/turf/open/floor/plating, +/area/maintenance/starboard/fore) +"wnV" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 32 + }, +/obj/item/book/manual/wiki/barman_recipes, +/obj/item/reagent_containers/glass/rag, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "wot" = ( /obj/effect/turf_decal/siding/wideplating/dark, /obj/structure/chair/fancy/comfy{ @@ -64300,14 +61498,16 @@ "wpw" = ( /turf/open/floor/wood, /area/lawoffice) -"wpH" = ( -/obj/machinery/computer/slot_machine, -/obj/machinery/airalarm/directional/west, -/obj/machinery/light{ - dir = 8 +"wqi" = ( +/obj/structure/table, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/item/pen, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/white, +/area/medical/chemistry) "wqr" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -64317,6 +61517,16 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"wqB" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/security/checkpoint/medical) "wqH" = ( /obj/machinery/nanite_chamber, /obj/effect/turf_decal/bot, @@ -64331,23 +61541,15 @@ /turf/open/floor/iron, /area/crew_quarters/fitness) "wqX" = ( -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe"; - pixel_x = -4 - }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; - pixel_y = 30 - }, -/obj/effect/turf_decal/siding/wood{ - layer = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "wrc" = ( /obj/machinery/door/airlock/maintenance{ @@ -64423,20 +61625,12 @@ }, /turf/open/floor/prison, /area/security/prison) -"wsn" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +"wsz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wsQ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -64450,8 +61644,13 @@ /area/engine/engineering) "wte" = ( /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/fore) "wts" = ( @@ -64503,11 +61702,11 @@ /turf/open/floor/plating, /area/maintenance/starboard) "wtU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, /turf/open/floor/iron, /area/hallway/primary/starboard) @@ -64556,23 +61755,31 @@ /turf/open/floor/iron, /area/tcommsat/computer) "wvC" = ( -/obj/machinery/light_switch{ - pixel_x = 8; - pixel_y = 28 +/obj/machinery/stasis, +/obj/machinery/light{ + dir = 1 }, -/obj/effect/turf_decal/tile/red/half/contrasted{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/chair/fancy/bench{ - pixel_y = 13 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "wvD" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/ai_monitored/nuke_storage) +"wvH" = ( +/obj/structure/table, +/obj/item/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 5 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "wvN" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -64641,13 +61848,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/chair{ dir = 4 }, -/obj/structure/chair/office/light{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/apothecary) "wxA" = ( @@ -64747,21 +61950,19 @@ /turf/open/floor/wood, /area/lawoffice) "wAh" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 + dir = 1 }, -/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, -/area/maintenance/starboard/fore) +/area/hallway/secondary/service) "wAx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -64810,32 +62011,18 @@ /turf/open/floor/iron/dark, /area/storage/tech) "wBq" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/open/floor/wood, /area/crew_quarters/theatre) -"wCh" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/hallway/primary/aft) "wCn" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/door/window/westleft{ + name = "Monkey Pen"; + req_access_txt = "9" }, -/turf/open/floor/iron/white, +/turf/open/floor/iron, /area/medical/genetics) "wCo" = ( /obj/effect/spawner/structure/window/reinforced, @@ -64850,10 +62037,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"wCy" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/iron/dark, -/area/medical/surgery) "wCz" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -64887,13 +62070,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"wDc" = ( -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/dark_green/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) "wDR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -64905,44 +62081,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness) -"wEf" = ( -/obj/item/instrument/accordion, -/obj/item/instrument/banjo, -/obj/item/instrument/bikehorn, -/obj/item/instrument/eguitar, -/obj/item/instrument/glockenspiel, -/obj/item/instrument/guitar, -/obj/item/instrument/harmonica, -/obj/item/instrument/musicalmoth, -/obj/item/instrument/piano_synth, -/obj/item/instrument/recorder, -/obj/item/instrument/saxophone, -/obj/item/instrument/trombone, -/obj/item/instrument/trumpet, -/obj/item/instrument/violin, -/obj/structure/closet/crate/wooden, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "wEg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/machinery/light_switch{ + pixel_x = 21; + pixel_y = 22 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "wEt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +/obj/structure/table, +/obj/machinery/dish_drive{ + pixel_y = 5 }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) @@ -64960,10 +62109,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) -"wES" = ( -/obj/structure/grille/broken, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "wFf" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/black/fourcorners, @@ -65029,13 +62174,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/engine/break_room) -"wHm" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/crew_quarters/theatre) "wHs" = ( /turf/closed/wall/r_wall, /area/security/courtroom) @@ -65056,31 +62194,12 @@ /turf/open/floor/iron/white, /area/medical/chemistry) "wId" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/bar/atrium) -"wIw" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/machinery/vending/cigarette, -/obj/structure/sign/poster/contraband/lusty_xenomorph{ - pixel_y = 32 - }, -/obj/structure/sign/poster/contraband/have_a_puff{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/iron, -/area/hallway/secondary/service) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "wIz" = ( /obj/structure/railing/corner{ dir = 8 @@ -65135,9 +62254,6 @@ /area/security/warden) "wJd" = ( /obj/effect/landmark/start/chemist, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/apothecary) "wJI" = ( @@ -65148,27 +62264,9 @@ /turf/open/floor/iron, /area/storage/primary) "wJV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Hydroponics Backroom"; - req_access_txt = "35" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/hydroponics/constructable, /obj/machinery/camera/directional/north, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/hydroponics) "wKb" = ( /obj/effect/turf_decal/stripes/line{ @@ -65238,6 +62336,10 @@ /turf/open/floor/iron, /area/storage/primary) "wKB" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Plumbing Factory Maintenance"; + req_access_txt = "5" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, @@ -65250,15 +62352,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/plasticflaps/opaque, -/obj/machinery/door/window/northleft{ - dir = 8; - icon_state = "right"; - name = "Plumbing Factory"; - req_access_txt = "5; 33" - }, /turf/open/floor/iron/white, -/area/medical/chemistry) +/area/maintenance/aft) "wKN" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -65336,6 +62431,11 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"wMn" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, +/turf/open/floor/iron/dark, +/area/medical/morgue) "wMs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -65361,6 +62461,11 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"wME" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/smartfridge/chemistry, +/turf/closed/wall, +/area/medical/apothecary) "wMF" = ( /obj/item/reagent_containers/food/drinks/mug{ pixel_x = 6; @@ -65459,12 +62564,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) -"wOH" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 5 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "wOZ" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -65480,13 +62579,6 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) -"wPk" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/closet/secure_closet/medical3, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/storage) "wPp" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -65520,32 +62612,39 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"wPX" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/dark, -/area/medical/cryo) +"wPZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/security/checkpoint/medical) "wQj" = ( /turf/closed/wall/r_wall, /area/security/detectives_office) -"wQn" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/maintenance/aft) "wQw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 + dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, /turf/open/floor/iron/white, -/area/medical/medbay/lobby) +/area/medical/sleeper) "wQz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -65678,39 +62777,20 @@ }, /turf/open/floor/iron/techmaint, /area/security/brig) -"wTo" = ( -/obj/structure/kitchenspike, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) -"wTM" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_y = 7 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 +"wTF" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 }, -/obj/item/storage/pill_bottle/mannitol, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, /area/medical/cryo) +"wTL" = ( +/turf/closed/wall, +/area/medical/medbay/central) "wTO" = ( /obj/effect/spawner/randomvend/cola, /turf/open/floor/iron, /area/crew_quarters/locker) -"wTS" = ( -/obj/structure/reagent_dispensers/beerkeg, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "wUe" = ( /obj/machinery/computer/station_alert{ dir = 4 @@ -65792,32 +62872,34 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"wUY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) -"wVd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, +"wVw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/turf/open/floor/carpet/grimy, -/area/crew_quarters/bar) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wVH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/basic/cockroach, /turf/open/floor/carpet, /area/vacant_room/office) +"wVK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "wVL" = ( /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -65865,33 +62947,18 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "wXd" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/chair/fancy/sofa/corp/corner/concave{ - dir = 8 +/obj/machinery/light/small, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 }, -/turf/open/floor/carpet/black, -/area/crew_quarters/bar/atrium) +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "wXg" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/central) -"wXi" = ( -/obj/item/wrench/medical, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/item/crowbar, -/obj/structure/table/glass, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/medical/cryo) +/turf/open/floor/iron/white, +/area/medical/medbay/central) "wXt" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -65911,12 +62978,6 @@ /turf/open/floor/iron, /area/crew_quarters/dorms) "wXP" = ( -/obj/effect/turf_decal/tile/blue, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/table/reinforced, /obj/item/wrench/medical, /obj/machinery/airalarm/directional/south{ @@ -65924,8 +62985,8 @@ }, /obj/item/crowbar, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/dark, -/area/medical/surgery) +/turf/open/floor/iron/white, +/area/medical/cryo) "wXQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -66056,21 +63117,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"xbA" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xbB" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -66135,21 +63181,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/security/prison) -"xcn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "xcs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -66294,14 +63325,18 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"xgC" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +"xgB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/food/pie/cream, -/turf/open/floor/carpet/purple, -/area/crew_quarters/bar/atrium) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "xhm" = ( /obj/effect/turf_decal/delivery, /obj/structure/curtain, @@ -66311,18 +63346,18 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/noslip/standard, /area/security/prison) -"xin" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +"xib" = ( +/obj/machinery/door/airlock/medical{ + name = "Medbay Reception"; + req_access_txt = "5" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/white, -/area/medical/medbay/central) +/area/medical/medbay/lobby) "xiN" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -66475,6 +63510,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/quartermaster/exploration_dock) +"xkT" = ( +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/surgery) "xkU" = ( /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, @@ -66515,12 +63564,6 @@ /turf/open/floor/iron, /area/science/robotics/mechbay) "xlt" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ icon_state = "0-2" @@ -66528,7 +63571,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/grass/no_border, +/turf/open/floor/iron/white, /area/medical/genetics) "xlK" = ( /obj/machinery/computer/holodeck{ @@ -66580,6 +63623,16 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) +"xmN" = ( +/mob/living/carbon/monkey, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/genetics) "xne" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -66680,6 +63733,9 @@ /turf/open/floor/iron, /area/quartermaster/qm) "xnX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /obj/effect/turf_decal/pool{ dir = 1 }, @@ -66789,27 +63845,6 @@ /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) "xpY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/white/opposingcorners, -/obj/effect/turf_decal/tile/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair, /obj/machinery/airalarm/directional/north{ pixel_y = 23 @@ -66817,8 +63852,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/turf/open/floor/iron/dark, +/area/medical/surgery) "xqa" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -66880,12 +63915,9 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "xsc" = ( -/obj/structure/table, -/obj/item/knife/kitchen{ - pixel_x = -9 - }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) +/obj/structure/kitchenspike, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "xsl" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -66908,27 +63940,12 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"xsy" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/hallway/primary/aft) "xsL" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "xsM" = ( /obj/machinery/gateway{ dir = 5 @@ -66939,12 +63956,17 @@ /turf/open/floor/engine, /area/gateway) "xsW" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xtf" = ( /obj/structure/closet/secure_closet/chemical, /obj/effect/turf_decal/tile/yellow{ @@ -66981,13 +64003,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron, /area/tcommsat/computer) -"xtF" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance"; - req_access_txt = "5" - }, -/turf/open/floor/plating, -/area/medical/surgery) "xtS" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -67105,17 +64120,8 @@ /obj/machinery/plumbing/bottle_dispenser{ dir = 4 }, -/obj/machinery/door/window/westleft{ - name = "plumbing factory duct access"; - red_alert_access = 1; - req_access_txt = "5; 33"; - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/open/floor/iron/white, -/area/medical/storage) +/area/medical/chemistry) "xvU" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -67171,25 +64177,17 @@ /turf/open/floor/iron/solarpanel/airless, /area/solar/port/aft) "xwG" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/radio/off, -/obj/machinery/recharger{ - pixel_x = -10 - }, -/obj/item/restraints/handcuffs{ - pixel_y = 11 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 11 +/obj/structure/table/glass, +/obj/item/storage/belt/medical, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/item/storage/box/medipens, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "xwN" = ( /obj/machinery/light{ dir = 1 @@ -67205,6 +64203,16 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"xxf" = ( +/mob/living/carbon/monkey, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron, +/area/medical/genetics) "xxi" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_y = -30 @@ -67250,14 +64258,14 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "xyz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 }, -/turf/open/floor/wood/big, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "xyW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -67279,9 +64287,11 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) "xzq" = ( -/turf/open/floor/iron/white/side{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 8 }, +/turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) "xzw" = ( /obj/structure/cable/yellow{ @@ -67294,23 +64304,10 @@ }, /turf/open/floor/iron, /area/quartermaster/office) -"xAb" = ( -/obj/machinery/iv_drip, -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/patients_rooms) "xAg" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "psypriv"; - name = "Psycology Shutters" - }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical/exam_room) +/area/medical/cryo) "xAx" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -67322,24 +64319,15 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"xAy" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/vending/medical{ - pixel_x = -2 - }, -/obj/machinery/vending/medical{ - pixel_x = -2 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/medical/storage) "xAG" = ( /obj/machinery/holopad, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/turf_decal/tile/dark_blue, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "xAH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -67389,21 +64377,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/fitness) -"xBJ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xBK" = ( /obj/structure/bed/roller, /obj/structure/disposalpipe/segment, @@ -67451,12 +64424,11 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "xDy" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/dark, -/area/maintenance/aft) +/area/medical/morgue) "xDA" = ( /obj/machinery/light{ dir = 1 @@ -67489,16 +64461,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"xEB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xFg" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted, @@ -67595,6 +64557,9 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"xGZ" = ( +/turf/closed/wall, +/area/medical/sleeper) "xHw" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -67613,11 +64578,17 @@ /turf/open/floor/iron, /area/storage/tools) "xHH" = ( -/obj/machinery/light/small{ +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/machinery/iv_drip, +/obj/machinery/light{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/medical/morgue) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xHI" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -67647,12 +64618,6 @@ }, /turf/open/floor/plating, /area/engine/atmos) -"xHN" = ( -/obj/effect/mapping_helpers/dead_body_placer, -/obj/structure/closet, -/obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xHO" = ( /obj/machinery/holopad, /turf/open/floor/carpet, @@ -67679,22 +64644,9 @@ /turf/open/floor/iron, /area/crew_quarters/locker) "xIy" = ( -/obj/machinery/power/apc/auto_name/south, -/obj/structure/cable/yellow, -/obj/machinery/light, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/grid, -/area/medical/patients_rooms) +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/medical/surgery) "xIQ" = ( /obj/structure/table, /obj/machinery/newscaster{ @@ -67771,6 +64723,18 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"xKW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "xLi" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -67849,10 +64813,10 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "xLZ" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -67934,16 +64898,6 @@ /turf/open/floor/iron/white, /area/science/lab) "xNr" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder, -/obj/effect/turf_decal/siding/wood{ - layer = 1 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/structure/table/wood, @@ -67953,7 +64907,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/turf/open/floor/wood/big, +/turf/open/floor/wood, /area/crew_quarters/bar) "xNz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -67961,6 +64915,12 @@ }, /turf/open/floor/iron/freezer, /area/security/prison) +"xNA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/medical/morgue) "xNB" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -68081,6 +65041,13 @@ }, /turf/open/floor/iron/techmaint, /area/storage/tech) +"xQv" = ( +/obj/structure/table, +/obj/machinery/plantgenes{ + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/hydroponics) "xQD" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -68134,10 +65101,12 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "xSg" = ( +/obj/structure/chair{ + dir = 8 + }, /obj/effect/turf_decal/tile/yellow{ - dir = 4 + dir = 8 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, /area/medical/apothecary) "xSo" = ( @@ -68180,26 +65149,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xTb" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 20 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/fore) "xTj" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -68226,20 +65175,25 @@ /turf/open/floor/iron/dark, /area/security/main) "xTz" = ( -/obj/structure/chair/wood{ - dir = 1 +/obj/structure/table/wood, +/obj/structure/mirror{ + pixel_x = -28 }, -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 2; - icon_state = "left"; - name = "Holodeck Controls" +/obj/item/lipstick/random{ + pixel_x = 2; + pixel_y = 2 }, -/obj/structure/window/reinforced/tinted{ +/obj/item/lipstick/random{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/theatre/backstage) +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/crew_quarters/theatre) "xTE" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -68256,6 +65210,13 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"xUm" = ( +/obj/effect/spawner/randomvend/cola, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "xUC" = ( /obj/structure/table/glass, /obj/item/folder/white, @@ -68267,23 +65228,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/white, /area/crew_quarters/heads/cmo) "xUY" = ( -/obj/machinery/airalarm{ - pixel_y = 25 +/obj/structure/table/glass, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/structure/chair/fancy/bench{ - pixel_y = 13 - }, -/turf/open/floor/iron, -/area/security/checkpoint/medical) +/turf/open/floor/iron/white, +/area/medical/sleeper) "xVe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -68349,12 +65309,10 @@ /turf/open/floor/iron/freezer, /area/security/prison) "xWd" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/bar/atrium) +/obj/structure/table/reinforced, +/obj/item/clothing/head/hats/tophat, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "xWg" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -68460,15 +65418,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/bridge) -"xYf" = ( -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/glass/reinforced, -/area/crew_quarters/bar/atrium) "xYk" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -68541,6 +65490,16 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"xZB" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark, +/area/hydroponics) "xZW" = ( /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) @@ -68554,16 +65513,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"yaR" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/door/airlock{ - id_tag = "Toilet1"; - name = "Toilet Unit #1" - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/toilet) "yaU" = ( /obj/structure/sign/departments/minsky/supply/cargo{ pixel_x = -32 @@ -68613,22 +65562,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"ycs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "ycx" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -68718,13 +65651,6 @@ }, /turf/open/floor/iron/cafeteria, /area/hallway/secondary/exit) -"yes" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/white, -/area/medical/apothecary) "yev" = ( /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -68786,26 +65712,6 @@ }, /turf/open/floor/wood, /area/security/detectives_office) -"yfG" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/structure/closet/secure_closet/freezer/cream_pie, -/obj/item/food/pie/cream, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/theatre/backstage) "yfN" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -68821,14 +65727,6 @@ }, /turf/open/floor/plating, /area/bridge) -"ygc" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/crew_quarters/kitchen) "yge" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -68840,20 +65738,13 @@ /turf/open/floor/iron, /area/engine/atmos) "ygi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/structure/chair/stool, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ygm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/machinery/holopad, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "ygo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68871,20 +65762,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/chapel/office) -"ygr" = ( -/obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/medical/morgue) "ygu" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, /turf/open/floor/iron/white, /area/medical/genetics) @@ -68963,24 +65845,13 @@ /turf/open/floor/prison, /area/security/prison) "yhN" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -31 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, /obj/machinery/camera/autoname/directional/south, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, -/area/medical/genetics/cloning) +/area/medical/genetics) "yhZ" = ( /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" @@ -68989,6 +65860,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/storage/primary) +"yiG" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/medbay/central) "yiW" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -69000,10 +65878,11 @@ /turf/open/floor/iron/dark, /area/science/nanite) "yjf" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood, -/area/crew_quarters/bar/atrium) +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "yjg" = ( /turf/open/floor/glass/reinforced, /area/science/nanite) @@ -69018,6 +65897,14 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"yjm" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/wirecutters, +/turf/open/floor/iron, +/area/hydroponics) "yjs" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -69033,6 +65920,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/telecomms, /area/quartermaster/exploration_dock) +"yju" = ( +/obj/machinery/door/window/southleft{ + name = "Kitchen Delivery"; + req_access_txt = "28" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron, +/area/crew_quarters/kitchen/coldroom) "yjS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -69054,12 +65952,13 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/security/brig) -"ykN" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 1 +"ykx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, -/area/crew_quarters/heads/cmo) +/area/medical/morgue) "ykW" = ( /obj/machinery/holopad, /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ @@ -69081,27 +65980,43 @@ broken = 1 }, /area/vacant_room/office) -"ylm" = ( -/obj/item/toy/beach_ball/holoball, -/obj/machinery/light/floor, -/turf/open/floor/wood/big, -/area/maintenance/aft) +"ylL" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/eastright{ + base_state = "left"; + icon_state = "left"; + name = "Chemistry Desk"; + req_access_txt = "33" + }, +/obj/machinery/door/poddoor/preopen{ + id = "chemistry_shutters"; + name = "Chemistry shutters" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/medical/apothecary) "ylU" = ( -/obj/structure/chair/fancy/corp{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1; + name = "Connector Port (Air Supply)" }, -/obj/machinery/button/door{ - id = "medpriv1"; - name = "Psycology Shutters Control"; - pixel_x = -27; - pixel_y = 1 +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron/white, +/area/medical/cryo) +"yma" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/mob/living/simple_animal/pet/cat{ - name = "Josito"; +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/carpet/green, -/area/medical/exam_room) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/sleeper) (1,1,1) = {" aaa @@ -98547,12 +95462,12 @@ hbS tuq hKs rZC -aJw -wCh -xsy -mRI -tCd -pTx +cBD +cBD +cBD +cBD +cBD +cBD vmA bLK bLK @@ -98804,12 +95719,12 @@ hbS klN hKs bBu -bzs -bzs -bzs -bzs -bzs -bzs +cBD +bDL +bDL +bDL +qSz +cBD gVj bLK mzf @@ -99061,12 +95976,12 @@ vWd klN hKs aXh -bzs -bAw -bAw -bAw +nxn +cwS +wMn +ykx uhH -bzs +cBD gVj bLK avA @@ -99318,13 +96233,13 @@ vWd klN hKs xkE -bzs +cBD fVW -bAw -bAw -bAw -bzs -gVj +bFi +bbe +oji +mhC +moO bLK bLM cwm @@ -99575,12 +96490,12 @@ hbS klN hKs aJq -dbl -bAw -bAw -bAw +cBD +tcH +cAL +aML qfy -dbl +cBD gVj bLK bLL @@ -99832,12 +96747,12 @@ bqH xTN hKs aJq -bzs +cBD oAb -bAw -bAw -bAw -bzs +bFi +xNA +iIt +cBD gVj bLK bLN @@ -100089,12 +97004,12 @@ bqH aLh sMZ qVS -bzs -bAw -bAw -bAw -bAw -bzs +cBD +cAL +cAL +cAL +lip +cBD gVj bLK hBJ @@ -100346,12 +97261,12 @@ bqH klN hKs aJq -bzs -bzs -bzs -bzs -bzs -bzs +cBD +cBD +cBD +cBD +cGy +cBD gVj bLK bMK @@ -100603,12 +97518,12 @@ bqH klN hKs uHQ -bzs +cBD pec dYX -owt +cBD nio -bzs +cBD gVj bLK bML @@ -100860,12 +97775,12 @@ bqH klN hKs aJq -bzs +cBD rAu pOK lRT mAq -bzs +cBD gVj bLK bMN @@ -101117,12 +98032,12 @@ tpk nss hKs byU -bzs +cBD ezr tAL -kgf +cBD sqA -bzs +cBD gVj bLK pZf @@ -101374,12 +98289,12 @@ sRe nss hKs aJq -bzs -cXr -ylm -duE -wQn -gxv +cBD +cBD +cBD +cBD +iIt +cBD gVj bLK bMP @@ -101631,12 +98546,12 @@ bqH tjO gnO aJq -bzs +cBD fLU mVB -ioP -sqA -bzs +cBD +xgB +cBD lJM eSP fyx @@ -101888,12 +98803,12 @@ tjO tjO hKs aJq -bzs +cBD pyC -vRp +pOK byT -mAq -bzs +xKW +cBD afs bLK bJF @@ -102109,9 +99024,9 @@ aAh fBg ahC aAh -nfP -aAh -yaR +dIg +qmG +dIg aAh eFb aNC @@ -102123,8 +99038,8 @@ aJq aJq aJq aJq -aJq qVS +aJq bco aJq beo @@ -102145,12 +99060,12 @@ jgJ jgJ fRI aJq -bzs -jkY -ceV -nLm +cBD +ezr +tAL +cBD xDy -bzs +cBD lyR bLK bMU @@ -102366,7 +99281,7 @@ ueF nuK ahC aAh -uSG +rnq aAh uSG aAh @@ -102380,8 +99295,8 @@ aJq aJq aJq aJq -aJq qVS +aJq bcp aJq beq @@ -102406,7 +99321,7 @@ cBD cBD cBD cBD -cBD +hyX cBD lyR bLK @@ -102622,49 +99537,49 @@ tzK pur epw ahC +aAh +dYR +aAh lYC -lYC -lYC -lYC -lYC +aAh aCr -rPQ -rPQ aCr +aCr +aJC +aJC +qMv +aJC vWr -vWr -kog -lAw -lAw -gSI -vWr -vWr -mkg -mkg -mkg -btZ -btZ -btZ -btZ -bQj -btZ -btZ -bIr -bIr -bIr -bIr -cBD -cBD -cBD -cBD -cBD -cBD -cBD +aJC +qMv +aJC +aJC +nIK +nIK +nIK +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +xGZ +wTL +wTL +wTL +wTL +wTL +wTL +wTL kIy xHH dNp wdv -cBD +wTL gVj bLK bMS @@ -102876,30 +99791,30 @@ dUh ure pWi oup -lYC -lYC -lYC -lYC -kDY -yfG -irH -lYC +aAh +coc +ahC +aAh +aCr +aCr +aCr +aCr rXR -aMr -ndY +lpE +ftC pXi hML -wpH +fRF bbT +fRF jcb -jcb -fTU +fRF oDC -vWr -qZh +aJC aYV aYV -btZ +aYV +xGZ xUY syv eBB @@ -102909,19 +99824,19 @@ gof ilX nrR duf -vVu -cBD +xGZ +kcm qlc pgo oQv eXv -bDL -cBD -cBD +ich +bdf +tXt mTC -bFi +ftu dmX -cBD +wTL lyR bLK bMV @@ -103133,53 +100048,53 @@ foO bXG fTj ucv -lYC -nUS -lOQ -bgl +aAh +aAh +aAh +aAh isq dBk -fqf -lYC +aCr +aCr cHh -lJm +aMr ucw -dtA -dje -cGt -vwy -vwy oFf +fRF +nXx +fRF +fRF +oFf +fRF jQr -jQr -vVO -tqW -oVr +aJC aYV -btZ +aYV +aYV +xGZ wvC -qFr -dko +cCX +cCX kqk cCX -btZ +oZj cfl ask hXZ -lXx -cBD -kIy -taj +xGZ +jIS +cth +hQB lWG -ueP +mNs hMS -bFi -cBD -cBD +uPt +wVw +lfZ szX -cBD -cBD -lyR +uyg +lCX +fOI bLK bLK lZm @@ -103390,53 +100305,53 @@ iJR arQ rcl lvU -lYC +arj tpy xTz cMB efx rlt -bab +aCr fPu aMr -flj -wHm -eTG +ndY +ucw +fRF tUS -vwy -vwy +dCL +nzB ygi -vwy +axP fbl djG -chD +aJC aYV -mNB -nAS -btZ +aYV +aYV +xGZ dWx amQ -byB +cCX mLw ihl -btZ +lhk ckf -wPX -fQL -wTM +xGZ +xGZ +xGZ gzk xsW -xcn fqK +fqK +qwh +hiU +bdf +wXg +cWP +wsz acw -ygr -acw -uuA -acw -acw -acw -nCQ -mfb +wTL +xdc ivX bLK hFx @@ -103647,52 +100562,52 @@ rLR rLR qrR nOH -lYC +arj nqW jcQ tRh rXJ asK stE -lYC +hgO hgO flj -dhk -uyj -qpC -nUR +ucw +fRF +fRF +yjf nUR -mXq +fRF oFf -xgC +fRF gOo -vWr +aJC +aYV aYV -mNB ber -btZ +xGZ cdE xsL -dKt -rTU -kmT -btZ +cCX +cCX +cCX +cpn ntr qOZ oco -wXi -cBD -kIy +xGZ +msV +pfi jpB -cAL -cAL -cAL -jNA -cBD +bhh +bhh +hiU +wTL +yiG bsY -bFi +mWr aOb -cBD +wTL xdc ccv bLK @@ -103904,52 +100819,52 @@ qOk qOk azn dGe -lYC +arj uMu lOQ igO -ioH bPZ -wEf +bPZ +aCr oyo aMr -flj -gya -eTG +tYf +ucw +fRF qYz wId -vwy +vmg ygm -vwy -dpF -pBG +fRF +fRF +fRF vWr -qZh -mNB -bgK -btZ +aYV +aYV +aYV +xGZ tVg -btZ +cZL oLz akL idr -btZ -hDn +roQ +ezk ezk sXY hDn -cBD -cBD +qjl +gjz vQx -cBD +nbk mdw -cBD -cBD -cBD -cBD -vPG -cBD -cBD +xUm +gWM +gWM +gWM +gWM +xkT +gWM xdc uDi bLK @@ -104161,46 +101076,46 @@ aXF qOk azm mjx -lYC -lYC -lYC -nRU -lYC -lYC -lYC +arj +aCr +qXd +aCr +aCr +aCr +aCr sdf -ocI -otq -ooc -eTG +aMr +aMr +ucw +fRF mQX -pYm -vwy -ygm -vwy -fNc -vGW -vWr -apY -mNB +oFf +khg +fRF +nXx +fRF +fRF +qMv +aYV +luw edz -uwZ +xGZ fBH -rAJ -ktC -aIj +hgz +yma +hgz ktC gAZ -gKT -hEU +hgz +hgz gcr -hEU +bHV rjC nWO ghy -pXo -xAb -qpl +gWM +gWM +gWM gWM nWN vjG @@ -104418,49 +101333,49 @@ qOk qOk xnX rrt -arj -kRo -aFm +foF +img +lxR tDm -asw -asw -asw -som +fSO +anf +aCr +eNh eNh cOh wBq -eTG +fRF aYL vzv -tWb +fbl lqj +ioQ cNw -cNw -tvc -nOv -dNd -npT +fRF +vWr +aYV +mNB cOt -uwZ -tyP -kSZ +xGZ +xGZ +aGK wQw -hhs -vRZ -dcK -uye +ihf +ihf +xGZ +ihf mVZ ihf -jDJ +xGZ eSV -jDJ +tIw gfz -krc -ofG +gWM +oqV szp pKB -oKY -tqE +kiX +mZd oKY sYW gWM @@ -104675,52 +101590,52 @@ qOk qOk isb rUJ -tzw -img -cqG -eXr -aoP -aqA -aJC -aJC -aJC -aJC -lrE +arj +alP +alP +alP +pme +hSR aJC -tWj -rKR -llf -wUY +oez +fRF +fRF +fRF +fRF +mQX +oFf +fRF +fRF yjf -vwy +fRF jfU lAw -wai +aYV mNB rpN iQT ejy -ktC +qep pXc -ktC qep -uwZ -iQT -rOu +qep +nGd +pWh +kSZ jYj -nFU -axx -eFP +uwZ +jIS +lHY nnt -ptb +gWM tTW oqV -gWM +pKB iMu -aZL +hgh mYX qie -gWM +rqA hRx bzs aaf @@ -104933,49 +101848,49 @@ ipt eDu dIq arj -awD -mft -xBJ -aJC -aJC -aJC +gXs +aaa +alP +dyU +vQA +uDy xyz -kga -crO gey -dVe +gey +gey +wId +dGZ +fRF +fRF +fRF +fRF fRF -kDX -xYf -uzw -dBu -dBu hLo -rZN -vQj -qrG +aJC +aYV +mNB rpN -bIn +iQT +gVb kSZ -pcD -oxh -kNi -lwT +ciI +kSZ +qep raG uSy qvN -uwZ -fdS -wgg +vSO +xib +uEq fdS wgg oUA dOw xIy -gWM +pKB tDn prD -mWQ +mZd hZz gWM xdc @@ -105190,49 +102105,49 @@ yff yff soV arj -lIc +gXs +aaf +alP +tcM anf -xBJ aJC -dDT -nMa bIV -wlx -aJC eFY -fRF -mtu -hHR -dbS -eNs +qrS +eFY +nVk +bzU bzU -fNc +bzU +bzU +bzU +fRF qqG -vWr -jLb -eFs -mkY -cwB +aJC +ekM +mNB +rpN +iQT sYS -hQG -fOb -qjW -gxt +kSZ +oxh +aTy +qep dXy fJP dBg eYy -sod -eFP -mNx -eFP -kYn -xpY -omP +uwZ +ieu +lHY +nnt gWM -kdk +xpY +oqV +pKB +iMu nXP -gSK +nIR vmH gWM xdc @@ -105439,57 +102354,57 @@ aaa arj auB auB +auB iNS auB auB iNS auB auB -auB arj -kOg -anf -xTj -eas -hHU -gRt -wVd -sEG +arj +aaa +alP +tcM +aJC +aJC +aJC +aJC +aJC +aJC aJC -lLV -fRF pCl kDX xWd -wUY -vwy +gsX +gsX rwp lpk -vWr -bcr +aJC +aYV wtU -rpN +mkY bIn -pcD -kSZ +iqq +iuC tXx -uMa -tRj +kSZ +qep gkP -hon -ovi -uwZ -pZE +btZ +btZ +btZ +btZ iou -tuT -oUA -tuT -sSh -igN +miY +vTC gWM -mwZ -vNZ +oqV +oqV +pKB +kiX mZd +nKj uFd gWM xdc @@ -105703,52 +102618,52 @@ aro aro aro aro +aro auB -anf -anf -fFh +aaf +alP +tcM aJC -ebD xNr ugv rkN tTp -fxi +aJC nIb -nkB -vsf -xWd -wUY -vwy +fRF +fRF +nXO +fRF +ejI lqc dyy -uZx +aJC aYV -wtU +bCB rpN -iQT -sEL -ktC +ptz +pcD +kSZ iMs -ktC -uQy -uwZ -iQT +kSZ +qep +wqB +pSQ sBy -uwZ -muC -pIh +hui +bQj +jIS eFP mcH -ixE -rvI -qDE -kPw +gWM +gWM +gWM +gWM bYZ dTj exK -eUk -xtF +gSK +gWM xdc bzs aaf @@ -105960,12 +102875,12 @@ aro aro aro aro +aro auB -rlW -mft -sFk -aJC -aJC +aaa +alP +xTj +iXu wqX qWA sLi @@ -105973,37 +102888,37 @@ sWL lif qLp qCI -kDX -xWd -wUY -vwy -tQZ +eJd +fRF +fRF +dtl +fRF wXd -flr +aJC aYV -wtU +bCB cOt uwZ kPJ -pcD kSZ -pcD kSZ +kSZ +qep nga rCx -vjn +erY eJg -vjn +ddG kfl vjn -rCx +bhh iRh sKv dTD gWM -dwq -hgh -hFa +gWM +gWM +gWM jIC gWM xdc @@ -106217,52 +103132,52 @@ aro aro aro aro +aro auB -qcH -mft -pNT -biY +aaf +alP +hZH aJC dvT -qWA +sfb jOE +ksW aJC -krs -qLp -khg -kDX +fEb +mxY +fRF muB -rGt -wnV +fRF wnV -tHE -vWr +fRF +fRF +aJC aYV -wtU +bCB dkG uwZ elG qjW -ktC +qjW qjW kos -nga -gKT -hEU +tjE +nqJ +uyI +wPZ +qZD gKT -hEU -gKT -hEU -gKT -hEU +jYA +jSv +vwz hfM hEU -gWM -gWM +bIr +ngj cGl +orG bbg -bbg -gWM +wTL xdc bzs bzs @@ -106474,52 +103389,52 @@ aro aro aro aro +aro auB -qTA -tlN -xbA -aoP +aaa +alP +hZH +aJC aJC -wTS dwM nfy aJC -oyF -eWY -iwt +aJC +aJI +aJI whR -wnV +aJI vRI +aJI vwy -vwy -vWr -vWr -jtG +aJI +aJI +bcs oJS -bgK +aYV bok bok sKN -gis bjX +ylL bok -bok -bRO -bKN +btZ +rkb +eeV tdJ -bKN -bRO -bRO -bRO -uHf -nHi +btZ +mtf +wXg +sNM +wXg +lHY uHf -gWM -wCy +xAg +qNk fgX dSV ufm -gWM +wTL jGB bkQ lmG @@ -106731,29 +103646,29 @@ aro aro aro aro +aro auB -awG -tbH -dZF -dZF -aJC -aJC -aJC -aJC -aJC +aaf +alP +hZH +tKW +wjl +iIA +khW aJC -gUA +hSN +aJI hBt -aJC -rEo -dRW -dRW +aVz +aVz +aVz +aVz dRW -vWr +aJI gGE aYV -kDj -nAS +aYV +aYV bok kCC stH @@ -106761,13 +103676,13 @@ eBs xSg oZx bok -kmp -txv -aCM -jLL -wPk -nuw -bRO +xJf +xJf +xJf +xJf +xJf +xJf +xJf oic cmH oOT @@ -106776,13 +103691,13 @@ uUh oib jOy wXP -gWM -msr -msr -fMc -msr -msr +bRO +pDf msr +bRO +bRO +bRO +bRO bNd bNd bNd @@ -106988,53 +103903,53 @@ aro aro aro aro +aro auB -xHN -pRi +aaa +alP +hZH +aJC +dZF +dZF +dZF dZF -mep -pva -iMP dZF -urf -bed -pnx -pnx -jWI -ukz -iNh -pQx -pQx -sDk aJI +jWI +aVz +aVz +aVz +aVz +aVz +uGG jDu aYV -kDj aYV -cyC +aYV +bok tjM wJd -jhL +vzb pCf wbB -tzg -pEd +bok +wqi nhs pEd jmR dMw ueo -bKN -jIS +xJf +wXg gup -jIS -rJX -rJX -rJX -rJX +rhu +mJJ +bnA +nLY +ioM rJX -rJX -msr +bRO +ftW eRP axm nDf @@ -107245,52 +104160,52 @@ aro aro aro aro +aro auB -tAA -pRi -dZF +aaa +alP fpi mIT -sCe +dZF slJ nOa mEG xsc -cCq +aJI pnx sYK sEi pwj aVz -tOd -aJI -aJI -jAX -kDj +aVz +ezT +jDu +aYV +aYV aYV bok rfs -yes +jhL hgW eCT iiQ -cyC -tce -hTp -qSU +bok +jLS +jLS +jLS rBA -fnN -jIJ +jLS +jLS raZ -rWe -tIw wXg -rJX +tIw +eMT +uno dyV gyv uAg ylU -iPc +bRO asT mcw lVs @@ -107502,28 +104417,28 @@ aro aro aro aro +aro auB -oWd -hZH -dZF +aaa +alP rUx jJk cJn -dZF +bCR nbs -mEG -aVD +qbx +eBH pns -pnx -sYK -sEi -lea +vWK +suw +wvH +aVD +bqO aVz -rqs -pPg -dOd -wai -kDj +ezT +jDu +aYV +aYV aYV bok pYs @@ -107536,18 +104451,18 @@ oNk vpV awq aRP -sMD pgp -bKN -bhh +pgp +lqs +ciw iwM -bhh -rJX +hiU +xAg shE tUf vQo jdx -qfb +bRO vSv iuJ cai @@ -107759,58 +104674,58 @@ aro aro aro aro +aro auB -wOH -xTb -hmh +aaa +alP rki -rqR -tDz +mmx +dZF mCP ozm geE htY -aFi +aJI rOy -sYK -sEi +gBy +egM wEt -uwX +aVz gFh -eCu -mih -lVC -mgl +ezT +jDu aYV -cyC -oZx +aYV +dCE +bok +mOJ wxj -eBs -stH +hgW +jhL vDk -bok -uvE -szT -xAy +wME +jLS +cVy +jLS uNf -sji -pTg -bRO -llJ -iNm -pSd -rJX -jpd +jLS +jLS +raZ +wXg +lHY +hiU +xAg +shE rxI qNk -jdx -gFA -msr +wTF +bRO +cLt jwg bDi jBD fMz -jDG +eQl bNd fYc pST @@ -108008,6 +104923,7 @@ aaa aaa arj auB +auB arj iNS auB @@ -108017,26 +104933,25 @@ arj arj arj arj -arA -qhD -vEe -oCl -rfr +aaa +alP +rki +mmx kSp -dZF +yju iBf wEg -aVD -qDs +smk +aJI atN -sYK -sEi -uZH +wVK +ohQ +cCq +aVz aVz -lwo uSx -dOd -wai +jDu +aYV aYV aYV bok @@ -108045,29 +104960,29 @@ lGW bii abV gwq -bok -bKN -fQC -bKN +tmr +jLS +cVy +jLS wln xvM fYx -bRO -jIS -lHY -bCD -rJX +xJf +ibg +miY +gvw +bIr xAg -mZn xAg -rJX -rJX -msr +xAg +bIr +bRO +bKN kjC -msr -msr -msr -msr +bKN +bRO +bRO +bRO bNd bWX eOi @@ -108271,31 +105186,31 @@ tTL xlK wuU jBO +arj +anf alP -jGU -alP -dFb -hZH -dZF +aaf +aaa +alO sRT -rOS -wTo +mmx +dZF +dZF dZF -mWv ejG evS -mpM +aJI vAa -sYK -sEi -uZH -aVz +vVL +gIM +gIM +gIM enT -ygc +aJI jDe -vkj aYV -bgK +aYV +aYV bok bok bok @@ -108303,28 +105218,28 @@ ulM bok bok bok -but -hGn -but +vpr +lkg +vpr ltW dTo -but +oan xJf iAC -ycs -alX +lHY +hiU bGD -wXg -qKp -wXg +hiU +hiU +hiU hzu elL -pSd +hiU iZn -pSd -vTC -pSd -wXg +hiU +gvw +hiU +hiU tZx ryd nWT @@ -108528,31 +105443,31 @@ iCa xBv iwa vTy -cVb -cVb -cVb -cVb -apg +arj +jGU +alP +aaf +aaa +alP +sRT +mmx +aJL +oAj dZF dZF -ieB -wTo dZF -vdg -mIV -vEJ -kru +aJI weA kAW -aja +aVz rUo +rgH xzq -xzq -knM aJI -kgy +gGE +aYV +aYV aYV -bds xJf nRz but @@ -108560,9 +105475,9 @@ vMT but bla mVY -jLS -cVy -jLS +but +hGn +but jLS jLS but @@ -108571,18 +105486,18 @@ rFx iwd lWY vLl -llH -lAh -eZo -xin +mNs +mNs +mNs +mNs mNs gkg oAt -qjl +hQB lds jSv hQB -qjl +hQB cBB pPe tKd @@ -108786,30 +105701,30 @@ xtm arj arj cVb -mlD -rKW cVb -mYz -btx -dZF -dZF -dZF -dZF -aJI +cVb +cVb +cVb +cVb +kMy +gVm +aIp +hpT +yjm +aIp +aIp aJI aJI -rEQ aSP +cCk +aJI aJI aJI -nhe -ppf -fQg aJI aJI -ahp -ahp -ahp +mkg +mkg +mkg xJf bhp jLS @@ -108817,28 +105732,28 @@ myP vim qKT jLS -jLS +pgC mKD +bjT jLS -bvu -jLS +akK but xJf lyB wXg -iwn -nvD -fDd -azo -pSd +sNM +wXg +wXg +wXg +wXg oSe -pSd +wXg wkv -pSd -akO +wXg +wXg ibg sNM -pSd +wXg wXg dGB wXg @@ -109046,19 +105961,19 @@ cVb joW pOo hlt -cVb +mHp wAh lWj wte -aJL +aIp dTB lwk -tbc aIp -heV -wcj +vsm +mZQ +mZQ pHw -uJx +hAe frY mZQ uJx @@ -109076,31 +105991,31 @@ yew jLS jLS cVy -uSA -hGj -bvu +jLS +jLS +jLS hmY bye bMc +mrQ +bMc bMc bMc -lqw bMc -pEV bMc bon -dZH +bMc kYS -dZH -sGZ -bOt -bOt +bMc +bMc bOt +edy +tqu bdE rHt gdk -bOt -bOt +edy +edy vHh bNd oon @@ -109303,23 +106218,23 @@ cVb mUk sZN ahD +aGM cVb -dfT -tId +anf kai vLI tmD bTm -qBh aIp +dmc hdI nEv hsw -bMJ +fBe fBe fBe vPo -fAD +aRJ pwk aYV aYV @@ -109332,16 +106247,16 @@ brc blg jLS ied -cVy -drp -dTo +vyv +jLS +jLS jLS hwc bye qTj fNG uPb -huU +bEL vcv bEL bKz @@ -109357,7 +106272,7 @@ iHt jTG jrW kUb -bOt +edy lwA bNd bNd @@ -109556,28 +106471,28 @@ apC apC alP orP -tqr -gPi -kNU -kut -tqr -coq +cVb +cVb +cVb +cVb +cVb +cVb oQt owT aIp mug lni -mBF aIp +mZQ aci vGY bRN -rXw -tsz -wDc -sbH -fAD -miC +aRJ +aVK +aRJ +aRJ +aRJ +pwk aYV aYV aYV @@ -109589,15 +106504,15 @@ brc cTO jLS ied -fTJ +vyv +jLS jLS jLS -mij but bye mKG -mNl -lBo +nel +nel hgg cAA bBP @@ -109612,9 +106527,9 @@ ohB jVx xUC hYS -ykN +jrW tJO -bOt +edy lwA bNd bZT @@ -109812,29 +106727,29 @@ anf acX apC awF -orP -cVb -pZL -bIs +mmx +alP +arA +anf kzl -cVb -fJA +asw +asw oor ejP aIp rlv ptd -gQK +aIp wJV -vIR -kJf +aci +vGY jEN tNt -sUn -gkN +aRJ +aRJ sbH fAD -hiW +miC aYV aYV aYV @@ -109850,7 +106765,7 @@ oJk jLS jLS jLS -pim +but bye hhg lDe @@ -109859,19 +106774,19 @@ byO gCa tKs ygu -bMc -nel +usK +fxm byj nel agQ bOt mOq -jrW +wlY sOW fOA xAG iIe -bOt +edy lwA bNd isE @@ -110069,33 +106984,33 @@ anf anf apC aoQ -afq -cVb -wIw -qbF +woY +gTO +gTO +gTO rpu -cVb +rCd caq jWd -bbJ +dFY aIp hBo -aVK -hnh +fNe aIp +lZJ gRG -tWk +vGY eTy fiJ -qNu -wDc +aRJ +aRJ sbH -qJc -lkO +miC +aYV +aYV aYV aYV aYV -jCi xJf xiN bpL @@ -110112,14 +107027,14 @@ bye xlt rPA eiN -gCo +cMa wCn cMa iTg -bon +bMc fPd -hvK -kRW +nel +nel yhN bOt xLM @@ -110128,7 +107043,7 @@ esL pnm aTR iCs -bOt +edy lwA bNd bSU @@ -110326,36 +107241,36 @@ anf anf apC awG -mmx -cVb -cVb -cVb -cVb -cVb -rlw +fUO +alP +alP +alP +alP +alP +alO lln -pSi +aIp aIp qAM -aRJ -cNB +fvB aNQ -ibx -uFX -kms -mcJ -nGP -nGP +mZQ +aci +vGY +aRJ +aRJ +aRJ +aRJ oje -fAD -aNQ +juv +aYV tqW oVr bez wwk xJf -bvu -bvu +gKR +vIa bvu gzL tzn @@ -110363,29 +107278,29 @@ rha wHW bQh bvu -wgc +bvu rqV bye -bon -bon -ctE -bon +hcT +jAK +xxf +uOY mqy +xmN +mSf bon -bon -bon +jIT +tek +ajb sGZ -sGZ -sGZ -sGZ -bOt -bOt -bOt -bOt -bOt -bOt -bOt bOt +edy +edy +edy +edy +edy +edy +edy lwA bNd iLi @@ -110583,29 +107498,29 @@ anf anf apC awH -woY -gTO -gTO -vjq -tQW -xEB -odn +fUO +alP +aMV +anf +alP +aaa +aaf gzY -tei aIp -lQj -geG +kUv +aRJ +hCO frd -aIp +xZB tMZ uMx uNn -oVB -lxF -uNn -uNn +geG +geG +geG +vPo mFB -aIp +aYV aYV mNB jnu @@ -110621,28 +107536,28 @@ xJf xJf xJf xJf -spR +xJf bye -pPN +bon orD -pPN -bzs -eDc -clf -cBd -bzs +ctE +bon +bon +bon +bon +bon +bon +bon +bon +bon +bOt cwu cki -bAw -bAw -bAw -bAw -haD cAR bAw cBd clf -bzs +edy iis bNd bNd @@ -110842,28 +107757,28 @@ apC aoP fUO qNX -wES +anf pLl -lRB -qNX -aFm +alP +alP +gqT tAM -anf -aIp aIp +dyt +xQv fPM -aIp -aIp -aIp -aIp -aIp +aNQ +ejR +mZQ +mZQ +mZQ odJ -aIp -aIp +uSc +mZQ tWY -aIp -aIp -oLG +miC +aYV +aYV imz xvr ndk @@ -110884,7 +107799,7 @@ oDP mkm rpW kVv -qYq +yji yji yji yji @@ -111102,25 +108017,25 @@ alP alP alP alP -cWX +aFm fSS aGF -biY -anf -anf -anf -anf -alP -anf -awD -anf -mdi -alP -kzZ -elM -qen -lPy -aYV +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +aIp +oLG kDj mJF bfT @@ -111363,18 +108278,18 @@ rUC iMY rfG lMk -wsn -wsn -wsn -wsn -wsn -wsn +hiT +hiT +hiT +hiT +hiT +hiT wer -wsn +hiT hiT lNM dxg -lKG +osd lKG ulZ cJb @@ -111631,8 +108546,8 @@ aFu aFu aFu xPg -dqU -dqU +aYV +aYV tod qwp win @@ -111889,8 +108804,8 @@ aUB aFu aYV aYV -aYV -aYV +dRt +dRt aYV tdc bfU @@ -113673,8 +110588,8 @@ apE aBF aBF hWb +anf aFw -fiP dJQ aJJ uVh @@ -113931,8 +110846,8 @@ anf anf fyh eQM +wnU rek -kFk kUm mBa nXq