From c7fea7f6e72f8fed647cf901d0fe4f89e7e2c646 Mon Sep 17 00:00:00 2001 From: Dimach Date: Sun, 24 Sep 2023 11:42:04 +0000 Subject: [PATCH] Update kilostation --- _maps/map_files/KiloStation2/KiloStation2.dmm | 844 +++++++++++------- 1 file changed, 517 insertions(+), 327 deletions(-) diff --git a/_maps/map_files/KiloStation2/KiloStation2.dmm b/_maps/map_files/KiloStation2/KiloStation2.dmm index eec7559d12217f2..25026c9cc6c56e2 100644 --- a/_maps/map_files/KiloStation2/KiloStation2.dmm +++ b/_maps/map_files/KiloStation2/KiloStation2.dmm @@ -762,6 +762,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "akH" = ( @@ -899,7 +900,7 @@ /turf/open/floor/wood, /area/station/commons/locker) "amq" = ( -/mob/living/simple_animal/hostile/asteroid/basilisk{ +/mob/living/basic/mining/basilisk{ environment_smash = 0 }, /turf/open/misc/asteroid/airless, @@ -1070,6 +1071,7 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "aov" = ( @@ -1078,6 +1080,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/effect/turf_decal/stripes/red/box, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "aoz" = ( @@ -1742,8 +1745,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "aAU" = ( -/obj/structure/grille, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "aBi" = ( @@ -2539,7 +2542,7 @@ pixel_x = -2 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "aNp" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -3905,13 +3908,10 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bpg" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/wrench, -/obj/item/crowbar/red, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/vending/security, /turf/open/floor/iron/dark, /area/station/security/lockers) "bpj" = ( @@ -3940,7 +3940,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "bpz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4435,10 +4435,14 @@ /area/station/maintenance/fore) "byb" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, -/obj/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering West" + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "bys" = ( /obj/effect/turf_decal/siding/blue{ dir = 5 @@ -4605,6 +4609,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "bAX" = ( @@ -4851,14 +4858,12 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "bFm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/structure/cable, +/obj/effect/decal/cleanable/oil, +/obj/machinery/byteforge, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "bFu" = ( /obj/structure/cable, /turf/closed/wall/rust, @@ -5112,6 +5117,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"bKe" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/mechbay) "bKj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -5260,12 +5270,8 @@ "bPf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "bPK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/status_display/shuttle/directional/east{ - shuttle_id = "arrivals_shuttle" - }, /obj/machinery/status_display/shuttle/directional/east{ shuttle_id = "arrivals_shuttle" }, @@ -5298,12 +5304,14 @@ "bPZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/docking, /turf/closed/wall, /area/station/hallway/secondary/entry) "bQb" = ( /obj/structure/flora/bush/leavy/style_random, /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/flowers_yw/style_random, +/mob/living/basic/pet/bumbles, /turf/open/floor/grass, /area/station/service/hydroponics) "bQn" = ( @@ -6507,10 +6515,6 @@ pixel_y = -6; req_access = list("engineering") }, -/obj/item/computer_disk/atmos{ - pixel_x = 10; - pixel_y = -4 - }, /obj/item/toy/figure/ce{ pixel_x = 8; pixel_y = 6 @@ -6663,7 +6667,7 @@ /area/station/maintenance/department/crew_quarters/bar) "cjq" = ( /obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase{ +/obj/item/storage/briefcase/secure{ pixel_y = 6 }, /obj/item/radio{ @@ -7085,7 +7089,7 @@ /turf/closed/wall/r_wall, /area/space/nearstation) "cox" = ( -/mob/living/simple_animal/sloth/citrus, +/mob/living/basic/sloth/citrus, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -7336,7 +7340,6 @@ "csM" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/structure/sign/warning/electric_shock/directional/south, /obj/effect/turf_decal/siding/red/corner{ dir = 4 }, @@ -7345,6 +7348,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/button/door/directional/south{ + id = "secmechbay"; + name = "Security Mech Garage Door Controls"; + req_access = list("security"); + pixel_x = -8 + }, /turf/open/floor/iron/dark, /area/station/security/lockers) "csW" = ( @@ -7418,7 +7427,7 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "cuj" = ( -/mob/living/simple_animal/hostile/asteroid/hivelord, +/mob/living/basic/mining/hivelord, /turf/open/misc/asteroid/airless, /area/space/nearstation) "cup" = ( @@ -8255,15 +8264,16 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "cLG" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/item/radio/intercom/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "cLL" = ( @@ -8296,7 +8306,6 @@ /obj/effect/turf_decal/bot, /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, -/obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -8458,7 +8467,7 @@ /area/station/maintenance/starboard) "cQR" = ( /turf/closed/wall, -/area/station/maintenance/department/cargo) +/area/station/bitrunning/den) "cQV" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -9058,7 +9067,7 @@ /area/station/hallway/primary/fore) "cZT" = ( /obj/effect/turf_decal/bot, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/light/small/directional/south, /obj/machinery/iv_drip, /obj/effect/decal/cleanable/dirt, @@ -9334,7 +9343,7 @@ }, /obj/item/pen/fountain, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "deZ" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -9590,7 +9599,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/rack/gunrack, -/obj/effect/spawner/armory_spawn/cmg, +/obj/effect/spawner/armory_spawn/smg, /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "dix" = ( @@ -9808,6 +9817,10 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) +"dlm" = ( +/obj/vehicle/sealed/mecha/ripley/paddy/preset, +/turf/open/floor/iron/recharge_floor, +/area/station/security/mechbay) "dlI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, @@ -9931,6 +9944,19 @@ /obj/item/wallframe/apc, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) +"dnD" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/mob/living/simple_animal/pet/poppy, +/turf/open/floor/iron, +/area/station/engineering/lobby) "dnF" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/showroomfloor, @@ -10095,7 +10121,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -11533,6 +11558,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "dNL" = ( @@ -11600,6 +11628,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "dOW" = ( @@ -11653,7 +11682,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "dQx" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/bot_white/left, /obj/machinery/light/small/directional/west, @@ -11803,7 +11832,7 @@ pixel_x = -4 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "dSn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -12335,11 +12364,14 @@ /area/station/science/xenobiology) "ecl" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset, -/obj/effect/spawner/random/maintenance, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/netpod, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "ecE" = ( /turf/closed/wall/rust, /area/station/service/chapel/storage) @@ -12465,6 +12497,11 @@ "eft" = ( /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) +"efB" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "efG" = ( /turf/closed/wall, /area/station/maintenance/fore) @@ -12918,7 +12955,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "emx" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -12962,7 +12999,7 @@ /area/station/maintenance/disposal/incinerator) "enj" = ( /turf/closed/wall/r_wall, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "enr" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed{ @@ -13538,7 +13575,7 @@ /obj/effect/landmark/start/nanotrasen_consultant, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "exN" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -13587,7 +13624,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "eyl" = ( -/mob/living/simple_animal/hostile/bear{ +/mob/living/basic/bear{ desc = "Once a trained show bear, this creature has been left abandoned and unfed."; environment_smash = 0; health = 160; @@ -13752,7 +13789,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/old, -/mob/living/simple_animal/hostile/retaliate/goat{ +/mob/living/basic/goat/pete{ name = "Pete" }, /turf/open/floor/iron/freezer, @@ -14073,6 +14110,9 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"eHw" = ( +/turf/closed/wall/r_wall, +/area/station/security/mechbay) "eHI" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -14164,6 +14204,11 @@ name = "upload camera"; network = list("aiupload") }, +/obj/item/radio/intercom/directional/east{ + broadcasting = 1; + frequency = 1447; + name = "Private Channel" + }, /turf/open/floor/circuit/green{ luminosity = 2 }, @@ -14220,8 +14265,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/effect/turf_decal/stripes/red/box, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "eJy" = ( @@ -14364,7 +14409,7 @@ "eMo" = ( /obj/structure/sign/departments/evac, /turf/closed/wall, -/area/station/maintenance/department/cargo) +/area/station/bitrunning/den) "eMr" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, @@ -14517,6 +14562,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ePb" = ( @@ -14695,7 +14741,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, /obj/effect/landmark/start/coroner, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -14834,7 +14879,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/machinery/camera/directional/north{ c_tag = "Starboad Hallway Custodial Bay"; name = "starboard camera" @@ -15284,7 +15328,7 @@ /area/station/maintenance/disposal/incinerator) "fdA" = ( /obj/structure/table_frame/wood, -/mob/living/simple_animal/hostile/asteroid/basilisk{ +/mob/living/basic/mining/basilisk{ environment_smash = 0 }, /turf/open/floor/carpet/green, @@ -15697,6 +15741,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "fjI" = ( @@ -16450,6 +16495,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "fuB" = ( @@ -16899,17 +16945,18 @@ }, /area/station/service/chapel) "fBh" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Departure Lounge" }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "departures-entrance" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "fBm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced/spawner/directional/west, @@ -17499,7 +17546,7 @@ "fJr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, -/mob/living/basic/syndicate/russian{ +/mob/living/basic/trooper/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); name = "Russian Mobster" @@ -17635,8 +17682,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/room) "fKJ" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -18685,7 +18736,7 @@ }, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "gbY" = ( /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/ash, @@ -18779,6 +18830,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "gev" = ( @@ -19417,7 +19471,7 @@ /turf/open/floor/iron/dark/corner{ dir = 4 }, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "goY" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -20073,6 +20127,14 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"gzi" = ( +/obj/machinery/computer/quantum_console, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "gzv" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -20146,6 +20208,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/item/crowbar/red, +/obj/item/wrench, /turf/open/floor/iron/dark, /area/station/security/lockers) "gBp" = ( @@ -20501,7 +20565,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "gGs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20837,7 +20901,7 @@ "gLm" = ( /obj/machinery/status_display/ai/directional/south, /obj/effect/decal/cleanable/dirt, -/mob/living/basic/giant_spider/hunter/scrawny, +/mob/living/basic/spider/giant/hunter/scrawny, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "gLn" = ( @@ -20909,13 +20973,9 @@ /turf/open/space/basic, /area/space/nearstation) "gMA" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/bitrunning/den) "gMC" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/delivery, @@ -21044,6 +21104,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) +"gPo" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/landmark/start/corrections_officer, +/turf/open/floor/iron, +/area/station/security/office) "gPy" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/rdconsole{ @@ -21375,9 +21441,9 @@ "gUK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/east, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/gbp_redemption, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "gUS" = ( @@ -22044,7 +22110,7 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "hiQ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22111,6 +22177,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "hjk" = ( @@ -23386,7 +23455,7 @@ }, /obj/machinery/holopad, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "hCK" = ( /obj/structure/table, /obj/item/clothing/gloves/color/orange, @@ -23431,12 +23500,12 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "hDa" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "hDy" = ( /obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23557,17 +23626,11 @@ /area/station/maintenance/aft) "hEH" = ( /obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, -/obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) +/turf/closed/wall, +/area/station/bitrunning/den) "hEI" = ( /obj/machinery/pdapainter/medbay, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -23674,7 +23737,6 @@ /area/station/hallway/primary/fore) "hGC" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/rnd/bepis, /obj/effect/turf_decal/box/white, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -23695,7 +23757,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "hHg" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ +/obj/machinery/cryo_cell{ dir = 4 }, /obj/effect/turf_decal/delivery, @@ -23808,7 +23870,7 @@ id = "nt_rep_priv_2" }, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "hIS" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/rnd_all, @@ -23911,6 +23973,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/effect/landmark/start/bouncer, /turf/open/floor/iron/dark, /area/station/service/bar/atrium) "hJZ" = ( @@ -23943,7 +24006,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/north, @@ -24086,7 +24148,6 @@ /obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/power/shieldwallgen, /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, @@ -26381,6 +26442,17 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"itG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/mechbay) "itR" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -28774,7 +28846,7 @@ "jfK" = ( /obj/structure/table/glass, /obj/item/stack/package_wrap, -/obj/item/storage/secure/briefcase, +/obj/item/storage/briefcase/secure, /obj/item/hand_labeler, /obj/item/reagent_containers/spray/cleaner, /obj/structure/cable, @@ -28879,16 +28951,13 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "jgI" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/item/clothing/shoes/jackboots{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/sofa/corp/right{ + dir = 8 }, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/cowboy/black, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "jgN" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) @@ -29120,7 +29189,7 @@ /obj/structure/table, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/item/storage/toolbox/emergency, -/obj/item/wirerod, +/obj/item/melee/baton/security/cattleprod, /obj/machinery/light/small/directional/north, /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, @@ -29702,6 +29771,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "jwu" = ( @@ -29944,7 +30016,7 @@ /area/station/command/bridge) "jBO" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/cryo_cell{ +/obj/machinery/cryo_cell{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -30087,13 +30159,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/effect/landmark/start/depsec/supply, /obj/structure/chair/office{ dir = 8 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/effect/landmark/start/customs_agent, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "jEC" = ( @@ -30327,12 +30399,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "jIV" = ( -/obj/machinery/vending/security, /obj/effect/turf_decal/bot, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/lockers) "jIW" = ( @@ -30440,7 +30513,6 @@ /turf/open/floor/iron, /area/station/security/courtroom) "jJB" = ( -/obj/structure/cable, /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -30783,11 +30855,11 @@ /area/station/science/server) "jPe" = ( /turf/closed/wall/r_wall/rust, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "jPq" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, -/obj/item/storage/secure/briefcase{ +/obj/item/storage/briefcase/secure{ pixel_y = 4 }, /obj/item/radio{ @@ -31085,7 +31157,7 @@ pixel_x = -32 }, /obj/machinery/light/directional/north, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/surgery_tray/full, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -31185,7 +31257,6 @@ "jWL" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -31720,10 +31791,10 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "kgD" = ( @@ -31788,6 +31859,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "kix" = ( @@ -32410,6 +32482,17 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall, /area/station/security/lockers) +"ksX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/mechbay) "ktc" = ( /obj/structure/sign/poster/contraband/random/directional/west, /obj/effect/spawner/random/structure/girder, @@ -32545,7 +32628,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark/textured, -/area/station/cargo/sorting) +/area/station/hallway/primary/starboard) "kvM" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -32573,8 +32656,7 @@ /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/jungle/mook{ - environment_smash = 0; +/mob/living/basic/mining/mook{ name = "deformed creature" }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -32708,6 +32790,7 @@ network = list("ss13","engine") }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "kyU" = ( @@ -33856,7 +33939,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/recycler, +/obj/machinery/recycler{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/service/janitor) "kSs" = ( @@ -34000,7 +34085,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark/textured, -/area/station/cargo/sorting) +/area/station/hallway/primary/starboard) "kUR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -34127,7 +34212,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/item/kirbyplants/organic/plant21, /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/red{ @@ -34188,6 +34272,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/royalblue, /area/station/service/chapel/office) +"kXG" = ( +/obj/machinery/button/delam_scram, +/turf/closed/wall/r_wall/rust, +/area/station/maintenance/starboard/aft) "kXJ" = ( /obj/machinery/door/poddoor/preopen{ id = "xeno1"; @@ -34379,7 +34467,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/mob/living/basic/giant_spider/tarantula/scrawny, +/mob/living/basic/spider/giant/tarantula/scrawny, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -34518,7 +34606,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "lby" = ( /turf/closed/wall, /area/station/science/robotics/mechbay) @@ -34744,14 +34832,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "lfu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/computer/order_console/bitrunning, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "lfz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -34983,6 +35066,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "ljy" = ( @@ -35044,7 +35128,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/structure/cable, /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -35274,7 +35357,7 @@ "loy" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "loI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35877,7 +35960,7 @@ /obj/machinery/firealarm/directional/west, /obj/machinery/newscaster/directional/south, /obj/item/stack/package_wrap, -/obj/item/storage/secure/briefcase{ +/obj/item/storage/briefcase/secure{ pixel_y = 4 }, /obj/item/hand_labeler, @@ -36356,6 +36439,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "lFC" = ( @@ -36384,7 +36470,7 @@ "lGa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/canister_frame/machine/unfinished_canister_frame, +/obj/structure/fluff/broken_canister_frame, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -36508,6 +36594,16 @@ "lIs" = ( /turf/closed/wall/rust, /area/station/security/execution/education) +"lIN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/delam_scram/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "lIR" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -37146,6 +37242,7 @@ dir = 4 }, /obj/machinery/light/directional/north, +/obj/effect/landmark/start/blueshield, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/captain) "lUq" = ( @@ -37188,9 +37285,8 @@ /area/station/command/heads_quarters/cmo) "lVe" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, /obj/structure/table/reinforced, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/surgery_tray/full, /turf/open/floor/iron/dark, /area/station/medical/morgue) "lVf" = ( @@ -38043,7 +38139,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/old, -/mob/living/basic/giant_spider/hunter/scrawny, +/mob/living/basic/spider/giant/hunter/scrawny, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) @@ -38180,7 +38276,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/secure/briefcase, +/obj/item/storage/briefcase/secure, /obj/effect/turf_decal/tile/red{ dir = 4 }, @@ -39016,7 +39112,7 @@ /obj/item/wirecutters{ pixel_y = 5 }, -/obj/item/wirerod, +/obj/item/melee/baton/security/cattleprod, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/interrogation) @@ -39474,8 +39570,8 @@ /obj/item/storage/belt/utility, /obj/item/clothing/head/utility/welding, /obj/item/clothing/glasses/welding, -/obj/structure/noticeboard/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/posialert/directional/north, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "mGz" = ( @@ -40002,13 +40098,7 @@ /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "mPE" = ( -/obj/structure/sink/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Computers"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -41173,6 +41263,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/vending/access/command, /turf/open/floor/iron, /area/station/command/bridge) "njf" = ( @@ -41440,7 +41531,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -41824,7 +41914,7 @@ "nvA" = ( /obj/machinery/suit_storage_unit/hos, /obj/effect/turf_decal/delivery, -/obj/item/storage/secure/safe/hos{ +/obj/structure/secure_safe/hos{ pixel_x = 36; pixel_y = 28 }, @@ -41885,10 +41975,6 @@ "nwf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -42166,7 +42252,7 @@ "nBZ" = ( /obj/machinery/newscaster/directional/west, /obj/structure/table, -/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/surgery_tray/full, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -42706,8 +42792,7 @@ /obj/effect/decal/remains/human, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/simple_animal/hostile/jungle/mook{ - environment_smash = 0; +/mob/living/basic/mining/mook{ name = "deformed creature" }, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -43131,13 +43216,14 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) "nTd" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ +/obj/machinery/quantum_server, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "nTo" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, @@ -43393,7 +43479,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "nZE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -43618,7 +43704,6 @@ dir = 4 }, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/dark, /area/station/medical/morgue) "ocZ" = ( @@ -43791,7 +43876,7 @@ /area/space/nearstation) "ogL" = ( /turf/closed/wall/rust, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "ogM" = ( /obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/wideplating/dark/corner, @@ -43850,6 +43935,10 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) +"oid" = ( +/obj/structure/sign/delam_procedure, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) "oig" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44490,7 +44579,7 @@ /area/station/service/library) "otO" = ( /obj/structure/table, -/obj/item/storage/secure/briefcase, +/obj/item/storage/briefcase/secure, /obj/item/taperecorder, /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/floor/iron/dark, @@ -44800,7 +44889,6 @@ /area/space/nearstation) "ozt" = ( /obj/structure/chair/office/light, -/obj/effect/landmark/start/depsec/medical, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, @@ -44808,6 +44896,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/effect/landmark/start/orderly, /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/medical) "ozw" = ( @@ -44821,12 +44910,12 @@ /area/station/cargo/warehouse) "ozz" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "ozO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -44902,7 +44991,6 @@ /area/station/hallway/primary/fore) "oAO" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/lapvend, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, @@ -45675,6 +45763,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"oQt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "oQv" = ( /obj/structure/bookcase/random, /obj/structure/cable, @@ -45786,8 +45881,12 @@ /obj/machinery/airalarm/directional/south, /obj/effect/mapping_helpers/airalarm/mixingchamber_access, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnancefreezer" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron/showroomfloor, -/area/station/science/ordnance/freezerchamber) +/area/station/science/ordnance) "oSq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45855,15 +45954,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "oSX" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "oTd" = ( @@ -46303,7 +46402,7 @@ /obj/structure/table, /obj/item/healthanalyzer, /obj/item/hand_labeler, -/obj/item/storage/secure/safe/caps_spare/directional/north, +/obj/structure/secure_safe/caps_spare/directional/north, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, @@ -46526,14 +46625,14 @@ /area/station/medical/medbay/central) "pdZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/caution_sign, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/bitrunner, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "pem" = ( /obj/structure/transit_tube/curved/flipped{ dir = 4 @@ -47439,6 +47538,7 @@ dir = 1 }, /obj/effect/spawner/random/engineering/tracking_beacon, +/mob/living/basic/pet/dog/corgi/borgi, /turf/open/floor/iron, /area/station/science/robotics/mechbay) "pqu" = ( @@ -47936,7 +48036,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "pzC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49733,6 +49833,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, +/mob/living/basic/pet/dog/markus, /turf/open/floor/iron, /area/station/cargo/storage) "qdk" = ( @@ -49984,15 +50085,14 @@ /turf/open/floor/plating, /area/station/hallway/primary/port) "qih" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/newscaster/directional/south, +/obj/effect/landmark/start/bitrunner, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/area/station/bitrunning/den) "qij" = ( /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -51849,7 +51949,6 @@ "qRh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/structure/disposalpipe/junction/flip, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -52482,6 +52581,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos) +"rap" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) "raM" = ( /obj/machinery/light/directional/west, /obj/machinery/status_display/ai/directional/west, @@ -52930,6 +53034,10 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"rik" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "riB" = ( /obj/machinery/computer/shuttle/labor{ dir = 1 @@ -53010,7 +53118,7 @@ /area/station/cargo/office) "riT" = ( /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "riW" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -53049,7 +53157,7 @@ /obj/effect/landmark/start/nanotrasen_consultant, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "rjR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -53417,7 +53525,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -54037,7 +54144,7 @@ /area/station/service/chapel) "rxt" = ( /obj/structure/table/wood, -/obj/item/storage/secure/briefcase{ +/obj/item/storage/briefcase/secure{ pixel_x = 5; pixel_y = 5 }, @@ -54353,6 +54460,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "rDi" = ( @@ -54743,6 +54853,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/airalarm/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "rKI" = ( @@ -55343,7 +55454,7 @@ "rSL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/giant_spider/hunter/scrawny, +/mob/living/basic/spider/giant/hunter/scrawny, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "rSN" = ( @@ -55447,7 +55558,7 @@ dir = 1 }, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "rUj" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark/corner, @@ -55887,7 +55998,7 @@ dir = 4 }, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "scE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -56011,7 +56122,7 @@ "sdT" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall/rust, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "sdX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -56243,6 +56354,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) "shZ" = ( @@ -56417,7 +56531,7 @@ name = "Privacy Shutters Control" }, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "slo" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced/tinted, @@ -57080,6 +57194,13 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"svI" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/security/mechbay) "svW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -57744,7 +57865,7 @@ /turf/closed/wall, /area/station/service/bar/atrium) "sHn" = ( -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/effect/turf_decal/bot_white/left, /obj/structure/extinguisher_cabinet/directional/west, @@ -58209,6 +58330,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "sNe" = ( @@ -58789,9 +58912,6 @@ pixel_x = 6; pixel_y = 5 }, -/obj/machinery/ecto_sniffer{ - pixel_x = -6 - }, /obj/item/mod/core/standard{ pixel_x = -4 }, @@ -60486,7 +60606,7 @@ }, /obj/item/camera_film, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "twu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -60622,6 +60742,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/effect/landmark/start/corrections_officer, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) "tzF" = ( @@ -60657,11 +60778,10 @@ /area/station/hallway/primary/central) "tzL" = ( /obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/item/flashlight/lamp, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/ammo_workbench, /turf/open/floor/iron/dark, /area/station/security/office) "tzN" = ( @@ -61375,6 +61495,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/closet/secure_closet/blueshield, /turf/open/floor/iron, /area/station/command/bridge) "tMW" = ( @@ -61386,10 +61507,14 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "tNa" = ( -/obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/netpod, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "tNe" = ( /obj/structure/disposalpipe/junction, /obj/structure/cable, @@ -61441,13 +61566,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) "tNQ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) +/turf/closed/wall, +/area/station/bitrunning/den) "tNW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61837,7 +61958,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "tUO" = ( /obj/structure/railing{ dir = 1 @@ -62337,7 +62458,6 @@ /turf/open/floor/iron/dark/telecomms, /area/station/science/server) "ucm" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 9 }, @@ -62723,6 +62843,12 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"uhb" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/landmark/start/blueshield, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "uhp" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -62862,7 +62988,7 @@ "ukd" = ( /obj/structure/table/wood, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "uke" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -63477,7 +63603,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "usV" = ( /obj/structure/table/wood, /obj/item/pai_card, @@ -63510,7 +63636,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/dark, /area/station/medical/morgue) "utk" = ( @@ -63715,7 +63840,7 @@ /obj/item/assembly/flash/handheld, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "uwX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -63811,13 +63936,14 @@ /area/station/hallway/secondary/entry) "uAc" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/sheet/glass{ - amount = 20 +/obj/machinery/netpod, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/item/radio/intercom/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "uAe" = ( /obj/structure/chair{ dir = 8 @@ -63970,6 +64096,10 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"uCq" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/mechbay) "uCQ" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/frame/machine, @@ -65095,6 +65225,22 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) +"uXK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door/directional/north{ + id = "secmechbay"; + name = "Security Mech Garage Door Controls"; + req_access = list("security"); + pixel_x = 24 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/mechbay) "uXL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65135,7 +65281,7 @@ /area/station/science/ordnance) "uYp" = ( /obj/structure/chair/stool/bar/directional/west, -/mob/living/basic/syndicate/russian{ +/mob/living/basic/trooper/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); name = "Russian Mobster" @@ -65290,8 +65436,12 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron/showroomfloor, -/area/station/science/ordnance/burnchamber) +/area/station/science/ordnance) "uZZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall, @@ -66342,7 +66492,7 @@ }, /obj/machinery/light/directional/east, /obj/item/lighter, -/obj/item/storage/secure/safe/directional/east, +/obj/structure/secure_safe/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -66479,7 +66629,7 @@ id = "nt_rep_priv" }, /turf/open/floor/plating, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "vtv" = ( /obj/structure/table/bronze, /obj/item/clothing/suit/costume/bronze, @@ -66818,6 +66968,12 @@ /obj/effect/turf_decal/siding/purple/corner{ dir = 4 }, +/obj/structure/sink/directional/west, +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology Computers"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno") + }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) "vyD" = ( @@ -67285,17 +67441,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"vFc" = ( -/obj/structure/sign/warning/docking, -/obj/machinery/door/airlock/external{ - name = "Arrival Shuttle Airlock"; - space_dir = 2 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "vFk" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -67933,12 +68078,6 @@ "vNE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/north{ - broadcasting = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -26 - }, /obj/structure/sign/departments/aiupload/directional/west, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -68318,6 +68457,7 @@ dir = 8 }, /obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/landmark/start/bouncer, /turf/open/floor/wood, /area/station/service/bar/atrium) "vSp" = ( @@ -68414,12 +68554,13 @@ /turf/closed/wall/rust, /area/station/maintenance/fore) "vUp" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Drone Bay Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/machinery/door/airlock/mining/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/bitrunning/den) "vUr" = ( /obj/structure/table/glass, /obj/item/crowbar{ @@ -68427,11 +68568,11 @@ pixel_y = 11 }, /obj/machinery/light/directional/east, -/obj/item/roller{ +/obj/item/emergency_bed{ pixel_x = 7; pixel_y = 10 }, -/obj/item/roller, +/obj/item/emergency_bed, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -69466,6 +69607,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/cryopod/prison/directional/west, /turf/open/floor/plating, /area/station/security/prison) "wkP" = ( @@ -69819,17 +69961,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "wpn" = ( -/obj/item/kirbyplants/organic/plant21, -/obj/item/radio/intercom/directional/north, /obj/machinery/status_display/ai/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) +/turf/closed/wall, +/area/station/bitrunning/den) "wpu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/mob/living/simple_animal/hostile/asteroid/hivelord, +/mob/living/basic/mining/hivelord, /turf/open/floor/plating, /area/station/cargo/warehouse) "wpw" = ( @@ -70483,7 +70623,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/mob/living/simple_animal/hostile/asteroid/hivelord, +/mob/living/basic/mining/hivelord, /turf/open/floor/plating, /area/station/cargo/warehouse) "wAz" = ( @@ -70499,6 +70639,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/red, +/obj/effect/landmark/start/science_guard, /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/science/research) "wAG" = ( @@ -70519,6 +70660,11 @@ /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +"wAZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/bitrunning/den) "wBf" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -70661,6 +70807,7 @@ /obj/structure/chair/stool/bar/directional/east, /obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/landmark/start/bouncer, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "wEJ" = ( @@ -71022,7 +71169,6 @@ /obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/bot, /obj/machinery/firealarm/directional/west, -/obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -71087,7 +71233,7 @@ /area/station/maintenance/fore) "wJn" = ( /turf/closed/wall/rust, -/area/station/maintenance/department/cargo) +/area/station/bitrunning/den) "wJo" = ( /turf/open/floor/plating, /area/station/maintenance/department/security) @@ -71268,7 +71414,7 @@ /obj/machinery/newscaster/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "wNs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71363,6 +71509,12 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"wOX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/curtain/cloth/prison, +/turf/open/floor/plating, +/area/station/security/prison/safe) "wPh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -71629,7 +71781,6 @@ network = list("ss13","engine") }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/firealarm/directional/east, /obj/structure/cable, /obj/machinery/modular_computer/preset/engineering, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -71644,6 +71795,20 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) +"wTq" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "secmechbay"; + name = "Security Mech Bay Shutters" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/security/mechbay) "wTx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -71940,7 +72105,7 @@ /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "wZW" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, @@ -72338,7 +72503,7 @@ "xhe" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/syndicate/russian{ +/mob/living/basic/trooper/russian{ environment_smash = 0; loot = list(/obj/effect/mob_spawn/corpse/human/russian); name = "Russian Mobster" @@ -72430,7 +72595,7 @@ pixel_x = 12 }, /obj/item/radio/intercom/directional/east, -/mob/living/simple_animal/parrot/poly, +/mob/living/basic/parrot/poly, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "xjr" = ( @@ -72577,6 +72742,11 @@ }, /turf/open/floor/plating, /area/station/security/prison) +"xkC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/closed/wall/r_wall, +/area/station/maintenance/starboard/aft) "xkP" = ( /obj/structure/table/wood, /obj/item/storage/photo_album{ @@ -72686,6 +72856,15 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"xlw" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Security - Mechbay" + }, +/turf/open/floor/iron, +/area/station/security/mechbay) "xlA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -73505,6 +73684,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/computer/cryopod/directional/west, /turf/open/floor/plating, /area/station/security/prison) "xAW" = ( @@ -73554,7 +73734,13 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/structure/crate, +/obj/machinery/door/airlock/maintenance{ + name = "Supermatter Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "xBI" = ( @@ -74128,6 +74314,9 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) +"xJW" = ( +/turf/closed/wall/r_wall/rust, +/area/station/security/mechbay) "xKn" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74901,6 +75090,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/poster/official/random/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "xWS" = ( @@ -75036,7 +75226,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/structure/bed/roller, +/obj/structure/bed/medical/emergency, /obj/machinery/iv_drip, /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -75243,7 +75433,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "ycp" = ( -/mob/living/simple_animal/hostile/asteroid/hivelord, +/mob/living/basic/mining/hivelord, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) "ycr" = ( @@ -75764,7 +75954,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, -/area/command/heads_quarters/captain/private/nt_rep) +/area/station/command/heads_quarters/nt_rep) "ykK" = ( /obj/structure/frame/computer{ anchored = 1; @@ -80900,8 +81090,8 @@ aeU aeU aeu nKO -eJN -eJN +wOX +wOX toh nIW koi @@ -83213,11 +83403,11 @@ aaa aaa vku nKO -eJN -eJN +wOX +wOX nKO -eJN -eJN +wOX +wOX nKO qJs sAv @@ -94539,7 +94729,7 @@ lTf oKW tUV uZC -pNe +gPo esn pZI pUA @@ -98150,9 +98340,9 @@ rkU aka aka aka -aeu -aeu -aeu +eHw +eHw +eHw cke aeu aaa @@ -98405,11 +98595,11 @@ ojW sLf kbx btg -rkG -aeu -aeu -aUz -aeU +xJW +dlm +svI +xlw +eHw acm aaa aaa @@ -98662,11 +98852,11 @@ xRL fjz kir jIV -moz -aeU -aeU -aeU -aaa +wTq +uXK +itG +ksX +bKe acm aaa aaa @@ -98919,11 +99109,11 @@ qJO qbf fQM csM -rhd -hmO -xgs -kem -acm +eHw +eHw +uCq +eHw +eHw qJs aaa aaa @@ -99179,8 +99369,8 @@ oZE oZE vuM brK -xgs -xgs +hmO +hmO qkf aaa aaa @@ -105048,7 +105238,7 @@ wiM pFs tnq fvT -spQ +uhb sQj cBW ftz @@ -110475,7 +110665,7 @@ rwD pwo hZT lNK -lNK +dnD rvU pLu lbq @@ -111518,7 +111708,7 @@ uqD kBz vyN mda -vyN +rik dGG vyN eVL @@ -111775,7 +111965,7 @@ quv lhm lYb kvM -mNt +lIN mNt mNt dPr @@ -113051,9 +113241,9 @@ dmf xOB qZX qZX -qZX +oid hjj -jjs +kXG qZX rKn lyu @@ -113308,7 +113498,7 @@ rbp nan cuV vLG -cuV +qZX sOJ aov qZX @@ -113565,9 +113755,9 @@ cuV cuV cuV aAU -oQk +rap xBz -gDM +xkC qZX pKR fyj @@ -115086,10 +115276,10 @@ jnp tOy wJn wJn -fBh cQR cQR -pIl +cQR +fBh pIl mbE eHY @@ -115599,7 +115789,7 @@ pHE bmX dwh cQR -wJn +gzi pdZ ecl wJn @@ -116114,10 +116304,10 @@ bHR xTH wJn lfu -cQR +wAZ cQR eMo -pIl +fBh pIl mbE iSw @@ -116371,7 +116561,7 @@ yaF jAl cQR bFm -wJn +efB wpn cLG jwn @@ -116885,7 +117075,7 @@ kVD cQb cQR jgI -cQR +oQt hEH oSX kdO @@ -117143,7 +117333,7 @@ tOy cQR cQR cQR -vOW +cQR wJe sMh iCW @@ -117417,7 +117607,7 @@ oTy uct aQz oDp -vFc +gJj bUN bUN bUN