diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm index 46e22d19fb67b..b115c323a356e 100644 --- a/_maps/RandomRuins/SpaceRuins/interdyne.dmm +++ b/_maps/RandomRuins/SpaceRuins/interdyne.dmm @@ -104,7 +104,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) "eJ" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -496,7 +496,7 @@ /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) "uy" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) "vd" = ( @@ -656,7 +656,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/interdyne) "By" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/interdyne) @@ -672,7 +672,7 @@ /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/interdyne) "DA" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) @@ -719,7 +719,7 @@ /area/ruin/space/has_grav/interdyne) "Ft" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) @@ -732,7 +732,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/interdyne) "FC" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /obj/structure/cable, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/interdyne) diff --git a/_maps/RandomRuins/SpaceRuins/meatderelict.dmm b/_maps/RandomRuins/SpaceRuins/meatderelict.dmm index 96959954e2678..e3cdb52cad39e 100644 --- a/_maps/RandomRuins/SpaceRuins/meatderelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/meatderelict.dmm @@ -1008,7 +1008,7 @@ /area/ruin/space/has_grav/powered/biooutpost) "tv" = ( /obj/effect/decal/cleanable/blood/tracks, -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /turf/open/indestructible/white{ icon_state = "showroomfloor" }, diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 24444e56c3aa2..f6f00007f5a89 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -203,15 +203,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"adi" = ( -/obj/structure/grille, -/obj/structure/barricade/wooden, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "adk" = ( /obj/machinery/mech_bay_recharge_port, /turf/open/floor/plating, @@ -311,6 +302,10 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"aeX" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/treatment_center) "afw" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1 @@ -740,6 +735,29 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/hallway) +"akn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/north{ + c_tag = "Prison Entry"; + network = list("ss13","prison") + }, +/obj/machinery/button/flasher{ + id = "permaflash2"; + name = "Flasher button"; + pixel_y = 24 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/flasher/directional/north{ + id = "permaflash1"; + pixel_x = 16 + }, +/turf/open/floor/iron/textured_large, +/area/station/security/prison) "akp" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/hfr_room) @@ -813,6 +831,7 @@ /obj/item/gun/energy/temperature/security, /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced/spawner/directional/north, +/obj/item/clothing/suit/hooded/ablative, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "alp" = ( @@ -1053,19 +1072,6 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto/fore) -"aoq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "aot" = ( /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) @@ -1103,6 +1109,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"aoY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - SMES Room"; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "apb" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, @@ -1170,6 +1187,15 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/misc/grass, /area/station/hallway/secondary/exit/departure_lounge) +"apZ" = ( +/obj/machinery/quantum_server, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo - Bitrunning Den"; + network = list("ss13","cargo") + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) "aqm" = ( /obj/machinery/holopad, /obj/effect/landmark/event_spawn, @@ -1219,17 +1245,6 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) -"aqy" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/engineering, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "aqF" = ( /obj/structure/railing{ dir = 10 @@ -1271,30 +1286,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"arc" = ( -/obj/structure/table/glass, -/obj/machinery/camera/directional/north{ - c_tag = "Virology - Workspace"; - network = list("ss13","medbay") - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/machinery/requests_console/directional/north{ - department = "Virology"; - name = "Virology Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "are" = ( /obj/machinery/light/small/directional/south, /obj/effect/spawner/random/trash/cigbutt, @@ -1323,6 +1314,15 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"arH" = ( +/obj/structure/closet/secure_closet/security/med, +/obj/structure/cable, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/light/directional/south, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "arN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1348,16 +1348,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"asi" = ( -/obj/machinery/door/airlock/security, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "asq" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -1465,6 +1455,20 @@ /obj/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"atG" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Cargo - Mining Dock"; + dir = 8; + network = list("ss13","cargo") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "atH" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -1475,16 +1479,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"atI" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Research - E.X.P.E.R.I-MENTOR Lab"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple/half, -/turf/open/floor/iron/white, -/area/station/science/explab) "atR" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 1 @@ -1766,6 +1760,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/ghetto/fore/starboard) +"axO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/obj/machinery/duct, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron/white, +/area/station/science/genetics) "axW" = ( /obj/structure/holosign/barrier/engineering, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1940,18 +1950,6 @@ /obj/structure/bed/maint, /turf/open/floor/plating, /area/station/maintenance/department/medical/ghetto) -"azM" = ( -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Brig Warden's Office" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/warden) "azO" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/bot, @@ -1994,15 +1992,6 @@ light_color = "#a659ff" }, /area/station/service/bar) -"aAh" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Central Hallway East" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "aAk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, @@ -2074,6 +2063,22 @@ }, /turf/open/floor/carpet/red, /area/station/maintenance/department/security/ghetto) +"aBB" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/normal/directional/north{ + network = list("engine","engineering","tcomms","minisat"); + name = "Engineering Security Monitor"; + pixel_y = 35 + }, +/obj/effect/landmark/start/depsec/engineering, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "aBE" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, @@ -2191,15 +2196,18 @@ "aCP" = ( /turf/open/floor/plating, /area/station/construction/mining/aux_base) -"aCU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Supermatter Room Aft"; - network = list("ss13","engine","engineering") +"aCR" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/toilet{ + pixel_y = 8; + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/machinery/camera/directional/west{ + c_tag = "Prison Solitary 1"; + network = list("ss13","prison") + }, +/turf/open/floor/iron, +/area/station/security/prison) "aCZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 @@ -2455,14 +2463,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"aGk" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/holopad, -/turf/open/floor/wood, -/area/station/service/cafeteria) "aGr" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/pew{ @@ -2614,6 +2614,13 @@ /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance) +"aHN" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Secure Tech Storage"; + network = list("ss13","engineering") + }, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) "aHO" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -2681,15 +2688,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard/aft) -"aIx" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "aIE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3145,27 +3143,11 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"aOK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/landmark/start/depsec/supply, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "aOM" = ( /obj/machinery/telecomms/server/presets/common, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/telecomms, /area/station/tcommsat/server) -"aOQ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Secure Tech Storage"; - network = list("ss13","engineering") - }, -/turf/open/floor/plating, -/area/station/engineering/storage/tech) "aOV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3186,14 +3168,6 @@ /obj/effect/mapping_helpers/requests_console/announcement, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"aPk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/engineering/dronefabricator) "aPm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3351,6 +3325,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"aRo" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/engineering, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "aRu" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -3442,18 +3427,30 @@ }, /turf/open/misc/beach/sand, /area/station/service/hydroponics) -"aSi" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 +"aSg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "JimNortonKitchen" }, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Xenobiology Cell 1"; - network = list("ss13","xeno","rd") +/obj/item/storage/fancy/coffee_condi_display{ + pixel_y = 10; + pixel_x = 1 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) +/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ + pixel_x = 12; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/turf/open/floor/wood, +/area/station/service/cafeteria) "aSj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -3624,12 +3621,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) -"aTV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "aTZ" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -3670,6 +3661,15 @@ }, /turf/open/floor/iron, /area/station/cargo/office) +"aUT" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Cargo - Bay South"; + network = list("ss13","cargo") + }, +/obj/effect/spawner/random/trash/box, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) "aUZ" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -3837,6 +3837,12 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"aWW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "aXb" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -3922,30 +3928,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating, /area/station/maintenance/aft) -"aXR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNortonKitchen" - }, -/obj/item/storage/fancy/coffee_condi_display{ - pixel_y = 10; - pixel_x = 1 - }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ - pixel_x = 12; - pixel_y = 4 - }, -/obj/structure/table/reinforced, -/turf/open/floor/wood, -/area/station/service/cafeteria) "aXV" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white, @@ -3960,17 +3942,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"aXX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Freezers"; - network = list("ss13","engine","engineering") - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "aXY" = ( /obj/item/storage/backpack/duffelbag/clown, /obj/item/food/grown/banana, @@ -4058,16 +4029,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/station/service/theater) -"aYX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Supermatter Room Starboard"; - network = list("ss13","engine","engineering") - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "aZa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/loading_area{ @@ -4147,26 +4108,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/processing) -"bad" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNortonKitchen" - }, -/obj/structure/desk_bell{ - pixel_x = -1; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_y = 2; - pixel_x = -7 - }, -/obj/structure/table/reinforced, -/turf/open/floor/wood, -/area/station/service/cafeteria) "bae" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/light/small/directional/north, @@ -4643,24 +4584,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) -"bhc" = ( -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/requests_console/directional/south{ - department = "Cargo"; - name = "Security Requests Console" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "bhg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/west, @@ -4810,11 +4733,53 @@ /obj/item/restraints/handcuffs/cable/zipties, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"biY" = ( +/obj/structure/dresser, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Officer's Quarters"; + network = list("ss13","medbay") + }, +/obj/machinery/button/door/directional/north{ + id = "CMO_bedroom"; + name = "CMO Office Shutters"; + req_access = list("cmo") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "bjb" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/computer/cryopod/directional/south, /turf/open/floor/iron, /area/station/security/prison) +"bjc" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/machinery/light_switch/directional/south, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + pixel_y = 10; + id = "engineering_lockdown"; + name = "Engineering Lockdown"; + req_access = list("ce"); + color = "yellow" + }, +/obj/machinery/button/door/directional/west{ + id = "atmoslock"; + name = "Atmos Lockdown"; + req_access = list("ce") + }, +/obj/machinery/button/door/directional/west{ + pixel_y = -10; + id = "transittube_lockdown"; + name = "Transit Tube Lockdown"; + req_access = list("ce") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "bje" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -4995,6 +4960,17 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +"blq" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Lobby West"; + network = list("ss13","engineering") + }, +/obj/structure/chair, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "blv" = ( /obj/effect/turf_decal/tile/dark{ dir = 1 @@ -5263,18 +5239,43 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"bpA" = ( -/obj/machinery/light/directional/north, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/stripes/line{ +"bpv" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Gravity Generator Foyer"; + network = list("ss13","engineering") + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/gravity_generator) +"bpx" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Virology - Airlock"; + network = list("ss13","medbay") + }, +/obj/structure/sink/directional/west, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Atmos Control Room East"; - network = list("ss13","engineering") +/turf/open/floor/iron/white, +/area/station/medical/virology) +"bpy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Lounge" }, -/turf/open/floor/iron/showroomfloor, -/area/station/engineering/atmos) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"bpH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "bpJ" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/tile, @@ -5508,6 +5509,19 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) +"brQ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/corporate{ + id_tag = "ntr_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/nanotrasen_representative) "brR" = ( /turf/open/floor/plating, /area/station/maintenance/fore) @@ -5516,16 +5530,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) -"bsa" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay - Lobby"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "bsf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5592,16 +5596,6 @@ }, /turf/open/floor/carpet, /area/station/service/chapel) -"bta" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Brig Main Hall West 1" - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/brig) "btb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5669,6 +5663,15 @@ }, /turf/open/floor/iron, /area/station/security/holding_cell) +"bui" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "bup" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5743,6 +5746,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"bvj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/hop, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/hop, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "bvz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -5795,6 +5808,23 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/construction) +"bwc" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/south{ + name = "Engineering Desk"; + req_access = list("engine_equip") + }, +/obj/structure/desk_bell{ + pixel_x = 6 + }, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/iron, +/area/station/engineering/lobby) "bwj" = ( /obj/machinery/atmospherics/components/binary/temperature_gate{ dir = 4; @@ -5865,6 +5895,17 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/wood, /area/station/command/meeting_room) +"bwU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Freezers"; + network = list("ss13","engine","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "bwY" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/firealarm/directional/east, @@ -5904,12 +5945,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"bxz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "bxI" = ( /obj/structure/closet/crate, /obj/item/toy/dodgeball, @@ -5938,6 +5973,16 @@ }, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/captain) +"bxM" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/science) "bxT" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt, @@ -5971,6 +6016,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"byf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals North" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/hallway/secondary/entry) "byg" = ( /obj/structure/closet/crate/freezer, /obj/effect/turf_decal/bot, @@ -6098,6 +6158,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aft) +"bAv" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Research - Polygon East"; + network = list("ss13","rd","ordnance") + }, +/turf/open/floor/iron/airless, +/area/station/science/ordnance/bomb) "bAH" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/structure/sign/warning/electric_shock/directional/south, @@ -6320,19 +6388,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/cafeteria) -"bDC" = ( -/obj/structure/closet/crate/wooden/toy, -/obj/item/toy/mecha/honk, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/machinery/camera/directional/north{ - c_tag = "Clown Office" - }, -/obj/structure/mirror/directional/north, -/turf/open/floor/iron/kitchen, -/area/station/service/theater) "bDE" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -6365,16 +6420,6 @@ /obj/structure/ore_box, /turf/open/floor/iron, /area/station/cargo/storage/ghetto/depot) -"bDW" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Prison General North"; - network = list("ss13","prison") - }, -/obj/structure/cable, -/obj/structure/punching_bag, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/security/prison/ghetto) "bDX" = ( /obj/structure/railing{ dir = 8 @@ -6548,6 +6593,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/aft) +"bGg" = ( +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/turf/open/floor/iron/dark, +/area/station/service/library/artgallery) "bGi" = ( /turf/closed/wall, /area/station/commons/storage/primary) @@ -7035,20 +7087,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/engineering/atmos) -"bMR" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/item/radio/intercom/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Supermatter Engine Room South"; - network = list("ss13","engine","engineering") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway/west) "bMV" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -7068,16 +7106,16 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto/central) -"bNg" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Fore Primary Hallway South" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +"bNj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Supermatter Room Starboard"; + network = list("ss13","engine","engineering") }, -/obj/structure/sign/departments/court/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "bNl" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7214,24 +7252,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/visit) -"bOU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Supermatter Foyer"; - network = list("ss13","engine","engineering") - }, -/obj/structure/rack, -/obj/item/analyzer, -/obj/item/geiger_counter, -/obj/item/geiger_counter{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway/west) "bOW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/south, @@ -7279,16 +7299,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, /area/space/nearstation) -"bPF" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Vacant Store" - }, -/obj/machinery/button/door/directional/north{ - id = "vacantstore_north" - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/dark/small, -/area/station/commons/vacant_room/commissary) "bPK" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -7632,6 +7642,19 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"bUt" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rnd"; + name = "Research Lab Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/lab) "bUB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7738,14 +7761,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/lobby) -"bWs" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "medical_break" - }, -/turf/open/floor/plating, -/area/station/medical/break_room) "bWv" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral{ @@ -7876,6 +7891,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/chapel) +"bXN" = ( +/obj/machinery/light/directional/north, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Atmos Control Room East"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) "bXP" = ( /obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, @@ -7900,6 +7927,16 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/command/bridge) +"bYm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - HFR - East"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) "bYr" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -7961,20 +7998,23 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"bZv" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Brig Main Hall South-West" - }, -/turf/open/floor/iron/dark, -/area/station/security/brig) "bZw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/server) +"bZx" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/xenobiology) "bZF" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -8529,6 +8569,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto) +"cgA" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/button/door/directional/west{ + pixel_y = 10; + id = "engineering_lockdown"; + name = "Engineering Lockdown"; + req_one_access = list("ce","security"); + color = "yellow" + }, +/obj/machinery/button/door/directional/west{ + id = "atmoslock"; + name = "Atmos Lockdown"; + req_one_access = list("ce","security") + }, +/obj/machinery/button/door/directional/west{ + pixel_y = -10; + id = "transittube_lockdown"; + name = "Transit Tube Lockdown"; + req_one_access = list("ce","security") + }, +/obj/structure/table, +/obj/machinery/recharger, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "cgQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/plating, @@ -8720,16 +8789,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"ciO" = ( -/obj/machinery/door/airlock/security, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "ciP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8821,6 +8880,19 @@ }, /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/fore) +"cjE" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/supply, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/computer/security/telescreen/cargo_sec/directional/north{ + network = list("cargo","mine","auxbase","vault"); + name = "Cargo Security Monitor"; + pixel_y = 35 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "cjH" = ( /obj/structure/chair/office, /obj/machinery/camera/directional/north{ @@ -8928,17 +9000,6 @@ /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/iron, /area/station/cargo/storage) -"ckO" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Reception"; - network = list("ss13","engineering") - }, -/obj/machinery/computer/security/telescreen/engine/directional/north, -/obj/item/folder/yellow, -/obj/item/pen, -/turf/open/floor/iron, -/area/station/engineering/lobby) "ckQ" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -9056,6 +9117,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"clW" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Research - E.X.P.E.R.I-MENTOR Lab"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple/half, +/turf/open/floor/iron/white, +/area/station/science/explab) "clY" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north, @@ -9130,18 +9201,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"cni" = ( -/obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos North"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "cnm" = ( /turf/open/floor/iron/stairs/left{ dir = 4 @@ -9320,21 +9379,6 @@ /obj/structure/sign/poster/contraband/tools/directional/north, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) -"cpS" = ( -/obj/structure/cable, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Brig Secure Armory East" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "cpY" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -9517,18 +9561,6 @@ /obj/item/clothing/shoes/magboots, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) -"csr" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos NorthEast"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "css" = ( /obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_y = -1; @@ -9623,6 +9655,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/department/electrical/ghetto) +"cto" = ( +/obj/machinery/duct, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Project Room Aft"; + network = list("ss13","engineering") + }, +/obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "ctu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9952,15 +9996,6 @@ /obj/machinery/suit_storage_unit/industrial/loader, /turf/open/floor/iron, /area/station/cargo/storage/ghetto/depot) -"cxR" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Cargo - Bay South"; - network = list("ss13","cargo") - }, -/obj/effect/spawner/random/trash/box, -/obj/structure/sign/poster/random/directional/south, -/turf/open/floor/iron, -/area/station/cargo/storage) "cxU" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/decal/cleanable/dirt, @@ -9992,17 +10027,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/ghetto/kitchen) -"cyu" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/upper) +"cyw" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "cyz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -10097,20 +10129,6 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/station/maintenance/fore) -"czt" = ( -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Equipment Storage Hardsuits"; - network = list("ss13","engineering") - }, -/obj/item/stack/sheet/mineral/plasma/five, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "czF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ @@ -10418,20 +10436,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"cDQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "cDV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10507,10 +10511,6 @@ /obj/structure/hedge/opaque, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"cEH" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/cryo) "cEI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -10837,6 +10837,21 @@ /obj/machinery/cell_charger, /turf/open/floor/iron, /area/station/maintenance/ghetto/fore/starboard) +"cIx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/iron, +/area/station/maintenance/department/electrical) "cIJ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -10943,17 +10958,6 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room) -"cJF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/medical, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "cJM" = ( /obj/machinery/light/directional/south, /obj/machinery/airalarm/directional/south, @@ -11041,36 +11045,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"cLb" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/button/door{ - name = "Quarantine Shutters"; - id = "quarantine"; - req_access = list("cmo"); - pixel_y = 3; - pixel_x = -6; - color = "yellow" - }, -/obj/machinery/button/door{ - name = "CMO Office Shutters"; - id = "CMO"; - req_access = list("cmo"); - pixel_y = -2; - pixel_x = 6 - }, -/obj/machinery/button/door{ - name = "CMO Door Control"; - id = "CMO_door"; - req_access = list("cmo"); - pixel_y = 8; - pixel_x = 6; - normaldoorcontrol = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "cLd" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/yellow{ @@ -11391,15 +11365,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/command/bridge) -"cOC" = ( -/obj/machinery/door/poddoor{ - id = "xenobio_maint_fore"; - name = "Xenobiology Blast Door" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/ghetto/aft) "cOM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11520,15 +11485,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"cQl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "cQm" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ dir = 1 @@ -11575,6 +11531,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"cRd" = ( +/obj/effect/spawner/structure/window, +/obj/structure/sign/warning/no_smoking/circle, +/turf/open/floor/plating, +/area/station/medical/surgery/theatre) "cRf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -11611,20 +11572,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) -"cRG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"cRE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Hallway West"; - network = list("ss13","engineering") - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals East" }, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "cRM" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -11722,6 +11677,14 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/ghetto/central) +"cTb" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/science, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "cTu" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/item/radio/intercom/directional/south, @@ -11737,6 +11700,21 @@ /obj/structure/sign/warning/vacuum/directional/east, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/fore) +"cTK" = ( +/obj/structure/rack, +/obj/item/clothing/gloves/color/black{ + pixel_x = -6 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black{ + pixel_x = 6 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Atmos HFR Equipment Room"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) "cTN" = ( /obj/structure/rack, /obj/item/clothing/under/misc/burial, @@ -12594,6 +12572,18 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/service/bar) +"dch" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos NorthEast"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dcn" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -12655,6 +12645,17 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port) +"ddt" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Delivery Office"; + network = list("ss13","cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "ddK" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/green/filled/line, @@ -12793,6 +12794,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron, /area/station/maintenance/port) +"dfO" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "dfV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -12941,6 +12949,18 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall, /area/station/medical/cryo) +"dhR" = ( +/obj/structure/table, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "dib" = ( /obj/item/target/clown, /obj/effect/decal/cleanable/blood/old, @@ -12981,6 +13001,16 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"dip" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/full, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "div" = ( /obj/structure/rack, /obj/item/camera, @@ -13053,21 +13083,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, /area/station/commons/fitness) -"dja" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/command/hop{ - id_tag = "HoP_door" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/hop, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "djb" = ( /obj/item/vending_refill/boozeomat, /turf/open/floor/plating, @@ -13716,20 +13731,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) -"dpB" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/effect/landmark/start/depsec/medical, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/med_sec/directional/east{ - name = "Medbay Security Monitor"; - pixel_y = 6 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "dpE" = ( /obj/machinery/light/small/directional/south{ name = "maintenance light"; @@ -13788,9 +13789,32 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"dqW" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "drc" = ( /turf/closed/wall, /area/station/command/heads_quarters/hos) +"dre" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "engsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) "drt" = ( /obj/machinery/button/door/directional/east{ id = "warehouse_shutters"; @@ -13799,23 +13823,6 @@ /obj/item/banner/cargo, /turf/open/floor/iron, /area/station/cargo/storage) -"dru" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/siding/wideplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/tank_dispenser{ - pixel_x = -1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos Storage"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/storage/gas) "drv" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, @@ -14009,16 +14016,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/aft) -"dtb" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Brig Main Hall West 2" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/brig) "dtf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14202,6 +14199,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/xenobiology) +"dvy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron, +/area/station/science/research) "dvz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -14297,6 +14308,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"dwG" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos East"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dwH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -14370,6 +14392,14 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"dyb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/south{ + c_tag = "Locker Room West" + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/locker) "dyc" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -14464,22 +14494,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) -"dzc" = ( -/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, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, -/turf/open/floor/iron, -/area/station/engineering/hallway) "dzl" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, @@ -14520,11 +14534,6 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/maintenance/department/electrical/ghetto) -"dzP" = ( -/obj/structure/closet/wardrobe/white/medical, -/obj/item/clothing/head/soft/paramedic, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "dzQ" = ( /obj/structure/railing{ dir = 1 @@ -14759,12 +14768,9 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"dCO" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Starboard Primary Hallway 3" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +"dCL" = ( +/turf/closed/wall, +/area/station/security/checkpoint/engineering) "dCQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14842,17 +14848,6 @@ }, /turf/open/floor/iron, /area/station/science/ordnance/testlab) -"dEb" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Supermatter Room Port"; - network = list("ss13","engine","engineering") - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) "dEd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -14878,6 +14873,18 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"dEs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Arrivals Auxiliary Docking South" + }, +/turf/open/floor/iron/white/corner{ + dir = 4 + }, +/area/station/hallway/secondary/entry) "dEt" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -15383,13 +15390,6 @@ "dKJ" = ( /turf/open/openspace, /area/station/maintenance/port/aft) -"dKM" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) "dKN" = ( /turf/closed/wall, /area/station/maintenance/solars/starboard/fore) @@ -15401,6 +15401,19 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/medical/surgery/fore) +"dKV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/qm, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/supply/qm, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) "dKW" = ( /obj/machinery/computer/camera_advanced/base_construction/aux, /turf/open/floor/iron, @@ -15578,25 +15591,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) -"dNB" = ( -/obj/machinery/computer/records/security, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/button/door/directional/north{ - id = "engsecprivacy"; - name = "Privacy Shutter Control"; - req_one_access = list("ce","security") - }, -/obj/machinery/requests_console/directional/east{ - name = "Security Requests Console"; - department = "engineering" - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "dND" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15605,6 +15599,10 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"dNF" = ( +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "dNI" = ( /obj/machinery/conveyor{ dir = 1; @@ -15943,12 +15941,6 @@ /obj/structure/destructible/cult/item_dispenser/archives/library, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) -"dTn" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Arrivals Auxiliary Docking South-East" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "dTr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -16081,6 +16073,15 @@ "dVg" = ( /turf/closed/wall, /area/station/medical/medbay/aft) +"dVk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rd_office_shutters"; + name = "Privacy Shutters"; + dir = 1 + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/rd) "dVq" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan{ dir = 1 @@ -16233,6 +16234,27 @@ }, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"dXj" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "robotics_desk"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/window/left/directional/west{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/obj/structure/desk_bell{ + pixel_y = 8 + }, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "dXq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -16248,6 +16270,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"dXu" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/command/hos{ + id_tag = "hos_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/security/hos, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "dXD" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/holopad, @@ -16257,33 +16290,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"dXK" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "medsecprivacy"; - name = "Privacy Shutters" - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id = "quarantine"; - name = "Quarantine Lockdown"; - opacity = 0 - }, -/obj/machinery/door/window/brigdoor/right/directional/west{ - name = "Security Desk"; - req_access = list("brig_entrance") - }, -/obj/item/radio/off, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "dXQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -16395,14 +16401,24 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "eaa" = ( -/obj/structure/barricade/wooden, /obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rnd"; + name = "Research Lab Shutters" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east{ + name = "Research and Development Desk"; + req_access = list("science") + }, +/obj/structure/desk_bell, /obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/science/lab) "eab" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, @@ -16484,6 +16500,36 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"eaI" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/button/door{ + name = "Quarantine Shutters"; + id = "quarantine"; + req_access = list("cmo"); + pixel_y = 3; + pixel_x = -6; + color = "yellow" + }, +/obj/machinery/button/door{ + name = "CMO Office Shutters"; + id = "CMO"; + req_access = list("cmo"); + pixel_y = -2; + pixel_x = 6 + }, +/obj/machinery/button/door{ + name = "CMO Door Control"; + id = "CMO_door"; + req_access = list("cmo"); + pixel_y = 8; + pixel_x = 6; + normaldoorcontrol = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "eaK" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -17073,6 +17119,15 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/station/science/lab) +"ejh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "ejj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17103,25 +17158,6 @@ dir = 1 }, /area/station/hallway/secondary/entry) -"ejw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/camera/directional/east{ - c_tag = "Arrivals Hallway" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"ejH" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rd_office_shutters"; - name = "Privacy Shutters"; - dir = 1 - }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/rd) "ejI" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /mob/living/basic/mouse, @@ -17136,17 +17172,6 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"ejQ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Lobby East"; - network = list("ss13","engineering") - }, -/obj/structure/chair, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "ejR" = ( /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, /obj/effect/turf_decal/tile/yellow, @@ -17188,22 +17213,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/ghetto) -"ekm" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/normal/directional/north{ - network = list("engine","engineering","tcomms","minisat"); - name = "Engineering Security Monitor"; - pixel_y = 35 - }, -/obj/effect/landmark/start/depsec/engineering, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "ekp" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/closet/radiation, @@ -17238,23 +17247,42 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) -"ekJ" = ( -/obj/machinery/duct, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - Project Room Aft"; - network = list("ss13","engineering") - }, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 +"ekL" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/directional/south{ + c_tag = "EVA" }, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark/smooth_large, +/area/station/ai_monitored/command/storage/eva) "ekQ" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) +"ekX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/button/door/directional/north{ + id = "research_lockdown"; + name = "Research Lockdown Control"; + pixel_x = 6; + req_one_access = list("rd","security"); + color = "yellow" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "rndsecprivacy"; + name = "Privacy Shutter Control"; + pixel_x = -6; + req_one_access = list("rd","security") + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "elu" = ( /obj/machinery/duct, /turf/open/floor/plating, @@ -17357,15 +17385,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) -"emM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/east{ - c_tag = "Arrivals Auxiliary Docking North" - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "emP" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -17607,14 +17626,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard/aft) -"epP" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/engineering/hallway) "epS" = ( /obj/structure/cable, /obj/effect/landmark/start/detective, @@ -17657,33 +17668,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"eqp" = ( -/obj/machinery/modular_computer/preset/research{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/anticorner{ - dir = 1 - }, -/obj/machinery/button/door/directional/west{ - id = "rd_office_shutters"; - name = "Privacy Shutters Control"; - req_access = list("rd"); - pixel_y = -10 - }, -/obj/machinery/button/door/directional/west{ - id = "research_lockdown"; - name = "Research Lockdown Control"; - req_access = list("rd"); - pixel_y = 10; - color = "yellow" - }, -/obj/machinery/button/door/directional/west{ - id = "rd_robotics_window_shutters"; - name = "Upper Privacy Shutters Control"; - req_access = list("rd") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "eqC" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17763,6 +17747,11 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"erR" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/space/openspace, +/area/space/nearstation) "erS" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -17908,16 +17897,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"euI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/hop, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/hop, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "euJ" = ( /obj/machinery/duct, /turf/open/floor/plating, @@ -18009,6 +17988,18 @@ /obj/structure/closet/secure_closet/evidence, /turf/open/floor/iron/dark, /area/station/security/evidence) +"ewc" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Xenobiology Cell 6"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "ewd" = ( /turf/closed/wall, /area/station/security/office) @@ -18067,14 +18058,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) -"exw" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/landmark/start/depsec/supply, +"exr" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) +/obj/structure/filingcabinet, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Security Post"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "exB" = ( /obj/effect/spawner/random/trash/box, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -18143,18 +18137,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/large, /area/station/commons/storage/primary) -"eyZ" = ( -/obj/machinery/door/poddoor/shutters{ - id = "Skynet_launch"; - name = "Mech Bay" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron/dark, -/area/station/science/robotics/mechbay) "ezi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -18519,39 +18501,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) -"eEj" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/button/door/directional/west{ - pixel_y = 10; - id = "engineering_lockdown"; - name = "Engineering Lockdown"; - req_one_access = list("ce","security"); - color = "yellow" - }, -/obj/machinery/button/door/directional/west{ - id = "atmoslock"; - name = "Atmos Lockdown"; - req_one_access = list("ce","security") - }, -/obj/machinery/button/door/directional/west{ - pixel_y = -10; - id = "transittube_lockdown"; - name = "Transit Tube Lockdown"; - req_one_access = list("ce","security") - }, -/obj/structure/table, -/obj/machinery/recharger, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) -"eEk" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/surgery/aft) "eEx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/warning/docking/directional/south, @@ -18743,6 +18692,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) +"eHi" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Prison General North"; + network = list("ss13","prison") + }, +/obj/structure/cable, +/obj/structure/punching_bag, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/security/prison/ghetto) "eHj" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -18782,20 +18741,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"eHE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron, -/area/station/engineering/hallway) "eHP" = ( /obj/structure/table, /obj/machinery/light/small/directional/north, @@ -18867,9 +18812,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"eIq" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "eIw" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "eIA" = ( @@ -18882,6 +18834,14 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) +"eIH" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/engineering/dronefabricator) "eIQ" = ( /obj/structure/spider/stickyweb, /obj/structure/door_assembly/door_assembly_silver{ @@ -19027,13 +18987,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/showroomfloor, /area/station/service/kitchen/abandoned) -"eKx" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/landmark/start/depsec/engineering, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "eKA" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) @@ -19210,6 +19163,12 @@ "eNf" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) +"eNi" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "eNj" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -19425,6 +19384,15 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/ghetto/central/aft) +"eQI" = ( +/obj/structure/grille, +/obj/structure/barricade/wooden, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "eQK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19927,8 +19895,28 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, +/obj/structure/table, +/obj/item/taperecorder{ + pixel_x = -10; + pixel_y = 4 + }, +/obj/item/camera{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/clothing/glasses/sunglasses, /turf/open/floor/wood/tile, /area/station/service/lawoffice) +"eXC" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/closet/secure_closet/security/engine, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "eXQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -19944,25 +19932,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"eYb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNortonKitchen" - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = -3; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_y = -1 - }, -/turf/open/floor/wood, -/area/station/service/cafeteria) "eYd" = ( /obj/structure/railing{ dir = 8 @@ -19981,16 +19950,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/science/research) -"eYi" = ( -/obj/structure/table, -/obj/machinery/camera/directional/south{ - c_tag = "Departure Lounge South-West" - }, -/obj/item/stack/sheet/cardboard{ - amount = 10 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "eYk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20184,19 +20143,6 @@ dir = 1 }, /area/station/engineering/atmos) -"fbo" = ( -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/matter_bin, -/obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/scanning_module, -/obj/effect/turf_decal/tile/purple/anticorner, -/obj/item/stock_parts/capacitor, -/obj/structure/table, -/turf/open/floor/iron/white, -/area/station/science/lab) "fbp" = ( /turf/open/floor/wood/large, /area/station/maintenance/ghetto/port) @@ -20226,18 +20172,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/ghetto/central) -"fbR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "Research Lab Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/lab) "fbS" = ( /obj/item/kirbyplants/random/dead, /obj/effect/spawner/random/maintenance, @@ -20368,6 +20302,17 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"fdD" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/effect/landmark/start/depsec/medical, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "fdL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -20758,6 +20703,30 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"fiJ" = ( +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/flashlight/pen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/clothing/neck/stethoscope{ + pixel_y = 4; + pixel_x = 5 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Chief Medical Officer's Office"; + network = list("ss13","medbay"); + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "fiK" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/closed/wall/r_wall, @@ -20804,13 +20773,6 @@ /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"fjb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "fjd" = ( /obj/structure/cable, /obj/machinery/holopad/secure, @@ -20938,18 +20900,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/small, /area/station/maintenance/ghetto/central) -"fkx" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Research - Xenobiology East"; - network = list("ss13","xeno","rd"); - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "fkB" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -20993,6 +20943,14 @@ }, /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) +"fli" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Construction Area"; + network = list("ss13","engineering") + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/construction) "fll" = ( /obj/machinery/light/small/directional/north, /obj/machinery/flasher/directional/north{ @@ -21025,14 +20983,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"flN" = ( -/obj/machinery/computer/records/security, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "flO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21065,47 +21015,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"flU" = ( -/obj/item/assembly/timer{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/assembly/timer{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/assembly/timer{ - pixel_x = 8 - }, -/obj/item/assembly/timer{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/item/assembly/igniter{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/assembly/igniter{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/assembly/igniter{ - pixel_x = -6 - }, -/obj/item/assembly/igniter{ - pixel_x = -6; - pixel_y = -3 - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay - Chemistry"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "fmj" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/engine/cult, @@ -21426,16 +21335,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) -"fqP" = ( -/obj/structure/sign/warning/docking/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Arrivals Center" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "fqT" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/delivery/white{ @@ -21443,15 +21342,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"fqU" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Dormitories East" - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "fqZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/stasis{ @@ -21479,15 +21369,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"frs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - HFR South"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "fru" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21649,6 +21530,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/command/teleporter) +"fsM" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "fsT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -21685,6 +21572,20 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/electrical) +"ftE" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Hallway North"; + network = list("ss13","medbay") + }, +/obj/structure/sign/departments/morgue/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay) "ftL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21719,6 +21620,18 @@ dir = 4 }, /area/station/hallway/secondary/entry) +"ful" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Brig Warden's Office" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/warden) "fur" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/dark, @@ -21856,6 +21769,19 @@ /obj/effect/mapping_helpers/airlock/access/any/service/kitchen, /turf/open/floor/iron/dark, /area/station/service/bar) +"fvV" = ( +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stack/sheet/glass, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/effect/turf_decal/tile/purple/anticorner, +/obj/item/stock_parts/capacitor, +/obj/structure/table, +/turf/open/floor/iron/white, +/area/station/science/lab) "fwa" = ( /obj/item/clothing/mask/breath, /obj/effect/decal/cleanable/dirt, @@ -22243,6 +22169,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"fAT" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "fBf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22308,6 +22242,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/ghetto/fore/starboard) +"fBV" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron, +/area/station/engineering/hallway) "fBY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22322,18 +22263,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) -"fCg" = ( -/obj/structure/table/wood, -/obj/item/camera, -/obj/item/storage/photo_album{ - pixel_y = -10 - }, -/obj/item/crowbar, -/obj/machinery/camera/directional/east{ - c_tag = "Captain's Office" - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "fCh" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/north, @@ -22395,16 +22324,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/server) -"fCO" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Atmos Mini-Hallway"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "fCS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22419,6 +22338,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) +"fDc" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) "fDe" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/cobweb, @@ -22623,6 +22556,13 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"fFr" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Brig Briefing Room" + }, +/turf/open/floor/iron, +/area/station/security/office) "fFs" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, @@ -22631,13 +22571,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/royalblack, /area/station/maintenance/ghetto/fore/starboard) -"fFv" = ( -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Central Hallway North-East" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) "fFB" = ( /obj/machinery/conveyor{ dir = 1; @@ -22692,6 +22625,26 @@ /obj/structure/sign/warning/pods/directional/east, /turf/open/floor/plating, /area/station/maintenance/fore) +"fGm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/pen{ + pixel_x = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "fGn" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -22996,15 +22949,6 @@ dir = 1 }, /area/station/maintenance/starboard/fore) -"fJy" = ( -/obj/machinery/modular_computer/preset/id, -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Cargo - QM's Office"; - network = list("ss13","cargo") - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/qm) "fJA" = ( /obj/effect/spawner/random/structure/crate, /obj/machinery/power/apc/auto_name/directional/north, @@ -23117,6 +23061,20 @@ /obj/effect/spawner/random/food_or_drink/snack/lizard, /turf/open/floor/iron/kitchen, /area/station/security/prison) +"fLd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "fLk" = ( /obj/structure/table, /obj/item/stack/sheet/glass{ @@ -23247,37 +23205,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) -"fMP" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics_window"; - name = "Robotics Lab Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/mechbay) "fMS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/engineering/hallway) -"fMT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Hallway East"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) "fMX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23519,14 +23452,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/blueshield) -"fPO" = ( -/obj/structure/closet/crate, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Storage"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/storage_shared) "fPT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet/chestdrawer, @@ -23702,6 +23627,14 @@ /obj/structure/rack, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"fSv" = ( +/obj/structure/filingcabinet, +/obj/structure/sign/poster/official/space_cops/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "fSw" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -23936,6 +23869,38 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"fVL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 3; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = -8 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = -6 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -7 + }, +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Chemistry Lab East"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/chemistry/ghetto) "fVV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24295,23 +24260,15 @@ /obj/item/toy/figure/hos, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"gax" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Lobby"; - network = list("ss13","rd") - }, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half{ - dir = 4 +"gaw" = ( +/obj/effect/turf_decal/bot_red, +/obj/item/beacon, +/obj/machinery/camera/directional/east{ + c_tag = "Research - Polygon Center"; + network = list("ss13","rd","ordnance") }, -/obj/item/folder, -/obj/item/pen, -/turf/open/floor/iron, -/area/station/science/lobby) +/turf/open/floor/iron/airless, +/area/station/science/ordnance/bomb) "gaA" = ( /obj/structure/table/wood/poker, /obj/item/coin/diamond, @@ -24373,13 +24330,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"gbc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "gbf" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) @@ -24554,6 +24504,25 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) +"gdW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Mime Office" + }, +/obj/structure/table/wood, +/obj/structure/mirror/directional/north, +/obj/item/lipstick/random{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/lipstick/random{ + pixel_y = 4 + }, +/obj/item/lipstick/random{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/theater) "gea" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister, @@ -24620,17 +24589,6 @@ }, /turf/open/floor/iron/telecomms, /area/station/tcommsat/server) -"geB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - SMES Room"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) "geM" = ( /obj/machinery/door/airlock/engineering/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -24690,6 +24648,7 @@ pixel_x = 4; pixel_y = 2 }, +/obj/item/clothing/glasses/sunglasses, /turf/open/floor/wood/tile, /area/station/service/lawoffice) "gfe" = ( @@ -24714,16 +24673,14 @@ /obj/effect/turf_decal/tile/dark/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/commons/dorms) -"gft" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +"gfo" = ( +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Polygon South"; + network = list("ss13","rd","ordnance") }, -/obj/machinery/light/directional/west, -/obj/structure/closet/secure_closet/security/engine, -/obj/item/book/manual/wiki/security_space_law, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) +/turf/open/floor/iron/airless, +/area/station/science/ordnance/bomb) "gfI" = ( /obj/structure/cable, /obj/machinery/power/terminal, @@ -24755,6 +24712,19 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/department/electrical/ghetto) +"ggl" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio_maint_aft"; + name = "Xenobiology Blast Door" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + id = "xenobio_maint_fore"; + name = "Xenobiology Blast Door" + }, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/aft) "ggq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -24847,6 +24817,17 @@ /obj/machinery/barsign/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ghG" = ( +/obj/structure/closet/secure_closet/security/sec, +/obj/item/clothing/mask/balaclava, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/camera/directional/west{ + c_tag = "Brig Security Equipment Lockers" + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "ghH" = ( /obj/effect/decal/cleanable/crayon/rune2, /obj/effect/mapping_helpers/broken_floor, @@ -24994,18 +24975,16 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "gjO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/qm, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/supply/qm, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Xenobiology Cell 8"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "gjP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/north, @@ -25088,6 +25067,17 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) +"gls" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/directional/east{ + c_tag = "Research - Server Room"; + network = list("ss13","rd"); + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/server) "glu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25140,6 +25130,16 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"gmg" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Entrance"; + network = list("ss13","cargo") + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "gmi" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -25156,14 +25156,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"gmG" = ( -/obj/structure/filingcabinet, -/obj/structure/sign/poster/official/space_cops/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "gmH" = ( /turf/open/floor/iron/freezer, /area/station/maintenance/ghetto/fore/starboard) @@ -25179,6 +25171,18 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/hallway/secondary/entry) +"gmN" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos NorthWest"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gmR" = ( /obj/machinery/telecomms/processor/preset_four, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ @@ -25416,24 +25420,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, /area/station/maintenance/ghetto/kitchen) -"gpz" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery"; - location = "engineering" - }, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/obj/machinery/door/window/left/directional/east{ - name = "Drone Fabricator"; - req_access = list("engine_equip") - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/dronefabricator) "gpE" = ( /obj/structure/closet/crate/bin, /obj/effect/spawner/random/maintenance/two, @@ -25479,25 +25465,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/paramedic) -"gqo" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rnd"; - name = "Research Lab Shutters" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/right/directional/east{ - name = "Research and Development Desk"; - req_access = list("science") - }, -/obj/structure/desk_bell, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/lab) "gqq" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -25564,6 +25531,17 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/sorting) +"grH" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "grQ" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -25579,6 +25557,17 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/command/bridge) +"grZ" = ( +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id = "quarantine"; + name = "Quarantine Lockdown"; + opacity = 0 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/paramedic) "gsa" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25602,6 +25591,16 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/engineering/hallway) +"gsz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) "gsB" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/prison) @@ -25926,6 +25925,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/open/floor/iron, /area/station/engineering/hallway) +"gxU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/command/rd, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/science/rd, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/rd) "gxY" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/waterbottle, @@ -26006,6 +26018,15 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central) +"gzp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Supermatter Room Aft"; + network = list("ss13","engine","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "gzr" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, @@ -26269,6 +26290,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"gDg" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "gDo" = ( /obj/structure/table/wood, /obj/item/papercutter{ @@ -26395,6 +26422,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"gFq" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Prison Forestry North"; + network = list("ss13","prison") + }, +/obj/structure/flora/bush/jungle, +/obj/machinery/airalarm/directional/north, +/turf/open/misc/grass, +/area/station/security/prison/garden) "gFt" = ( /obj/structure/table, /obj/item/holosign_creator/atmos{ @@ -26746,6 +26782,21 @@ "gJs" = ( /turf/open/space/openspace, /area/space/nearstation) +"gJY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/command/ce{ + id_tag = "ce_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/engineering/ce, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "gKa" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/warm/directional/north, @@ -26946,6 +26997,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) +"gLM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos West"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gLS" = ( /obj/machinery/computer/station_alert{ dir = 8 @@ -26983,19 +27048,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"gMJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/command/rd, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/science/rd, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/rd) "gML" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/box/white/corners, @@ -27086,21 +27138,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/cryo) -"gNS" = ( -/obj/machinery/requests_console/directional/west{ - department = "Cargo"; - name = "Quartermaster's Desk Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/machinery/computer/security/qm{ - network = list("cargo","mine","auxbase","vault") - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/qm) "gNV" = ( /obj/machinery/computer/prisoner/management{ req_access = list("lawyer") @@ -27144,6 +27181,16 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark, /area/station/security/brig) +"gOd" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Brig Main Hall South-West" + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "gOg" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, @@ -27303,6 +27350,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron/white, /area/station/maintenance/aft) +"gPA" = ( +/obj/machinery/button/elevator/directional/north{ + id = "aft_vator" + }, +/obj/machinery/lift_indicator/directional/north{ + linked_elevator_id = "aft_vator" + }, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo - Bay North"; + network = list("ss13","cargo") + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "gPC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -27459,6 +27522,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) +"gRh" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Locker Room East" + }, +/turf/open/floor/iron, +/area/station/commons/locker) "gRD" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -27484,32 +27553,22 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/starboard/fore) -"gSh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/science, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) -"gSn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/camera/directional/north{ - c_tag = "Departure Lounge North-East" - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "gSo" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) +"gSp" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Lobby East"; + network = list("ss13","engineering") + }, +/obj/structure/chair, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "gSq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -27597,14 +27656,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"gUb" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Prison Cafeteria External"; - network = list("ss13","prison") - }, -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space/nearstation) "gUf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27754,17 +27805,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/port) -"gWc" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Vacant Office" - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "gWj" = ( /obj/structure/urinal{ pixel_y = 32 @@ -27991,23 +28031,6 @@ /obj/effect/spawner/random/structure/barricade, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) -"gYU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "mining_internal" - }, -/obj/machinery/bouldertech/refinery, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo - Mining Ore Smeltery"; - network = list("ss13","cargo","mine") - }, -/turf/open/floor/iron/small, -/area/station/cargo/storage/ghetto) "gZc" = ( /obj/structure/closet, /turf/open/floor/iron, @@ -28161,6 +28184,24 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/bitrunning/den) +"hbj" = ( +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_one_access = list("cmo","security"); + pixel_x = 6 + }, +/obj/machinery/computer/records/medical, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/button/door/directional/north{ + id = "quarantine"; + name = "Quarantine Lockdown Control"; + req_one_access = list("cmo","security"); + pixel_x = -6; + color = "yellow" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "hbr" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -28297,14 +28338,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/security/brig) -"hdn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/engineering/lobby) "hdp" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -28322,20 +28355,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) -"hdx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 8 - }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos West"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hdJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair{ @@ -28362,6 +28381,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) +"hec" = ( +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Reception"; + network = list("ss13","engineering") + }, +/obj/machinery/computer/security/telescreen/engine/directional/north, +/obj/item/folder/yellow, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/engineering/lobby) "hej" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -28380,12 +28410,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"hep" = ( -/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/white, -/area/station/medical/medbay/lobby) "heq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -28570,6 +28594,16 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) +"hgL" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Fore Primary Hallway South" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/sign/departments/court/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "hgP" = ( /obj/machinery/computer/security{ dir = 8 @@ -28615,6 +28649,15 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"hhB" = ( +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/iron/stairs/left{ + dir = 8 + }, +/area/station/engineering/transit_tube) "hhF" = ( /obj/item/vending_refill/cigarette, /obj/structure/sign/poster/contraband/rebels_unite/directional/south, @@ -28740,22 +28783,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) -"hiO" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Brig Labor Camp Airlock North" - }, -/obj/item/restraints/handcuffs, -/obj/item/clothing/under/rank/prisoner, -/obj/item/clothing/under/rank/prisoner/skirt, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/structure/cable, -/obj/machinery/gulag_item_reclaimer{ - pixel_y = 28 - }, -/turf/open/floor/iron, -/area/station/security/processing) "hiQ" = ( /turf/open/floor/iron/dark/small, /area/station/medical/morgue) @@ -28869,6 +28896,14 @@ }, /turf/open/floor/iron, /area/station/security/prison) +"hkN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) "hkP" = ( /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, @@ -28931,23 +28966,26 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/ghetto/aft) +"hlF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/camera/directional/south{ + c_tag = "Dormitories Center" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "hlG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/asphalt, /area/station/maintenance/ghetto/garden) -"hlO" = ( -/obj/structure/table, -/obj/item/radio/off, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "hmb" = ( /obj/effect/turf_decal/tile/purple, /obj/structure/sign/departments/science/directional/south, @@ -28969,6 +29007,17 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"hmv" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Cargo - Security Post"; + network = list("ss13","cargo") + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/airalarm/directional/south, +/obj/structure/closet/secure_closet/security/cargo, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "hmw" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, @@ -29021,6 +29070,10 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine/atmos) +"hne" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/surgery/aft) "hng" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -29236,7 +29289,7 @@ /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "hpp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) "hpu" = ( @@ -29287,14 +29340,6 @@ /obj/machinery/vending/security, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"hpZ" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Research - Polygon East"; - network = list("ss13","rd","ordnance") - }, -/turf/open/floor/iron/airless, -/area/station/science/ordnance/bomb) "hql" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -29432,16 +29477,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto/fore) -"hrG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/light/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Starboard Primary Hallway 4" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard/west) "hrP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron/recharge_floor, @@ -29573,13 +29608,14 @@ "hub" = ( /turf/closed/wall, /area/station/science/lab) -"hug" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - id = "rd_robotics_window_shutters" +"hun" = ( +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Prison Forestry External"; + network = list("ss13","prison") }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) +/turf/open/openspace, +/area/station/security/prison) "hup" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -29656,19 +29692,6 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/iron/kitchen, /area/station/maintenance/ghetto/bar) -"huJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Supermatter Engine Room North"; - network = list("ss13","engine","engineering") - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway/west) "huO" = ( /obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/bot, @@ -29823,29 +29846,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"hwR" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "medsecprivacy"; - name = "Privacy Shutters" - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id = "quarantine"; - name = "Quarantine Lockdown"; - opacity = 0 - }, -/obj/machinery/door/window/brigdoor/left/directional/west{ - name = "Security Desk"; - req_access = list("brig_entrance") - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "hwT" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -30045,6 +30045,24 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/ghetto/central) +"hzs" = ( +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/camera/directional/east{ + c_tag = "Research - Research and Development Lab"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple/anticorner, +/obj/structure/table, +/turf/open/floor/iron, +/area/station/science/lab) "hzz" = ( /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron, @@ -30138,15 +30156,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/service/janitor) -"hAH" = ( -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/iron/stairs/left{ - dir = 8 - }, -/area/station/engineering/transit_tube) "hAJ" = ( /obj/structure/railing{ dir = 6 @@ -30155,11 +30164,6 @@ /obj/item/storage/box, /turf/open/floor/iron/showroomfloor, /area/station/service/kitchen/abandoned) -"hAN" = ( -/obj/structure/closet/secure_closet/atmospherics, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "hBh" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -30270,19 +30274,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/wood, /area/station/service/kitchen/abandoned) -"hCx" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/supply, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/computer/security/telescreen/cargo_sec/directional/north{ - network = list("cargo","mine","auxbase","vault"); - name = "Cargo Security Monitor"; - pixel_y = 35 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "hCz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30361,6 +30352,18 @@ /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"hDp" = ( +/obj/structure/table/glass, +/obj/item/storage/box/donkpockets, +/obj/machinery/camera/directional/east{ + c_tag = "Virology - Break Room"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "hDv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/plating, @@ -30562,19 +30565,14 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hFa" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/radio/intercom/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Research - Xenobiology Maintenance Access"; - network = list("ss13","xeno","rd") +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/camera/directional/west{ + c_tag = "Dormitories East" }, /turf/open/floor/iron, -/area/station/science/xenobiology) +/area/station/commons/dorms) "hFb" = ( /obj/machinery/iv_drip, /obj/item/reagent_containers/blood, @@ -30640,6 +30638,19 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"hFY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "hGd" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -30794,15 +30805,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"hHL" = ( -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Turbine"; - network = list("ss13","engineering") - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "hHU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -30859,11 +30861,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"hID" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "hIG" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -30900,11 +30897,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"hIY" = ( -/obj/machinery/power/turbine/inlet_compressor, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "hJh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31234,23 +31226,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/fore) -"hNn" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - HFR - East"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) -"hNr" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "hNu" = ( /obj/structure/chair/stool{ dir = 4 @@ -31411,20 +31386,6 @@ "hPO" = ( /turf/closed/wall, /area/station/cargo/sorting) -"hPP" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Cargo - Mining Dock"; - dir = 8; - network = list("ss13","cargo") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "hPQ" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ color = "#0000ff"; @@ -31461,13 +31422,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"hQC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "hQF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31548,13 +31502,6 @@ "hRA" = ( /turf/closed/wall/rust, /area/station/maintenance/ghetto/starboard) -"hRC" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Gravity Generator Foyer"; - network = list("ss13","engineering") - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/gravity_generator) "hRP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -31652,6 +31599,15 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/security/office) +"hTh" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Foyer East"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/stairs/right{ + dir = 8 + }, +/area/station/engineering/hallway) "hTp" = ( /obj/structure/cable, /obj/effect/mapping_helpers/airlock/autoname, @@ -31696,29 +31652,21 @@ /area/station/maintenance/port/fore) "hTL" = ( /obj/structure/rack, -/obj/item/clothing/suit/hooded/ablative, /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced/spawner/directional/east{ pixel_x = 3 }, /obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) -"hTP" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 +/obj/item/storage/box/teargas{ + pixel_x = 1; + pixel_y = -2 }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 +/obj/item/storage/box/flashes{ + pixel_x = 3 }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) +/obj/item/gun/grenadelauncher, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "hTZ" = ( /obj/structure/rack, /obj/item/wrench, @@ -31773,6 +31721,11 @@ /obj/structure/table/wood, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) +"hUM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/layer_manifold/brown, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "hUN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31865,6 +31818,22 @@ /obj/effect/landmark/start/magistrate, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/magistrate) +"hVM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -8; + pixel_y = -24 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "hVO" = ( /obj/structure/chair/wood, /turf/open/floor/carpet, @@ -32014,15 +31983,6 @@ /obj/structure/sign/warning/secure_area/directional/south, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"hYc" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Courtroom North" - }, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood/parquet, -/area/station/security/courtroom) "hYg" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/red{ @@ -32081,6 +32041,33 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/storage/art) +"hZk" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 1 + }, +/obj/machinery/button/door/directional/west{ + id = "rd_office_shutters"; + name = "Privacy Shutters Control"; + req_access = list("rd"); + pixel_y = -10 + }, +/obj/machinery/button/door/directional/west{ + id = "research_lockdown"; + name = "Research Lockdown Control"; + req_access = list("rd"); + pixel_y = 10; + color = "yellow" + }, +/obj/machinery/button/door/directional/west{ + id = "rd_robotics_window_shutters"; + name = "Upper Privacy Shutters Control"; + req_access = list("rd") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "hZl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -32136,14 +32123,6 @@ "hZw" = ( /turf/open/floor/iron, /area/station/maintenance/aft) -"hZF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/landmark/start/depsec/supply, -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "hZK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -32243,16 +32222,15 @@ }, /turf/open/floor/plating, /area/station/service/lawoffice) -"ibb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rndsecprivacy"; - name = "Privacy Shutters" +"iaU" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Prison Forestry South"; + network = list("ss13","prison") }, -/turf/open/floor/plating, -/area/station/security/checkpoint/science) +/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/south, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron, +/area/station/security/prison/garden) "ibc" = ( /obj/structure/statue/station_map/cyberiad/w, /turf/open/floor/iron, @@ -32295,14 +32273,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/grass, /area/station/service/hydroponics) -"icf" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Research - Xenobiology Pens Observation South"; - network = list("ss13","rd","xeno"); - dir = 2 - }, -/turf/open/openspace, -/area/station/science/xenobiology) "icg" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/brown/anticorner/contrasted, @@ -32366,6 +32336,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/brig) +"idc" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Chemistry Lab North"; + network = list("ss13","medbay") + }, +/obj/machinery/chem_master, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/chemistry/ghetto) "idm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32541,6 +32519,21 @@ /obj/machinery/status_display/evac/directional, /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +"ifY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/poddoor/shutters{ + id = "Skynet_launch"; + name = "Mech Bay" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/mechbay) "igb" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -32550,6 +32543,21 @@ }, /turf/open/floor/wood, /area/station/maintenance/ghetto/fore/starboard) +"igh" = ( +/obj/structure/plasticflaps{ + opacity = 1 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Research Division" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "igl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ @@ -32640,6 +32648,20 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"ihS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay - Hallway South"; + network = list("ss13","medbay") + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/medbay) "ihX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -32685,6 +32707,14 @@ }, /turf/open/floor/iron, /area/station/security/courtroom/holding) +"iiy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "iiG" = ( /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron, @@ -32720,6 +32750,17 @@ /obj/machinery/light/warm/no_nightlight/directional/east, /turf/open/floor/carpet, /area/station/medical/psychology) +"ijf" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Supermatter Room Port"; + network = list("ss13","engine","engineering") + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "iji" = ( /obj/machinery/status_display/door_timer{ id = "Cell 2"; @@ -32798,6 +32839,13 @@ }, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) +"ijK" = ( +/obj/machinery/holopad, +/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/white, +/area/station/medical/medbay/lobby) "ijO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33039,17 +33087,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"inC" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Cargo - Security Post"; - network = list("ss13","cargo") - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/machinery/airalarm/directional/south, -/obj/structure/closet/secure_closet/security/cargo, -/obj/item/book/manual/wiki/security_space_law, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "inE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33208,6 +33245,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ips" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "ipw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33331,6 +33375,15 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"ira" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "iro" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -33429,6 +33482,14 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"isr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/service/cafeteria) "isz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33784,23 +33845,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/dorms) -"iwR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsecprivacy"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/engineering) -"iwT" = ( -/obj/machinery/flasher/portable, -/obj/effect/turf_decal/bot_white/left, -/obj/machinery/camera/directional/north{ - c_tag = "Brig Secure Armory North" - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "iwV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -33834,10 +33878,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) -"ixv" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "ixz" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -33956,19 +33996,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"izY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/corporate, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/magistrate) "iAi" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -33995,16 +34022,6 @@ /obj/structure/bed/medical/anchored, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"iAu" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/machinery/camera/directional/west{ - c_tag = "Research - Ordnance Watching Room"; - network = list("ss13","rd","ordnance"); - dir = 10 - }, -/turf/open/floor/iron, -/area/station/science/ordnance/testlab) "iAD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34205,6 +34222,12 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/hfr_room) +"iDh" = ( +/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/white, +/area/station/medical/medbay/lobby) "iDn" = ( /obj/machinery/atmospherics/components/binary/valve/on{ dir = 4 @@ -34365,11 +34388,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/white, /area/station/science/lower) -"iFw" = ( -/obj/effect/turf_decal/tile/purple, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "iFy" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -35063,6 +35081,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/mechbay) +"iND" = ( +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/engineering/dronefabricator) "iNF" = ( /obj/machinery/computer/operating{ dir = 4 @@ -35205,6 +35234,30 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, /area/station/maintenance/ghetto/fore/starboard) +"iPC" = ( +/obj/structure/table/glass, +/obj/machinery/camera/directional/north{ + c_tag = "Virology - Workspace"; + network = list("ss13","medbay") + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/machinery/requests_console/directional/north{ + department = "Virology"; + name = "Virology Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "iPQ" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -35303,6 +35356,18 @@ /mob/living/basic/pet/dog/pug, /turf/open/floor/wood/large, /area/station/medical/psychology) +"iRE" = ( +/obj/machinery/light/directional/north, +/obj/structure/table, +/obj/machinery/microwave/engineering/cell_included, +/obj/machinery/requests_console/directional/north{ + department = "engineering" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/announcement, +/turf/open/floor/iron, +/area/station/engineering/break_room) "iRJ" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, @@ -35704,24 +35769,6 @@ "iWG" = ( /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"iWM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/command/cmo{ - id_tag = "CMO_door" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/medical/cmo, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "iWN" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating, @@ -35730,6 +35777,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/commons/storage/art) +"iXc" = ( +/obj/machinery/photocopier, +/obj/machinery/camera/directional/west{ + c_tag = "Lawyer's Office" + }, +/obj/structure/secure_safe/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/tile, +/area/station/service/lawoffice) "iXk" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron, @@ -35738,17 +35796,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) -"iXn" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo - Auxiliary Warehouse"; - network = list("ss13","cargo") - }, -/turf/open/floor/iron, -/area/station/cargo/office) "iXs" = ( /obj/structure/frame/machine, /obj/effect/decal/cleanable/dirt, @@ -35812,6 +35859,13 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) +"iYa" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "iYb" = ( /obj/structure/flora/bush/fullgrass/style_random, /mob/living/basic/butterfly, @@ -35905,6 +35959,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) +"iYX" = ( +/obj/structure/sink/directional/west, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Access"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "iZh" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine/hull/reinforced, @@ -35932,6 +35997,13 @@ /obj/item/electronics/airlock, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"iZF" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research - Secure Lab Test Chamber"; + network = list("ss13","rd","test") + }, +/turf/open/floor/engine, +/area/station/science/lower) "iZN" = ( /obj/structure/rack, /obj/effect/spawner/random/clothing/costume, @@ -36031,16 +36103,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/port/greater) -"jbe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/turf/open/floor/plating, -/area/station/service/library/ghetto) +"jbb" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Drone Fabricator Room"; + network = list("ss13","engineering") + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/dronefabricator) "jbg" = ( /obj/structure/table, /obj/item/stock_parts/scanning_module{ @@ -36072,18 +36144,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/ghetto) -"jbw" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Supermatter Emitters"; - network = list("ss13","engine","engineering") - }, -/obj/effect/landmark/event_spawn, -/obj/machinery/power/emitter{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "jbx" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -36187,6 +36247,17 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"jdd" = ( +/obj/machinery/requests_console/directional/east{ + department = "Medbay"; + name = "Medbay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/light/directional/east, +/obj/structure/filingcabinet/chestdrawer, +/obj/item/folder/white, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "jdk" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -36298,17 +36369,19 @@ }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"jey" = ( -/obj/structure/table/wood, +"jel" = ( +/obj/structure/cable, +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/machinery/light/directional/south, -/obj/machinery/microwave/engineering/cell_included, -/obj/machinery/airalarm/directional/south, /obj/machinery/camera/directional/south{ - c_tag = "Medbay - Break Room"; - network = list("ss13","medbay") + network = list("ss13","engineering"); + c_tag = "Chief Engineer's Office" }, -/turf/open/floor/iron/cafeteria, -/area/station/medical/break_room) +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "jeC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36448,12 +36521,6 @@ /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white, /area/station/science/lower) -"jgo" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Starboard Primary Hallway 5" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard/west) "jgp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/table, @@ -36514,12 +36581,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) -"jgW" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/library/artgallery) "jha" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36613,10 +36674,10 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/stamp/law, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/item/stamp/law, /turf/open/floor/wood/tile, /area/station/service/lawoffice) "jir" = ( @@ -36632,6 +36693,20 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/cafeteria, /area/station/security/prison/ghetto) +"jiD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/vending/coffee, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Dormitories West" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/commons/dorms) "jiP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/white/line{ @@ -36811,6 +36886,17 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron, /area/station/maintenance/ghetto/central) +"jkT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/turf/open/floor/plating, +/area/station/service/library/ghetto) "jkW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/wood, @@ -36832,25 +36918,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"jlM" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Mime Office" - }, -/obj/structure/table/wood, -/obj/structure/mirror/directional/north, -/obj/item/lipstick/random{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/lipstick/random{ - pixel_y = 4 - }, -/obj/item/lipstick/random{ - pixel_x = -6; - pixel_y = 4 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/theater) "jlW" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -37015,40 +37082,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/security/interrogation/ghetto) -"joH" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/light_switch/directional/north, -/obj/machinery/light/small/directional/north, -/obj/structure/table, -/obj/item/electronics/airalarm{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/electronics/firealarm{ - pixel_y = 6; - pixel_x = 6 - }, -/obj/item/electronics/firealarm{ - pixel_x = 6 - }, -/obj/item/electronics/airalarm{ - pixel_x = -6 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - HFR Prep Room"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) -"joL" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/structure/lattice, -/turf/open/space/openspace, -/area/space/nearstation) "joZ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -37181,15 +37214,6 @@ /obj/effect/decal/nt_logo, /turf/open/floor/carpet/red, /area/station/maintenance/department/security/ghetto) -"jrg" = ( -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Cryodorms" - }, -/turf/open/floor/iron/white, -/area/station/common/cryopods) "jrj" = ( /obj/machinery/light/small/directional/east, /obj/effect/spawner/random/maintenance/two, @@ -37334,21 +37358,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/science/explab) -"jsZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Arrivals North" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/hallway/secondary/entry) "jtc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, @@ -37361,35 +37370,38 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aft) +"jtm" = ( +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Cryodorms" + }, +/turf/open/floor/iron/white, +/area/station/common/cryopods) "jtn" = ( /obj/machinery/modular_computer/preset/cargochat/service, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/wood/parquet, /area/station/hallway/secondary/service) "jtA" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/flashlight/pen{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 4; - pixel_x = 5 +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Test Lab"; + network = list("ss13","rd") }, -/obj/machinery/camera/directional/east{ - c_tag = "Chief Medical Officer's Office"; - network = list("ss13","medbay"); - dir = 1 +/obj/item/healthanalyzer/advanced, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs{ + pixel_x = 4; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/purple/half{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/turf/open/floor/iron/white, +/area/station/science/lower) "jtG" = ( /obj/machinery/button/door/directional{ id = "atmos_pro"; @@ -37507,17 +37519,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage) -"jvy" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos East"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "jvF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -37530,6 +37531,17 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"jvL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id = "quarantine"; + name = "Quarantine Lockdown"; + opacity = 0 + }, +/turf/open/floor/plating, +/area/station/medical/paramedic) "jvO" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -37717,6 +37729,15 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) +"jym" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Courtroom Lobby" + }, +/turf/open/floor/wood/parquet, +/area/station/security/courtroom) "jys" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37786,17 +37807,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"jzh" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id = "quarantine"; - name = "Quarantine Lockdown"; - opacity = 0 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/paramedic) "jzr" = ( /obj/structure/chair/sofa/corp/left{ dir = 4 @@ -38030,14 +38040,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured_large, /area/station/hallway/secondary/entry) -"jCY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/ghetto) "jDa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38083,6 +38085,10 @@ /obj/machinery/power/floodlight, /turf/open/floor/plating, /area/station/engineering/storage) +"jDR" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/cryo) "jDU" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/table, @@ -38219,6 +38225,15 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, /area/station/command/bridge) +"jFe" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Tech Storage"; + network = list("ss13","engineering") + }, +/turf/open/floor/plating, +/area/station/engineering/storage/tech) "jFf" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -38245,6 +38260,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) +"jFz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Arrivals South" + }, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/entry) "jFA" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth, @@ -38601,6 +38626,14 @@ }, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hop) +"jJs" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Break Room"; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/engineering/break_room) "jJy" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -39001,6 +39034,20 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet, /area/station/service/library) +"jPq" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Supermatter Engine Room South"; + network = list("ss13","engine","engineering") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway/west) "jPs" = ( /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, @@ -39184,22 +39231,6 @@ }, /turf/open/floor/eighties, /area/station/commons/dorms/apartment1) -"jRY" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/half, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/south{ - c_tag = "Brig Restroom" - }, -/obj/item/storage/fancy/donut_box{ - pixel_y = 10 - }, -/obj/item/storage/fancy/donut_box{ - pixel_y = 6 - }, -/obj/item/storage/fancy/donut_box, -/turf/open/floor/iron/edge, -/area/station/security/checkpoint/customs) "jRZ" = ( /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/fore) @@ -39241,16 +39272,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"jSG" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Gravity Generator Room"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/gravity_generator) "jSH" = ( /turf/closed/wall/rust, /area/station/maintenance/ghetto/sorting) @@ -39362,14 +39383,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron, /area/station/cargo/storage) -"jUm" = ( -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Polygon South"; - network = list("ss13","rd","ordnance") - }, -/turf/open/floor/iron/airless, -/area/station/science/ordnance/bomb) "jUq" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -39677,6 +39690,15 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/commons/dorms) +"jXM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - HFR South"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) "jXX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39786,6 +39808,19 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) +"jZn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/corporate{ + id_tag = "blueshield_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/blueshield) "jZr" = ( /mob/living/basic/killer_tomato, /obj/effect/decal/cleanable/dirt/dust, @@ -39820,6 +39855,23 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"jZN" = ( +/obj/structure/table/reinforced, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/core{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Atmospherics - HFR"; + network = list("ss13","engineering") + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hfr_room) "jZO" = ( /obj/structure/table/wood, /obj/machinery/recharger{ @@ -40057,19 +40109,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/openspace, /area/space/nearstation) -"kcS" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/locked, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "kcZ" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/nuke_storage) @@ -40218,27 +40257,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"keT" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "robotics_desk"; - name = "Robotics Lab Shutters" - }, -/obj/machinery/door/window/left/directional/west{ - name = "Robotics Desk"; - req_access = list("robotics") - }, -/obj/structure/desk_bell{ - pixel_y = 8 - }, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "keV" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, @@ -40355,6 +40373,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron, /area/station/maintenance/aft) +"kgE" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Brig Main Hall West 1" + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/brig) "kgG" = ( /obj/structure/bed, /obj/machinery/computer/security/telescreen/entertainment/directional/north, @@ -40447,6 +40475,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aft) +"khO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "engsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/engineering) "khQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41026,6 +41063,17 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/engineering/storage_shared) +"kpj" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Research - Toxins Mixing"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) "kpk" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/yellow, @@ -41109,16 +41157,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto) -"kqg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/effect/landmark/start/depsec/medical, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "kqk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -41380,18 +41418,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/engine, /area/station/medical/pharmacy) -"ktA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, -/turf/open/floor/iron, -/area/station/engineering/hallway) "ktC" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/siding/white{ @@ -41624,15 +41650,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/ghetto/central/fore) -"kwy" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - Project Room Fore"; - network = list("ss13","engineering") - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/trimline/yellow/line, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "kwz" = ( /obj/structure/chair/stool/bar{ dir = 8 @@ -41750,6 +41767,14 @@ "kzc" = ( /turf/closed/wall, /area/station/hallway/primary/aft) +"kzh" = ( +/obj/structure/rack, +/obj/item/multitool, +/obj/machinery/camera/directional/north{ + c_tag = "Auxiliary Tool Storage" + }, +/turf/open/floor/iron, +/area/station/commons/storage/emergency/port) "kzo" = ( /obj/structure/railing{ dir = 4 @@ -41778,6 +41803,17 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/engineering/hallway/west) +"kzH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay - Lobby Reception"; + network = list("ss13","medbay") + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "kzI" = ( /obj/structure/chair/stool/directional/south, /obj/effect/spawner/random/engineering/flashlight, @@ -41853,16 +41889,6 @@ "kAy" = ( /turf/open/floor/plating, /area/station/maintenance/port/aft) -"kAA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/camera/directional/west{ - c_tag = "Janitor Closet" - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/service/janitor) "kAC" = ( /obj/effect/turf_decal/delivery, /obj/structure/window/reinforced/spawner/directional/south, @@ -41943,6 +41969,14 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, /area/station/cargo/sorting) +"kBK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/depsec/supply, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "kBL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/blue{ @@ -42052,6 +42086,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"kCL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "kCR" = ( /obj/structure/table/wood, /obj/structure/microscope, @@ -42296,6 +42336,7 @@ pixel_x = 6 }, /obj/effect/turf_decal/bot_white, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "kFg" = ( @@ -42488,15 +42529,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/aft) -"kGQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cargosecprivacy"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/supply) "kGU" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, @@ -42692,6 +42724,17 @@ /obj/structure/disposalpipe/junction/yjunction, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"kJj" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research - Xenobiology Killroom Chamber"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/xenobiology) "kJl" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -42751,6 +42794,15 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/medical/psychology) +"kJY" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Secure Storage East"; + network = list("ss13","engineering") + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/engineering/storage) "kKa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -43001,14 +43053,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"kMU" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Break Room"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/engineering/break_room) "kMW" = ( /obj/machinery/door/airlock/public, /obj/effect/mapping_helpers/airlock/autoname, @@ -43308,6 +43352,17 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/gravity_generator) +"kQS" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Vacant Office" + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) "kQY" = ( /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) @@ -43660,21 +43715,6 @@ /obj/effect/landmark/navigate_destination/vault, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"kVU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/unres, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron/white, -/area/station/science/research) "kVX" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/blue{ @@ -43763,29 +43803,24 @@ /turf/open/floor/plating, /area/station/engineering/transit_tube) "kWZ" = ( -/obj/item/grenade/barrier{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/grenade/barrier{ - pixel_y = 4 - }, -/obj/item/grenade/barrier{ - pixel_y = 4; - pixel_x = 6 +/obj/effect/turf_decal/bot_white, +/obj/structure/rack, +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = -2 }, -/obj/item/grenade/barrier{ - pixel_x = -6; - pixel_y = -4 +/obj/item/clothing/glasses/hud/security/sunglasses/gars{ + pixel_x = 3; + pixel_y = 2 }, -/obj/item/grenade/barrier{ - pixel_y = -4 +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = 2 }, -/obj/item/grenade/barrier{ - pixel_y = -4; - pixel_x = 6 +/obj/item/clothing/glasses/hud/security/sunglasses{ + pixel_x = -3; + pixel_y = -2 }, -/obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "kXa" = ( @@ -44000,24 +44035,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"kZp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 4 - }, -/obj/item/pen{ - pixel_x = 4 - }, -/obj/item/stamp/head/rd{ - pixel_x = 7; - pixel_y = -2 - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "kZu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -44069,6 +44086,11 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/evidence) +"kZZ" = ( +/obj/effect/spawner/structure/window, +/obj/structure/sign/departments/exam_room, +/turf/open/floor/plating, +/area/station/medical/treatment_center) "las" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -44097,19 +44119,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) -"laT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/public, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/window/preopen{ - dir = 4; - id = "JimNortonBottom" - }, -/turf/open/floor/wood, -/area/station/service/cafeteria) "laX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44372,18 +44381,6 @@ }, /turf/open/floor/iron, /area/station/cargo/office) -"leA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Arrivals Auxiliary Docking South" - }, -/turf/open/floor/iron/white/corner{ - dir = 4 - }, -/area/station/hallway/secondary/entry) "leN" = ( /obj/structure/table, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -44425,15 +44422,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/ghetto/central/aft) -"lfl" = ( -/obj/structure/chair/sofa/bench/right{ - dir = 4 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Departure Lounge North-West" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "lfw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -44505,12 +44493,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) -"lgC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "lgF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44580,6 +44562,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/hallway) +"lhy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Project Room Closet"; + network = list("ss13","engineering") + }, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/half{ + dir = 8 + }, +/area/station/engineering/atmos/project) "lhE" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, @@ -44664,42 +44658,15 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/aft) -"liH" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Cryogenics"; - network = list("ss13","medbay") - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/pill_bottle/mannitol, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/requests_console/directional/south{ - department = "Medbay"; - name = "Medbay Requests Console" +"liF" = ( +/obj/machinery/door/poddoor{ + id = "xenobio_maint_fore"; + name = "Xenobiology Blast Door" }, -/turf/open/floor/iron/white, -/area/station/medical/cryo) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/aft) "liP" = ( /obj/structure/chair/stool{ dir = 1 @@ -44785,20 +44752,18 @@ /area/station/engineering/atmos/mix/ghetto) "lka" = ( /obj/item/storage/box/firingpins{ - pixel_y = 5 + pixel_y = 5; + pixel_x = -5 }, /obj/effect/spawner/random/armory/barrier_grenades, /obj/effect/turf_decal/bot_white, /obj/structure/table/reinforced, +/obj/item/storage/box/seccarts{ + pixel_y = 8; + pixel_x = 6 + }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"lke" = ( -/obj/machinery/holopad, -/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/white, -/area/station/medical/medbay/lobby) "lkr" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -44807,14 +44772,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) -"lkJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "lkU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -44905,6 +44862,17 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/gravity_generator) +"lmn" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Xenobiology Cell 3"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "lmq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -45003,6 +44971,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) +"lnf" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "lnh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45290,20 +45267,6 @@ }, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/blueshield) -"lqk" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/structure/sign/poster/official/random/directional/east, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Break Room"; - network = list("ss13","rd"); - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/breakroom) "lql" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45473,16 +45436,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/security/execution) -"lrM" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/research_director, -/obj/machinery/computer/security/telescreen/research/directional/south{ - network = list("rd","xeno","test","ordnance") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "lrR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -45622,24 +45575,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/service/chapel) -"ltl" = ( -/obj/structure/table, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Test Lab"; - network = list("ss13","rd") - }, -/obj/item/healthanalyzer/advanced, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/lower) "ltw" = ( /obj/structure/railing{ dir = 1 @@ -45684,18 +45619,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"lui" = ( -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/toilet{ - pixel_y = 8; - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Prison Solitary 2"; - network = list("ss13","prison") - }, -/turf/open/floor/iron, -/area/station/security/prison) "luk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45762,6 +45685,19 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"luP" = ( +/obj/machinery/rnd/production/techfab/department/cargo, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/directional/west{ + department = "Cargo Bay"; + name = "Cargo Bay Requests Console" + }, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Office"; + network = list("ss13","cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/office) "luY" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -46416,9 +46352,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"lEp" = ( -/turf/closed/wall, -/area/station/maintenance/disposal/incinerator) "lEq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/effect/decal/cleanable/generic, @@ -46494,6 +46427,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage) +"lFt" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/plasticflaps{ + opacity = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/left/directional/north{ + req_access = list("engine_equip"); + name = "engineering" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "lFx" = ( /obj/machinery/vending/coffee, /turf/open/floor/iron/dark, @@ -46576,10 +46521,6 @@ }, /turf/open/floor/carpet/orange, /area/station/maintenance/starboard/fore) -"lGg" = ( -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "lGn" = ( /obj/machinery/light/directional/west, /obj/item/radio/intercom/prison/directional/north, @@ -46822,6 +46763,26 @@ /obj/effect/mapping_helpers/airlock/access/all/command/nanotrasen_representative, /turf/open/floor/plating, /area/station/command/heads_quarters/nanotrasen_representative) +"lJx" = ( +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/poster/ripped/directional/north, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/camera/directional/north{ + c_tag = "Prison Cafeteria"; + network = list("ss13","prison") + }, +/turf/open/floor/iron/cafeteria, +/area/station/security/prison) "lJB" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/cable_coil/thirty, @@ -46938,20 +46899,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto/aft) -"lKy" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Research - Security Post"; - network = list("ss13","rd"); - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "lKC" = ( /obj/machinery/netpod, /obj/machinery/airalarm/directional/south, @@ -47650,6 +47597,15 @@ /obj/structure/closet/wardrobe/pjs, /turf/open/floor/iron/kitchen/small, /area/station/maintenance/starboard/fore) +"lTQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/ghetto) "lTR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -47659,6 +47615,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"lTX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "lUd" = ( /obj/structure/table/reinforced, /obj/item/vending_refill/snack{ @@ -47712,29 +47679,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/ghetto/central) -"lUJ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research Director's Office"; - network = list("ss13","rd") - }, -/obj/structure/table/glass, -/obj/item/radio/intercom/directional/north, -/obj/item/computer_disk{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/computer_disk/ordnance{ - pixel_y = 4; - pixel_x = -5 - }, -/obj/item/computer_disk/ordnance, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/purple/anticorner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "lUN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /obj/machinery/light/directional/south, @@ -47892,14 +47836,6 @@ }, /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) -"lWk" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Prison Library"; - network = list("ss13","prison") - }, -/obj/effect/spawner/random/entertainment/arcade, -/turf/open/floor/wood, -/area/station/security/prison) "lWl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47997,6 +47933,17 @@ "lXl" = ( /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"lXr" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "lXw" = ( /obj/structure/toilet{ dir = 4 @@ -48487,17 +48434,6 @@ /obj/machinery/duct, /turf/open/floor/iron/smooth, /area/station/commons/toilet/restrooms) -"mdv" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Xenobiology Cell 3"; - network = list("ss13","xeno","rd") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "mdx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -48518,26 +48454,27 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/iron/white, /area/station/maintenance/aft) +"mdS" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/tank_dispenser{ + pixel_x = -1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos Storage"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/storage/gas) "mdT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/medical) -"mdU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron, -/area/station/science/research) "mdW" = ( /obj/machinery/light/floor, /turf/open/floor/iron/white, @@ -48647,15 +48584,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/security/evidence) -"mfM" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Research Hallway South" - }, -/turf/open/floor/iron/white, -/area/station/science/research) "mfO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48708,6 +48636,18 @@ /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/ghetto) +"mgr" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Robotics Lab North"; + network = list("ss13","rd"); + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "mgu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48786,6 +48726,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"mhL" = ( +/obj/structure/closet/crate/wooden/toy, +/obj/item/toy/mecha/honk, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/machinery/camera/directional/north{ + c_tag = "Clown Office" + }, +/obj/structure/mirror/directional/north, +/turf/open/floor/iron/kitchen, +/area/station/service/theater) "mhZ" = ( /obj/structure/chair/comfy/beige, /obj/effect/turf_decal/siding/dark{ @@ -48874,21 +48827,6 @@ /obj/item/melee/baton/security/cattleprod, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"mjs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/camera/directional/south{ - c_tag = "Dormitories Center" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "mjy" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/door/airlock/public/glass, @@ -48920,6 +48858,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"mjQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rndsecprivacy"; + name = "Privacy Shutters"; + dir = 1 + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/science) "mjS" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -49045,6 +48993,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/maintenance/aft) +"mlN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron, +/area/station/science/ordnance/office) "mlQ" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/stripes/line{ @@ -49305,6 +49269,13 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/atmos/storage/gas) +"mqA" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/holopad, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "mqF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49335,15 +49306,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/airless, /area/station/science/ordnance/bomb) -"mqQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "JimNortonKitchen" - }, -/obj/item/modular_computer/laptop/preset/civilian, -/obj/structure/table/reinforced, -/turf/open/floor/wood, -/area/station/service/cafeteria) "mqU" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -49360,13 +49322,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"mrb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/south{ - c_tag = "Brig Firing Range" - }, -/turf/open/floor/iron, -/area/station/security/range) "mrf" = ( /turf/closed/wall, /area/station/command/heads_quarters/magistrate) @@ -49436,15 +49391,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) -"mrK" = ( -/obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) -"mrM" = ( +"mrI" = ( /obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rnd"; - name = "Research Lab Shutters" + id = "robotics_window"; + name = "Robotics Lab Shutters" }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -49452,7 +49402,11 @@ name = "Research Lockdown Blast Doors" }, /turf/open/floor/plating, -/area/station/science/lab) +/area/station/science/robotics/mechbay) +"mrK" = ( +/obj/machinery/atmospherics/components/binary/valve, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "mrO" = ( /obj/machinery/door/poddoor/massdriver_trash, /turf/open/floor/plating, @@ -49481,6 +49435,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) +"msj" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Turbine"; + network = list("ss13","engineering") + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "msn" = ( /obj/structure/bed, /obj/item/toy/plush/hampter/security, @@ -49522,6 +49485,14 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) +"msZ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "mtc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/yellow{ @@ -49823,6 +49794,18 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) +"mxa" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Xenobiology Cell 1"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "mxh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light_switch/directional/south, @@ -50036,6 +50019,18 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood, /area/station/commons/dorms) +"mAc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/iron/stairs/right{ + dir = 8 + }, +/area/station/engineering/transit_tube) "mAe" = ( /obj/machinery/conveyor{ dir = 4; @@ -50095,14 +50090,6 @@ /obj/machinery/power/tracker, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/port/fore) -"mAL" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "mAR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50123,10 +50110,10 @@ /turf/open/floor/carpet/royalblack, /area/station/maintenance/port/aft) "mBk" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mBn" = ( @@ -50156,16 +50143,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"mBx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Arrivals South" - }, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/entry) "mBC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50292,6 +50269,20 @@ }, /turf/open/floor/engine, /area/station/science/explab) +"mCX" = ( +/obj/structure/cable, +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Equipment Storage Hardsuits"; + network = list("ss13","engineering") + }, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "mDd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/yellow{ @@ -50416,6 +50407,16 @@ /obj/structure/sign/departments/restroom/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) +"mEB" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/engineering/break_room) "mEM" = ( /obj/machinery/duct, /turf/open/floor/plating, @@ -50465,15 +50466,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"mEW" = ( -/obj/structure/chair/pew/left{ - dir = 8 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Courtroom Lobby" - }, -/turf/open/floor/wood/parquet, -/area/station/security/courtroom) "mEX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/power/apc/auto_name/directional/east, @@ -50504,12 +50496,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"mFn" = ( -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","prison") - }, -/turf/open/openspace, -/area/station/security/prison) "mFv" = ( /obj/item/exodrone, /obj/machinery/exodrone_launcher, @@ -50563,17 +50549,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark/small, /area/station/security/interrogation/ghetto) -"mFL" = ( -/obj/machinery/requests_console/directional/east{ - department = "Medbay"; - name = "Medbay Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/light/directional/east, -/obj/structure/filingcabinet/chestdrawer, -/obj/item/folder/white, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) +"mFN" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "mFR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -50658,6 +50637,19 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"mGN" = ( +/obj/machinery/light/small/directional/south{ + name = "maintenance light"; + nightshift_allowed = 0; + nightshift_enabled = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay - Morgue South" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "mGR" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -51036,15 +51028,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/holding_cell) -"mKS" = ( -/obj/structure/closet/secure_closet/security/med, -/obj/structure/cable, -/obj/machinery/light_switch/directional/south, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/light/directional/south, -/obj/item/book/manual/wiki/security_space_law, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) +"mKW" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "mKX" = ( /obj/effect/landmark/start/security_officer, /obj/structure/curtain/cloth/fancy, @@ -51074,6 +51069,18 @@ /obj/item/folder/red, /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/fore) +"mLg" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Supermatter Emitters"; + network = list("ss13","engine","engineering") + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/power/emitter{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "mLj" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/directional/east{ @@ -51099,16 +51106,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/common/cryopods) -"mLy" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay - Hallway Center"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay) "mLI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51170,6 +51167,14 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating, /area/station/maintenance/aft) +"mMO" = ( +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/turf/open/floor/wood, +/area/station/service/library/ghetto) "mMP" = ( /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, @@ -51183,6 +51188,11 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, /turf/open/floor/iron/stairs/right, /area/station/engineering/hallway) +"mNe" = ( +/obj/structure/closet/wardrobe/white/medical, +/obj/item/clothing/head/soft/paramedic, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "mNh" = ( /obj/item/clothing/suit/caution{ pixel_y = -10; @@ -51411,6 +51421,19 @@ }, /turf/open/floor/iron/grimy, /area/station/maintenance/ghetto/starboard) +"mQl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/corporate, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/magistrate) "mQo" = ( /obj/structure/chair/wood{ dir = 8 @@ -51853,6 +51876,17 @@ /obj/item/seeds/orange, /turf/open/misc/grass, /area/station/security/prison/garden) +"mWB" = ( +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo - Bay Lower Floor"; + network = list("ss13","cargo") + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/cargo/storage/ghetto) "mWD" = ( /obj/structure/table/wood, /obj/item/taperecorder{ @@ -51943,15 +51977,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"mYd" = ( -/obj/structure/table/reinforced, -/obj/machinery/camera/directional/south{ - c_tag = "EVA" - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark/smooth_large, -/area/station/ai_monitored/command/storage/eva) "mYf" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -52150,16 +52175,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) -"nad" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Drone Fabricator Room"; - network = list("ss13","engineering") - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/dronefabricator) "nai" = ( /obj/machinery/vending/coffee, /obj/structure/extinguisher_cabinet/directional/north, @@ -52446,6 +52461,14 @@ /obj/machinery/light/floor, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"nex" = ( +/obj/machinery/computer/records/security, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "neC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red{ @@ -52456,6 +52479,42 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"neD" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay - Cryogenics"; + network = list("ss13","medbay") + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/requests_console/directional/south{ + department = "Medbay"; + name = "Medbay Requests Console" + }, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "neK" = ( /obj/item/cultivator, /turf/open/floor/plating, @@ -52464,13 +52523,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) -"nff" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Research - Secure Lab Test Chamber"; - network = list("ss13","rd","test") - }, -/turf/open/floor/engine, -/area/station/science/lower) "nfi" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, @@ -52701,16 +52753,12 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"niD" = ( -/obj/machinery/dna_infuser, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Genetics"; - network = list("ss13","rd") - }, -/obj/item/infuser_book, -/obj/effect/turf_decal/tile/purple/half, -/turf/open/floor/iron/dark, -/area/station/science/genetics) +"niy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "niE" = ( /turf/open/floor/catwalk_floor, /area/station/cargo/drone_bay/ghetto) @@ -52723,6 +52771,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/ghetto/garden) +"niR" = ( +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Brig Labor Camp Airlock North" + }, +/obj/item/restraints/handcuffs, +/obj/item/clothing/under/rank/prisoner, +/obj/item/clothing/under/rank/prisoner/skirt, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/structure/cable, +/obj/machinery/gulag_item_reclaimer{ + pixel_y = 28 + }, +/turf/open/floor/iron, +/area/station/security/processing) "nja" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53012,6 +53076,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nmm" = ( +/obj/machinery/flasher/portable, +/obj/effect/turf_decal/bot_white/left, +/obj/machinery/camera/directional/north{ + c_tag = "Brig Secure Armory North" + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "nmA" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -53122,21 +53194,6 @@ /obj/structure/fireaxecabinet/empty/directional/north, /turf/open/floor/iron, /area/station/maintenance/ghetto/port/aft) -"nnH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/poddoor/shutters{ - id = "Skynet_launch"; - name = "Mech Bay" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron/dark, -/area/station/science/robotics/mechbay) "nnJ" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -53290,6 +53347,12 @@ /obj/machinery/hydroponics/soil, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"noT" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Brig Prisoner Processing West" + }, +/turf/open/floor/iron, +/area/station/security/courtroom/holding) "npf" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -53307,13 +53370,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"npz" = ( -/obj/machinery/door/airlock, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/service/library/ghetto) "npE" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -53689,14 +53745,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/commons/locker) -"nup" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/iron, -/area/station/cargo/office) "nuu" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -53707,11 +53755,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"nuv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/decal/cleanable/dirt, +"nux" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Prisoner Lockers" + }, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +/area/station/security/processing) "nuy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -53875,13 +53928,6 @@ "nwx" = ( /turf/closed/wall/r_wall, /area/station/security/execution) -"nwy" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Brig Briefing Room" - }, -/turf/open/floor/iron, -/area/station/security/office) "nwz" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -53964,6 +54010,47 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"nxv" = ( +/obj/item/assembly/timer{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/assembly/timer{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/assembly/timer{ + pixel_x = 8 + }, +/obj/item/assembly/timer{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/item/assembly/igniter{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/assembly/igniter{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/assembly/igniter{ + pixel_x = -6 + }, +/obj/item/assembly/igniter{ + pixel_x = -6; + pixel_y = -3 + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay - Chemistry"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "nxS" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/east, @@ -53984,17 +54071,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto) -"nyt" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/command/hos{ - id_tag = "hos_door" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/security/hos, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "nyv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54439,16 +54515,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) -"nDC" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Cargo - Entrance"; - network = list("ss13","cargo") - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "nDE" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/catwalk_floor/iron_dark, @@ -54482,6 +54548,12 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"nDR" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Arrivals Auxiliary Docking South-East" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "nDT" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -54599,13 +54671,6 @@ "nFL" = ( /turf/open/floor/carpet, /area/station/maintenance/aft) -"nFS" = ( -/obj/machinery/computer/security/mining{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "nFU" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance) @@ -54769,6 +54834,10 @@ /obj/item/gps, /turf/open/floor/plating, /area/station/service/chapel/monastery) +"nHJ" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/surgery/fore) "nHO" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -55057,6 +55126,17 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"nMx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/science, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "nMz" = ( /turf/closed/wall, /area/station/security/checkpoint/customs) @@ -55183,20 +55263,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"nNP" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Hallway North"; - network = list("ss13","medbay") - }, -/obj/structure/sign/departments/morgue/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay) "nNQ" = ( /obj/structure/closet/secure_closet/personal{ anchored = 1 @@ -55300,11 +55366,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) -"nOL" = ( -/obj/machinery/computer/crew, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "nPb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55396,19 +55457,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/cargo/warehouse) -"nQc" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research - Xenobiology Access"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/anticorner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "nQf" = ( /obj/machinery/light/directional/north, /obj/machinery/status_display/evac/directional/north, @@ -55544,15 +55592,6 @@ }, /turf/open/floor/iron/airless, /area/station/science/ordnance/bomb) -"nRT" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Prison Forestry North"; - network = list("ss13","prison") - }, -/obj/structure/flora/bush/jungle, -/obj/machinery/airalarm/directional/north, -/turf/open/misc/grass, -/area/station/security/prison/garden) "nSf" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/autoname, @@ -55938,16 +55977,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"nWG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "engsecprivacy"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/engineering) "nXa" = ( /obj/machinery/bookbinder, /turf/open/floor/iron/dark, @@ -56110,6 +56139,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/cargo/storage/ghetto) +"nYR" = ( +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/service/library, +/turf/open/floor/iron/dark, +/area/station/service/library/artgallery) "nYX" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -56221,19 +56258,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"oao" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Secure Storage West"; - network = list("ss13","engineering") - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "oar" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56384,6 +56408,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/ghetto/port) +"obW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/camera/directional/north{ + c_tag = "Kitchen" + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "obY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/effect/decal/cleanable/dirt, @@ -56519,6 +56553,13 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) +"odg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/south{ + c_tag = "Brig Firing Range" + }, +/turf/open/floor/iron, +/area/station/security/range) "odl" = ( /obj/structure/table, /obj/item/reagent_containers/spray/plantbgone, @@ -56643,18 +56684,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) -"ofc" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/plasticflaps{ - opacity = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - req_access = list("engine_equip"); - name = "engineering" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "ofq" = ( /obj/machinery/bluespace_beacon, /obj/effect/turf_decal/stripes/line{ @@ -56819,20 +56848,42 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"ohD" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/button/door/directional/north{ + id = "cargosecprivacy"; + name = "Privacy Shutter Control"; + req_one_access = list("qm","security") + }, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) +"ohK" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/storage/belt/utility, +/obj/item/radio, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Equipment Storage Lockers"; + network = list("ss13","engineering") + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/main) "ohN" = ( /obj/machinery/light/small/directional/north, /obj/structure/sign/directions/arrival/directional/north, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"ohZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "oib" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance, @@ -56854,13 +56905,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) -"oir" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/hallway) "oiw" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/window/reinforced/spawner/directional/north, @@ -56939,34 +56983,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"ojf" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 4 - }, -/obj/machinery/light_switch/directional/south, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - pixel_y = 10; - id = "engineering_lockdown"; - name = "Engineering Lockdown"; - req_access = list("ce"); - color = "yellow" - }, -/obj/machinery/button/door/directional/west{ - id = "atmoslock"; - name = "Atmos Lockdown"; - req_access = list("ce") - }, -/obj/machinery/button/door/directional/west{ - pixel_y = -10; - id = "transittube_lockdown"; - name = "Transit Tube Lockdown"; - req_access = list("ce") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "ojh" = ( /obj/machinery/light/directional/north, /obj/structure/rack, @@ -56996,6 +57012,13 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/ghetto) +"ojt" = ( +/obj/structure/bodycontainer/morgue, +/obj/machinery/camera/directional/west{ + c_tag = "Chapel - Crematorium" + }, +/turf/open/floor/engine/cult, +/area/station/service/chapel/office) "oju" = ( /obj/structure/table, /obj/item/raw_anomaly_core/random{ @@ -57038,6 +57061,20 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"ojU" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research - Security Post"; + network = list("ss13","rd"); + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "okh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -57063,19 +57100,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) -"okz" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/radio/off, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "okD" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -57204,14 +57228,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"omI" = ( -/obj/structure/cable, -/obj/machinery/camera/directional/south{ - c_tag = "Solars - North-East" - }, -/obj/machinery/power/smes, -/turf/open/floor/plating, -/area/station/maintenance/solars/starboard/fore) "omR" = ( /obj/structure/table, /turf/open/floor/iron, @@ -57250,19 +57266,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/arrivals) -"onf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "robotics_desk"; - name = "Robotics Lab Shutters" - }, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "onk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -57393,6 +57396,33 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) +"ooC" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id = "quarantine"; + name = "Quarantine Lockdown"; + opacity = 0 + }, +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Security Desk"; + req_access = list("brig_entrance") + }, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "ooE" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood, @@ -57446,6 +57476,16 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/ghetto) +"oph" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Gravity Generator Room"; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/gravity_generator) "opj" = ( /obj/effect/spawner/random/structure/table, /obj/effect/spawner/random/engineering/flashlight, @@ -57485,6 +57525,16 @@ }, /turf/open/floor/iron, /area/station/engineering/hallway) +"opE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/directional/north{ + c_tag = "Departure Lounge North-East" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "opI" = ( /obj/machinery/light/small/directional/north, /obj/structure/sink/directional/west, @@ -57528,16 +57578,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"oqi" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Prisoner Lockers" - }, -/obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/processing) "oqj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57550,6 +57590,20 @@ "oqm" = ( /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/ghetto/port) +"oqn" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/sign/poster/official/random/directional/east, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Break Room"; + network = list("ss13","rd"); + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) "oqA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth, @@ -57797,22 +57851,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"oti" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron, -/area/station/science/ordnance/office) "otj" = ( /obj/machinery/button/door/directional/east{ id = "brig_courtroom"; @@ -57873,17 +57911,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hos) -"otU" = ( -/obj/structure/chair/comfy/teal{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Virology - Lobby"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/green/filled/line, -/turf/open/floor/iron/white, -/area/station/medical/medbay) "ouf" = ( /obj/structure/table/wood, /obj/item/vending_refill/boozeomat, @@ -58082,14 +58109,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"owD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/ordnance/office) "owG" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -58107,6 +58126,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"owM" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Hallway South East" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "owP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -58363,6 +58391,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft) +"oAD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "oAG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron, @@ -58527,16 +58562,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/carpet/red, /area/station/maintenance/department/security/ghetto) -"oDa" = ( -/obj/structure/sign/departments/telecomms/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Central Primary Hallway South" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "oDc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58587,6 +58612,16 @@ }, /turf/open/floor/wood, /area/station/maintenance/starboard/upper) +"oDM" = ( +/obj/structure/table/wood, +/obj/machinery/airalarm/directional/north, +/obj/item/storage/crayons, +/obj/item/book/bible, +/obj/machinery/camera/directional/north{ + c_tag = "Chapel - Chaplain's Office" + }, +/turf/open/floor/carpet/black, +/area/station/service/chapel/office) "oDN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/arrows{ @@ -58777,16 +58812,6 @@ /obj/effect/mapping_helpers/broken_machine, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"oFN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/directional/west{ - c_tag = "Brig Lobby West" - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/brig/entrance) "oFW" = ( /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/blueshield) @@ -58910,6 +58935,22 @@ /obj/structure/weightmachine/weightlifter, /turf/open/floor/iron, /area/station/security/prison/ghetto) +"oIi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron, +/area/station/science/research) "oIo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58980,25 +59021,11 @@ /obj/item/storage/belt/medical, /turf/open/floor/iron/white, /area/station/maintenance/aft) -"oJi" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "oJo" = ( /obj/item/weldingtool, /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron, /area/station/maintenance/ghetto/central) -"oJu" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/landmark/start/depsec/engineering, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "oJz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -59066,17 +59093,6 @@ "oKg" = ( /turf/open/floor/cult, /area/station/maintenance/starboard/fore) -"oKi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced/tinted, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/upper) "oKn" = ( /obj/machinery/light/small/directional/west, /obj/structure/sign/departments/engineering/directional/west, @@ -59308,16 +59324,6 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) -"oMR" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "oNg" = ( /obj/structure/table/wood, /obj/item/food/pistachios, @@ -59370,17 +59376,6 @@ /obj/structure/sign/directions/arrival/directional/west, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"oNW" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/security, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "oOa" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/closet/crate, @@ -59586,6 +59581,15 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"oQZ" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Courtroom North" + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/parquet, +/area/station/security/courtroom) "oRa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -59595,6 +59599,20 @@ /obj/structure/ladder, /turf/open/floor/plating, /area/station/commons/storage/emergency) +"oRy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Hallway West"; + network = list("ss13","engineering") + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) "oRG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on/scrubbers/hidden/layer2{ @@ -59694,14 +59712,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/magistrate, /turf/open/floor/plating, /area/station/security/courtroom) -"oSK" = ( -/obj/structure/closet/emcloset, -/obj/machinery/camera/directional/north{ - c_tag = "Fore Starboard Solar Access" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/maintenance/starboard/fore) "oSL" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -59747,6 +59757,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/command/teleporter) +"oTc" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Research - Xenobiology Pens Observation North"; + network = list("ss13","rd","xeno"); + dir = 1 + }, +/turf/open/openspace, +/area/station/science/xenobiology) "oTd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59774,6 +59792,14 @@ }, /turf/open/floor/carpet, /area/station/service/library) +"oTy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "oTz" = ( /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, @@ -59818,15 +59844,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) -"oUp" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Theatre" - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/service/theater) "oUL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -59849,18 +59866,6 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"oVb" = ( -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/toilet{ - pixel_y = 8; - dir = 4 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Prison Solitary 1"; - network = list("ss13","prison") - }, -/turf/open/floor/iron, -/area/station/security/prison) "oVh" = ( /obj/structure/bed, /obj/item/bedsheet/clown, @@ -60091,6 +60096,18 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/science/xenobiology) +"oXy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "robotics_window"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "oXI" = ( /obj/effect/spawner/random/structure/crate, /obj/machinery/button/door/directional/west{ @@ -60306,26 +60323,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"paG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/radio/off{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/obj/item/pen{ - pixel_x = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "paX" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -60360,6 +60357,14 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/security/holding_cell) +"pbI" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/ghetto) "pbK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60398,15 +60403,6 @@ }, /turf/open/floor/iron/telecomms, /area/station/tcommsat/server) -"pck" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Foyer East"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron/stairs/right{ - dir = 8 - }, -/area/station/engineering/hallway) "pcn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -60544,6 +60540,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) +"pdV" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Research Hallway South" + }, +/turf/open/floor/iron/white, +/area/station/science/research) "ped" = ( /obj/structure/railing{ dir = 1 @@ -60641,25 +60646,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/atmos) -"pfd" = ( -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = 8; - pixel_y = -24 - }, -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -8; - pixel_y = -24 - }, -/obj/machinery/computer/turbine_computer{ - dir = 8; - mapping_id = "main_turbine" - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_y = -32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "pfh" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, @@ -60784,6 +60770,18 @@ "pgU" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"pgV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/turf/open/floor/iron, +/area/station/engineering/hallway) "phb" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/barman_recipes{ @@ -60832,6 +60830,25 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +"phH" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "JimNortonKitchen" + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_y = -1 + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) "phI" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -60872,17 +60889,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"piz" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "piI" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4; @@ -61063,6 +61069,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"pkI" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research - Xenobiology Access"; + network = list("ss13","rd","xeno") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "pkK" = ( /obj/structure/chair{ dir = 4 @@ -61078,6 +61097,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft) +"pkU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Atmos Control Room West"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "pkV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -61188,6 +61219,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"pmc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Supermatter Foyer"; + network = list("ss13","engine","engineering") + }, +/obj/structure/rack, +/obj/item/analyzer, +/obj/item/geiger_counter, +/obj/item/geiger_counter{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway/west) "pmf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61218,18 +61267,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/maintenance/ghetto/aft) -"pmt" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Xenobiology Cell 6"; - network = list("ss13","xeno","rd") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "pmx" = ( /obj/structure/frame/computer{ dir = 1 @@ -61358,12 +61395,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) -"pol" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Locker Room East" - }, -/turf/open/floor/iron, -/area/station/commons/locker) "pop" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/entry) @@ -61395,17 +61426,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) -"poA" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Lobby West"; - network = list("ss13","engineering") - }, -/obj/structure/chair, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "poO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61481,6 +61501,14 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/commons/fitness) +"ppL" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/landmark/start/depsec/supply, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "ppT" = ( /obj/machinery/door/airlock/public, /obj/effect/mapping_helpers/airlock/autoname, @@ -61491,6 +61519,16 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/iron, /area/station/maintenance/ghetto/starboard) +"pqj" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Foyer West"; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/hallway) "pqm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61548,11 +61586,6 @@ /obj/item/bedsheet/brown, /turf/open/floor/wood, /area/station/maintenance/ghetto/fore/starboard) -"pre" = ( -/obj/effect/spawner/structure/window, -/obj/structure/sign/departments/exam_room, -/turf/open/floor/plating, -/area/station/medical/treatment_center) "prg" = ( /obj/structure/chair{ dir = 8 @@ -61622,6 +61655,12 @@ /obj/item/stack/medical/bone_gel, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) +"psc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "psd" = ( /obj/structure/rack, /obj/item/toy/minimeteor, @@ -61629,12 +61668,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft) -"psk" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Starboard Primary Hallway 1" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "psq" = ( /obj/structure/cable, /obj/machinery/door/poddoor/shutters{ @@ -61684,6 +61717,18 @@ /obj/item/trash/semki, /turf/open/floor/plating, /area/station/maintenance/aft) +"pte" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/research) "ptj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -61912,14 +61957,6 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"pvw" = ( -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Polygon North"; - network = list("ss13","rd","ordnance") - }, -/turf/open/floor/iron/airless, -/area/station/science/ordnance/bomb) "pvD" = ( /turf/closed/wall/r_wall, /area/station/science/breakroom) @@ -62071,6 +62108,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"pxh" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Supermatter"; + network = list("ss13","engine","engineering") + }, +/obj/structure/sign/warning/radiation/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "pxn" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/box/white/corners, @@ -62085,21 +62130,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/commons/storage/emergency/port) -"pxt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/airlock/command/ce{ - id_tag = "ce_door" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/engineering/ce, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "pxu" = ( /obj/effect/turf_decal/tile/purple/half{ dir = 1 @@ -62229,26 +62259,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"pyZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/vending/coffee, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Dormitories West" - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/commons/dorms) "pzh" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, /obj/machinery/portable_atmospherics/canister, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "pzi" = ( @@ -62256,15 +62272,24 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard/aft) +"pzp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/engineering/hallway) "pzr" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"pzu" = ( -/obj/effect/spawner/structure/window, -/obj/structure/sign/warning/no_smoking/circle, -/turf/open/floor/plating, -/area/station/medical/surgery/theatre) "pzD" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/reinforced, @@ -62274,6 +62299,15 @@ /obj/item/reagent_containers/cup/glass/drinkingglass, /turf/open/floor/iron, /area/station/security/courtroom) +"pzH" = ( +/obj/machinery/modular_computer/preset/id, +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo - QM's Office"; + network = list("ss13","cargo") + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) "pzS" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -62349,14 +62383,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"pAO" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Construction Area"; - network = list("ss13","engineering") - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/construction) "pAP" = ( /obj/structure/table, /obj/item/hand_labeler{ @@ -62370,11 +62396,6 @@ /obj/structure/broken_flooring/pile/directional/north, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) -"pBa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/lattice/catwalk, -/turf/open/space/openspace, -/area/space/nearstation) "pBm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62524,20 +62545,29 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"pCo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/general, +"pCr" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id = "quarantine"; + name = "Quarantine Lockdown"; + opacity = 0 }, -/turf/open/floor/iron, -/area/station/science/research) +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "Security Desk"; + req_access = list("brig_entrance") + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "pCt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62603,6 +62633,13 @@ /obj/effect/spawner/structure/electrified_grille, /turf/open/floor/plating, /area/station/maintenance/aft) +"pDl" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) "pDm" = ( /obj/item/rack_parts, /turf/open/floor/plating, @@ -62631,6 +62668,16 @@ /obj/structure/closet/wardrobe/mixed, /turf/open/floor/iron, /area/station/commons/locker) +"pDJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/camera/directional/west{ + c_tag = "Janitor Closet" + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/service/janitor) "pDL" = ( /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, @@ -62757,19 +62804,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"pFg" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/general, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/xenobiology) "pFk" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, @@ -62787,6 +62821,15 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) +"pFA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cargosecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/supply) "pFD" = ( /obj/structure/rack, /obj/item/circuitboard/machine/chem_heater, @@ -62819,6 +62862,16 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"pGj" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Ordnance Lower Mix Lab"; + network = list("ss13","rd") + }, +/obj/structure/sign/warning/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "pGl" = ( /obj/structure/chair/stool{ dir = 1 @@ -62895,17 +62948,6 @@ }, /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) -"pHf" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/directional/east{ - c_tag = "Research - Server Room"; - network = list("ss13","rd"); - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/server) "pHh" = ( /turf/closed/wall, /area/station/service/kitchen) @@ -63045,16 +63087,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"pIB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsecprivacy"; - name = "Privacy Shutters" +"pIy" = ( +/obj/structure/chair/office/light{ + dir = 4 }, -/turf/open/floor/plating, -/area/station/security/checkpoint/engineering) +/obj/effect/landmark/start/research_director, +/obj/machinery/computer/security/telescreen/research/directional/south{ + network = list("rd","xeno","test","ordnance") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "pIJ" = ( /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, @@ -63144,14 +63186,6 @@ /obj/effect/landmark/start/coroner, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) -"pKb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/east{ - c_tag = "Arrivals East" - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "pKc" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -63330,14 +63364,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) -"pLR" = ( -/obj/effect/spawner/random/structure/crate, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo - Warehouse"; - network = list("ss13","cargo") - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "pLV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -63390,6 +63416,18 @@ }, /turf/open/floor/wood/parquet, /area/station/security/courtroom) +"pNj" = ( +/obj/machinery/door/poddoor/shutters{ + id = "Skynet_launch"; + name = "Mech Bay" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/mechbay) "pNn" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -63400,19 +63438,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) -"pNv" = ( -/obj/machinery/door/airlock/hatch, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/command/minisat, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - name = "Transit Security Doors"; - id = "transittube_lockdown" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) "pNw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63632,6 +63657,21 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"pQj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/command/hop{ + id_tag = "HoP_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/hop, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "pQs" = ( /obj/item/book/random, /obj/structure/table/wood, @@ -63733,13 +63773,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"pRE" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "pRF" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, @@ -64151,12 +64184,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"pWv" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "pWy" = ( /obj/structure/rack, /obj/item/mop{ @@ -64256,21 +64283,6 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"pXq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/iron, -/area/station/maintenance/department/electrical) "pXB" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -64304,17 +64316,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"pYq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/camera/directional/north{ - c_tag = "Brig Main Hall East 1" - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/brig) "pYr" = ( /obj/structure/railing/corner, /turf/open/floor/iron/dark/smooth_edge, @@ -64395,15 +64396,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"pZE" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Permabrig Chapel Enterance" - }, -/turf/open/floor/iron, -/area/station/security/prison/ghetto) "pZF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -64719,6 +64711,18 @@ /obj/structure/lattice/catwalk, /turf/open/space/openspace, /area/space/nearstation) +"qeA" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "Research Lab Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/lab) "qeF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -64962,6 +64966,13 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/small, /area/station/security/mechbay) +"qiB" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "qiH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64983,6 +64994,14 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"qiT" = ( +/obj/vehicle/sealed/mecha/ripley/cargo, +/obj/machinery/camera/directional/north{ + c_tag = "Cargo - Depot Lower Floor"; + network = list("ss13","cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/storage/ghetto/depot) "qiU" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/box, @@ -65089,6 +65108,13 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/station/engineering/storage) +"qjN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "rd_robotics_window_shutters" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "qjV" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -65209,6 +65235,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/interrogation/ghetto) +"qlK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/door/airlock/command/hos, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/security/hos, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "qlM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65301,23 +65339,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/security/checkpoint/customs) -"qmK" = ( -/obj/structure/table/reinforced, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/core{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - HFR"; - network = list("ss13","engineering") - }, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hfr_room) "qmN" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -65528,6 +65549,17 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) +"qpQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/camera/directional/north{ + c_tag = "Brig Main Hall East 1" + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "qpU" = ( /obj/effect/spawner/structure/window, /obj/structure/disposalpipe/segment{ @@ -65535,6 +65567,23 @@ }, /turf/open/floor/plating, /area/station/cargo/lobby) +"qpY" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) +"qqd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "qql" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /turf/open/floor/iron/dark, @@ -65722,16 +65771,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"qtH" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Ordnance Lower Mix Lab"; - network = list("ss13","rd") - }, -/obj/structure/sign/warning/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "qtM" = ( /obj/machinery/vending/cigarette, /obj/effect/decal/cleanable/dirt, @@ -65779,13 +65818,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"quF" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/computer/security/telescreen/ce/directional/south{ - network = list("engine","engineering","tcomms","minisat") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "quH" = ( /obj/structure/sink/directional/north, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -65874,19 +65906,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/engineering/storage) -"qvL" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio_maint_aft"; - name = "Xenobiology Blast Door" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - id = "xenobio_maint_fore"; - name = "Xenobiology Blast Door" - }, -/turf/open/floor/plating, -/area/station/maintenance/ghetto/aft) "qvQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/dark_green{ @@ -65894,13 +65913,6 @@ }, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/ghetto/central) -"qwh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "qwo" = ( /obj/structure/table, /obj/item/clipboard{ @@ -65922,16 +65934,6 @@ /obj/effect/spawner/random/trash/box, /turf/open/floor/plating, /area/station/maintenance/ghetto/central/fore) -"qww" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research - Hallway Center"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "qwS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -65999,6 +66001,16 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/ghetto) +"qxo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/atmos, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "qxw" = ( /obj/structure/sink/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -66143,6 +66155,16 @@ }, /turf/open/openspace, /area/station/science/xenobiology) +"qzo" = ( +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "qzp" = ( /obj/machinery/button/door/directional{ id = "eng_vaul_maint"; @@ -66426,6 +66448,16 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) +"qCX" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "qCY" = ( /obj/structure/table, /obj/item/paper_bin, @@ -66834,18 +66866,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/central) -"qIu" = ( -/obj/structure/barricade/wooden, -/obj/machinery/conveyor{ - dir = 4; - id = "Construction" - }, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "qIF" = ( /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, @@ -66911,17 +66931,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"qJF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red, -/obj/machinery/camera/directional/east{ - c_tag = "Brig Prisoner Processing east" - }, -/turf/open/floor/iron/dark, -/area/station/security/holding_cell) "qJH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66939,14 +66948,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) -"qJT" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "qKe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -67033,6 +67034,11 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"qKJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "qKK" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -67169,18 +67175,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"qMT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/door/airlock/command/hos, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/security/hos, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "qMU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67449,18 +67443,6 @@ }, /turf/open/floor/iron/kitchen, /area/station/maintenance/ghetto/kitchen) -"qQd" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Atmos Control Room West"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "qQf" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -67473,17 +67455,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/ghetto/central) -"qQk" = ( -/obj/structure/table/reinforced, -/obj/machinery/requests_console/directional/east{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "qQo" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -67636,14 +67607,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"qSj" = ( -/obj/vehicle/sealed/mecha/ripley/cargo, -/obj/machinery/camera/directional/north{ - c_tag = "Cargo - Depot Lower Floor"; - network = list("ss13","cargo") - }, -/turf/open/floor/iron, -/area/station/cargo/storage/ghetto/depot) "qSz" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/yellow, @@ -67834,14 +67797,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"qVi" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Chemistry Lab North"; - network = list("ss13","medbay") - }, -/obj/machinery/chem_master, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/chemistry/ghetto) "qVj" = ( /turf/closed/wall, /area/station/maintenance/ghetto/kitchen) @@ -68105,17 +68060,6 @@ /obj/machinery/mecha_part_fabricator/maint, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"qXP" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos Center"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "qXZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68166,16 +68110,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/department/electrical) -"qYU" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/camera/directional/south{ - c_tag = "Courtroom South" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood/parquet, -/area/station/security/courtroom) "qZb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68191,6 +68125,16 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/chemistry/ghetto) +"qZi" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "qZo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68219,18 +68163,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"qZC" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/pen{ - pixel_y = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "qZJ" = ( /obj/structure/railing{ dir = 4 @@ -68303,26 +68235,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"rar" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo - Delivery Office"; - network = list("ss13","cargo") - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) -"raw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden/crude, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/ghetto) "rax" = ( /obj/machinery/conveyor{ dir = 4; @@ -68377,18 +68289,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"raT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/iron/stairs/right{ - dir = 8 - }, -/area/station/engineering/transit_tube) "raZ" = ( /obj/machinery/light_switch/directional/west, /obj/structure/table/reinforced, @@ -68578,6 +68478,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"rdh" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway 1" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "rdn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68602,12 +68508,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"rdX" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Starboard Primary Hallway 2" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "reb" = ( /obj/structure/table/reinforced, /obj/item/food/sandwich/cheese/grilled, @@ -68731,23 +68631,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) -"rfz" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/button/door/directional/north{ - id = "cargosecprivacy"; - name = "Privacy Shutter Control"; - req_one_access = list("qm","security") - }, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "rfD" = ( /obj/structure/table, /obj/structure/bedsheetbin{ @@ -68790,12 +68673,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/pod, /area/station/maintenance/ghetto/storage) -"rgb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/station/maintenance/disposal/incinerator) "rgo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -68937,6 +68814,13 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) +"rib" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "rik" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69325,6 +69209,21 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"rmQ" = ( +/obj/machinery/requests_console/directional/west{ + department = "Cargo"; + name = "Quartermaster's Desk Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/machinery/computer/security/qm{ + network = list("cargo","mine","auxbase","vault") + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/qm) "rmU" = ( /turf/closed/wall, /area/station/maintenance/ghetto/port/aft) @@ -69663,6 +69562,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/medical/virology) +"rqO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/engineering/hallway) "rqS" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -69959,20 +69866,6 @@ }, /turf/open/floor/wood, /area/station/maintenance/aft) -"run" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 5 - }, -/obj/item/storage/belt/utility, -/obj/item/radio, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Equipment Storage Lockers"; - network = list("ss13","engineering") - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) "ruq" = ( /obj/machinery/button/door/directional/west{ id = "Toilet2"; @@ -69992,6 +69885,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"ruv" = ( +/obj/machinery/igniter/incinerator_atmos{ + id = "waste_incinerator_igniter" + }, +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "ruC" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -70013,6 +69914,22 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) +"ruO" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/half, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/south{ + c_tag = "Brig Restroom" + }, +/obj/item/storage/fancy/donut_box{ + pixel_y = 10 + }, +/obj/item/storage/fancy/donut_box{ + pixel_y = 6 + }, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/edge, +/area/station/security/checkpoint/customs) "ruP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -70036,6 +69953,17 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"ruV" = ( +/obj/structure/chair/comfy/teal{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Virology - Lobby"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay) "ruY" = ( /obj/structure/chair{ name = "Engineering Station" @@ -70180,17 +70108,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/department/electrical/ghetto) -"rym" = ( -/obj/machinery/status_display/supply{ - pixel_y = 32 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Cargo - Bay Lower Floor"; - network = list("ss13","cargo") - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/cargo/storage/ghetto) "ryq" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/cigar, @@ -70295,6 +70212,17 @@ /obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron/smooth, /area/station/medical/chemistry/ghetto) +"rAk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/engineering/hallway/west) "rAm" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -70576,6 +70504,17 @@ /obj/item/wrench, /turf/open/space/openspace, /area/space/nearstation) +"rED" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/camera/directional/east{ + c_tag = "Brig Prisoner Processing east" + }, +/turf/open/floor/iron/dark, +/area/station/security/holding_cell) "rEF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70671,6 +70610,15 @@ /obj/structure/holosign/barrier/atmos, /turf/open/floor/plating, /area/station/maintenance/ghetto/auxiliary) +"rFU" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Departure Lounge Security" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "rFX" = ( /obj/effect/spawner/random/maintenance, /obj/effect/decal/cleanable/blood, @@ -70976,14 +70924,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"rKp" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Departure Lounge South-East" - }, -/obj/structure/closet/emcloset, -/obj/effect/landmark/start/hangover/closet, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "rKx" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 @@ -71038,6 +70978,26 @@ /obj/machinery/power/tracker, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) +"rLa" = ( +/obj/machinery/computer/security/mining{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"rLc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Supermatter Engine Room North"; + network = list("ss13","engine","engineering") + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway/west) "rLd" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -71060,6 +71020,34 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"rLu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door_buttons/access_button{ + idDoor = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Xeno Access Button"; + pixel_x = -24; + req_access = list("xenobiology") + }, +/obj/machinery/door/airlock/research{ + frequency = 1450; + autoclose = 0; + id_tag = "xeno_airlock_interior" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rLx" = ( /obj/structure/table, /obj/effect/spawner/random/engineering/tool, @@ -71099,15 +71087,6 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/iron/smooth, /area/station/maintenance/ghetto/central) -"rMd" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Prison Forestry South"; - network = list("ss13","prison") - }, -/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/south, -/obj/effect/landmark/start/prisoner, -/turf/open/floor/iron, -/area/station/security/prison/garden) "rMg" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -71184,6 +71163,20 @@ "rMZ" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"rNa" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/effect/landmark/start/depsec/medical, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/med_sec/directional/east{ + name = "Medbay Security Monitor"; + pixel_y = 6 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "rNf" = ( /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, @@ -71251,29 +71244,6 @@ /obj/machinery/power/smes/engineering, /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) -"rNS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/north{ - c_tag = "Prison Entry"; - network = list("ss13","prison") - }, -/obj/machinery/button/flasher{ - id = "permaflash2"; - name = "Flasher button"; - pixel_y = 24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/flasher/directional/north{ - id = "permaflash1"; - pixel_x = 16 - }, -/turf/open/floor/iron/textured_large, -/area/station/security/prison) "rNV" = ( /obj/structure/closet/secure_closet/medical1, /obj/effect/turf_decal/bot, @@ -71341,6 +71311,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft) +"rOP" = ( +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Central Hallway North-East" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "rOZ" = ( /obj/machinery/door/poddoor{ density = 0; @@ -71558,6 +71535,21 @@ }, /turf/open/space/openspace, /area/space/nearstation) +"rSA" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Brig Secure Armory East" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "rSG" = ( /obj/structure/table_frame, /obj/effect/spawner/random/maintenance, @@ -71571,15 +71563,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"rSM" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light/directional/south, -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/science, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "rSN" = ( /obj/structure/chair, /obj/machinery/camera/directional/east{ @@ -71645,6 +71628,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"rTt" = ( +/obj/structure/sign/departments/telecomms/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Central Primary Hallway South" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "rTv" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -71827,13 +71820,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"rVA" = ( -/obj/structure/bodycontainer/morgue, -/obj/machinery/camera/directional/west{ - c_tag = "Chapel - Crematorium" - }, -/turf/open/floor/engine/cult, -/area/station/service/chapel/office) "rVC" = ( /obj/structure/closet/secure_closet/personal/cabinet{ name = "clown's closet" @@ -71972,6 +71958,24 @@ }, /turf/open/floor/wood/parquet, /area/station/security/courtroom) +"rWV" = ( +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/directional/south{ + department = "Cargo"; + name = "Security Requests Console" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "rWY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/structure/cable, @@ -71997,6 +72001,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/cafeteria, /area/station/security/prison/ghetto) +"rXj" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Project Room Fore"; + network = list("ss13","engineering") + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/trimline/yellow/line, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "rXk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -72025,13 +72038,6 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, /area/station/maintenance/ghetto/port/aft) -"rXD" = ( -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "rXH" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/south, @@ -72063,6 +72069,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"rXT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals Auxiliary Docking North" + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "rXU" = ( /obj/structure/filingcabinet, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -72347,19 +72362,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) -"sbz" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/corporate{ - id_tag = "blueshield_door" +"sbE" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera/directional/north{ + c_tag = "Fore Starboard Solar Access" }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/blueshield) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/maintenance/starboard/fore) "sbF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -72477,6 +72487,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"scV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Hallway East"; + network = list("ss13","engineering") + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) "scW" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, @@ -72530,6 +72553,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"sdv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/ordnance) "sdw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/meter, @@ -72558,6 +72594,16 @@ "sdA" = ( /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"sdE" = ( +/obj/machinery/dna_infuser, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Genetics"; + network = list("ss13","rd") + }, +/obj/item/infuser_book, +/obj/effect/turf_decal/tile/purple/half, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "sdH" = ( /obj/structure/closet/secure_closet/captains, /obj/machinery/firealarm/directional/west, @@ -72620,22 +72666,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/port/aft) -"seA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/genetics, -/obj/machinery/duct, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron/white, -/area/station/science/genetics) "seE" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -72647,34 +72677,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat_interior) -"seG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/science/general, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door_buttons/access_button{ - idDoor = "xeno_airlock_interior"; - idSelf = "xeno_airlock_control"; - name = "Xeno Access Button"; - pixel_x = -24; - req_access = list("xenobiology") - }, -/obj/machinery/door/airlock/research{ - frequency = 1450; - autoclose = 0; - id_tag = "xeno_airlock_interior" - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/duct, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "seJ" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -72782,14 +72784,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) -"sgs" = ( -/obj/structure/rack, -/obj/item/multitool, -/obj/machinery/camera/directional/north{ - c_tag = "Auxiliary Tool Storage" - }, -/turf/open/floor/iron, -/area/station/commons/storage/emergency/port) "sgv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72859,6 +72853,16 @@ }, /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) +"shn" = ( +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "shp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72898,6 +72902,12 @@ dir = 1 }, /area/station/commons/storage/primary) +"shW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway 5" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard/west) "sif" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -73373,13 +73383,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"sns" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "snv" = ( /obj/structure/table, /obj/item/stack/sheet/glass, @@ -73391,6 +73394,19 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"snG" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/research/directional/north{ + network = list("rd","xeno","test","ordnance"); + pixel_y = 35; + name = "Research Security Monitor" + }, +/obj/effect/landmark/start/depsec/science, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "snN" = ( /obj/structure/table, /obj/item/flashlight/lamp/green, @@ -73569,16 +73585,6 @@ /obj/effect/turf_decal/siding/wideplating_new/corner, /turf/open/floor/iron, /area/station/security/prison/ghetto) -"sqo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Arrivals Lounge" - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "sqp" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -73633,6 +73639,16 @@ /obj/structure/cable, /turf/open/floor/wood/tile, /area/station/service/lawoffice) +"sqQ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay - Lobby"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "sqT" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -73674,6 +73690,25 @@ /obj/item/paper_bin, /turf/open/floor/iron/white, /area/station/science/lobby) +"srk" = ( +/obj/machinery/computer/records/security, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "engsecprivacy"; + name = "Privacy Shutter Control"; + req_one_access = list("ce","security") + }, +/obj/machinery/requests_console/directional/east{ + name = "Security Requests Console"; + department = "engineering" + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "srn" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -73734,15 +73769,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/disposal) -"sso" = ( -/obj/effect/turf_decal/bot_red, -/obj/item/beacon, -/obj/machinery/camera/directional/east{ - c_tag = "Research - Polygon Center"; - network = list("ss13","rd","ordnance") - }, -/turf/open/floor/iron/airless, -/area/station/science/ordnance/bomb) "sss" = ( /obj/structure/chair/office{ dir = 1 @@ -73831,6 +73857,17 @@ /obj/structure/chair, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"stV" = ( +/obj/structure/table/wood, +/obj/machinery/light/directional/south, +/obj/machinery/microwave/engineering/cell_included, +/obj/machinery/airalarm/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay - Break Room"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/cafeteria, +/area/station/medical/break_room) "stY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73898,16 +73935,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/ghetto/fore/starboard) -"suY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/machinery/camera/directional/north{ - c_tag = "Kitchen" - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "svg" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/door/airlock/medical/glass, @@ -74239,6 +74266,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"szs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Starboard Primary Hallway 4" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard/west) "szz" = ( /obj/structure/railing{ dir = 8 @@ -74393,26 +74430,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"sCj" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/all_access, -/obj/item/food/breadslice/plain, -/obj/item/food/breadslice/plain, -/obj/item/food/breadslice/plain, -/obj/item/food/grown/potato, -/obj/item/food/grown/potato, -/obj/item/food/grown/onion, -/obj/item/food/grown/onion, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/poster/ripped/directional/north, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/camera/directional/north{ - c_tag = "Prison Cafeteria"; - network = list("ss13","prison") - }, -/turf/open/floor/iron/cafeteria, -/area/station/security/prison) "sCm" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) @@ -74507,17 +74524,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/engine, /area/station/science/lower) -"sDn" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/effect/landmark/start/depsec/medical, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "sDw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -74563,6 +74569,41 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/maintenance/port) +"sDN" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Vacant Store" + }, +/obj/machinery/button/door/directional/north{ + id = "vacantstore_north" + }, +/obj/effect/turf_decal/tile/neutral/full, +/turf/open/floor/iron/dark/small, +/area/station/commons/vacant_room/commissary) +"sDP" = ( +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos North"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"sDR" = ( +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + name = "Transit Security Doors"; + id = "transittube_lockdown" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) "sDU" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -74571,6 +74612,23 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/wood/parquet, /area/station/security/courtroom) +"sDX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "mining_internal" + }, +/obj/machinery/bouldertech/refinery, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo - Mining Ore Smeltery"; + network = list("ss13","cargo","mine") + }, +/turf/open/floor/iron/small, +/area/station/cargo/storage/ghetto) "sDZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -74931,6 +74989,20 @@ /obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/iron, /area/station/maintenance/ghetto/fore/starboard) +"sIu" = ( +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/east, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red/full, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Security Post"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "sID" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, @@ -74943,14 +75015,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron, /area/station/maintenance/port/greater) -"sII" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/ordnance/testlab) "sIK" = ( /obj/structure/table/wood, /obj/machinery/airalarm/directional/south, @@ -75173,6 +75237,15 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/wood/parquet, /area/station/maintenance/ghetto/bar) +"sLZ" = ( +/obj/machinery/door/airlock/corporate, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/turf/open/floor/wood/tile, +/area/station/command/heads_quarters/magistrate) "sMd" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/entertainment/drugs, @@ -75209,14 +75282,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto) -"sMO" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Teleporter Room" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/command/teleporter) "sMU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/engine, @@ -75549,28 +75614,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"sSB" = ( -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/east, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Security Post"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) -"sSK" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/science, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "sSO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/effect/decal/cleanable/dirt/dust, @@ -76175,23 +76218,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"tcI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/left/directional/south{ - name = "Engineering Desk"; - req_access = list("engine_equip") - }, -/obj/structure/desk_bell{ - pixel_x = 6 - }, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/iron, -/area/station/engineering/lobby) "tcJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -76487,21 +76513,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) +"thB" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medical_break" + }, +/turf/open/floor/plating, +/area/station/medical/break_room) "thD" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, /turf/open/floor/wood, /area/station/maintenance/aft) -"thE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "thQ" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, @@ -76645,17 +76669,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/storage/tech) -"tjw" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Research - Toxins Mixing"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "tjE" = ( /obj/effect/spawner/random/structure/barricade, /obj/machinery/door/airlock, @@ -76764,6 +76777,15 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"tkZ" = ( +/obj/structure/barricade/wooden, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "tlb" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -76845,18 +76867,6 @@ /obj/structure/lattice, /turf/open/space/openspace, /area/space/nearstation) -"tlV" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Hallway North"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/iron/white, -/area/station/science/research) "tlX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77363,6 +77373,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) +"tqG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/engineering/lobby) "tqI" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -77640,6 +77658,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) +"tue" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "tuh" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/effect/decal/cleanable/dirt, @@ -77717,15 +77742,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/station/commons/locker) -"tuX" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Secure Storage East"; - network = list("ss13","engineering") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/engineering/storage) "tuZ" = ( /obj/machinery/light/small/directional/north, /obj/structure/cable, @@ -77843,15 +77859,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/maintenance/ghetto/starboard/aft) -"twg" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Central Hallway South East" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "twh" = ( /turf/open/floor/glass/reinforced, /area/station/service/chapel/monastery) @@ -77917,15 +77924,6 @@ /obj/structure/chair/sofa/corp/left, /turf/open/floor/carpet/green, /area/station/command/bridge) -"txh" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/security/checkpoint/supply) "txk" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -77962,6 +77960,19 @@ /obj/item/paper/crumpled, /turf/open/floor/iron/large, /area/station/maintenance/ghetto/central) +"txE" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Secure Storage West"; + network = list("ss13","engineering") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "txK" = ( /obj/structure/closet/wardrobe/grey, /turf/open/floor/iron, @@ -77976,17 +77987,6 @@ /obj/item/crowbar/red, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) -"txV" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/structure/cable, -/obj/structure/filingcabinet, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Security Post"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "tya" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/wood, @@ -77997,17 +77997,6 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/catwalk_floor, /area/station/maintenance/ghetto/port) -"tyf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/engineering/hallway/west) "tyl" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -78021,6 +78010,14 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/maintenance/ghetto/garden) +"typ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "tyC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -78041,6 +78038,23 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"tzc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"tzr" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay - Hallway Center"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay) "tzu" = ( /turf/closed/wall/rust, /area/station/maintenance/ghetto/fore/starboard) @@ -78514,16 +78528,6 @@ "tFO" = ( /turf/closed/wall/r_wall, /area/station/security/prison/visit) -"tGa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rndsecprivacy"; - name = "Privacy Shutters"; - dir = 1 - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/science) "tGb" = ( /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) @@ -78635,6 +78639,29 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron, /area/station/cargo/office) +"tHA" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway 3" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) +"tHE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/obj/structure/cable, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id = "quarantine"; + name = "Quarantine Lockdown"; + opacity = 0 + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "tHH" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -79175,6 +79202,14 @@ /obj/item/flashlight/lamp, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) +"tOm" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Departure Lounge South-East" + }, +/obj/structure/closet/emcloset, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "tOt" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -79232,23 +79267,6 @@ "tOZ" = ( /turf/closed/wall/rust, /area/station/maintenance/port/fore) -"tPa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "medsecprivacy"; - name = "Privacy Shutters" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id = "quarantine"; - name = "Quarantine Lockdown"; - opacity = 0 - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/medical) "tPd" = ( /obj/structure/table/wood, /turf/open/floor/carpet, @@ -79335,14 +79353,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/station/maintenance/ghetto/central) -"tQx" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/table, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "tQJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -79567,20 +79577,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"tUG" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "engsecprivacy"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/security/checkpoint/engineering) "tUK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -79708,18 +79704,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/asphalt, /area/station/maintenance/ghetto/garden) -"tVD" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics_window"; - name = "Robotics Lab Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "tVE" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) @@ -80012,6 +79996,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"tYQ" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Central Hallway East" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "tZc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -80046,18 +80039,21 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/ghetto/fore) -"tZG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "tZM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/department/electrical/ghetto) +"tZP" = ( +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay - Chemistry Lab South"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/chemistry/ghetto) "tZV" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -80156,6 +80152,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) +"uaL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "Arrivals Hallway" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "uaM" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/line{ @@ -80366,14 +80372,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark/small, /area/station/security/interrogation/ghetto) -"udX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "uea" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -80383,6 +80381,29 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"uee" = ( +/obj/structure/table/reinforced, +/obj/machinery/requests_console/directional/east{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) +"ueh" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/south{ + c_tag = "Research - Hallway North"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron/white, +/area/station/science/research) "uej" = ( /turf/open/openspace, /area/station/security/brig) @@ -80391,6 +80412,33 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/ghetto/auxiliary) +"ues" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/command/cmo{ + id_tag = "CMO_door" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, +/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, +/obj/effect/mapping_helpers/airlock/access/any/medical/cmo, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) +"uex" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/camera/directional/north{ + c_tag = "Theatre" + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/service/theater) "ueH" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/dark_blue/line{ @@ -80485,6 +80533,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) +"ufC" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Secure Storage South"; + network = list("ss13","engineering") + }, +/turf/open/floor/plating, +/area/station/engineering/storage) "ufD" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -80571,18 +80631,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/ghetto/fore/starboard) -"ugL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - Project Room Closet"; - network = list("ss13","engineering") - }, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/half{ - dir = 8 - }, -/area/station/engineering/atmos/project) "ugS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -80657,6 +80705,14 @@ /obj/item/kirbyplants/random/dead, /turf/open/floor/plating, /area/station/maintenance/ghetto/aft) +"uhJ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Prison Cafeteria External"; + network = list("ss13","prison") + }, +/obj/structure/lattice, +/turf/open/space/openspace, +/area/space/nearstation) "uhK" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) @@ -80706,6 +80762,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/psychology) +"uiy" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Research - Xenobiology Secure Cell Interior"; + network = list("ss13","xeno","rd") + }, +/obj/machinery/status_display/ai/directional/west, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) "uiE" = ( /obj/machinery/conveyor{ dir = 4; @@ -80788,18 +80853,6 @@ /obj/effect/spawner/random/clothing/pirate_or_bandana, /turf/open/floor/wood, /area/station/service/kitchen/abandoned) -"ujt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/research) "ujA" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, @@ -80929,6 +80982,23 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/fore) +"ulv" = ( +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Lobby"; + network = list("ss13","rd") + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 4 + }, +/obj/item/folder, +/obj/item/pen, +/turf/open/floor/iron, +/area/station/science/lobby) "ulA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -80942,6 +81012,11 @@ }, /turf/open/floor/iron, /area/station/science/lobby) +"ulS" = ( +/obj/machinery/computer/crew, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "ulV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/purple/half, @@ -81102,17 +81177,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/white, /area/station/science/genetics) -"uoz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Medbay - Lobby Reception"; - network = list("ss13","medbay") - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "uoO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -81130,12 +81194,6 @@ /obj/effect/spawner/random/structure/barricade, /turf/open/floor/plating, /area/station/maintenance/department/medical/ghetto/central) -"upa" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Brig Prisoner Processing West" - }, -/turf/open/floor/iron, -/area/station/security/courtroom/holding) "upd" = ( /obj/effect/turf_decal/delivery, /obj/machinery/meter, @@ -81212,6 +81270,16 @@ /obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plating, /area/station/commons/storage/emergency) +"uqp" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Brig Main Hall West 2" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "uqs" = ( /obj/effect/turf_decal/tile/green/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -81307,17 +81375,6 @@ /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"urS" = ( -/obj/structure/sink/directional/west, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Access"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple/anticorner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "usf" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -81417,28 +81474,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/wood, /area/station/command/meeting_room) -"utT" = ( -/obj/machinery/rnd/production/protolathe/department/engineering, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Shared Storage"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/storage_shared) -"utY" = ( -/obj/structure/table/glass, -/obj/item/storage/box/donkpockets, -/obj/machinery/camera/directional/east{ - c_tag = "Virology - Break Room"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "uub" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/mess, @@ -81486,6 +81521,11 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/station/commons/storage/art) +"uuw" = ( +/obj/effect/turf_decal/tile/purple, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "uuD" = ( /turf/open/openspace, /area/station/hallway/secondary/entry) @@ -81514,14 +81554,6 @@ /obj/machinery/computer/monitor, /turf/open/floor/iron/dark, /area/station/engineering/hallway/west) -"uva" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/closet/radiation, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "uvc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, @@ -81532,15 +81564,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port) -"uvm" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Departure Lounge Security" - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "uvo" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/glass{ @@ -81717,10 +81740,6 @@ /obj/effect/spawner/random/trash/deluxe_garbage, /turf/open/floor/wood, /area/station/maintenance/ghetto/port/aft) -"uxG" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/treatment_center) "uxH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81756,6 +81775,13 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/ghetto/abandoned_gambling_den) +"uyg" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway 6" + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard/west) "uyt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -81805,16 +81831,6 @@ "uyT" = ( /turf/closed/wall, /area/station/maintenance/ghetto/abandoned_gambling_den) -"uyY" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "uzk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -81840,13 +81856,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/port) -"uzK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "uzL" = ( /turf/closed/wall, /area/station/science/lower) @@ -82124,15 +82133,6 @@ /obj/effect/turf_decal/siding/white, /turf/open/water/alternative/muddy/no_fishing, /area/station/service/kitchen/abandoned) -"uDt" = ( -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Chemistry Lab South"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/turf/open/floor/iron/white, -/area/station/medical/chemistry/ghetto) "uDC" = ( /obj/structure/table/optable, /obj/item/autopsy_scanner, @@ -82305,6 +82305,22 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"uGN" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/food/grown/banana, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Virology - Observation"; + network = list("ss13","medbay") + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "uGO" = ( /obj/structure/table/wood, /obj/effect/spawner/random/trash/cigbutt, @@ -82322,18 +82338,6 @@ "uGR" = ( /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) -"uHa" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Atmos NorthWest"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uHg" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -82365,14 +82369,6 @@ /obj/structure/statue/station_map/cyberiad/north, /turf/open/floor/iron, /area/station/command/bridge) -"uHC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "uHG" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/smooth, @@ -82388,6 +82384,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"uHW" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","prison") + }, +/turf/open/openspace, +/area/station/security/prison) "uHZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82641,6 +82643,13 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) +"uLj" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research - Mech Bay"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/robotics/mechbay) "uLk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82703,17 +82712,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/service/chapel/monastery) -"uMc" = ( -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/engineering/dronefabricator) "uMd" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -83007,14 +83005,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"uPd" = ( -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Prison Forestry External"; - network = list("ss13","prison") - }, -/turf/open/openspace, -/area/station/security/prison) "uPq" = ( /obj/effect/turf_decal/tile/dark_green{ dir = 1 @@ -83221,6 +83211,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/bar) +"uSA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Port Hallway" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "uSG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -83314,6 +83313,16 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"uTV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/west{ + c_tag = "Brig Lobby West" + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig/entrance) "uUa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /obj/effect/decal/cleanable/dirt/dust, @@ -83454,6 +83463,21 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space/openspace, /area/space/nearstation) +"uWD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/iron/white, +/area/station/science/research) "uWT" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -83494,6 +83518,20 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"uXS" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "uXV" = ( /turf/closed/wall, /area/station/maintenance/department/medical/ghetto/morgue) @@ -83554,16 +83592,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard/aft) -"uYK" = ( -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/north, -/obj/item/storage/crayons, -/obj/item/book/bible, -/obj/machinery/camera/directional/north{ - c_tag = "Chapel - Chaplain's Office" - }, -/turf/open/floor/carpet/black, -/area/station/service/chapel/office) "uYL" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -83662,6 +83690,11 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"uZW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "uZX" = ( /obj/structure/railing{ dir = 1 @@ -83699,13 +83732,13 @@ /turf/open/floor/iron, /area/station/maintenance/ghetto/kitchen) "vaF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 10 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ + dir = 10 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "vaH" = ( @@ -83734,19 +83767,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/ghetto) -"vaU" = ( -/obj/machinery/rnd/production/techfab/department/cargo, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/requests_console/directional/west{ - department = "Cargo Bay"; - name = "Cargo Bay Requests Console" - }, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo - Office"; - network = list("ss13","cargo") - }, -/turf/open/floor/iron, -/area/station/cargo/office) "vaX" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -83785,16 +83805,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"vbA" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/poddoor/preopen{ - name = "Engineering Security Doors"; - id = "engineering_lockdown" - }, -/turf/open/floor/plating, -/area/station/engineering/break_room) "vbG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -83825,6 +83835,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) +"vcf" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Prison Library"; + network = list("ss13","prison") + }, +/obj/effect/spawner/random/entertainment/arcade, +/turf/open/floor/wood, +/area/station/security/prison) "vco" = ( /obj/item/bedsheet/hop{ dir = 4 @@ -84116,6 +84134,15 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/ghetto/port) +"vgj" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Departure Lounge North-West" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "vgn" = ( /obj/structure/table/optable{ desc = "A cold, hard place for your final rest."; @@ -84225,6 +84252,15 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/textured_large, /area/station/security/prison) +"vir" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/landmark/start/depsec/supply, +/turf/open/floor/iron, +/area/station/security/checkpoint/supply) "vis" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/light/directional/south, @@ -84241,15 +84277,6 @@ "vix" = ( /turf/closed/wall, /area/station/hallway/secondary/service) -"viB" = ( -/obj/machinery/door/airlock/corporate, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/magistrate) "viJ" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 4 @@ -84277,18 +84304,6 @@ /obj/structure/sign/poster/official/help_others/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"viS" = ( -/obj/machinery/light/directional/north, -/obj/structure/table, -/obj/machinery/microwave/engineering/cell_included, -/obj/machinery/requests_console/directional/north{ - department = "engineering" - }, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/announcement, -/turf/open/floor/iron, -/area/station/engineering/break_room) "viW" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/stairs/west, @@ -84411,6 +84426,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) +"vjS" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/landmark/start/depsec/engineering, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "vjX" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor/massdriver_ordnance, @@ -84708,6 +84730,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/port) +"vnu" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Permabrig Chapel Enterance" + }, +/turf/open/floor/iron, +/area/station/security/prison/ghetto) "vny" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, @@ -84835,19 +84866,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/security/office) -"voI" = ( -/obj/machinery/light/small/directional/south{ - name = "maintenance light"; - nightshift_allowed = 0; - nightshift_enabled = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay - Morgue South" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "voK" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/grass, @@ -84885,6 +84903,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) +"vpb" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/iron, +/area/station/cargo/office) "vpn" = ( /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) @@ -85017,6 +85043,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/medical/surgery/aft) +"vqE" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 8 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "vqH" = ( /obj/structure/railing{ dir = 4 @@ -85140,6 +85178,18 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) +"vrJ" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research - Xenobiology East"; + network = list("ss13","xeno","rd"); + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "vrL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -85289,14 +85339,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/security/brig) -"vsY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/south{ - c_tag = "Locker Room West" - }, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/commons/locker) "vtb" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -85535,6 +85577,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/storage) +"vvF" = ( +/obj/structure/sign/warning/docking/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Arrivals Center" + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "vvG" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/tile, @@ -85662,19 +85714,16 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/project) -"vxT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/corporate{ - id_tag = "ntr_door" +"vxV" = ( +/obj/machinery/rnd/production/protolathe/department/engineering, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Shared Storage"; + network = list("ss13","engineering") }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/any/command/magistrate, -/obj/effect/mapping_helpers/airlock/access/any/command/nanotrasen_representative, -/turf/open/floor/wood/tile, -/area/station/command/heads_quarters/nanotrasen_representative) +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) "vxW" = ( /obj/structure/chair{ dir = 8 @@ -85756,28 +85805,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft) -"vzp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/button/door/directional/north{ - id = "research_lockdown"; - name = "Research Lockdown Control"; - pixel_x = 6; - req_one_access = list("rd","security"); - color = "yellow" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "rndsecprivacy"; - name = "Privacy Shutter Control"; - pixel_x = -6; - req_one_access = list("rd","security") - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "vzr" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/starboard/fore) @@ -86033,19 +86060,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/science/xenobiology) -"vCN" = ( -/obj/structure/cable, -/obj/machinery/computer/station_alert{ +"vCC" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, -/obj/machinery/keycard_auth/wall_mounted/directional/south, -/obj/machinery/light/directional/south, -/obj/machinery/camera/directional/south{ - network = list("ss13","engineering"); - c_tag = "Chief Engineer's Office" +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmos Center"; + network = list("ss13","engineering") }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) +/turf/open/floor/iron, +/area/station/engineering/atmos) "vDk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -86260,9 +86285,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/port) -"vGb" = ( -/turf/closed/wall, -/area/station/security/checkpoint/engineering) "vGh" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, @@ -86345,13 +86367,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"vHi" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Starboard Primary Hallway 6" +"vHk" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard/west) +/obj/effect/landmark/start/depsec/engineering, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "vHl" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light/directional/south, @@ -86497,6 +86521,13 @@ dir = 4 }, /area/station/maintenance/ghetto/central) +"vJb" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/computer/security/telescreen/ce/directional/south{ + network = list("engine","engineering","tcomms","minisat") + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "vJf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -86579,22 +86610,7 @@ /obj/effect/turf_decal/tile/dark, /turf/open/floor/iron, /area/station/commons/fitness) -"vJT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics_window"; - name = "Robotics Lab Shutters" - }, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/science/robotics/lab) "vJV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -86616,6 +86632,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/ghetto/fore/starboard) +"vKl" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "vKm" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/delivery, @@ -86777,6 +86804,19 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"vMr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/window/preopen{ + dir = 4; + id = "JimNortonBottom" + }, +/turf/open/floor/wood, +/area/station/service/cafeteria) "vMy" = ( /obj/structure/table/wood/fancy/royalblack, /obj/item/megaphone, @@ -86830,21 +86870,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"vNl" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/black{ - pixel_x = -6 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black{ - pixel_x = 6 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Atmos HFR Equipment Room"; - network = list("ss13","engineering") - }, -/turf/open/floor/iron/dark, -/area/station/engineering/hallway) "vNo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -87061,18 +87086,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"vRH" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 8 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "vRI" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -87181,6 +87194,26 @@ /obj/structure/chair/comfy/black, /turf/open/floor/plating, /area/station/maintenance/fore) +"vTw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "JimNortonKitchen" + }, +/obj/structure/desk_bell{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 2; + pixel_x = -7 + }, +/obj/structure/table/reinforced, +/turf/open/floor/wood, +/area/station/service/cafeteria) "vTz" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -87412,21 +87445,6 @@ dir = 8 }, /area/station/command/gateway) -"vWq" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "Research Division" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id = "research_lockdown"; - name = "Research Lockdown Blast Doors" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "vWx" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -87552,6 +87570,15 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/maintenance/ghetto/port/aft) +"vXP" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/light/directional/south, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/science, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science) "vXV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -87712,16 +87739,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/ghetto/central/aft) -"waG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/security, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/tile/red/full, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "waJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/rack, @@ -88488,15 +88505,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/service/chapel/monastery) -"wki" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Port Hallway" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "wkn" = ( /obj/structure/water_source/puddle, /turf/open/misc/beach/sand, @@ -88645,6 +88653,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) +"wmI" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, +/obj/machinery/camera/directional/west{ + c_tag = "Research - Ordnance Watching Room"; + network = list("ss13","rd","ordnance"); + dir = 10 + }, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) "wmT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -88765,17 +88783,6 @@ /obj/structure/cable, /turf/open/floor/carpet/red, /area/station/commons/dorms/apartment1) -"woX" = ( -/obj/machinery/photocopier, -/obj/machinery/camera/directional/west{ - c_tag = "Lawyer's Office" - }, -/obj/structure/secure_safe/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood/tile, -/area/station/service/lawoffice) "woY" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -88822,22 +88829,6 @@ /obj/effect/turf_decal/tile/neutral/half, /turf/open/floor/iron/edge, /area/station/security/checkpoint/customs) -"wpL" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/food/grown/banana, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Virology - Observation"; - network = list("ss13","medbay") - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "wpY" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -89053,6 +89044,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) +"wsz" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Starboard Primary Hallway 2" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wsL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -89136,24 +89133,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wtV" = ( -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/dropper, -/obj/machinery/camera/directional/east{ - c_tag = "Research - Research and Development Lab"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/tile/purple/anticorner, -/obj/structure/table, -/turf/open/floor/iron, -/area/station/science/lab) "wua" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/machinery/light/small/directional/south, @@ -89275,6 +89254,20 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"wvD" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/radio/intercom/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Research - Xenobiology Maintenance Access"; + network = list("ss13","xeno","rd") + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) "wvI" = ( /obj/structure/chair/comfy/teal{ dir = 8 @@ -89604,6 +89597,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/station/maintenance/starboard/fore) +"wzW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "wzX" = ( /obj/item/kirbyplants/random/dead, /obj/effect/spawner/random/trash/graffiti{ @@ -90082,6 +90086,14 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/hfr_room) +"wEM" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/ordnance/office) "wER" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -90245,13 +90257,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"wGL" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/holopad, -/obj/effect/landmark/start/depsec/medical, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "wGV" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/fore) @@ -90291,10 +90296,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood/parquet, /area/station/security/courtroom) -"wHY" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/surgery/fore) "wIg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90336,15 +90337,6 @@ /obj/structure/sign/departments/court/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"wIB" = ( -/obj/machinery/quantum_server, -/obj/machinery/camera/directional/north{ - c_tag = "Cargo - Bitrunning Den"; - network = list("ss13","cargo") - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/bitrunning/den) "wID" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -90374,6 +90366,33 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"wIM" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/small/directional/north, +/obj/structure/table, +/obj/item/electronics/airalarm{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/electronics/firealarm{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/electronics/firealarm{ + pixel_x = 6 + }, +/obj/item/electronics/airalarm{ + pixel_x = -6 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - HFR Prep Room"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron/dark, +/area/station/engineering/hallway) "wJo" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -90981,31 +91000,12 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) -"wQZ" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Research - Xenobiology Cell 8"; - network = list("ss13","xeno","rd") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "wRm" = ( /obj/structure/railing{ dir = 1 }, /turf/open/floor/glass/reinforced, /area/station/hallway/secondary/dock) -"wRo" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Research - Xenobiology Pens Observation North"; - network = list("ss13","rd","xeno"); - dir = 1 - }, -/turf/open/openspace, -/area/station/science/xenobiology) "wRp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -91114,6 +91114,16 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"wSC" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research - Hallway Center"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "wSH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -91230,18 +91240,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) -"wUd" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Virology - Airlock"; - network = list("ss13","medbay") - }, -/obj/structure/sink/directional/west, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "wUk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -91263,6 +91261,22 @@ "wUC" = ( /turf/closed/wall, /area/station/medical/virology) +"wUL" = ( +/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, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden, +/turf/open/floor/iron, +/area/station/engineering/hallway) "wUN" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/bot, @@ -91433,6 +91447,16 @@ }, /turf/open/floor/iron, /area/station/cargo/storage/ghetto) +"wXq" = ( +/obj/structure/table, +/obj/machinery/camera/directional/south{ + c_tag = "Departure Lounge South-West" + }, +/obj/item/stack/sheet/cardboard{ + amount = 10 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "wXr" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -91462,20 +91486,6 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"wXM" = ( -/obj/structure/dresser, -/obj/item/radio/intercom/directional/east, -/obj/machinery/camera/directional/north{ - c_tag = "Chief Medical Officer's Quarters"; - network = list("ss13","medbay") - }, -/obj/machinery/button/door/directional/north{ - id = "CMO_bedroom"; - name = "CMO Office Shutters"; - req_access = list("cmo") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) "wXN" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/blood/old, @@ -91576,13 +91586,14 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"wZg" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/service/library/artgallery) +"wZo" = ( +/obj/structure/closet/crate, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Engine Storage"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "wZp" = ( /obj/effect/turf_decal/trimline/dark_blue/line, /obj/machinery/camera/directional/south{ @@ -91592,16 +91603,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix/ghetto) -"wZs" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Foyer West"; - network = list("ss13","engineering") - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "wZB" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -91648,14 +91649,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"xax" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "xaB" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, @@ -91703,6 +91696,29 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"xbg" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Research Director's Office"; + network = list("ss13","rd") + }, +/obj/structure/table/glass, +/obj/item/radio/intercom/directional/north, +/obj/item/computer_disk{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/computer_disk/ordnance{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/computer_disk/ordnance, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/purple/anticorner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "xbk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -91728,13 +91744,6 @@ /obj/effect/mapping_helpers/requests_console/information, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"xbx" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Research - Mech Bay"; - network = list("ss13","rd") - }, -/turf/open/floor/iron/dark, -/area/station/science/robotics/mechbay) "xbG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -91836,6 +91845,16 @@ }, /turf/open/openspace, /area/station/science/xenobiology) +"xda" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "xdc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -91980,24 +91999,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"xep" = ( -/obj/machinery/button/door/directional/north{ - id = "medsecprivacy"; - name = "Privacy Shutters Control"; - req_one_access = list("cmo","security"); - pixel_x = 6 - }, -/obj/machinery/computer/records/medical, -/obj/effect/turf_decal/tile/red/full, -/obj/machinery/button/door/directional/north{ - id = "quarantine"; - name = "Quarantine Lockdown Control"; - req_one_access = list("cmo","security"); - pixel_x = -6; - color = "yellow" - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "xes" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -92262,6 +92263,24 @@ }, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"xgA" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/camera/directional/south{ + c_tag = "Courtroom South" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/security/courtroom) +"xgU" = ( +/obj/structure/cable, +/obj/machinery/camera/directional/south{ + c_tag = "Solars - North-East" + }, +/obj/machinery/power/smes, +/turf/open/floor/plating, +/area/station/maintenance/solars/starboard/fore) "xgV" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -92384,19 +92403,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"xiY" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/research/directional/north{ - network = list("rd","xeno","test","ordnance"); - pixel_y = 35; - name = "Research Security Monitor" - }, -/obj/effect/landmark/start/depsec/science, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science) "xjf" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/tile/yellow, @@ -92497,17 +92503,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"xjS" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Research - Xenobiology Killroom Chamber"; - network = list("ss13","xeno","rd") - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark/telecomms, -/area/station/science/xenobiology) "xjT" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -92737,6 +92732,16 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) +"xnq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xnz" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -92825,6 +92830,18 @@ "xoo" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/cmo) +"xov" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "robotics_window"; + name = "Robotics Lab Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "xoy" = ( /obj/structure/cable, /turf/open/floor/iron/stairs/right, @@ -92874,6 +92891,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark, /area/station/tcommsat/server) +"xpd" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Teleporter Room" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/command/teleporter) "xpf" = ( /obj/structure/grille/broken, /obj/item/stack/rods, @@ -92895,18 +92920,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/station/maintenance/fore) -"xpQ" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera/directional/north{ - c_tag = "Research - Robotics Lab North"; - network = list("ss13","rd"); - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "xpY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -92933,6 +92946,36 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"xqB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_x = 4 + }, +/obj/item/pen{ + pixel_x = 4 + }, +/obj/item/stamp/head/rd{ + pixel_x = 7; + pixel_y = -2 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) +"xqH" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/toilet{ + pixel_y = 8; + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Prison Solitary 2"; + network = list("ss13","prison") + }, +/turf/open/floor/iron, +/area/station/security/prison) "xqL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -93266,15 +93309,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"xuy" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Research - Xenobiology Secure Cell Interior"; - network = list("ss13","xeno","rd") - }, -/obj/machinery/status_display/ai/directional/west, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) "xuG" = ( /obj/structure/cable, /obj/effect/landmark/start/assistant, @@ -93386,6 +93420,16 @@ /obj/item/crowbar, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"xwC" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Atmos Mini-Hallway"; + network = list("ss13","engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xwI" = ( /obj/item/kirbyplants/random/dead, /turf/open/floor/wood, @@ -93439,17 +93483,6 @@ /obj/structure/sign/warning/secure_area/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) -"xxA" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/item/clothing/mask/balaclava, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/camera/directional/west{ - c_tag = "Brig Security Equipment Lockers" - }, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "xxO" = ( /obj/item/seeds/potato, /obj/effect/spawner/random/structure/closet_maintenance, @@ -93507,6 +93540,17 @@ "xys" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit/departure_lounge) +"xyt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/computer/turbine_computer{ + dir = 1; + mapping_id = "main_turbine" + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "xyv" = ( /obj/structure/cable, /obj/machinery/door/airlock/atmos, @@ -93546,6 +93590,27 @@ }, /turf/open/floor/iron, /area/station/maintenance/ghetto/port/greater) +"xyQ" = ( +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Research - Polygon North"; + network = list("ss13","rd","ordnance") + }, +/turf/open/floor/iron/airless, +/area/station/science/ordnance/bomb) +"xyU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "robotics_desk"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/poddoor/preopen{ + id = "research_lockdown"; + name = "Research Lockdown Blast Doors" + }, +/turf/open/floor/plating, +/area/station/science/robotics/lab) "xyV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -93576,20 +93641,6 @@ /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/iron/dark, /area/station/maintenance/ghetto/port) -"xzu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/camera/directional/east{ - c_tag = "Medbay - Hallway South"; - network = list("ss13","medbay") - }, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/medical/medbay) "xzQ" = ( /obj/item/taperecorder{ pixel_x = -6; @@ -93673,6 +93724,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/ghetto/aft) +"xAO" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo - Auxiliary Warehouse"; + network = list("ss13","cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/office) "xAT" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -93749,6 +93811,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"xCB" = ( +/obj/structure/barricade/wooden, +/obj/machinery/conveyor{ + dir = 4; + id = "Construction" + }, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "xCJ" = ( /obj/effect/spawner/random/glass_shards, /obj/machinery/light/small/directional/east, @@ -94166,14 +94240,6 @@ /obj/machinery/duct, /turf/open/floor/iron/smooth, /area/station/commons/toilet/restrooms) -"xIz" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Supermatter"; - network = list("ss13","engine","engineering") - }, -/obj/structure/sign/warning/radiation/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "xIE" = ( /obj/structure/rack, /obj/item/flashlight, @@ -94568,12 +94634,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"xNE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "xNK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -94670,6 +94730,14 @@ /obj/structure/table/wood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) +"xOY" = ( +/obj/effect/spawner/random/structure/crate, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Warehouse"; + network = list("ss13","cargo") + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "xPg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -95001,17 +95069,6 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/department/security/ghetto/fore) -"xTz" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id = "quarantine"; - name = "Quarantine Lockdown"; - opacity = 0 - }, -/turf/open/floor/plating, -/area/station/medical/paramedic) "xTF" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/carpet/green, @@ -95119,6 +95176,14 @@ /obj/machinery/vending/wallmed/directional/east, /turf/open/floor/iron/white/textured, /area/station/security/medical) +"xUW" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Research - Xenobiology Pens Observation South"; + network = list("ss13","rd","xeno"); + dir = 2 + }, +/turf/open/openspace, +/area/station/science/xenobiology) "xUX" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -95141,6 +95206,14 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"xVf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "xVm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -95488,42 +95561,19 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) +"yan" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "JimNortonKitchen" + }, +/obj/item/modular_computer/laptop/preset/civilian, +/obj/structure/table/reinforced, +/turf/open/floor/wood, +/area/station/service/cafeteria) "yaq" = ( /obj/structure/sink/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"yar" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = 3; - pixel_y = -8 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = -8 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = -6 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = -7 - }, -/obj/structure/sign/warning/no_smoking/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Chemistry Lab East"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/chemistry/ghetto) "yay" = ( /obj/effect/spawner/random/trash/graffiti{ spawn_loot_chance = 50 @@ -95589,15 +95639,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ybj" = ( -/obj/machinery/igniter/incinerator_atmos{ - id = "waste_incinerator_igniter" - }, -/obj/machinery/air_sensor/incinerator_tank, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer2, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "ybl" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -95766,15 +95807,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/small, /area/station/maintenance/ghetto/central) -"ydA" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Tech Storage"; - network = list("ss13","engineering") - }, -/turf/open/floor/plating, -/area/station/engineering/storage/tech) "ydD" = ( /obj/structure/window/fulltile, /obj/structure/flora/bush/flowers_yw/style_random, @@ -95854,6 +95886,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/range) +"yeP" = ( +/obj/structure/table/wood, +/obj/item/camera, +/obj/item/storage/photo_album{ + pixel_y = -10 + }, +/obj/item/crowbar, +/obj/machinery/camera/directional/east{ + c_tag = "Captain's Office" + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "yfg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -95948,22 +95992,6 @@ "ygq" = ( /turf/open/floor/carpet/black, /area/station/commons/lounge) -"ygG" = ( -/obj/machinery/button/elevator/directional/north{ - id = "aft_vator" - }, -/obj/machinery/lift_indicator/directional/north{ - linked_elevator_id = "aft_vator" - }, -/obj/machinery/camera/directional/north{ - c_tag = "Cargo - Bay North"; - network = list("ss13","cargo") - }, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "ygO" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/autoname, @@ -96176,18 +96204,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/ghetto) -"yjx" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/power/energy_accumulator/tesla_coil, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Secure Storage South"; - network = list("ss13","engineering") - }, -/turf/open/floor/plating, -/area/station/engineering/storage) "yjy" = ( /obj/structure/table/optable, /turf/open/floor/iron/dark, @@ -96220,6 +96236,24 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) +"ykg" = ( +/obj/structure/plasticflaps{ + opacity = 1 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery"; + location = "engineering" + }, +/obj/machinery/door/poddoor/preopen{ + name = "Engineering Security Doors"; + id = "engineering_lockdown" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Drone Fabricator"; + req_access = list("engine_equip") + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/dronefabricator) "ykh" = ( /obj/structure/railing{ dir = 4 @@ -96284,6 +96318,10 @@ /obj/item/circuitboard/machine/chem_dispenser, /turf/open/floor/plating, /area/station/maintenance/aft) +"ykM" = ( +/obj/machinery/power/turbine/inlet_compressor, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "ykO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -114478,7 +114516,7 @@ aaH eee rHY vED -bDW +eHi mQa rRj xdk @@ -115061,7 +115099,7 @@ rQU rQU rQU jJz -wIB +apZ ifO bDI cxd @@ -115567,7 +115605,7 @@ rQU rQU rQU rQU -rym +mWB bCN fGH oBo @@ -116287,7 +116325,7 @@ rgK rgK vEj nkc -nRT +gFq tJb tJb tJb @@ -116342,7 +116380,7 @@ oBo bCN xtd jIW -gYU +sDX org hBj oZU @@ -116553,7 +116591,7 @@ mLR jRd jRd vzY -rMd +iaU aPt isY doz @@ -116858,7 +116896,7 @@ bNC rZD eVn aOJ -hPP +atG mTM riE plE @@ -117306,7 +117344,7 @@ htA htA htA tuh -pZE +vnu ekb wfs pam @@ -117376,7 +117414,7 @@ oKG oKG tkt qCm -nFS +rLa hBj doz doz @@ -117875,7 +117913,7 @@ hxl wbn yfu qUy -qSj +qiT hET hET eRV @@ -119469,13 +119507,13 @@ job doz doz doz -jCY -raw -jCY -raw -jCY -raw -jCY +pbI +lTQ +pbI +lTQ +pbI +lTQ +pbI doz doz doz @@ -119723,19 +119761,19 @@ lcw pMA dKo dKo -jCY -raw -raw -jCY +pbI +lTQ +lTQ +pbI pMA pMA pMA pMA cKv -jCY -raw -jCY -raw +pbI +lTQ +pbI +lTQ dKo dKo pMA @@ -131271,7 +131309,7 @@ eDZ eDZ eWD kos -uDt +tZP vzJ xXv rQp @@ -132286,7 +132324,7 @@ vbK doz doz vzJ -qVi +idc xvz gMr hFR @@ -133576,7 +133614,7 @@ doz doz doz vzJ -yar +fVL pBD iAJ rEd @@ -136687,7 +136725,7 @@ etx etx tLJ tLJ -xuy +uiy tLJ tLJ etx @@ -138738,7 +138776,7 @@ fif fif fif hdh -pFg +bZx wCv cQI lSo @@ -138997,7 +139035,7 @@ egU cAC etx mSc -hFa +wvD wuS viO mpE @@ -139005,7 +139043,7 @@ iXB fJa swe aPQ -xjS +kJj vrD etx rQp @@ -139764,7 +139802,7 @@ doz etx xrG mrE -cOC +liF mpE mWc mpE @@ -139778,7 +139816,7 @@ ntO mpE mua mpE -qvL +ggl xXv rQp yfi @@ -140034,7 +140072,7 @@ srh jhg fKC iXB -wQZ +gjO etx qFZ rQp @@ -140214,7 +140252,7 @@ loN fGs mTb kYX -jbe +jkT uYI mYO bXI @@ -140223,10 +140261,10 @@ fer gUL gUL tnT -jgW +bGg tnT tnT -wZg +nYR tnT gUL gUL @@ -140535,7 +140573,7 @@ doz etx qyx oWA -cOC +liF mpE mWc mpE @@ -140549,7 +140587,7 @@ cjR mpE mWc mpE -qvL +ggl rQp xXv qQf @@ -140793,7 +140831,7 @@ etx uhq mrE etx -mdv +lmn iXB bwl sbO @@ -141306,7 +141344,7 @@ doz etx hhW xXv -cOC +liF mpE mWc mpE @@ -141320,7 +141358,7 @@ fIA mpE mua mpE -qvL +ggl roD fTZ wfp @@ -141576,7 +141614,7 @@ srh luu fKC iXB -pmt +ewc etx cmE xHx @@ -141765,7 +141803,7 @@ pNZ pNZ xjE xjE -npz +mMO dTt xjE xjE @@ -142077,7 +142115,7 @@ oVL etx uhq oWA -cOC +liF mpE mua mpE @@ -142091,7 +142129,7 @@ sun mpE mWc mpE -qvL +ggl xXv xXv wfp @@ -142335,7 +142373,7 @@ etx bBc qTy etx -aSi +mxa qll bwl goo @@ -142784,7 +142822,7 @@ vBZ vBZ qWU vBZ -uYK +oDM lFT auR csF @@ -142853,7 +142891,7 @@ wfp wfp wfp etx -fkx +vrJ cMA uNF vnE @@ -143038,7 +143076,7 @@ pgT veO ryU vBZ -rVA +ojt vGI vBZ mCJ @@ -147193,7 +147231,7 @@ nFU nFU nFU nFU -aoq +sdv nFU nFU nFU @@ -148739,7 +148777,7 @@ mLI oGf xLW aWU -qtH +pGj nFU pTl fKk @@ -172333,7 +172371,7 @@ tYD hqz nDE hqz -jsZ +byf xmL xmL iNK @@ -172606,7 +172644,7 @@ hbD cSx xmL xmL -mBx +jFz hbD tYD tYD @@ -172620,7 +172658,7 @@ tYD tYD tYD hbD -leA +dEs xmL aip hbD @@ -174402,7 +174440,7 @@ hZL iuR rYS yfg -fqP +vvF rUn xmL otq @@ -174418,7 +174456,7 @@ bcK uYj rUn xmL -dTn +nDR otq xmL eoS @@ -174651,7 +174689,7 @@ uJS uuG vsl uKE -pKb +cRE otq otq otq @@ -174664,7 +174702,7 @@ xmL xmL otq ftc -emM +rXT otq otq olE @@ -175955,7 +175993,7 @@ qHg njA muZ bVv -sgs +kzh sHW wOT tvz @@ -176210,7 +176248,7 @@ kpb nGE tcB fse -gWc +kQS xPx xPx xPx @@ -176454,7 +176492,7 @@ buL icD jcc nwJ -sqo +bpy vub lBb uuD @@ -177231,7 +177269,7 @@ otq nQu vlh lIr -ejw +uaL vlh olm bIw @@ -178214,7 +178252,7 @@ ddm ddm ddm ddm -gUb +uhJ tYD tYD tYD @@ -179034,7 +179072,7 @@ pDI xtx xtx xtx -vsY +dyb jal ekQ fMy @@ -179496,7 +179534,7 @@ tYD tYD tYD ddm -sCj +lJx iLe sQV lYv @@ -180897,7 +180935,7 @@ dmU svM kZJ giG -dEb +ijf jcP mlQ svM @@ -181370,7 +181408,7 @@ dBr itr nTK hsX -cxR +aUT dMR gJs gJs @@ -181550,7 +181588,7 @@ tYD trM isY ddm -lWk +vcf cmj aiD vjs @@ -181601,7 +181639,7 @@ eao vFW rAW bzp -pol +gRh nNQ sVx gib @@ -181823,7 +181861,7 @@ frJ xRv wmw kLL -mFn +uHW nUk nUk nUk @@ -182130,7 +182168,7 @@ xPx xPx xPx xPx -ygG +gPA kGz njk njk @@ -182346,7 +182384,7 @@ nUk nUk nUk nUk -uPd +hun ddm kJd qsJ @@ -182626,7 +182664,7 @@ gLn gLn dlT cTW -wki +uSA tXc tXc tXc @@ -182656,7 +182694,7 @@ beH nQa hLf oXI -pLR +xOY pje nrT beH @@ -182686,7 +182724,7 @@ oXc kJd xRt rLg -jbw +mLg wQD pgU cte @@ -182842,7 +182880,7 @@ ddm ddm ddm lFA -oVb +aCR ddm hCm oAi @@ -182893,12 +182931,12 @@ oRn tXc uWj xPx -gNS +rmQ snN ekG osx wgD -gjO +dKV vvw vvw vvw @@ -182957,7 +182995,7 @@ sMU kUx kih qDM -xIz +pxh qlX jrp eSR @@ -183218,7 +183256,7 @@ aKp aKp kom bGL -aCU +gzp rLg xRt tYD @@ -183407,7 +183445,7 @@ xaB tXc nzI xPx -fJy +pzH jsH eHn lqS @@ -183676,7 +183714,7 @@ cPg les gLy mes -vaU +luP ixb qds jng @@ -184384,7 +184422,7 @@ kJd gOj ddm iNS -lui +xqH ddm mvm xRv @@ -184711,8 +184749,8 @@ bFM lRl mOF aDM -nup -iXn +vpb +xAO mAy icg lRl @@ -184742,7 +184780,7 @@ coz kJd xRt rLg -aXX +bwU bkh pcP xdF @@ -184951,7 +184989,7 @@ pQe raR vRY dKy -rar +ddt eaQ xnP wry @@ -184966,8 +185004,8 @@ jSS lRl uhZ uhZ -kGQ -ciO +pFA +shn oXc oXc oXc @@ -185011,7 +185049,7 @@ qaY wmT tUT tUT -aYX +bNj gbs mbG mKo @@ -185157,7 +185195,7 @@ lMG lrv kKz nRB -rNS +akn cZx jdP tFO @@ -185222,8 +185260,8 @@ hnZ clU vzR uhZ -hlO -exw +dhR +ppL shG oXc iTs @@ -185290,9 +185328,9 @@ wNB cZJ cZJ cZJ -tYD -tYD -tYD +kJd +kJd +kJd tYD tYD tYD @@ -185478,10 +185516,10 @@ bDk jHw tXR uNh -kGQ -hNr -hCx -bhc +pFA +dfO +cjE +rWV oXc vtu qfY @@ -185544,17 +185582,17 @@ cZJ ovZ jHU baa -uva -hAN -cZJ -tYD -tYD -tYD -tYD -tYD -tYD -tYD -tYD +ips +xyt +xEN +psc +eAR +kJd +kJd +kJd +kJd +kJd +kJd tYD tYD tYD @@ -185666,7 +185704,7 @@ tYD tYD tYD nRB -hiO +niR vrG mxh seo @@ -185713,7 +185751,7 @@ cTW nQA scY scY -bPF +sDN mbT mbT mLO @@ -185735,10 +185773,10 @@ qZs kNa wQX oMO -kGQ -flN -hZF -txh +pFA +nex +kBK +lnf oXc ngQ mKa @@ -185802,16 +185840,16 @@ bJg vJj bxU xfP -oJi -xEN -joL -kJd -kJd -tYD -tYD -tYD -tYD -tYD +wzW +cZJ +qiB +cZJ +udL +cZJ +trM +trM +trM +trM tYD tYD tYD @@ -185993,9 +186031,9 @@ uNh wDU hUQ uhZ -rfz -aOK -inC +ohD +vir +hmv oXc oyc tVz @@ -186038,7 +186076,7 @@ mcZ qWM eBL xbR -bOU +pmc bAZ cxz fur @@ -186055,21 +186093,21 @@ aWy aWy xca cZJ -uuF +eNi mBk pzh hZK -qZC +uZW +hpp +iMY +hpp +hSi +cZJ wNB -tZG -eAR -kJd -kJd -kJd -kJd -kJd -kJd -tYD +cZJ +cZJ +fNa +gOj tYD tYD tYD @@ -186282,7 +186320,7 @@ nZg nbf eqE qcz -tyf +rAk ofF qqC iuf @@ -186312,21 +186350,21 @@ uRb aWy cZJ cZJ -qwh +iiy vaF eIw -hID -bxz -cZJ -rgb -cZJ -cZJ -cZJ -trM -trM -trM +hUM +aWW +mKW +oAD +uXS +ruv +ykM +dcS +lxI +euX trM -tYD +gOj tYD tYD tYD @@ -186450,7 +186488,7 @@ ngW ngW ngW eLF -bZv +gOd cjz ngW ngW @@ -186507,7 +186545,7 @@ mty sLh mty wzR -nDC +gmg bUW mty mty @@ -186545,7 +186583,7 @@ fjs fjs fjs fjs -huJ +rLc jnB hgK qtO @@ -186556,7 +186594,7 @@ hVY kDb tMA fur -bMR +jPq bAZ rgH rgH @@ -186571,15 +186609,15 @@ nQz llm xIm vJV -nuv -nuv -lgC -hpp -iMY -hpp -hSi +hZK +hZK +hVM +cZJ +mGT cZJ +qxx cZJ +xVf cZJ cZJ fNa @@ -186787,7 +186825,7 @@ cDB eKL jbX prJ -ofc +lFt qYT tAz tYi @@ -186825,22 +186863,22 @@ idm hnb idP cZJ -hHL +msj hZK -fjb -nkA +uZW +uZW +uZW +hFY +cZJ +vnQ +cZJ +cZJ +cZJ uuF -xNE -kcS -udX -hTP -ybj -hIY -dcS -lxI -euX +cZJ +rEy trM -gOj +kJd tYD tYD tYD @@ -186955,7 +186993,7 @@ seo cxa seo seo -dtb +uqp vAf qAN acI @@ -186963,7 +187001,7 @@ uAf eIT aqp eeM -woX +iXc kJI nvN eXB @@ -187055,7 +187093,7 @@ tAz qKe wHl fjs -fPO +wZo rae adg fyc @@ -187086,18 +187124,18 @@ jTS jjz ouO mFb -rXD -pfd -cZJ -mGT -cZJ -qxx -cZJ -cZJ -cZJ +nkA +kCL +qxo +niy +uuF +uuF +uuF +qpY cZJ -fNa -gOj +trM +trM +kJd tYD tYD tYD @@ -187208,7 +187246,7 @@ tYD tYD nRB gKx -oqi +nux bQU img seo @@ -187343,15 +187381,15 @@ cZJ cZJ tXg cZJ -lEp -lEp cZJ -vnQ cZJ -udL cZJ -rEy -trM +qKJ +cZJ +cZJ +cZJ +cZJ +cZJ trM trM kJd @@ -187494,7 +187532,7 @@ nhU ehs ehs ehs -qYU +xgA qsJ fmX bKu @@ -187602,8 +187640,8 @@ hGL kJd kJd kJd -pBa -pBa +erR +erR trM trM trM @@ -188000,7 +188038,7 @@ ruP iSW aZz oLc -hYc +oQZ ifN uTn ehs @@ -188065,7 +188103,7 @@ fvD qzN qzN sBm -pAO +fli iXV xHB oXc @@ -188075,13 +188113,13 @@ mez dWQ dWQ qZv -nad +jbb otr dWQ -qIu -pXq -eaa -adi +xCB +cIx +tkZ +eQI fjs fjs fjs @@ -188098,7 +188136,7 @@ tFm cUs bmd jvr -oao +txE cvJ lCN uLk @@ -188255,7 +188293,7 @@ acI mrf mrf gyL -viB +sLZ mrf mrf lvi @@ -188360,7 +188398,7 @@ xrx vgG isj nXm -yjx +ufC awU rgH rgH @@ -188507,7 +188545,7 @@ khF izL iNx juX -oFN +uTV nKK mrf gNV @@ -188554,7 +188592,7 @@ xMK pbY jro sOa -euI +bvj ooE cbf oYV @@ -188605,7 +188643,7 @@ bRg bRg bRg bRg -cRG +oRy jdk awU lKb @@ -188772,7 +188810,7 @@ hVK beb gnb mrf -mEW +jym rfH gIk xse @@ -188848,17 +188886,17 @@ aDx mxC jeV kqR -vGb -vGb -vGb -vGb -vGb -wZs +dCL +dCL +dCL +dCL +dCL +pqj ftL hZh wUN oil -czt +mCX bJE wUN hZh @@ -189011,7 +189049,7 @@ tCv tCv tCv tCv -bta +kgE uqx rSI wLg @@ -189077,7 +189115,7 @@ hqt iwB dKZ ndG -dja +pQj sRE tEb dyi @@ -189101,15 +189139,15 @@ oXc oXc rxQ dWQ -aPk -uMc -gpz -vGb -vGb -eEj -gft -oMR -vGb +eIH +iND +ykg +dCL +dCL +cgA +eXC +qZi +dCL opB mwx hZh @@ -189133,7 +189171,7 @@ jmW jmW jmW hfG -uHa +gmN jkQ mmp vfD @@ -189361,12 +189399,12 @@ kYD rVa qkP nyc -tUG -aIx -ekm -oJu -eKx -pIB +fDc +ejh +aBB +vHk +vjS +gsz snl fxA hZh @@ -189380,7 +189418,7 @@ qsB jdk awU lmH -tuX +kJY qjL awU aqO @@ -189561,7 +189599,7 @@ wGV drA yme vML -mYd +ekL uxD ntU sTa @@ -189595,7 +189633,7 @@ yjA knx jQZ cbZ -vxT +brQ vbt aNe lZy @@ -189612,18 +189650,18 @@ nUo pmy gnh kzc -poA +blq vNo thw vku wYk nWw -tUG -paG -aTV -qJT -xax -oNW +fDc +fGm +fsM +msZ +typ +lXr bOu pBN iMb @@ -189655,7 +189693,7 @@ pbS jGU byM xWN -hdx +gLM ada bbY fre @@ -189799,7 +189837,7 @@ eMl feV gWs dwz -izY +mQl rpJ xTZ cnL @@ -189875,12 +189913,12 @@ tdc sqy rgS lbA -vGb -dNB -aqy -sns -txV -iwR +dCL +srk +aRo +iYa +exr +khO vyg uTC uRF @@ -190132,13 +190170,13 @@ vNo uQm eLO pRd -vGb -vGb -nWG -nWG -vGb -vGb -oir +dCL +dCL +dre +dre +dCL +dCL +fBV eel hZh qrA @@ -190291,7 +190329,7 @@ xcz xcz xcz hlp -azM +ful dmB ktb ovJ @@ -190387,10 +190425,10 @@ aVO oDj lCn oth -hdn -hdn +tqG +tqG vBz -ckO +hec jJG vVU xAa @@ -190409,7 +190447,7 @@ iro alL orZ jLz -geB +aoY qHG qJI gLS @@ -190578,7 +190616,7 @@ ajN hRz hRz jOv -bNg +hgL kVX gfe vpN @@ -190644,7 +190682,7 @@ svZ mcX mcX xKc -hdn +tqG tPy axq xur @@ -190668,7 +190706,7 @@ nvj tmO jcM qHG -dru +mdS ifg aHh gZw @@ -190901,7 +190939,7 @@ iRd ikG xRd pIx -tcI +bwc rQq oQv oQv @@ -191158,7 +191196,7 @@ ggR rwa rwa rPd -hdn +tqG iTy cLd jTW @@ -191415,8 +191453,8 @@ keQ plD plD btJ -hdn -hdn +tqG +tqG vBz jiR eGn @@ -191426,7 +191464,7 @@ vBz gsm xdz hZh -run +ohK aDC cap xKS @@ -191614,7 +191652,7 @@ sxb lSM nvt qXz -mqQ +yan bDu uKn wzo @@ -191648,7 +191686,7 @@ hpn lWQ pTr jHL -oDa +rTt hLh ufP aqt @@ -191664,7 +191702,7 @@ xPg dRA oSf ojj -kAA +pDJ fig cgh edt @@ -191673,7 +191711,7 @@ lGu kZI aIE bJL -epP +rqO pJa pJa aIp @@ -191681,7 +191719,7 @@ pJa gYd pzS opB -eHE +pzp hZh pPI pPI @@ -191690,7 +191728,7 @@ pPI pPI hZh qsB -dKM +pDl qHG qHG qHG @@ -191703,7 +191741,7 @@ jQC jmW jmW hfG -cni +sDP soq mHY sLI @@ -191711,7 +191749,7 @@ hlr rqY xUQ dcs -qXP +vCC ada spB hGk @@ -191824,7 +191862,7 @@ tYD tYD tYD xcz -iwT +nmm oEy glP alh @@ -191871,7 +191909,7 @@ nEu lSM qCd rpk -eYb +phH ghS olq wzo @@ -191930,7 +191968,7 @@ oBE gUC onX nzF -ktA +pgV wxi wxi gxS @@ -191957,7 +191995,7 @@ wND jHX qWg blL -qQd +pkU pZC kob ubk @@ -192085,7 +192123,7 @@ xMu hAu iOh vdS -cpS +rSA vdS vdS kst @@ -192120,7 +192158,7 @@ jCS ffA pXd fgy -jrg +jtm agg pDv pDv @@ -192128,8 +192166,8 @@ jzY lSM qCd rpk -bad -aGk +vTw +isr qjA whP wzo @@ -192165,7 +192203,7 @@ jHL kBL cNA tbn -sbz +jZn vvO vkr vtR @@ -192182,12 +192220,12 @@ hAG hxV cYg edt -ejQ +gSp gQF spb rnG rnG -dzc +wUL fRP fRP fRP @@ -192385,7 +192423,7 @@ ccg lSM nvt gZj -aXR +aSg bpk wUk gOs @@ -192444,7 +192482,7 @@ seJ spq lPh qqT -epP +rqO jOG fdL qKK @@ -192708,7 +192746,7 @@ cnU kzp cnU cnU -pck +hTh odo jsN noe @@ -192723,7 +192761,7 @@ dGP qam kKV yaQ -ojf +bjc dGP ncV ydU @@ -192901,7 +192939,7 @@ dQQ uFf wzo kXl -laT +vMr kXl wzo ssw @@ -192980,7 +193018,7 @@ xfb maU rez hnp -quF +vJb dGP tfR lsc @@ -193117,7 +193155,7 @@ ufm eWL nkz nTy -xxA +ghG rVX pLs pLs @@ -193148,7 +193186,7 @@ fgy chx brR fgy -jlM +gdW lrU ycw qxD @@ -193387,7 +193425,7 @@ tIT iqo fHS fHS -qJF +rED lUF fHS lhG @@ -193474,7 +193512,7 @@ cda lHn sDD wwy -aOQ +aHN oPw nTW doz @@ -193485,17 +193523,17 @@ jsN xMS kdj rJv -utT +vxV sZB kpf vKv goP -pxt +gJY hlo hhT tuv rbB -vCN +jel dGP dGP peX @@ -193699,7 +193737,7 @@ opI hDM vqZ oBG -sMO +xpd veN tEP tEP @@ -193725,7 +193763,7 @@ faO pxq rUO rUO -ydA +jFe wiR uUX uUX @@ -193767,7 +193805,7 @@ jGU vAw kII dcs -jvy +dwG ada qMq cyO @@ -193883,7 +193921,7 @@ gaN eOL eMs cqN -mrb +odg ufm ovm kBS @@ -193901,7 +193939,7 @@ kJB mJo sHK kXa -upa +noT vjL nFi kJB @@ -193932,7 +193970,7 @@ iJW iGO toP kNp -fFv +rOP kfK gaM lmV @@ -193997,7 +194035,7 @@ urB kmI ozm ouZ -kMU +jJs kpk ozm xjf @@ -194204,7 +194242,7 @@ jOr ezF jlq cul -fCg +yeP wnX fzs lRk @@ -194524,7 +194562,7 @@ ovV ovV dGP dGP -bpA +bXN nwu ocK pwa @@ -194689,7 +194727,7 @@ fgy fgy bHX fgy -oUp +uex jJy nUy hri @@ -194715,7 +194753,7 @@ xoC acd xkX mZJ -aAh +tYQ gzo vxp vxp @@ -194729,7 +194767,7 @@ qoM eui fod vRG -twg +owM qoM hEi qoM @@ -194764,7 +194802,7 @@ hpN hpN hpN lVu -viS +iRE ouW pty gOQ @@ -194787,7 +194825,7 @@ xPD hnA hfG hfG -csr +dch jyw jGU jGU @@ -194958,7 +194996,7 @@ xyb kok iJW iGO -pyZ +jiD kNp xru kfK @@ -195019,7 +195057,7 @@ vTH ezU hXT ezU -vbA +mEB urB urB nHE @@ -195038,7 +195076,7 @@ jxn fmq dzv cMU -fCO +xwC cZI peF geR @@ -195169,7 +195207,7 @@ lLX nMz hTt bnt -jRY +ruO nMz dsE pZs @@ -195751,7 +195789,7 @@ eiG vhF xeh xWl -flU +nxv mIn ktr bhZ @@ -195807,7 +195845,7 @@ jJC oqH jxn oOX -vNl +cTK cnU hfG hfG @@ -195942,7 +195980,7 @@ dkq wix xBb nMz -nwy +fFr hTq slm iqO @@ -196058,7 +196096,7 @@ xLZ xLZ mxX cnU -fMT +scV lbQ cnU oqH @@ -196232,7 +196270,7 @@ cjL eUA eUA fgy -bDC +mhL ivD dCq kFR @@ -196464,7 +196502,7 @@ prg prg mka ewd -pYq +qpQ lFQ qsV wtn @@ -196716,7 +196754,7 @@ tVE tVE wba wba -nyt +dXu wba wba tVE @@ -197008,7 +197046,7 @@ nyv kcP oAt oAt -mjs +hlF gnf qiU iPQ @@ -197046,9 +197084,9 @@ lcZ fwl jyF cFr -uxG -pre -uxG +aeX +kZZ +aeX dVg dVg dVg @@ -197567,7 +197605,7 @@ gLx lnZ pki sqv -wHY +nHJ jwd dpI kRS @@ -197619,7 +197657,7 @@ akp hfT vmJ dSW -qmK +jZN mGz cRN erx @@ -197748,7 +197786,7 @@ lZr upr tUS bGZ -qMT +qlK rEF icU pSj @@ -197811,7 +197849,7 @@ eng aQK ren oCm -dzP +mNe gqk sNS jxk @@ -197820,11 +197858,11 @@ hkd lqQ ahj nHf -pzu +cRd yfI spc lVp -wHY +nHJ gkB lZi yjy @@ -198056,7 +198094,7 @@ wFA eUM bOe vOa -psk +rdh nke cef dJK @@ -198065,10 +198103,10 @@ ptS sdA fid eng -xTz -jzh -jzh -jzh +jvL +grZ +grZ +grZ eng nBq rTc @@ -198081,7 +198119,7 @@ gLx hFE oZN lVp -wHY +nHJ ejV wkN edY @@ -198321,7 +198359,7 @@ jcf ptS sdA fWP -bsa +sqQ pJi hZO flS @@ -198370,17 +198408,17 @@ npX bMD hIt cnU -joH +wIM pwz akm rjU dQP aXv siT -kwy +rXj xkP xkP -ekJ +cto siT nEz pYB @@ -198595,7 +198633,7 @@ oew tqI oZN oJD -wHY +nHJ nAz tkp tkp @@ -198622,7 +198660,7 @@ aFs nRd qCU pbo -hRC +bpv qCU bRq wTK @@ -198650,7 +198688,7 @@ hjX xFS xhh pVg -frs +jXM akp job kJd @@ -198833,8 +198871,8 @@ sjr dOD rbv huB -hQC -cQl +rib +ira omG omG omG @@ -199061,7 +199099,7 @@ qSL eEF vMM eEF -fqU +hFa eEF nEu caW @@ -199109,7 +199147,7 @@ cUp uRn oZN oJD -eEk +hne ovf kux kux @@ -199604,7 +199642,7 @@ cef dJK lyK sdA -lGg +dNF pwS dJK wxM @@ -199623,7 +199661,7 @@ gLx eSO dUK iPv -eEk +hne amF wtQ wEf @@ -199672,7 +199710,7 @@ pYB hen akp akp -hNn +bYm dKq hlc cBo @@ -199846,7 +199884,7 @@ oOG fxV fgR wkX -suY +obW dKr jWz mcM @@ -199876,11 +199914,11 @@ uQg uJF gTc iFU -pzu +cRd yfI oZN iPv -eEk +hne qvd hgo xkb @@ -200116,17 +200154,17 @@ ckR nke uDV jFQ -tPa -dXK -hwR -tPa +tHE +ooC +pCr +tHE jFQ -nOL -hep -lke -ohZ -cJF -thE +ulS +iDh +ijK +bui +qqd +xnq tRu uJF qBf @@ -200137,7 +200175,7 @@ gLx jHx oZN iPv -eEk +hne hhK rJd vwI @@ -200167,11 +200205,11 @@ rYA qCU ceC hpN -piz +vKl hpN xFx -raT -hAH +mAc +hhB oQf aXv aXv @@ -200369,19 +200407,19 @@ dKr iuz aDZ pHh -rdX +wsz nke ckR jFQ -xep -sDn -lkJ -uzK -waG -gbc -uoz -mFL -pRE +hbj +fdD +oTy +tzc +dip +tue +kzH +jdd +eIq ptj nTm qtE @@ -200631,9 +200669,9 @@ nke ckR jFQ dKA -dpB -kqg -mKS +rNa +xda +arH jFQ dJK dJK @@ -200644,9 +200682,9 @@ lcZ mSJ jyF cFr -uxG -pre -uxG +aeX +kZZ +aeX gLx mTv oZN @@ -200697,7 +200735,7 @@ wZQ jzE tna aSj -ugL +lhy oQf tYD tYD @@ -200887,17 +200925,17 @@ ckR nke ckR jFQ -sSB -qQk -wGL -mAL +sIu +uee +mqA +cyw jFQ tuq iNF cZU cCS lCk -nNP +ftE kEh qbQ iov @@ -200908,7 +200946,7 @@ alU bBw qbQ fCK -mLy +tzr sqG twT alU @@ -200932,7 +200970,7 @@ doz qCU llT hCq -jSG +oph hCq kQR qCU @@ -200945,7 +200983,7 @@ qQo qwo oPo snr -pNv +sDR lVb iWC oQf @@ -201176,7 +201214,7 @@ upv upv pOi vIE -xzu +ihS jYl jmB iyG @@ -201411,16 +201449,16 @@ xJM pKC iJZ adA -cEH +jDR cMB tnR -cEH +jDR nnU nnU rOZ htm xoo -iWM +ues ndZ ndZ ndZ @@ -201671,7 +201709,7 @@ adA hIG qWw pMa -liH +neD nnU pPG elu @@ -201680,7 +201718,7 @@ chc wdz jvO vVr -cLb +eaI lpB xoo qIi @@ -201951,7 +201989,7 @@ uIF ueU xNK fys -otU +ruV dRA nGm aOV @@ -202447,7 +202485,7 @@ nnU dIf lpq htm -jtA +fiJ mcn sYg sYg @@ -202458,7 +202496,7 @@ agU wwS vTG xoo -arc +iPC rqK gTy oTG @@ -202711,7 +202749,7 @@ bKm vVi emv xoo -wXM +biY qsO gHg xoo @@ -202951,11 +202989,11 @@ fwy dCQ fwy ucd -voI +mGN yeD -bWs +thB wqA -bWs +thB yeD nnU lpq @@ -203225,7 +203263,7 @@ awe xun htm eEz -wpL +uGN sTP xpY puQ @@ -203455,7 +203493,7 @@ xul qjt uap iur -dCO +tHA lCk sjf kko @@ -203727,7 +203765,7 @@ yeD dic qqM oOE -jey +stV nnU bIa htm @@ -203748,7 +203786,7 @@ uYQ fLX hIA aDt -wUd +bpx npt pTw hpN @@ -204221,7 +204259,7 @@ nBv nBv jxy kkl -hrG +szs kkl kkl kkl @@ -204257,7 +204295,7 @@ oiR fcj xpY rCF -utY +hDp rFm aWA vkj @@ -204439,9 +204477,9 @@ nwo xeX xCx mzJ -omI +xgU dKN -oSK +sbE lry lry gnf @@ -205256,7 +205294,7 @@ ocr kkl naE soG -nnH +ifY erF xhj afW @@ -205513,7 +205551,7 @@ sKd kkl sKd rYC -eyZ +pNj asx txo gLG @@ -206283,7 +206321,7 @@ wfV ugB kkl niF -fMP +mrI iEn aIl lNS @@ -206311,8 +206349,8 @@ fZm nnU nnU nnU -oKi -seA +lTX +axO nnU nnU ceC @@ -206540,10 +206578,10 @@ wfV qEI kkl niF -fMP +mrI hnT wBw -xbx +uLj msO ufk lYy @@ -206552,7 +206590,7 @@ ufk nvl vlt htm -cDQ +fLd htm htm brm @@ -206586,7 +206624,7 @@ gMn eWp nPZ htm -wRo +oTc cuq cuq xcZ @@ -206598,7 +206636,7 @@ tHY aEf cuq cuq -icf +xUW hpN axX blM @@ -207054,7 +207092,7 @@ wfV qpn kkl niF -tVD +xov lbS sHs oWo @@ -207311,7 +207349,7 @@ wfV xJU kkl niF -tVD +xov egv sHs rJT @@ -207326,7 +207364,7 @@ taN vTk osV ugh -eqp +hZk uiY rQM htm @@ -207582,7 +207620,7 @@ ugh maY ngX pdo -hug +qjN nqn eIh oLe @@ -207841,7 +207879,7 @@ rGV cOZ ugh udb -lrM +pIy wSc xMU urR @@ -208082,7 +208120,7 @@ wfV bMt kkl niF -vJT +oXy kvp tfT nCR @@ -208097,9 +208135,9 @@ ugh ugh ugh ugh -lUJ +xbg aVh -kZp +xqB brs cpi gNu @@ -208112,14 +208150,14 @@ upi lVn hZc aqm -niD +sdE axZ bWX jvh lXy cZo sRe -cyu +grH lpq nPZ nPZ @@ -208336,15 +208374,15 @@ ksn mjy epI epI -jgo +shW kkl niF -vJT +oXy ymg ckQ kDm ePl -xpQ +mgr ePl ePl fTg @@ -208353,7 +208391,7 @@ lmZ esC gzg khb -ejH +dVk vgI isn knL @@ -208375,7 +208413,7 @@ mCa ffg nKH sGs -atI +clW nnU sDE amm @@ -208598,9 +208636,9 @@ kkl hmb ugh ugh -onf -keT -onf +xyU +dXj +xyU ugh lWh kBY @@ -208610,7 +208648,7 @@ vwY gVF rEu lPH -gMJ +gxU tWs tWs tWs @@ -208867,14 +208905,14 @@ lmZ xdc uUN kQc -ejH +dVk mZH kXk sdy myR rUy ndV -pHf +gls tsW lCP kaw @@ -209405,7 +209443,7 @@ eyE vVN reB eyE -mfM +pdV ape mvt ppF @@ -209630,7 +209668,7 @@ fGz baH fzN xNr -kVU +uWD jGZ jGZ dCJ @@ -209665,11 +209703,11 @@ fDn lYW lYW lYW -pCo +dvy pKt hqy mRd -seG +rLu kel kel jqR @@ -209888,7 +209926,7 @@ uiF gLA dmb ppF -urS +iYX hJI dVb ppF @@ -209927,7 +209965,7 @@ iwl apA tcJ aPQ -nQc +pkI kHF wAt ppI @@ -210139,7 +210177,7 @@ sKd frw bMM oKR -gax +ulv diI goj kbG @@ -210152,7 +210190,7 @@ hub dyW vVN qIF -tlV +ueh pvD pvD kuE @@ -210160,14 +210198,14 @@ kuE kuE pvD pvD -qww +wSC vVN uUN -iFw +uuw bej -ibb -ibb -ibb +bxM +bxM +bxM uzL uzL hbu @@ -210421,10 +210459,10 @@ ukQ vVN uUN qIF -tGa -uyY -okz -vRH +mjQ +qCX +dqW +vqE uzL tnn kKF @@ -210654,9 +210692,9 @@ frw igt ord ord -gqo -mrM -mrM +eaa +bUt +bUt ord opl sJI @@ -210678,9 +210716,9 @@ sSW vVN uUN qIF -tGa -tQx -xiY +mjQ +fAT +snG rMt uzL pxu @@ -210935,10 +210973,10 @@ lYW vVN lYW lYW -asi +qzo uHZ bkE -gSh +nMx uzL pxu byv @@ -211166,7 +211204,7 @@ sKd sKd frw bMM -fbR +qeA fmJ snc qKv @@ -211178,7 +211216,7 @@ nEE xjo jqC jqC -ujt +pte jqC jqC sjx @@ -211193,9 +211231,9 @@ vVN uUN sJo bej -vzp -pWv -uHC +ekX +gDg +bpH uzL kuV wqQ @@ -211420,10 +211458,10 @@ epI epI epI epI -vHi +uyg frw bMM -fbR +qeA tTI mTH naH @@ -211441,7 +211479,7 @@ jqC pDR wDG tXh -lqk +oqn pvP bQl pvD @@ -211450,11 +211488,11 @@ vVN uUN uKw bej -sSK -ixv -rSM +cTb +mFN +vXP uzL -ltl +jtA jDM hsn rZm @@ -211680,7 +211718,7 @@ ljw sKd frw bMM -fbR +qeA slk whT nqx @@ -211703,13 +211741,13 @@ jqC jqC jqC bTH -mdU +oIi bTH bTH bej dbD -lKy -gmG +ojU +fSv uzL xPQ ggE @@ -211942,11 +211980,11 @@ dzT kMh drZ tbp -wtV +hzs nKg fCh tda -fbo +fvV jqC jaj mxz @@ -211976,7 +212014,7 @@ sDi qhM qed qed -nff +iZF nNJ jqC jqC @@ -212201,7 +212239,7 @@ ord ord jqC jqC -vWq +igh jqC jqC jqC @@ -212447,7 +212485,7 @@ dna btQ dbc uWT -lfl +vgj eTa lVS nlH @@ -212731,7 +212769,7 @@ jqC jqC jqC jqC -oti +mlN jqC jqC jqC @@ -212984,7 +213022,7 @@ rMZ eaK jqC wdk -tjw +kpj uIe rNn wbH @@ -213740,7 +213778,7 @@ qcQ vLH oqb eTa -eYi +wXq bTH rMZ qKu @@ -215037,9 +215075,9 @@ kiD ecc nxp cCP -owD -owD -owD +wEM +wEM +wEM vLK vLK rfn @@ -215300,7 +215338,7 @@ xRt vLK sXs aXI -iAu +wmI bhw lEd vLK @@ -216053,7 +216091,7 @@ ecx dQB pJp eTa -rKp +tOm dna tYD tYD @@ -216069,9 +216107,9 @@ jLS kTP fwd vLK -sII -sII -sII +hkN +hkN +hkN vLK vjX vLK @@ -216300,7 +216338,7 @@ pZd njQ xys xys -gSn +opE eTa eTa eTa @@ -217837,7 +217875,7 @@ tYD tYD tYD xys -uvm +rFU lNW sCR wiO @@ -221721,19 +221759,19 @@ tYD kJd grt cZN -pvw +xyQ fyN fyN xHV fyN fyN -sso +gaw fyN fyN xHV fyN fyN -jUm +gfo cZN grt kJd @@ -223269,7 +223307,7 @@ grt grt fyN fyN -hpZ +bAv fyN fyN grt diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index a0a228bf5fe86..a386fe33b1a97 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -81457,12 +81457,6 @@ /obj/item/reagent_containers/cup/rag, /turf/open/floor/iron/white/textured_large, /area/station/maintenance/department/medical) -"mdT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/station/maintenance/fore/lesser) "mec" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -118778,10 +118772,6 @@ /obj/effect/turf_decal/siding/thinplating_new/dark/corner, /turf/open/floor/iron/dark/herringbone, /area/station/service/chapel/funeral) -"rDY" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/station/maintenance/fore/greater) "rEc" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -196595,7 +196585,7 @@ fQE cUZ xGl pjP -mdT +iEt xnA pQW hAK @@ -266242,7 +266232,7 @@ bzt jkE nLg cij -rDY +bYy loK kCi nKp @@ -294174,4 +294164,4 @@ txW txW txW txW -"} \ No newline at end of file +"} diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 9a20e38ebcd5d..c800243246908 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -273,15 +273,7 @@ dir = 9 }, /obj/structure/cable, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass"; - outfit = /datum/outfit/corpse_assistant - }, +/mob/living/basic/zombie/rotten/assistant, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -360,14 +352,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass" - }, +/mob/living/basic/zombie/rotten, /turf/open/floor/iron, /area/shuttle/abandoned/crew) "aQ" = ( @@ -841,14 +826,7 @@ }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass" - }, +/mob/living/basic/zombie/rotten, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "bT" = ( @@ -1449,15 +1427,7 @@ }, /obj/effect/decal/cleanable/blood/gibs/old, /obj/structure/cable, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass"; - outfit = /datum/outfit/corpse_assistant - }, +/mob/living/basic/zombie/rotten/assistant, /turf/open/floor/iron, /area/shuttle/abandoned/medbay) "dc" = ( diff --git a/_maps/shuttles/whiteship_personalshuttle.dmm b/_maps/shuttles/whiteship_personalshuttle.dmm index 7666f6c63add1..0316e7f3aeab0 100644 --- a/_maps/shuttles/whiteship_personalshuttle.dmm +++ b/_maps/shuttles/whiteship_personalshuttle.dmm @@ -162,15 +162,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass"; - outfit = /datum/outfit/corpse_assistant - }, +/mob/living/basic/zombie/rotten/assistant, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned/engine) "gG" = ( @@ -195,15 +187,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/decal/cleanable/blood/splatter, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass"; - outfit = /datum/outfit/corpse_assistant - }, +/mob/living/basic/zombie/rotten/assistant, /turf/open/floor/plating, /area/shuttle/abandoned/engine) "nI" = ( @@ -260,15 +244,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/splatter, /obj/structure/chair/comfy/shuttle, -/mob/living/simple_animal/hostile/zombie{ - desc = "This undead fiend looks to be badly decomposed."; - environment_smash = 0; - health = 60; - melee_damage_lower = 11; - melee_damage_upper = 11; - name = "Rotting Carcass"; - outfit = /datum/outfit/corpse_assistant - }, +/mob/living/basic/zombie/rotten/assistant, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/bridge) "pS" = ( diff --git a/_maps/virtual_domains/psyker_zombies.dmm b/_maps/virtual_domains/psyker_zombies.dmm index 4ca97f8ef6315..c532e87189f9c 100644 --- a/_maps/virtual_domains/psyker_zombies.dmm +++ b/_maps/virtual_domains/psyker_zombies.dmm @@ -114,7 +114,7 @@ /turf/open/indestructible/dark, /area/virtual_domain) "X" = ( -/mob/living/simple_animal/hostile/zombie, +/mob/living/basic/zombie, /turf/open/indestructible/dark, /area/virtual_domain) "Y" = ( diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index e9fdda293686d..0bb8e8ad930e8 100644 --- a/code/__DEFINES/cargo.dm +++ b/code/__DEFINES/cargo.dm @@ -58,6 +58,6 @@ //At 320 it's 475 credits, at 1400 it's 669 credits, at 3000 (around gun crates) its 778, at 8000 (hat crate) it's 925 credits, at 9000 (expensive atmos cans) it's 943 credits, and at the 20k crate it's 1070 credits. /// Multiplies the logarithmic value calculating the free crate delivery reward -#define DEPARTMENTAL_ORDER_REWARD_COEFFICIENT 120 +#define DEPARTMENTAL_ORDER_REWARD_COEFFICIENT 40 // BANDASTATION EDIT - Original: 120 /// Used for the power of the logarithmic value for the free crate delivery reward #define DEPARTMENTAL_ORDER_REWARD_EXPONENT 1.5 diff --git a/code/__DEFINES/id_cards.dm b/code/__DEFINES/id_cards.dm index a42016dd3de3f..2d720630ce637 100644 --- a/code/__DEFINES/id_cards.dm +++ b/code/__DEFINES/id_cards.dm @@ -42,3 +42,22 @@ * Used to crop the ID card's transparency away when chaching the icon for better use in tgui chat. */ #define ID_ICON_BORDERS 1, 9, 32, 24 + +///Honorific will display next to the first name. +#define HONORIFIC_POSITION_FIRST (1<<0) +///Honorific will display next to the last name. +#define HONORIFIC_POSITION_LAST (1<<1) +///Honorific will not be displayed. +#define HONORIFIC_POSITION_NONE (1<<2) +///Honorific will be appended to the full name at the start. +#define HONORIFIC_POSITION_FIRST_FULL (1<<3) +///Honorific will be appended to the full name at the end. +#define HONORIFIC_POSITION_LAST_FULL (1<<4) + +#define HONORIFIC_POSITION_BITFIELDS(...) list( \ + "Honorific + First Name" = HONORIFIC_POSITION_FIRST, \ + "Honorific + Last Name" = HONORIFIC_POSITION_LAST, \ + "Honorific + Full Name" = HONORIFIC_POSITION_FIRST_FULL, \ + "Full Name + Honorific" = HONORIFIC_POSITION_LAST_FULL, \ + "Disable Honorific" = HONORIFIC_POSITION_NONE, \ +) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index ac8396f207042..f70ccb47bcebc 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -130,3 +130,6 @@ ///Defines for priorities for the bubble_icon_override comp #define BUBBLE_ICON_PRIORITY_ACCESSORY 2 #define BUBBLE_ICON_PRIORITY_ORGAN 1 + +/// Sent from /atom/movable/proc/compose_message() to find an honorific. Compatible with NAME_PART_INDEX: (list/stored_name, mob/living/carbon/carbon_human) +#define COMSIG_ID_GET_HONORIFIC "id_get_honorific" diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index e2fdf01e9aaba..46987974d8049 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -26,12 +26,10 @@ //several flags for the Necropolis curse status effect ///makes the edges of the target's screen obscured #define CURSE_BLINDING (1<<0) -///spawns creatures that attack the target only -#define CURSE_SPAWNING (1<<1) ///causes gradual damage -#define CURSE_WASTING (1<<2) +#define CURSE_WASTING (1<<1) ///hands reach out from the sides of the screen, doing damage and stunning if they hit the target -#define CURSE_GRASPING (1<<3) +#define CURSE_GRASPING (1<<2) //Incapacitated status effect flags /// If the mob is normal incapacitated. Should never need this, just avoids issues if we ever overexpand this diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 276866038afce..edc227b09582d 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -374,3 +374,22 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex) return "a rolling pin" else return "something... but the gods didn't set this up right (Please report this bug)" + +///Find the first name of a mob from a passed string with regex +/proc/first_name(given_name) + var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace or "-" + firstname.Find(given_name) + return firstname.match + +/// Find the last name of a mob from a passed string with regex +/proc/last_name(given_name) + var/static/regex/lasttname = new("\[^\\s-\]+$") //First word before whitespace or "-" + lasttname.Find(given_name) + return lasttname.match + +/// Find whitespace or dashes in the passed string with regex and returns TRUE if found +/proc/is_mononym(given_name) + var/static/regex/breaks = regex(@"\s") + if(breaks.Find(given_name)) + return FALSE + return TRUE diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 878e44cb5e850..800cbb87cb3f3 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -107,9 +107,9 @@ GLOBAL_LIST_INIT(phobia_mobs, list( /mob/living/basic/shade, /mob/living/basic/skeleton, /mob/living/basic/wizard, + /mob/living/basic/zombie, /mob/living/simple_animal/bot/mulebot/paranormal, /mob/living/simple_animal/hostile/dark_wizard, - /mob/living/simple_animal/hostile/zombie, )), )) diff --git a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm index 582253e0b926b..96a02afb5749b 100644 --- a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm +++ b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm @@ -380,7 +380,7 @@ /atom/movable/screen/plane_master/ghost name = "Ghost" - documentation = "Ghosts draw here, so they don't get mixed up in the visuals of the game world. Note, this is not not how we HIDE ghosts from people, that's done with invisible and see_invisible." + documentation = "Ghosts draw here, so they don't get mixed up in the visuals of the game world. Note, this is not how we HIDE ghosts from people, that's done with invisible and see_invisible." plane = GHOST_PLANE render_relay_planes = list(RENDER_PLANE_NON_GAME) diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm index bcdf8e0230c4d..a32abbac6ca97 100644 --- a/code/controllers/subsystem/dynamic/dynamic.dm +++ b/code/controllers/subsystem/dynamic/dynamic.dm @@ -1,9 +1,3 @@ -#define FAKE_GREENSHIFT_FORM_CHANCE 15 -#define FAKE_REPORT_CHANCE 8 -#define PULSAR_REPORT_CHANCE 8 -#define REPORT_NEG_DIVERGENCE -15 -#define REPORT_POS_DIVERGENCE 15 - // Are HIGH_IMPACT_RULESETs allowed to stack? GLOBAL_VAR_INIT(dynamic_no_stacking, TRUE) // If enabled does not accept or execute any rulesets. @@ -195,10 +189,6 @@ SUBSYSTEM_DEF(dynamic) /// Used for choosing different midround injections. var/list/current_midround_rulesets - /// The amount of threat shown on the piece of paper. - /// Can differ from the actual threat amount. - var/shown_threat - VAR_PRIVATE/next_midround_injection /datum/controller/subsystem/dynamic/proc/admin_panel() @@ -336,7 +326,7 @@ SUBSYSTEM_DEF(dynamic) continue min_threat = min(ruleset.cost, min_threat) - var/greenshift = GLOB.dynamic_forced_extended || (threat_level < min_threat && shown_threat < min_threat) //if both shown and real threat are below any ruleset, its extended time + var/greenshift = GLOB.dynamic_forced_extended || (threat_level < min_threat) //if threat is below any ruleset, its extended time SSstation.generate_station_goals(greenshift ? INFINITY : CONFIG_GET(number/station_goal_budget)) var/list/datum/station_goal/goals = SSstation.get_station_goals() @@ -384,39 +374,10 @@ SUBSYSTEM_DEF(dynamic) /// Generate the advisory level depending on the shown threat level. /datum/controller/subsystem/dynamic/proc/generate_advisory_level() var/advisory_string = "" - if(prob(PULSAR_REPORT_CHANCE)) - for(var/datum/station_trait/our_trait as anything in shuffle(SSstation.station_traits)) - advisory_string += our_trait.get_pulsar_message() - if(length(advisory_string)) - return advisory_string - - advisory_string += "Advisory Level: Pulsar Star
" - advisory_string += "Your sector's advisory level is Pulsar Star. A large, unknown electromagnetic field has stormed through nearby surveillance equipment, causing major data loss. Partial data was recovered and showed no credible threats to Nanotrasen assets within the Spinward Sector; however, the Department of Intelligence advises maintaining high alert against potential threats due to the lack of complete data." - return advisory_string - //a white dwarf shift leads to a green security alert on report and special announcement, this prevents a meta check if the alert report is fake or not. - if(round(shown_threat) == 0 && round(threat_level) == 0) - advisory_string += "Advisory Level: White Dwarf
" - advisory_string += "Your sector's advisory level is White Dwarf. Our surveillance has ruled out any and all potential threats known in our database, eliminating most risks to our assets in the Spinward Sector. We advise a lower level of security, alongside distributing resources on potential profit." - return advisory_string - - switch(round(shown_threat)) - if(0 to 19) - var/show_core_territory = (GLOB.current_living_antags.len > 0) - if (prob(FAKE_GREENSHIFT_FORM_CHANCE)) - show_core_territory = !show_core_territory - - if (show_core_territory) - advisory_string += "Advisory Level: Blue Star
" - advisory_string += "Your sector's advisory level is Blue Star. At this threat advisory, the risk of attacks on Nanotrasen assets within the sector is minor but cannot be ruled out entirely. Remain vigilant." - else - advisory_string += "Advisory Level: Green Star
" - advisory_string += "Your sector's advisory level is Green Star. Surveillance information shows no credible threats to Nanotrasen assets within the Spinward Sector at this time. As always, the Department of Intelligence advises maintaining vigilance against potential threats, regardless of a lack of known threats." - if(20 to 39) + switch(round(threat_level)) + if(0 to 65) advisory_string += "Advisory Level: Yellow Star
" advisory_string += "Your sector's advisory level is Yellow Star. Surveillance shows a credible risk of enemy attack against our assets in the Spinward Sector. We advise a heightened level of security alongside maintaining vigilance against potential threats." - if(40 to 65) - advisory_string += "Advisory Level: Orange Star
" - advisory_string += "Your sector's advisory level is Orange Star. Upon reviewing your sector's intelligence, the Department has determined that the risk of enemy activity is moderate to severe. At this advisory, we recommend maintaining a higher degree of security and reviewing red alert protocols with command and the crew." if(66 to 79) advisory_string += "Advisory Level: Red Star
" advisory_string += "Your sector's advisory level is Red Star. The Department of Intelligence has decrypted Cybersun communications suggesting a high likelihood of attacks on Nanotrasen assets within the Spinward Sector. Stations in the region are advised to remain highly vigilant for signs of enemy activity and to be on high alert." @@ -518,11 +479,6 @@ SUBSYSTEM_DEF(dynamic) ) return TRUE -/datum/controller/subsystem/dynamic/proc/setup_shown_threat() - if (prob(FAKE_REPORT_CHANCE)) - shown_threat = rand(1, 100) - else - shown_threat = clamp(threat_level + rand(REPORT_NEG_DIVERGENCE, REPORT_POS_DIVERGENCE), 0, 100) /datum/controller/subsystem/dynamic/proc/set_cooldowns() var/latejoin_injection_cooldown_middle = 0.5*(latejoin_delay_max + latejoin_delay_min) @@ -544,7 +500,6 @@ SUBSYSTEM_DEF(dynamic) configure_station_trait_costs() setup_parameters() setup_hijacking() - setup_shown_threat() setup_rulesets() //We do this here instead of with the midround rulesets and such because these rules can hang refs @@ -1093,9 +1048,3 @@ SUBSYSTEM_DEF(dynamic) #undef MAXIMUM_DYN_DISTANCE - -#undef FAKE_REPORT_CHANCE -#undef FAKE_GREENSHIFT_FORM_CHANCE -#undef PULSAR_REPORT_CHANCE -#undef REPORT_NEG_DIVERGENCE -#undef REPORT_POS_DIVERGENCE diff --git a/code/controllers/subsystem/dynamic/dynamic_logging.dm b/code/controllers/subsystem/dynamic/dynamic_logging.dm index 16bd56a730316..3e4987ecf7340 100644 --- a/code/controllers/subsystem/dynamic/dynamic_logging.dm +++ b/code/controllers/subsystem/dynamic/dynamic_logging.dm @@ -74,7 +74,6 @@ serialized["threat_level"] = threat_level serialized["round_start_budget"] = initial_round_start_budget serialized["mid_round_budget"] = threat_level - initial_round_start_budget - serialized["shown_threat"] = shown_threat var/list/serialized_snapshots = list() for (var/datum/dynamic_snapshot/snapshot as anything in snapshots) diff --git a/code/controllers/subsystem/stock_market.dm b/code/controllers/subsystem/stock_market.dm index 7d0e0ea9262ee..576f02ad8e9a6 100644 --- a/code/controllers/subsystem/stock_market.dm +++ b/code/controllers/subsystem/stock_market.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(stock_market) name = "Stock Market" - wait = 60 SECONDS + wait = 180 SECONDS // BANDASTATION EDIT - Original: 60 SECONDS init_order = INIT_ORDER_DEFAULT runlevels = RUNLEVEL_GAME @@ -48,10 +48,10 @@ SUBSYSTEM_DEF(stock_market) var/new_price = materials_prices[mat.type] + delta //get the limits - var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.5) + var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.8) // BANDASTATION EDIT - Original: * 0.5) if(!isnull(mat.minimum_value_override)) price_minimum = round(mat.minimum_value_override * SHEET_MATERIAL_AMOUNT) - var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 3) + var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 2) // BANDASTATION EDIT - Original: * 3) //clamp it down new_price = round(clamp(new_price, price_minimum, price_maximum)) @@ -81,10 +81,10 @@ SUBSYSTEM_DEF(stock_market) var/trend_life = materials_trend_life[mat] var/price_units = materials_prices[mat] - var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.5) + var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.8) // BANDASTATION EDIT - Original: * 0.5) if(!isnull(mat.minimum_value_override)) price_minimum = round(mat.minimum_value_override * SHEET_MATERIAL_AMOUNT) - var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 3) + var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 2) // BANDASTATION EDIT - Original: * 3) var/price_baseline = mat.value_per_unit * SHEET_MATERIAL_AMOUNT var/quantity_baseline = mat.tradable_base_quantity diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index cef20687a84d5..bed12417218d4 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -15,12 +15,17 @@ var/poll_role = "split personality" /datum/brain_trauma/severe/split_personality/on_gain() - var/mob/living/M = owner - if(M.stat == DEAD || !M.client) //No use assigning people to a corpse or braindead + var/mob/living/brain_owner = owner + if(brain_owner.stat == DEAD || !GET_CLIENT(brain_owner)) //No use assigning people to a corpse or braindead qdel(src) return ..() make_backseats() + +#ifdef UNIT_TESTS + return // There's no ghosts in the unit test +#endif + get_ghost() /datum/brain_trauma/severe/split_personality/proc/make_backseats() diff --git a/code/datums/elements/deliver_first.dm b/code/datums/elements/deliver_first.dm index b49c4dc28f4bf..8ae25c5ed0a43 100644 --- a/code/datums/elements/deliver_first.dm +++ b/code/datums/elements/deliver_first.dm @@ -90,7 +90,6 @@ if(area_check(target)) //noice, delivered! var/datum/bank_account/cargo_account = SSeconomy.get_dep_account(ACCOUNT_CAR) - cargo_account.adjust_money(DEPARTMENTAL_ORDER_REWARD_COEFFICIENT * (log(10, payment) ** DEPARTMENTAL_ORDER_REWARD_EXPONENT)) remove_lock(target) diff --git a/code/datums/id_trim/_id_trim.dm b/code/datums/id_trim/_id_trim.dm index 32bafcb41d3f7..b9356e9c35dc9 100644 --- a/code/datums/id_trim/_id_trim.dm +++ b/code/datums/id_trim/_id_trim.dm @@ -28,6 +28,10 @@ var/big_pointer = FALSE ///If set, IDs with this trim will give wearers arrows of different colors when pointing var/pointer_color + /// What honorifics, if any, will we set our wearer's name to when worn? + var/list/honorifics + /// What positions can our honorific take? To prevent names like "Peter Dr." + var/honorific_positions = NONE /datum/id_trim/proc/find_job() return null diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm index 498a4de254e3b..7432540f07f35 100644 --- a/code/datums/id_trim/centcom.dm +++ b/code/datums/id_trim/centcom.dm @@ -23,6 +23,8 @@ department_color = COLOR_CENTCOM_BLUE subdepartment_color = COLOR_SERVICE_LIME big_pointer = FALSE + honorifics = list("Custodian") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /// Trim for Centcom Thunderdome Overseers. /datum/id_trim/centcom/thunderdome_overseer @@ -39,11 +41,15 @@ access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) assignment = "CentCom Intern" big_pointer = FALSE + honorifics = list("Intern") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /// Trim for Centcom Head Interns. Different assignment, common station access added on. /datum/id_trim/centcom/intern/head assignment = "CentCom Head Intern" big_pointer = TRUE + honorifics = list("Head Intern") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/centcom/intern/head/New() . = ..() @@ -66,6 +72,8 @@ /datum/id_trim/centcom/medical_officer access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL) assignment = JOB_CENTCOM_MEDICAL_DOCTOR + honorifics = list("Doctor", "Dr.") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /// Trim for Centcom Research Officers. /datum/id_trim/centcom/research_officer @@ -94,6 +102,8 @@ /// Trim for Centcom Commanders. All Centcom and Station Access. /datum/id_trim/centcom/commander assignment = JOB_CENTCOM_COMMANDER + honorifics = list("Commander", "CMDR.") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/centcom/commander/New() . = ..() @@ -105,6 +115,9 @@ assignment = JOB_ERT_DEATHSQUAD trim_state = "trim_deathcommando" sechud_icon_state = SECHUD_DEATH_COMMANDO + honorifics = list("Commando") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE + /datum/id_trim/centcom/deathsquad/New() . = ..() @@ -114,6 +127,8 @@ /// Trim for generic ERT interns. No universal ID card changing access. /datum/id_trim/centcom/ert assignment = "Emergency Response Team Intern" + honorifics = list("Intern") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/centcom/ert/New() . = ..() @@ -138,6 +153,8 @@ subdepartment_color = COLOR_SECURITY_RED sechud_icon_state = SECHUD_SECURITY_RESPONSE_OFFICER big_pointer = FALSE + honorifics = list("Officer") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/centcom/ert/security/New() . = ..() @@ -164,6 +181,9 @@ subdepartment_color = COLOR_MEDICAL_BLUE sechud_icon_state = SECHUD_MEDICAL_RESPONSE_OFFICER big_pointer = FALSE + honorifics = list("Doctor", "Dr.") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE + /datum/id_trim/centcom/ert/medical/New() . = ..() @@ -177,6 +197,9 @@ subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_RELIGIOUS_RESPONSE_OFFICER big_pointer = FALSE + honorifics = list("Chaplain") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE + /datum/id_trim/centcom/ert/chaplain/New() . = ..() @@ -190,6 +213,9 @@ subdepartment_color = COLOR_SERVICE_LIME sechud_icon_state = SECHUD_JANITORIAL_RESPONSE_OFFICER big_pointer = FALSE + honorifics = list("Custodian") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE + /datum/id_trim/centcom/ert/janitor/New() . = ..() @@ -212,7 +238,11 @@ /datum/id_trim/centcom/ert/militia assignment = "Frontier Militia" big_pointer = FALSE + honorifics = list("Minuteman") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/centcom/ert/militia/general assignment = "Frontier Militia General" big_pointer = TRUE + honorifics = list("Minuteman General", "General") + honorific_positions = HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 34432a638db01..4b8b630617571 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -134,6 +134,8 @@ ACCESS_CE, ) job = /datum/job/atmospheric_technician + honorifics = list("Technician") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/bartender assignment = JOB_BARTENDER @@ -181,6 +183,8 @@ ACCESS_HOP, ) job = /datum/job/pun_pun + honorifics = list(", Almighty Scourge") + honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/bitrunner assignment = JOB_BITRUNNER @@ -250,6 +254,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/bridge_assistant + honorifics = list("Underling", "Assistant", "Mate") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/captain assignment = JOB_CAPTAIN @@ -266,6 +272,8 @@ job = /datum/job/captain big_pointer = TRUE pointer_color = COLOR_COMMAND_BLUE + honorifics = list("Captain", "Cpt.") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /// Captain gets all station accesses hardcoded in because it's the Captain. /datum/id_trim/job/captain/New() @@ -300,6 +308,9 @@ ACCESS_QM, ) job = /datum/job/cargo_technician + honorifics = list("Courier") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE + /datum/id_trim/job/chaplain assignment = JOB_CHAPLAIN @@ -322,6 +333,8 @@ ACCESS_HOP, ) job = /datum/job/chaplain + honorifics = list("Chaplain", "Reverend") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/chemist assignment = JOB_CHEMIST @@ -390,6 +403,8 @@ job = /datum/job/chief_engineer big_pointer = TRUE pointer_color = COLOR_ENGINEERING_ORANGE + honorifics = list("Chief") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/job/chief_medical_officer assignment = JOB_CHIEF_MEDICAL_OFFICER @@ -431,6 +446,8 @@ job = /datum/job/chief_medical_officer big_pointer = TRUE pointer_color = COLOR_MEDICAL_BLUE + honorifics = list(", PhD.", ", MD.") + honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/clown assignment = JOB_CLOWN @@ -473,10 +490,14 @@ ACCESS_HOP, ) job = /datum/job/cook + honorifics = list("Cook") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/cook/chef assignment = JOB_CHEF sechud_icon_state = SECHUD_CHEF + honorifics = list("Chef") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/coroner assignment = JOB_CORONER @@ -553,6 +574,8 @@ ACCESS_HOS, ) job = /datum/job/detective + honorifics = list("Detective", "Investigator") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/detective/refresh_trim_access() . = ..() @@ -697,6 +720,8 @@ job = /datum/job/head_of_security big_pointer = TRUE pointer_color = COLOR_SECURITY_RED + honorifics = list("Chief Officer", "Chief", "Officer") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/head_of_security/refresh_trim_access() . = ..() @@ -727,6 +752,8 @@ ACCESS_CHANGE_IDS, ) job = /datum/job/janitor + honorifics = list("Custodian") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/lawyer assignment = JOB_LAWYER @@ -748,6 +775,8 @@ ACCESS_HOP, ) job = /datum/job/lawyer + honorifics = list(", Esq.") + honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/medical_doctor assignment = JOB_MEDICAL_DOCTOR @@ -773,6 +802,8 @@ ACCESS_CMO, ) job = /datum/job/doctor + honorifics = list("Doctor", "Dr.") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/mime assignment = JOB_MIME @@ -824,6 +855,8 @@ ACCESS_CMO, ) job = /datum/job/paramedic + honorifics = list("EMT") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/prisoner assignment = JOB_PRISONER @@ -839,6 +872,8 @@ ) job = /datum/job/prisoner threat_modifier = 1 // I'm watching you + honorifics = list("Convict") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/prisoner/one trim_state = "trim_prisoner_1" @@ -891,6 +926,8 @@ ACCESS_HOP, ) job = /datum/job/psychologist + honorifics = list(", PhD.") + honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/quartermaster assignment = JOB_QUARTERMASTER @@ -931,6 +968,8 @@ job = /datum/job/quartermaster big_pointer = TRUE pointer_color = COLOR_CARGO_BROWN + honorifics = list("Manager") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/research_director assignment = JOB_RESEARCH_DIRECTOR @@ -981,6 +1020,8 @@ job = /datum/job/research_director big_pointer = TRUE pointer_color = COLOR_SCIENCE_PINK + honorifics = list("Director", "Dir.") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/roboticist assignment = JOB_ROBOTICIST @@ -1038,6 +1079,8 @@ ACCESS_RD, ) job = /datum/job/scientist + honorifics = list("Researcher") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /// Sec officers have departmental variants. They each have their own trims with bonus departmental accesses. /datum/id_trim/job/security_officer @@ -1066,6 +1109,8 @@ ACCESS_HOS, ) job = /datum/job/security_officer + honorifics = list("Officer") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /// List of bonus departmental accesses that departmental sec officers get by default. var/department_access = list() /// List of bonus departmental accesses that departmental security officers can in relation to how many overall security officers there are if the scaling system is set up. These can otherwise be granted via config settings. @@ -1144,6 +1189,7 @@ ACCESS_SURGERY, ACCESS_VIROLOGY, ) + honorifics = list("Orderly", "Officer") /datum/id_trim/job/security_officer/science assignment = JOB_SECURITY_OFFICER_SCIENCE @@ -1226,6 +1272,8 @@ ACCESS_CE, ) job = /datum/job/station_engineer + honorifics = list("Engineer") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/veteran_advisor assignment = JOB_VETERAN_ADVISOR @@ -1247,6 +1295,8 @@ template_access = list() job = /datum/job/veteran_advisor big_pointer = TRUE + honorifics = list("General", "Gen.") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/veteran_advisor/refresh_trim_access() . = ..() @@ -1258,7 +1308,6 @@ if(CONFIG_GET(flag/security_has_maint_access)) access |= list(ACCESS_MAINT_TUNNELS) - /datum/id_trim/job/warden assignment = JOB_WARDEN trim_state = "trim_warden" @@ -1286,6 +1335,8 @@ ACCESS_HOS, ) job = /datum/job/warden + honorifics = list("Officer", "Watchman", "Lieutenant", "Lt.") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /datum/id_trim/job/warden/refresh_trim_access() . = ..() diff --git a/code/datums/id_trim/outfits.dm b/code/datums/id_trim/outfits.dm index a2944a469f43e..c46938be6e094 100644 --- a/code/datums/id_trim/outfits.dm +++ b/code/datums/id_trim/outfits.dm @@ -71,6 +71,8 @@ department_color = COLOR_BLACK subdepartment_color = COLOR_GREEN threat_modifier = -1 // Cops recognise cops + honorifics = list("CISO") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_NONE /datum/id_trim/cyber_police/New() . = ..() diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm index 41c76aaf3784c..28a0429d9352f 100644 --- a/code/datums/id_trim/syndicate.dm +++ b/code/datums/id_trim/syndicate.dm @@ -17,6 +17,10 @@ big_pointer = FALSE /// Interdyne medical Staff +/datum/id_trim/syndicom/Interdyne + honorifics = list(", PhD.") + honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE + /datum/id_trim/syndicom/Interdyne/pharmacist assignment = "Interdyne Pharmacist" trim_state = "trim_medicaldoctor" @@ -46,6 +50,9 @@ access = list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) big_pointer = FALSE pointer_color = null + honorifics = list("Auditor") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE + /datum/id_trim/syndicom/irs/auditor assignment = "Internal Revenue Service Head Auditor" diff --git a/code/datums/memory/general_memories.dm b/code/datums/memory/general_memories.dm index eca745d3283a6..8fa8420527d23 100644 --- a/code/datums/memory/general_memories.dm +++ b/code/datums/memory/general_memories.dm @@ -95,7 +95,7 @@ /datum/memory/high_five/get_starts() return list( - "[protagonist_name] and [deuteragonist_name] having a a legendary [high_five_type]", + "[protagonist_name] and [deuteragonist_name] having a legendary [high_five_type]", "[protagonist_name] giving [deuteragonist_name] a [high_five_type]", "[protagonist_name] and [deuteragonist_name] giving each other a [high_five_type]", ) diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index ef241d61127ba..6ab7539cecd9a 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -64,7 +64,7 @@ /datum/map_template/ruin/icemoon/Lodge name = "Ice-Ruin Hunters Lodge" id = "lodge" - description = "An old hunting hunting lodge. I wonder if anyone is still home?" + description = "An old hunting lodge. I wonder if anyone is still home?" suffix = "icemoon_surface_lodge.dmm" /datum/map_template/ruin/icemoon/frozen_phonebooth diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 006a2a527dfb3..7627d16b66f45 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -461,26 +461,32 @@ /datum/status_effect/neck_slice/get_examine_text() return span_warning("[owner.p_Their()] neck is cut and is bleeding profusely!") +/// Applies a curse with various possible effects /mob/living/proc/apply_necropolis_curse(set_curse) - var/datum/status_effect/necropolis_curse/C = has_status_effect(/datum/status_effect/necropolis_curse) + var/datum/status_effect/necropolis_curse/curse = has_status_effect(/datum/status_effect/necropolis_curse) if(!set_curse) - set_curse = pick(CURSE_BLINDING, CURSE_SPAWNING, CURSE_WASTING, CURSE_GRASPING) - if(QDELETED(C)) + set_curse = pick(CURSE_BLINDING, CURSE_WASTING, CURSE_GRASPING) + if(QDELETED(curse)) apply_status_effect(/datum/status_effect/necropolis_curse, set_curse) else - C.apply_curse(set_curse) - C.duration += 3000 //time added by additional curses - return C + curse.apply_curse(set_curse) + curse.duration += 5 MINUTES //time added by additional curses + return curse +/// A curse that does up to three nasty things to you /datum/status_effect/necropolis_curse id = "necrocurse" duration = 10 MINUTES //you're cursed for 10 minutes have fun tick_interval = 5 SECONDS alert_type = null + /// Which nasty things are we doing? [CURSE_BLINDING / CURSE_WASTING / CURSE_GRASPING]] var/curse_flags = NONE - var/effect_last_activation = 0 - var/effect_cooldown = 100 - var/obj/effect/temp_visual/curse/wasting_effect = new + /// When should we next throw hands? + var/effect_next_activation = 0 + /// How long between throwing hands? + var/effect_cooldown = 10 SECONDS + /// Visuals for the wasting effect + var/obj/effect/temp_visual/curse/wasting_effect /datum/status_effect/necropolis_curse/on_creation(mob/living/new_owner, set_curse) . = ..() @@ -500,6 +506,8 @@ curse_flags |= set_curse if(curse_flags & CURSE_BLINDING) owner.overlay_fullscreen("curse", /atom/movable/screen/fullscreen/curse, 1) + if(curse_flags & CURSE_WASTING && !wasting_effect) + wasting_effect = new /datum/status_effect/necropolis_curse/proc/remove_curse(remove_curse) if(remove_curse & CURSE_BLINDING) @@ -509,6 +517,7 @@ /datum/status_effect/necropolis_curse/tick(seconds_between_ticks) if(owner.stat == DEAD) return + if(curse_flags & CURSE_WASTING) wasting_effect.forceMove(owner.loc) wasting_effect.setDir(owner.dir) @@ -517,31 +526,12 @@ animate(wasting_effect, alpha = 0, time = 32) playsound(owner, 'sound/effects/curse/curse5.ogg', 20, TRUE, -1) owner.adjustFireLoss(0.75) - if(effect_last_activation <= world.time) - effect_last_activation = world.time + effect_cooldown - if(curse_flags & CURSE_SPAWNING) - var/turf/spawn_turf - var/sanity = 10 - while(!spawn_turf && sanity) - spawn_turf = locate(owner.x + pick(rand(10, 15), rand(-10, -15)), owner.y + pick(rand(10, 15), rand(-10, -15)), owner.z) - sanity-- - if(spawn_turf) - var/mob/living/simple_animal/hostile/asteroid/curseblob/C = new (spawn_turf) - C.set_target = owner - C.GiveTarget() - if(curse_flags & CURSE_GRASPING) - var/grab_dir = turn(owner.dir, pick(-90, 90, 180, 180)) //grab them from a random direction other than the one faced, favoring grabbing from behind - var/turf/spawn_turf = get_ranged_target_turf(owner, grab_dir, 5) - if(spawn_turf) - grasp(spawn_turf) - -/datum/status_effect/necropolis_curse/proc/grasp(turf/spawn_turf) - set waitfor = FALSE - new/obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, owner.dir) - playsound(spawn_turf, 'sound/effects/curse/curse2.ogg', 80, TRUE, -1) - var/obj/projectile/curse_hand/C = new (spawn_turf) - C.aim_projectile(owner, spawn_turf) - C.fire() + + if(curse_flags & CURSE_GRASPING) + if(effect_next_activation > world.time) + return + effect_next_activation = world.time + effect_cooldown + fire_curse_hand(owner, range = 5, projectile_type = /obj/projectile/curse_hand) // This one stuns people /obj/effect/temp_visual/curse icon_state = "curse" diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index b8bfcf80382de..fe54a84c0769e 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -856,15 +856,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return COMPONENT_CANCEL_ATTACK_CHAIN if(ishuman(user)) var/mob/living/carbon/human/hum = user - if(hum.l_store == parent && !hum.get_active_held_item()) - INVOKE_ASYNC(hum, TYPE_PROC_REF(/mob, put_in_hands), parent) - hum.l_store = null + if(hum.l_store == parent || hum.r_store == parent) return - if(hum.r_store == parent && !hum.get_active_held_item()) - INVOKE_ASYNC(hum, TYPE_PROC_REF(/mob, put_in_hands), parent) - hum.r_store = null - return - if(parent.loc == user) INVOKE_ASYNC(src, PROC_REF(open_storage), user) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index 21d4f460617b6..3bbd5768e21e3 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -52,12 +52,12 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) listeners += candidate //Let's ensure the listener's name is not matched within another word or command (and viceversa). e.g. "Saul" in "somersault" - var/their_first_name = candidate.first_name() + var/their_first_name = first_name(candidate.name) if(!GLOB.all_voice_of_god_triggers.Find(their_first_name) && findtext(message, regex("(\\L|^)[their_first_name](\\L|$)", "i"))) specific_listeners += candidate //focus on those with the specified name to_remove_string += "[to_remove_string ? "|" : null][their_first_name]" continue - var/their_last_name = candidate.last_name() + var/their_last_name = last_name(candidate.name) if(their_last_name != their_first_name && !GLOB.all_voice_of_god_triggers.Find(their_last_name) && findtext(message, regex("(\\L|^)[their_last_name](\\L|$)", "i"))) specific_listeners += candidate // Ditto to_remove_string += "[to_remove_string ? "|" : null][their_last_name]" diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm index 46cf851b1ebd1..f2ecc7ac73e3e 100644 --- a/code/game/area/areas/ruins/_ruins.dm +++ b/code/game/area/areas/ruins/_ruins.dm @@ -5,7 +5,7 @@ icon = 'icons/area/areas_ruins.dmi' icon_state = "ruins" default_gravity = STANDARD_GRAVITY - area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA + area_flags = HIDDEN_AREA | UNIQUE_AREA ambience_index = AMBIENCE_RUINS flags_1 = CAN_BE_DIRTY_1 sound_environment = SOUND_ENVIRONMENT_STONEROOM diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index eb74dc5df1e65..7f88dc68758ce 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -561,7 +561,7 @@ exists_on_map = TRUE difficulty = 4 steal_hint = "The station's data Blackbox, found solely within Telecommunications." - destruction_method = "Too strong to be be destroyed via normal means - needs to be dusted via the supermatter, or burnt in the chapel's crematorium." + destruction_method = "Too strong to be destroyed via normal means - needs to be dusted via the supermatter, or burnt in the chapel's crematorium." /obj/item/blackbox/add_stealing_item_objective() return add_item_to_steal(src, /obj/item/blackbox) diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index a6685e4782ccd..c8236b5e8839f 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -85,7 +85,7 @@ /obj/machinery/computer/arcade/orion_trail/proc/newgame() // Set names of settlers in crew var/mob/living/player = usr - var/player_crew_name = player.first_name() + var/player_crew_name = first_name(player.name) settlers = list() for(var/i in 1 to ORION_STARTING_CREW_COUNT - 1) //one reserved to be YOU add_crewmember(update = FALSE) diff --git a/code/game/machinery/computer/arcade/orion_event.dm b/code/game/machinery/computer/arcade/orion_event.dm index d39766200dc52..7c834800f1dd2 100644 --- a/code/game/machinery/computer/arcade/orion_event.dm +++ b/code/game/machinery/computer/arcade/orion_event.dm @@ -219,7 +219,7 @@ var/lostfuel = rand(4,7) var/deadname = game.remove_crewmember() game.fuel -= lostfuel - text = "[deadname] was lost deep in the wreckage, and your own vessel lost [lostfuel] Fuel maneuvering to the the abandoned ship." + text = "[deadname] was lost deep in the wreckage, and your own vessel lost [lostfuel] Fuel maneuvering to the abandoned ship." event_responses += BUTTON_WHERE_DID_YOU_GO if(36 to 65) var/oldfood = rand(5,11) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b389438f0f9be..b70d105953e95 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -239,6 +239,8 @@ var/current_skin /// List of options to reskin. var/list/unique_reskin + /// If reskins change base icon state as well + var/unique_reskin_changes_base_icon_state = FALSE /// If reskins change inhands as well var/unique_reskin_changes_inhand = FALSE /// Do we apply a click cooldown when resisting this object if it is restraining them? @@ -1400,7 +1402,7 @@ return discover_after if(w_class > WEIGHT_CLASS_TINY) //small items like soap or toys that don't have mat datums - to_chat(victim, span_warning("[source_item? "Something strange was in the \the [source_item]..." : "I just bit something strange..."] ")) + to_chat(victim, span_warning("[source_item? "Something strange was in \the [source_item]..." : "I just bit something strange..."] ")) return discover_after // victim's chest (for cavity implanting the item) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index afc121ab770c5..181bc6eef64c3 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -32,6 +32,8 @@ /// Cached icon that has been built for this card. Intended to be displayed in chat. Cardboards IDs and actual IDs use it. var/icon/cached_flat_icon + ///What is our honorific name/title combo to be displayed? + var/honorific_title /obj/item/card/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] begins to swipe [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -111,6 +113,11 @@ var/big_pointer = FALSE ///If set, the arrow will have a different color. var/pointer_color + /// Will this ID card use the first or last name as the name displayed with the honorific? + var/honorific_position = HONORIFIC_POSITION_NONE + /// What is our selected honorific? + var/chosen_honorific + /datum/armor/card_id fire = 100 @@ -142,6 +149,7 @@ register_context() RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet)) + RegisterSignal(src, COMSIG_ID_GET_HONORIFIC, PROC_REF(return_message_name_part)) if(prob(1)) ADD_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD, ROUNDSTART_TRAIT) @@ -157,6 +165,20 @@ if(slot == ITEM_SLOT_ID) RegisterSignal(user, COMSIG_MOVABLE_POINTED, PROC_REF(on_pointed)) +/obj/item/card/id/proc/return_message_name_part(datum/source, list/stored_name, mob/living/carbon/carbon_human) + SIGNAL_HANDLER + var/voice_name = carbon_human.GetVoice() + var/end_string = "" + var/return_string = "" + if(carbon_human.name != voice_name) + end_string += " (as [registered_name])" + if(trim && honorific_position != HONORIFIC_POSITION_NONE && (carbon_human.name == voice_name)) //The voice and name are the same, so we display the title. + return_string += honorific_title + else + return_string += voice_name //Name on the ID ain't the same as the speaker, so we display their real name with no title. + return_string += end_string + stored_name[NAME_PART_INDEX] = return_string + /obj/item/card/id/proc/on_pointed(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point) SIGNAL_HANDLER if((!big_pointer && !pointer_color) || HAS_TRAIT(user, TRAIT_UNKNOWN)) @@ -478,6 +500,8 @@ context[SCREENTIP_CONTEXT_ALT_RMB] = "Assign account" else if(registered_account.account_balance > 0) context[SCREENTIP_CONTEXT_ALT_LMB] = "Withdraw credits" + if(trim && length(trim.honorifics)) + context[SCREENTIP_CONTEXT_CTRL_LMB] = "Toggle honorific" return CONTEXTUAL_SCREENTIP_SET /obj/item/card/id/proc/try_project_paystand(mob/user, turf/target) @@ -786,7 +810,7 @@ for(var/mob/living/carbon/human/viewing_mob in viewers(user, 2)) if(viewing_mob.stat || viewing_mob == user) continue - viewing_mob.say("Is something wrong? [user.first_name()]... you're sweating.", forced = "psycho") + viewing_mob.say("Is something wrong? [first_name(user.name)]... you're sweating.", forced = "psycho") break /obj/item/card/id/examine_more(mob/user) @@ -845,7 +869,15 @@ /// Updates the name based on the card's vars and state. /obj/item/card/id/proc/update_label() - var/name_string = registered_name ? "[registered_name]'s ID Card" : initial(name) + var/name_string + if(registered_name) + if(trim && (honorific_position & ~HONORIFIC_POSITION_NONE)) + name_string = "[update_honorific()]'s ID Card" + else + name_string = "[registered_name]'s ID Card" + else + name_string = initial(name) + var/assignment_string if(is_intern) @@ -858,6 +890,24 @@ name = "[name_string] ([assignment_string])" +/// Re-generates the honorific title. Returns the compiled honorific_title value +/obj/item/card/id/proc/update_honorific() + var/is_mononym = is_mononym(registered_name) + switch(honorific_position) + if(HONORIFIC_POSITION_FIRST) + honorific_title = "[chosen_honorific] [first_name(registered_name)]" + if(HONORIFIC_POSITION_LAST) + honorific_title = "[chosen_honorific] [last_name(registered_name)]" + if(HONORIFIC_POSITION_FIRST_FULL) + honorific_title = "[chosen_honorific] [first_name(registered_name)]" + if(!is_mononym) + honorific_title += " [last_name(registered_name)]" + if(HONORIFIC_POSITION_LAST_FULL) + if(!is_mononym) + honorific_title += "[first_name(registered_name)] " + honorific_title += "[last_name(registered_name)][chosen_honorific]" + return honorific_title + /// Returns the trim assignment name. /obj/item/card/id/proc/get_trim_assignment() return trim?.assignment || assignment @@ -871,6 +921,55 @@ return insert_money(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING return NONE +/obj/item/card/id/item_ctrl_click(mob/user) + if(!in_contents_of(user) || user.incapacitated) //Check if the ID is in the ID slot, so it can be changed from there too. + return + + if(!trim) + balloon_alert(user, "card has no trim!") + return + + if(!length(trim.honorifics)) + balloon_alert(user, "card has no honorific to use!") + return + + var/list/choices = list() + var/list/readable_names = HONORIFIC_POSITION_BITFIELDS() + for(var/i in readable_names) //Filter out the options you don't have on your ID. + if(trim.honorific_positions & readable_names[i]) //If the positions list has the same bit value as the readable list. + choices += i + + var/chosen_position = tgui_input_list(user, "What position do you want your honorific in?", "Flair!", choices) + if(user.incapacitated || !in_contents_of(user)) + return + var/honorific_position_to_use = readable_names[chosen_position] + + honorific_position = initial(honorific_position) //In case you want to force an honorific on an ID, set a default that won't always be NONE. + honorific_title = null //We reset this regardless so that we don't stack titles on accident. + + if(honorific_position_to_use & HONORIFIC_POSITION_NONE) + balloon_alert(user, "honorific disabled") + else + var/new_honorific = tgui_input_list(user, "What honorific do you want to use?", "Flair!!!", trim.honorifics) + if(!new_honorific || user.incapacitated || !in_contents_of(user)) + return + chosen_honorific = new_honorific + switch(honorific_position_to_use) + if(HONORIFIC_POSITION_FIRST) + honorific_position = HONORIFIC_POSITION_FIRST + balloon_alert(user, "honorific set: display first name") + if(HONORIFIC_POSITION_LAST) + honorific_position = HONORIFIC_POSITION_LAST + balloon_alert(user, "honorific set: display last name") + if(HONORIFIC_POSITION_FIRST_FULL) + honorific_position = HONORIFIC_POSITION_FIRST_FULL + balloon_alert(user, "honorific set: start of full name") + if(HONORIFIC_POSITION_LAST_FULL) + honorific_position = HONORIFIC_POSITION_LAST_FULL + balloon_alert(user, "honorific set: end of full name") + + update_label() + /obj/item/card/id/away name = "\proper a perfectly generic identification card" desc = "A perfectly generic identification card. Looks like it could use some flavor." diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm index dcfc7930ebfe2..43afbd43bd533 100644 --- a/code/game/objects/items/chromosome.dm +++ b/code/game/objects/items/chromosome.dm @@ -76,6 +76,6 @@ /obj/item/chromosome/energy name = "energetic chromosome" - desc = "A chromosome that reduces action based mutation cooldowns by by 50%." + desc = "A chromosome that reduces action based mutation cooldowns by 50%." icon_state = "energy" energy_coeff = 0.5 diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 03df05140388a..1b5f9a9fd901f 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -29,6 +29,10 @@ var/clumsy_knockdown_time = 18 SECONDS /// How much stamina damage we deal on a successful hit against a living, non-cyborg mob. var/stamina_damage = 55 + /// How much armor does our baton ignore? This operates as armour penetration, but only applies to the stun attack. + var/stun_armour_penetration = 15 + /// What armor does our stun attack check before delivering the attack? + var/armour_type_against_stun = MELEE /// Chance of causing force_say() when stunning a human mob var/force_say_chance = 33 /// Can we stun cyborgs? @@ -44,6 +48,9 @@ /// Boolean on whether people with chunky fingers can use this baton. var/chunky_finger_usable = FALSE + /// What term do we use to describe our baton being 'ready', or the phrase to use when var/active is TRUE. + var/activated_word = "ready" + /// The context to show when the baton is active and targeting a living thing var/context_living_target_active = "Stun" @@ -64,12 +71,31 @@ /obj/item/melee/baton/Initialize(mapload) . = ..() - // Adding an extra break for the sake of presentation - if(stamina_damage != 0) - offensive_notes = "It takes [span_warning("[CEILING(100 / stamina_damage, 1)] stunning hit\s")] to stun an enemy." register_item_context() +/obj/item/melee/baton/add_weapon_description() + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_baton_notes)) + +/obj/item/melee/baton/proc/add_baton_notes() + var/list/readout = list() + + if(affect_cyborg) + readout += "It can stun cyborgs for [round((stun_time_cyborg/10), 1)] seconds." + + readout += "\n[active ? "It is currently [span_warning("[activated_word]")], and capable of stunning." : "It is [span_warning("not [activated_word]")], and not capable of stunning."]" + + if(stamina_damage <= 0) // The advanced baton actually does have 0 stamina damage so...yeah. + readout += "Either is is [span_warning("completely unable to perform a stunning strike")], or it [span_warning("attacks via some unusual method")]." + return readout.Join("\n") + + readout += "It takes [span_warning("[HITS_TO_CRIT(stamina_damage)] strike\s")] to stun an enemy." + + readout += "\nThe effects of each strike can be mitigated by utilizing [span_warning("[armour_type_against_stun]")] armor." + + readout += "\nIt has a stun armor-piercing capability of [span_warning("[get_stun_penetration_value()]%")]." + return readout.Join("\n") + /** * Ok, think of baton attacks like a melee attack chain: * @@ -210,7 +236,9 @@ var/mob/living/carbon/human/human_target = target if(prob(force_say_chance)) human_target.force_say() - target.apply_damage(stamina_damage, STAMINA) + var/effective_armour_penetration = get_stun_penetration_value() + var/armour_block = target.run_armor_check(null, armour_type_against_stun, null, null, effective_armour_penetration) + target.apply_damage(stamina_damage, STAMINA, blocked = armour_block) if(!trait_check) target.Knockdown((isnull(stun_override) ? knockdown_time : stun_override)) additional_effects_non_cyborg(target, user) @@ -295,6 +323,10 @@ user.do_attack_animation(user) return +/// Handles the penetration value of our baton, called during baton_effect() +/obj/item/melee/baton/proc/get_stun_penetration_value() + return stun_armour_penetration + /obj/item/conversion_kit name = "conversion kit" desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else." @@ -321,6 +353,7 @@ bare_wound_bonus = 5 clumsy_knockdown_time = 15 SECONDS active = FALSE + activated_word = "extended" var/folded_drop_sound = 'sound/items/baton/telescopic_baton_folded_drop.ogg' var/folded_pickup_sound = 'sound/items/baton/telescopic_baton_folded_pickup.ogg' var/unfolded_drop_sound = 'sound/items/baton/telescopic_baton_unfolded_drop.ogg' @@ -392,6 +425,24 @@ playsound(src, on_sound, 50, TRUE) return COMPONENT_NO_DEFAULT_MESSAGE +/obj/item/melee/baton/telescopic/bronze + name = "bronze-capped telescopic baton" + desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked BRONZE, and thus has mediocre penetrative power." + icon_state = "telebaton_bronze" + stun_armour_penetration = 20 + +/obj/item/melee/baton/telescopic/silver + name = "silver-capped telescopic baton" + desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked SILVER, and thus has decent penetrative power." + icon_state = "telebaton_silver" + stun_armour_penetration = 40 + +/obj/item/melee/baton/telescopic/gold + name = "gold-capped telescopic baton" + desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked GOLD, and thus has exceptional penetrative power." + icon_state = "telebaton_gold" + stun_armour_penetration = 60 + /obj/item/melee/baton/telescopic/contractor_baton name = "contractor baton" desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets." @@ -408,6 +459,7 @@ cooldown = 2.5 SECONDS force_say_chance = 80 //very high force say chance because it's funny stamina_damage = 85 + stun_armour_penetration = 40 clumsy_knockdown_time = 24 SECONDS affect_cyborg = TRUE on_stun_sound = 'sound/items/weapons/contractor_baton/contractorbatonhit.ogg' @@ -432,7 +484,8 @@ desc_controls = "Left click to stun, right click to harm." icon = 'icons/obj/weapons/baton.dmi' icon_state = "stunbaton" - inhand_icon_state = "baton" + base_icon_state = "stunbaton" + inhand_icon_state = "stunbaton" worn_icon_state = "baton" icon_angle = -45 force = 10 @@ -443,12 +496,16 @@ throwforce = 7 force_say_chance = 50 stamina_damage = 60 + armour_type_against_stun = ENERGY + // This value is added to our stun armour penetration when called by get_stun_penetration_value(). For giving some batons extra OOMPH. + var/additional_stun_armour_penetration = 0 knockdown_time = 5 SECONDS clumsy_knockdown_time = 15 SECONDS cooldown = 2.5 SECONDS on_stun_sound = 'sound/items/weapons/egloves.ogg' on_stun_volume = 50 active = FALSE + activated_word = "activated" context_living_rmb_active = "Harmful Stun" light_range = 1.5 light_system = OVERLAY_LIGHT @@ -469,6 +526,10 @@ var/cell_hit_cost = STANDARD_CELL_CHARGE var/can_remove_cell = TRUE var/convertible = TRUE //if it can be converted with a conversion kit + ///Whether or not our inhand changes when active. + var/active_changes_inhand = TRUE + ///Whether or not our baton visibly changes the inhand sprite based on inserted cell + var/tip_changes_color = TRUE /datum/armor/baton_security bomb = 50 @@ -534,12 +595,19 @@ /obj/item/melee/baton/security/update_icon_state() if(active) - icon_state = "[initial(icon_state)]_active" + icon_state = "[base_icon_state]_active" + if(active_changes_inhand) + if(tip_changes_color) + inhand_icon_state = "[base_icon_state]_active_[get_baton_tip_color()]" + else + inhand_icon_state = "[base_icon_state]_active" return ..() if(!cell) - icon_state = "[initial(icon_state)]_nocell" + icon_state = "[base_icon_state]_nocell" + inhand_icon_state = "[base_icon_state]" return ..() - icon_state = "[initial(icon_state)]" + icon_state = "[base_icon_state]" + inhand_icon_state = "[base_icon_state]" return ..() /obj/item/melee/baton/security/examine(mob/user) @@ -594,9 +662,36 @@ /// Toggles the stun baton's light /obj/item/melee/baton/security/proc/toggle_light() + set_light_color(get_baton_tip_color(TRUE)) set_light_on(!light_on) return +/// Change our baton's top color based on the contained cell. +/obj/item/melee/baton/security/proc/get_baton_tip_color(set_light = FALSE) + var/tip_type_to_set + var/tip_light_to_set + + if(cell) + var/chargepower = cell.maxcharge + var/zap_value = clamp(chargepower/STANDARD_CELL_CHARGE, 0, 100) + switch(zap_value) + if(-INFINITY to 10) + tip_type_to_set = "orange" + tip_light_to_set = LIGHT_COLOR_ORANGE + if(11 to 20) + tip_type_to_set = "red" + tip_light_to_set = LIGHT_COLOR_INTENSE_RED + if(21 to 30) + tip_type_to_set = "green" + tip_light_to_set = LIGHT_COLOR_GREEN + if(31 to INFINITY) + tip_type_to_set = "blue" + tip_light_to_set = LIGHT_COLOR_BLUE + else + tip_type_to_set = "orange" + + return set_light ? tip_light_to_set : tip_type_to_set + /obj/item/melee/baton/security/proc/turn_on(mob/user) active = TRUE playsound(src, SFX_SPARKS, 75, TRUE, -1) @@ -653,6 +748,13 @@ stun_override = 0 //Avoids knocking people down prematurely. return ..() +/obj/item/melee/baton/security/get_stun_penetration_value() + if(cell) + var/chargepower = cell.maxcharge + var/zap_pen = clamp(chargepower/STANDARD_CELL_CHARGE, 0, 100) + return zap_pen + additional_stun_armour_penetration + return stun_armour_penetration + additional_stun_armour_penetration + /* * After a target is hit, we apply some status effects. * After a period of time, we then check to see what stun duration we give. @@ -719,6 +821,9 @@ /obj/item/melee/baton/security/loaded //this one starts with a cell pre-installed. preload_cell_type = /obj/item/stock_parts/power_store/cell/high +/obj/item/melee/baton/security/loaded/hos + preload_cell_type = /obj/item/stock_parts/power_store/cell/super + //Makeshift stun baton. Replacement for stun gloves. /obj/item/melee/baton/security/cattleprod name = "stunprod" @@ -726,6 +831,7 @@ desc_controls = "Left click to stun, right click to harm." icon = 'icons/obj/weapons/spear.dmi' icon_state = "stunprod" + base_icon_state = "stunprod" inhand_icon_state = "prod" worn_icon_state = null icon_angle = -45 @@ -738,6 +844,8 @@ throw_stun_chance = 10 slot_flags = ITEM_SLOT_BACK convertible = FALSE + active_changes_inhand = FALSE + tip_changes_color = FALSE var/obj/item/assembly/igniter/sparkler ///Determines whether or not we can improve the cattleprod into a new type. Prevents turning the cattleprod subtypes into different subtypes, or wasting materials on making it....another version of itself. var/can_upgrade = TRUE @@ -794,6 +902,7 @@ throw_speed = 1 icon = 'icons/obj/weapons/thrown.dmi' icon_state = "boomerang" + base_icon_state = "boomerang" inhand_icon_state = "boomerang" force = 5 throwforce = 5 @@ -801,6 +910,8 @@ cell_hit_cost = STANDARD_CELL_CHARGE * 2 throw_stun_chance = 99 //Have you prayed today? convertible = FALSE + active_changes_inhand = FALSE + tip_changes_color = FALSE custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*5, /datum/material/gold = SHEET_MATERIAL_AMOUNT) /obj/item/melee/baton/security/boomerang/Initialize(mapload) @@ -823,6 +934,7 @@ desc = "A prod with a bluespace crystal on the end. The crystal doesn't look too fun to touch." w_class = WEIGHT_CLASS_NORMAL icon_state = "teleprod" + base_icon_state = "teleprod" inhand_icon_state = "teleprod" slot_flags = null can_upgrade = FALSE @@ -844,6 +956,7 @@ desc = "A prod with a telecrystal on the end. It sparks with a desire for theft and subversion." w_class = WEIGHT_CLASS_NORMAL icon_state = "telecrystalprod" + base_icon_state = "telecrystalprod" inhand_icon_state = "telecrystalprod" slot_flags = null throw_stun_chance = 50 //I think it'd be funny diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a65f1b2ec290a..2e33a321cfdb2 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -688,7 +688,7 @@ /obj/item/borg/upgrade/transform name = "borg model picker (Standard)" - desc = "Allows you to to turn a cyborg into a standard cyborg." + desc = "Allows you to turn a cyborg into a standard cyborg." icon_state = "module_general" var/obj/item/robot_model/new_model = null @@ -699,7 +699,7 @@ /obj/item/borg/upgrade/transform/clown name = "borg model picker (Clown)" - desc = "Allows you to to turn a cyborg into a clown, honk." + desc = "Allows you to turn a cyborg into a clown, honk." icon_state = "module_honk" new_model = /obj/item/robot_model/clown diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 20ee0e69df6d7..f2c860d2d7644 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1044,7 +1044,7 @@ /obj/item/stack/tile/tram/plate name = "linear induction tram tiles" - singular_name = "linear induction tram tile tile" + singular_name = "linear induction tram tile" desc = "A tile with an aluminium plate for tram propulsion." icon_state = "darkiron_plate" inhand_icon_state = "tile-neon" diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm index b73df0a487b72..98a3165b5e2ab 100644 --- a/code/game/objects/items_reskin.dm +++ b/code/game/objects/items_reskin.dm @@ -64,8 +64,15 @@ return current_skin = pick icon_state = unique_reskin[pick] + + if (unique_reskin_changes_base_icon_state) + base_icon_state = icon_state + if (unique_reskin_changes_inhand) inhand_icon_state = icon_state + + update_appearance() + to_chat(user, "[src] is now skinned as '[pick].'") SEND_SIGNAL(src, COMSIG_OBJ_RESKIN, user, pick) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9924713d93908..8c8a39aa59f26 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -860,7 +860,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/plasma/plastitanium name = "plastitanium window" - desc = "A durable looking window made of an alloy of of plasma and titanium." + desc = "A durable looking window made of an alloy of plasma and titanium." icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' icon_state = "plastitanium_window-0" base_icon_state = "plastitanium_window" @@ -883,7 +883,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw /obj/structure/window/reinforced/plasma/plastitanium/indestructible name = "plastitanium window" - desc = "A durable looking window made of an alloy of of plasma and titanium." + desc = "A durable looking window made of an alloy of plasma and titanium." icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' icon_state = "plastitanium_window-0" base_icon_state = "plastitanium_window" diff --git a/code/game/say.dm b/code/game/say.dm index b703c1d35712c..232717750e1e7 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -149,7 +149,18 @@ GLOBAL_LIST_INIT(freqtospan, list( //Speaker name var/namepart var/list/stored_name = list(null) - SEND_SIGNAL(speaker, COMSIG_MOVABLE_MESSAGE_GET_NAME_PART, stored_name, visible_name) + + if(iscarbon(speaker)) //First, try to pull the modified title from a carbon's ID. This will override both visual and audible names. + var/mob/living/carbon/carbon_human = speaker + var/obj/item/id_slot = carbon_human.get_item_by_slot(ITEM_SLOT_ID) + if(id_slot) + var/obj/item/card/id/id_card = id_slot?.GetID() + if(id_card) + SEND_SIGNAL(id_card, COMSIG_ID_GET_HONORIFIC, stored_name, carbon_human) + + if(!stored_name[NAME_PART_INDEX]) //Otherwise, we just use whatever the name signal gives us. + SEND_SIGNAL(speaker, COMSIG_MOVABLE_MESSAGE_GET_NAME_PART, stored_name, visible_name) + namepart = "[stored_name[NAME_PART_INDEX] || speaker.GetVoice()]" // Bandastation Addition: span with color //End name span. diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e8d117fdc94ff..71374bf2464ff 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -497,7 +497,7 @@ var/new_value = input(usr, "Enter the forced threat level for dynamic mode.", "Forced threat level") as num if (new_value > 100) - return tgui_alert(usr, "The value must be be under 100.") + return tgui_alert(usr, "The value must be under 100.") GLOB.dynamic_forced_threat_level = new_value log_admin("[key_name(usr)] set 'forced_threat_level' to [GLOB.dynamic_forced_threat_level].") diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm index 4238b54f91543..618ee9e6f667e 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm @@ -109,15 +109,15 @@ bloodiest_wound.adjust_blood_flow(-0.5 * seconds_between_ticks) /// Torment the target with a frightening hand -/proc/fire_curse_hand(mob/living/carbon/victim, turf/forced_turf) +/proc/fire_curse_hand(mob/living/carbon/victim, turf/forced_turf, range = 8, projectile_type = /obj/projectile/curse_hand/hel) var/grab_dir = turn(victim.dir, pick(-90, 90, 180, 180)) // Not in front, favour behind - var/turf/spawn_turf = get_ranged_target_turf(victim, grab_dir, 8) + var/turf/spawn_turf = get_ranged_target_turf(victim, grab_dir, range) spawn_turf = forced_turf ? forced_turf : spawn_turf if (isnull(spawn_turf)) return new /obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, victim.dir) playsound(spawn_turf, 'sound/effects/curse/curse2.ogg', 80, TRUE, -1) - var/obj/projectile/curse_hand/hel/hand = new (spawn_turf) + var/obj/projectile/hand = new projectile_type(spawn_turf) hand.aim_projectile(victim, spawn_turf) if (QDELETED(hand)) // safety check if above fails - above has a stack trace if it does fail return diff --git a/code/modules/clothing/gloves/combat.dm b/code/modules/clothing/gloves/combat.dm index 55eeeba723f11..e7e12c8ee4b14 100644 --- a/code/modules/clothing/gloves/combat.dm +++ b/code/modules/clothing/gloves/combat.dm @@ -35,6 +35,6 @@ icon_state = "ftc_gloves" inhand_icon_state = "greyscale_gloves" -/obj/item/clothing/gloves/combat/floortiletile/Initialize(mapload) +/obj/item/clothing/gloves/combat/floortile/Initialize(mapload) . = ..() AddComponent(/datum/component/adjust_fishing_difficulty, -5) //tacticool diff --git a/code/modules/clothing/head/garlands.dm b/code/modules/clothing/head/garlands.dm index 4de0604044e32..374bd2fdafd4b 100644 --- a/code/modules/clothing/head/garlands.dm +++ b/code/modules/clothing/head/garlands.dm @@ -47,7 +47,7 @@ /obj/item/clothing/head/costume/garland/lily name = "lily crown" - desc = "A leafy flower crown with a cluster of large white lilies at at the front." + desc = "A leafy flower crown with a cluster of large white lilies at the front." icon_state = "lily_crown" worn_icon_state = "lily_crown" diff --git a/code/modules/clothing/neck/collar_bomb.dm b/code/modules/clothing/neck/collar_bomb.dm index 7a5314f4c18c6..372c6ab7cc58a 100644 --- a/code/modules/clothing/neck/collar_bomb.dm +++ b/code/modules/clothing/neck/collar_bomb.dm @@ -109,7 +109,7 @@ return var/mob/living/carbon/human/brian = collar.loc if(brian.get_item_by_slot(ITEM_SLOT_NECK) == collar) - brian.investigate_log("has has their [collar] triggered by [user] via yellow button.", INVESTIGATE_DEATHS) + brian.investigate_log("has had their [collar] triggered by [user] via yellow button.", INVESTIGATE_DEATHS) /obj/item/collar_bomb_button/Destroy() diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 9c9d81d01d73f..1141b94e82286 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -459,7 +459,7 @@ if(6) //X is a job message = "YOU MUST HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO ESCAPE HARM" if(7) //X is two jobs - message = "YOU MUST HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO ESCAPE HARM" + message = "YOU MUST HARM [ioncrew1] AND [ioncrew2] AND NOT ALLOW EITHER, THROUGH INACTION, TO ESCAPE HARM" if(2) //Protect switch(rand(1,7)) //What is X? diff --git a/code/modules/fishing/fish_mount.dm b/code/modules/fishing/fish_mount.dm index d2334910e2a55..4649f2e9125c2 100644 --- a/code/modules/fishing/fish_mount.dm +++ b/code/modules/fishing/fish_mount.dm @@ -78,7 +78,7 @@ if(fish_path.fish_id_redirect_path) fish_path = fish_path.fish_id_redirect_path var/fluff_name = pick("John Trasen III", "a nameless intern", "Pun Pun", AQUARIUM_COMPANY, "Unknown", "Central Command") - add_fish(new fish_path(src), from_persistence = TRUE, catcher = fluff_name) + add_fish(new fish_path(loc), from_persistence = TRUE, catcher = fluff_name) mounted_fish.randomize_size_and_weight() mounted_fish.set_status(FISH_DEAD) SSpersistence.save_trophy_fish(src) @@ -108,6 +108,11 @@ return ITEM_INTERACT_SUCCESS /obj/structure/fish_mount/proc/add_fish(obj/item/fish/fish, from_persistence = FALSE, catcher) + if(QDELETED(src)) // don't ever try to add a fish to one of these that's already been deleted - and get rid of the one that was created + qdel(fish) + return + if(QDELETED(fish)) // no adding deleted fishies either + return if(mounted_fish) mounted_fish.forceMove(loc) fish.forceMove(src) diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 37aea262426bb..4961fdbc042c8 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -104,29 +104,30 @@ SIGNAL_HANDLER UnregisterSignal(rod, COMSIG_FISHING_ROD_HOOKED_ITEM) -/obj/item/fishing_line/auto_reel/proc/on_hooked_item(obj/item/fishing_rod/source, atom/target, mob/living/user) +/obj/item/fishing_line/auto_reel/proc/on_hooked_item(obj/item/fishing_rod/source, atom/movable/target, mob/living/user) SIGNAL_HANDLER - if(!ismovable(target)) + + if(!istype(target) || target.anchored || target.move_resist >= MOVE_FORCE_STRONG) return - var/atom/movable/movable_target = target var/please_be_gentle = FALSE var/atom/destination var/datum/callback/throw_callback - if(isliving(movable_target) || !isitem(movable_target)) + if(isliving(target) || !isitem(target)) destination = get_step_towards(user, target) please_be_gentle = TRUE else destination = user - throw_callback = CALLBACK(src, PROC_REF(clear_hitby_signal), movable_target) - RegisterSignal(movable_target, COMSIG_MOVABLE_PRE_IMPACT, PROC_REF(catch_it_chucklenut)) + throw_callback = CALLBACK(src, PROC_REF(clear_hitby_signal), target) + RegisterSignal(target, COMSIG_MOVABLE_PRE_IMPACT, PROC_REF(catch_it_chucklenut)) - if(!movable_target.safe_throw_at(destination, source.cast_range, 2, callback = throw_callback, gentle = please_be_gentle)) - UnregisterSignal(movable_target, COMSIG_MOVABLE_PRE_IMPACT) + if(!target.safe_throw_at(destination, source.cast_range, 2, callback = throw_callback, gentle = please_be_gentle)) + UnregisterSignal(target, COMSIG_MOVABLE_PRE_IMPACT) else playsound(src, 'sound/items/weapons/batonextend.ogg', 50, TRUE) /obj/item/fishing_line/auto_reel/proc/catch_it_chucklenut(obj/item/source, atom/hit_atom, datum/thrownthing/throwingdatum) SIGNAL_HANDLER + var/mob/living/user = throwingdatum.initial_target.resolve() if(QDELETED(user) || hit_atom != user) return NONE diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm index af975bb4ccdb4..02df0ff9e7c0c 100644 --- a/code/modules/fishing/sources/source_types.dm +++ b/code/modules/fishing/sources/source_types.dm @@ -159,7 +159,6 @@ radial_name = "Chasm" overlay_state = "portal_chasm" radial_state = "ground_hole" - fish_source_flags = FISH_SOURCE_FLAG_EXPLOSIVE_NONE /datum/fish_source/portal/ocean fish_table = list( @@ -327,6 +326,7 @@ /datum/chasm_detritus = 30, ) fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15 + fish_source_flags = FISH_SOURCE_FLAG_EXPLOSIVE_NONE /datum/fish_source/chasm/on_start_fishing(obj/item/fishing_rod/rod, mob/fisherman, atom/parent) . = ..() diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 522f6e9f695f8..130fcb57b696a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -418,6 +418,7 @@ ) result = /obj/item/food/donkpocket/deluxe category = CAT_PASTRY + crafting_flags = parent_type::crafting_flags | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/donkpocket/deluxe/nocarb time = 15 diff --git a/code/modules/hallucination/fake_chat.dm b/code/modules/hallucination/fake_chat.dm index 049a337c1101c..963e718eed865 100644 --- a/code/modules/hallucination/fake_chat.dm +++ b/code/modules/hallucination/fake_chat.dm @@ -50,7 +50,7 @@ chosen = pick(list("Help!", "[pick_list_replacements(HALLUCINATION_FILE, "people")] is [pick_list_replacements(HALLUCINATION_FILE, "accusations")]!", "[pick_list_replacements(HALLUCINATION_FILE, "threat")] in [pick_list_replacements(HALLUCINATION_FILE, "location")][prob(50)?"!":"!!"]", - "[pick("Where's [hallucinator.first_name()]?", "Set [hallucinator.first_name()] to arrest!")]", + "[pick("Where's [first_name(hallucinator.name)]?", "Set [first_name(hallucinator.name)] to arrest!")]", "[pick("C","Ai, c","Someone c","Rec")]all the shuttle!", "AI [pick("rogue", "is dead")]!!", "Borgs rogue!", @@ -58,7 +58,7 @@ else chosen = pick(list("[pick_list_replacements(HALLUCINATION_FILE, "suspicion")]", "[pick_list_replacements(HALLUCINATION_FILE, "conversation")]", - "[pick_list_replacements(HALLUCINATION_FILE, "greetings")][hallucinator.first_name()]!", + "[pick_list_replacements(HALLUCINATION_FILE, "greetings")][first_name(hallucinator.name)]!", "[pick_list_replacements(HALLUCINATION_FILE, "getout")]", "[pick_list_replacements(HALLUCINATION_FILE, "weird")]", "[pick_list_replacements(HALLUCINATION_FILE, "didyouhearthat")]", @@ -71,7 +71,7 @@ chosen = capitalize(chosen) - chosen = replacetext(chosen, "%TARGETNAME%", hallucinator.first_name()) + chosen = replacetext(chosen, "%TARGETNAME%", first_name(hallucinator.name)) // Log the message feedback_details += "Type: [is_radio ? "Radio" : "Talk"], Source: [speaker.real_name], Message: [chosen]" diff --git a/code/modules/hallucination/fake_death.dm b/code/modules/hallucination/fake_death.dm index 126e9dd3a2b48..9583418f23220 100644 --- a/code/modules/hallucination/fake_death.dm +++ b/code/modules/hallucination/fake_death.dm @@ -59,7 +59,7 @@ "FUCK", "git gud", "god damn it", - "hey [hallucinator.first_name()]", + "hey [first_name(hallucinator.name)]", "i[prob(50) ? " fucking" : ""] hate [pick(things_to_hate)]", "is the AI rogue?", "rip", diff --git a/code/modules/hallucination/nearby_fake_item.dm b/code/modules/hallucination/nearby_fake_item.dm index 10d08ee47c96f..1896d28d34042 100644 --- a/code/modules/hallucination/nearby_fake_item.dm +++ b/code/modules/hallucination/nearby_fake_item.dm @@ -89,7 +89,7 @@ /datum/hallucination/nearby_fake_item/baton left_hand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' right_hand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' - image_icon_state = "baton" + image_icon_state = "stunbaton" /datum/hallucination/nearby_fake_item/baton/generate_fake_image(mob/living/carbon/human/holder, file) hallucinator.playsound_local(get_turf(holder), SFX_SPARKS, 75, TRUE, -1) diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index 64097a26c7627..65449e434ea4f 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -15,15 +15,16 @@ if(!.) return var/obj/item/seeds/our_seed = our_plant.get_plant_seed() - shield_uses = round(our_seed.potency / 20) + shield_uses = round(our_seed.potency / 95) // BANDASTATION EDIT - Original: / 20) //deliver us from evil o melon god - our_plant.AddComponent(/datum/component/anti_magic, \ - antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY, \ - inventory_flags = ITEM_SLOT_HANDS, \ - charges = shield_uses, \ - drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \ - expiration = CALLBACK(src, PROC_REF(expire)), \ - ) + if(shield_uses >= 1) // BANDASTATION Addition - No more shield if potency less than 95 + our_plant.AddComponent(/datum/component/anti_magic, \ + antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY, \ + inventory_flags = ITEM_SLOT_HANDS, \ + charges = shield_uses, \ + drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \ + expiration = CALLBACK(src, PROC_REF(expire)), \ + ) /// When the plant our gene is hosted in is drained of an anti-magic charge. /datum/plant_gene/trait/anti_magic/proc/drain_antimagic(mob/user, obj/item/our_plant) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 818c465d8fecc..0d472c9389b5f 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -67,7 +67,7 @@ uniform = /obj/item/clothing/under/rank/captain suit = /obj/item/clothing/suit/armor/vest/capcarapace backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/gold = 1, /obj/item/station_charter = 1, ) belt = /obj/item/modular_computer/pda/heads/captain diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index f85c2c54973b9..3a9a9fbc397b6 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -67,7 +67,7 @@ id_trim = /datum/id_trim/job/chief_engineer uniform = /obj/item/clothing/under/rank/engineering/chief_engineer backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/silver = 1, /obj/item/construction/rcd/ce = 1, ) belt = /obj/item/storage/belt/utility/chief/full diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index c9f126bb750bc..13a9eb97515f1 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -62,7 +62,7 @@ suit = /obj/item/clothing/suit/toggle/labcoat/cmo suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/silver = 1, ) belt = /obj/item/modular_computer/pda/heads/cmo ears = /obj/item/radio/headset/heads/cmo diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 1b8480f0d0b57..ed35cbf365f56 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -59,7 +59,7 @@ id_trim = /datum/id_trim/job/head_of_personnel uniform = /obj/item/clothing/under/rank/civilian/head_of_personnel backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/silver = 1, ) belt = /obj/item/modular_computer/pda/heads/hop ears = /obj/item/radio/headset/heads/hop diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index b9560708114be..431e0aaaf6b44 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -57,6 +57,7 @@ suit_store = /obj/item/gun/energy/e_gun backpack_contents = list( /obj/item/evidencebag = 1, + /obj/item/melee/baton/security/loaded/hos = 1, ) belt = /obj/item/modular_computer/pda/heads/hos ears = /obj/item/radio/headset/heads/hos/alt diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 32053daa5d8c8..251032662bf53 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -42,7 +42,7 @@ name = "Quartermaster" jobtype = /datum/job/quartermaster backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/bronze = 1, ) id_trim = /datum/id_trim/job/quartermaster id = /obj/item/card/id/advanced/silver diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 420138a6b9fba..cfd5044c267b0 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -62,7 +62,7 @@ uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck suit = /obj/item/clothing/suit/toggle/labcoat/research_director backpack_contents = list( - /obj/item/melee/baton/telescopic = 1, + /obj/item/melee/baton/telescopic/silver = 1, ) belt = /obj/item/modular_computer/pda/heads/rd head = /obj/item/clothing/head/beret/science/rd diff --git a/code/modules/library/skill_learning/job_skillchips/clown.dm b/code/modules/library/skill_learning/job_skillchips/clown.dm index 3cd88ff70963d..f8836b41dcad3 100644 --- a/code/modules/library/skill_learning/job_skillchips/clown.dm +++ b/code/modules/library/skill_learning/job_skillchips/clown.dm @@ -3,7 +3,7 @@ desc = "This biochip contain several terabytes of uncannily religious, Honkmother praising guides on how to reshape balloons into silly animals." auto_traits = list(TRAIT_BALLOON_SUTRA) skill_name = "Balloon Sutra" - skill_description = "Learn the the ancient Honkmotherian arts of balloon-sutra." + skill_description = "Learn the ancient Honkmotherian arts of balloon-sutra." skill_icon = "face-grin-tears" activate_message = span_notice("Blessed wisdom of Honkmother enwraps you, and with it, governship upon form of balloonkind.") deactivate_message = span_notice("'Remember, then, that true clownery requires freedom and willingness to bend, like ones of a floating balloon.'... Whatever that meant?") diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index c122b8abc1cd7..da7d288d161fe 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -102,7 +102,7 @@ /obj/effect/baseturf_helper/reinforced_plating/ceiling/replace_baseturf(turf/thing) var/turf/ceiling = get_step_multiz(thing, UP) if(isnull(ceiling)) - CRASH("baseturf helper is attempting to modify the Z level above but there is no Z level above above it.") + CRASH("baseturf helper is attempting to modify the Z level above but there is no Z level above it.") if(isspaceturf(ceiling) || istype(ceiling, /turf/open/openspace)) return return ..(ceiling) @@ -1373,6 +1373,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop) /obj/effect/mapping_helpers/mob_buckler/Initialize(mapload) . = ..() + if(!mapload) + log_mapping("[src] spawned outside of mapload!") + return INITIALIZE_HINT_QDEL + + return INITIALIZE_HINT_LATELOAD + +/obj/effect/mapping_helpers/mob_buckler/LateInitialize() var/atom/movable/buckle_to var/list/mobs = list() for(var/atom/movable/possible_buckle as anything in loc) @@ -1385,12 +1392,13 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop) if(isnull(buckle_to)) log_mapping("[type] at [x] [y] [z] did not find anything to buckle to") - return INITIALIZE_HINT_QDEL + qdel(src) + return for(var/mob/living/mob as anything in mobs) buckle_to.buckle_mob(mob, force = force_buckle) - return INITIALIZE_HINT_QDEL + qdel(src) ///Basic mob flag helpers for things like deleting on death. /obj/effect/mapping_helpers/basic_mob_flags diff --git a/code/modules/mob/living/basic/ruin_defender/zombie.dm b/code/modules/mob/living/basic/ruin_defender/zombie.dm new file mode 100644 index 0000000000000..b77920af8d154 --- /dev/null +++ b/code/modules/mob/living/basic/ruin_defender/zombie.dm @@ -0,0 +1,93 @@ +/// Everyone knows what a zombie is +/mob/living/basic/zombie + name = "Shambling Corpse" + desc = "When there is no more room in hell, the dead will walk in outer space." + icon = 'icons/mob/simple/simple_human.dmi' + mob_biotypes = MOB_ORGANIC|MOB_HUMANOID + sentience_type = SENTIENCE_HUMANOID + maxHealth = 100 + health = 100 + melee_damage_lower = 21 + melee_damage_upper = 21 + attack_verb_continuous = "bites" + attack_verb_simple = "bite" + attack_sound = 'sound/effects/hallucinations/growl1.ogg' + attack_vis_effect = ATTACK_EFFECT_BITE + combat_mode = TRUE + speed = 4 + status_flags = CANPUSH + death_message = "rapidly decays into a pile of bones!" + unsuitable_atmos_damage = 0 + unsuitable_cold_damage = 0 + faction = list(FACTION_HOSTILE) + basic_mob_flags = DEL_ON_DEATH + ai_controller = /datum/ai_controller/basic_controller/zombie + /// Outfit the zombie spawns with for visuals. + var/outfit = /datum/outfit/corpse_doctor + /// Chance to spread zombieism on hit + /// Only for admins because we don't actually want romerol to get into the round from space ruins generally speaking + var/infection_chance = 0 + +/mob/living/basic/zombie/Initialize(mapload) + . = ..() + apply_dynamic_human_appearance(src, outfit, /datum/species/zombie, bloody_slots = ITEM_SLOT_OCLOTHING) + AddElement(/datum/element/death_drops, string_list(list(/obj/effect/decal/remains/human))) + +/mob/living/basic/zombie/melee_attack(atom/target, list/modifiers, ignore_cooldown) + . = ..() + if (!. || !infection_chance || !ishuman(target) || !prob(infection_chance)) + return + try_to_zombie_infect(target) + +/// Weaker variant used if you want to put more of them in one place, won't attack obstacles +/mob/living/basic/zombie/rotten + name = "Rotting Carcass" + desc = "This undead fiend looks to be badly decomposed." + health = 60 + melee_damage_lower = 11 + melee_damage_upper = 11 + ai_controller = /datum/ai_controller/basic_controller/zombie/stupid + +/mob/living/basic/zombie/rotten/assistant + outfit = /datum/outfit/corpse_assistant + +/datum/outfit/corpse_doctor + name = "Corpse Doctor" + suit = /obj/item/clothing/suit/toggle/labcoat + uniform = /obj/item/clothing/under/rank/medical/doctor + shoes = /obj/item/clothing/shoes/sneakers/white + back = /obj/item/storage/backpack/medic + +/datum/outfit/corpse_assistant + name = "Corpse Assistant" + mask = /obj/item/clothing/mask/gas + uniform = /obj/item/clothing/under/color/grey + shoes = /obj/item/clothing/shoes/sneakers/black + back = /obj/item/storage/backpack + +/datum/ai_planning_subtree/random_speech/zombie + speech_chance = 1 + emote_hear = list("groans.", "moans.", "grunts.") + emote_see = list("twitches.", "shudders.") + +/datum/ai_controller/basic_controller/zombie + blackboard = list( + BB_TARGET_MINIMUM_STAT = HARD_CRIT, + BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, + ) + + ai_movement = /datum/ai_movement/basic_avoidance + idle_behavior = /datum/idle_behavior/idle_random_walk + planning_subtrees = list( + /datum/ai_planning_subtree/random_speech/zombie, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/attack_obstacle_in_path, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + ) + +/datum/ai_controller/basic_controller/zombie/stupid + planning_subtrees = list( + /datum/ai_planning_subtree/random_speech/zombie, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/basic_melee_attack_subtree, + ) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index e82d402b63f08..b399441cebb00 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -45,7 +45,7 @@ return signal_face // no need to null-check, because force_set will always set a signal_face var/face_name = !isnull(signal_face) ? signal_face : get_face_name("") var/id_name = !isnull(signal_id) ? signal_id : get_id_name("") - if (force_real_name) + if(force_real_name) var/fake_name if (face_name && face_name != real_name) fake_name = face_name diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index c953274646245..aa58299115821 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -166,7 +166,7 @@ else monkey_brain.tripping = TRUE background_icon_state = "bg_default_on" - to_chat(monkey_brain.owner, span_notice("You will now stumble while while colliding with people who are in combat mode.")) + to_chat(monkey_brain.owner, span_notice("You will now stumble while colliding with people who are in combat mode.")) build_all_button_icons() /obj/item/organ/brain/primate/on_mob_insert(mob/living/carbon/primate) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm deleted file mode 100644 index 5fbd6cda5cbfb..0000000000000 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ /dev/null @@ -1,132 +0,0 @@ -/mob/living/simple_animal/hostile/asteroid/curseblob - name = "curse mass" - desc = "A mass of purple... smoke?" - icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' - icon_state = "curseblob" - icon_living = "curseblob" - icon_aggro = "curseblob" - mob_biotypes = MOB_SPIRIT - move_to_delay = 5 - vision_range = 20 - aggro_vision_range = 20 - maxHealth = 40 //easy to kill, but oh, will you be seeing a lot of them. - health = 40 - melee_damage_lower = 10 - melee_damage_upper = 10 - melee_damage_type = BURN - attack_verb_continuous = "slashes" - attack_verb_simple = "slash" - attack_sound = 'sound/effects/curse/curseattack.ogg' - attack_vis_effect = ATTACK_EFFECT_SLASH - throw_message = "passes through the smokey body of" - obj_damage = 0 - environment_smash = ENVIRONMENT_SMASH_NONE - sentience_type = SENTIENCE_BOSS - layer = LARGE_MOB_LAYER - var/mob/living/set_target - var/datum/move_loop/has_target/force_move/our_loop - -/mob/living/simple_animal/hostile/asteroid/curseblob/Initialize(mapload) - . = ..() - QDEL_IN(src, 60 SECONDS) - AddElement(/datum/element/simple_flying) - playsound(src, 'sound/effects/curse/curse1.ogg', 100, TRUE, -1) - -/mob/living/simple_animal/hostile/asteroid/curseblob/Destroy() - new /obj/effect/temp_visual/dir_setting/curse/blob(loc, dir) - set_target = null - return ..() - -/mob/living/simple_animal/hostile/asteroid/curseblob/Goto(move_target, delay, minimum_distance) //Observe - if(check_for_target()) - return - move_loop(target, delay) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/move_loop(move_target, delay) - if(our_loop) - return - our_loop = GLOB.move_manager.force_move(src, move_target, delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - if(!our_loop) - return - RegisterSignal(move_target, COMSIG_MOB_STATCHANGE, PROC_REF(stat_change)) - RegisterSignal(move_target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(target_z_change)) - RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(our_z_change)) - RegisterSignal(our_loop, COMSIG_QDELETING, PROC_REF(handle_loop_end)) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/stat_change(datum/source, new_stat) - SIGNAL_HANDLER - if(new_stat != CONSCIOUS) - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/target_z_change(datum/source, old_z, new_z) - SIGNAL_HANDLER - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/our_z_change(datum/source, old_z, new_z) - SIGNAL_HANDLER - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/handle_loop_end() - SIGNAL_HANDLER - if(QDELETED(src)) - return - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/curseblob/handle_target_del(datum/source) - . = ..() - qdel(src) - -/mob/living/simple_animal/hostile/asteroid/curseblob/proc/check_for_target() - if(QDELETED(src) || !set_target) - return TRUE - if(set_target.stat != CONSCIOUS) - return TRUE - if(set_target.z != z) - return TRUE - -/mob/living/simple_animal/hostile/asteroid/curseblob/GiveTarget(new_target) - if(check_for_target()) - return - new_target = set_target - . = ..() - Goto(target, move_to_delay) - -/mob/living/simple_animal/hostile/asteroid/curseblob/LoseTarget() //we can't lose our target! - if(check_for_target()) - return - -//if it's not our target, we ignore it -/mob/living/simple_animal/hostile/asteroid/curseblob/CanAllowThrough(atom/movable/mover, border_dir) - . = ..() - if(mover == set_target) - return FALSE - if(isprojectile(mover)) - var/obj/projectile/proj = mover - if(proj.firer == set_target) - return FALSE - -#define IGNORE_PROC_IF_NOT_TARGET(X) /mob/living/simple_animal/hostile/asteroid/curseblob/##X(AM) { if (AM == set_target) return ..(); } - -IGNORE_PROC_IF_NOT_TARGET(attack_hand) - -IGNORE_PROC_IF_NOT_TARGET(attack_hulk) - -IGNORE_PROC_IF_NOT_TARGET(attack_paw) - -IGNORE_PROC_IF_NOT_TARGET(attack_alien) - -IGNORE_PROC_IF_NOT_TARGET(attack_larva) - -IGNORE_PROC_IF_NOT_TARGET(attack_animal) - -/mob/living/simple_animal/hostile/asteroid/curseblob/bullet_act(obj/projectile/proj) - if(proj.firer != set_target) - return BULLET_ACT_BLOCK - return ..() - -/mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L) - if(L != set_target) - return - return ..() - -#undef IGNORE_PROC_IF_NOT_TARGET diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm deleted file mode 100644 index 45bcf6cd3acd7..0000000000000 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ /dev/null @@ -1,51 +0,0 @@ -/mob/living/simple_animal/hostile/zombie - name = "Shambling Corpse" - desc = "When there is no more room in hell, the dead will walk in outer space." - icon = 'icons/mob/simple/simple_human.dmi' - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID - sentience_type = SENTIENCE_HUMANOID - speak_chance = 0 - stat_attack = HARD_CRIT //braains - maxHealth = 100 - health = 100 - harm_intent_damage = 5 - melee_damage_lower = 21 - melee_damage_upper = 21 - attack_verb_continuous = "bites" - attack_verb_simple = "bite" - attack_sound = 'sound/effects/hallucinations/growl1.ogg' - attack_vis_effect = ATTACK_EFFECT_BITE - combat_mode = TRUE - atmos_requirements = null - minbodytemp = 0 - status_flags = CANPUSH - death_message = "collapses, flesh gone in a pile of bones!" - del_on_death = TRUE - loot = list(/obj/effect/decal/remains/human) - /// The probability that we give people real zombie infections on hit. - var/infection_chance = 0 - /// Outfit the zombie spawns with for visuals. - var/outfit = /datum/outfit/corpse_doctor - -/mob/living/simple_animal/hostile/zombie/Initialize(mapload) - . = ..() - apply_dynamic_human_appearance(src, outfit, /datum/species/zombie, bloody_slots = ITEM_SLOT_OCLOTHING) - -/mob/living/simple_animal/hostile/zombie/AttackingTarget(atom/attacked_target) - . = ..() - if(. && ishuman(target) && prob(infection_chance)) - try_to_zombie_infect(target) - -/datum/outfit/corpse_doctor - name = "Corpse Doctor" - suit = /obj/item/clothing/suit/toggle/labcoat - uniform = /obj/item/clothing/under/rank/medical/doctor - shoes = /obj/item/clothing/shoes/sneakers/white - back = /obj/item/storage/backpack/medic - -/datum/outfit/corpse_assistant - name = "Corpse Assistant" - mask = /obj/item/clothing/mask/gas - uniform = /obj/item/clothing/under/color/grey - shoes = /obj/item/clothing/shoes/sneakers/black - back = /obj/item/storage/backpack diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 006b2684c9755..ffc201940847a 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -216,18 +216,6 @@ return M return 0 -///Find the first name of a mob from the real name with regex -/mob/proc/first_name() - var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace or "-" - firstname.Find(real_name) - return firstname.match - -/// Find the last name of a mob from the real name with regex -/mob/proc/last_name() - var/static/regex/lasttname = new("\[^\\s-\]+$") //First word before whitespace or "-" - lasttname.Find(real_name) - return lasttname.match - ///Returns a mob's real name between brackets. Useful when you want to display a mob's name alongside their real name /mob/proc/get_realname_string() if(real_name && real_name != name) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 435cfc3e7c74a..ec81574628d21 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -26,13 +26,11 @@ /// Is the pen integrated? var/integrated_pen = FALSE /** - * Weakref of the topmost piece of paper - * + * Topmost piece of paper * This is used for the paper displayed on the clipboard's icon * and it is the one attacked, when attacking the clipboard. - * (As you can't organise contents directly in BYOND) */ - var/datum/weakref/toppaper_ref + var/obj/item/paper/top_paper /obj/item/clipboard/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] begins putting [user.p_their()] head into the clip of \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -50,9 +48,8 @@ . = ..() if(!integrated_pen && pen) . += span_notice("Alt-click to remove [pen].") - var/obj/item/paper/toppaper = toppaper_ref?.resolve() - if(toppaper) - . += span_notice("Right-click to remove [toppaper].") + if(top_paper) + . += span_notice("Right-click to remove [top_paper].") /// Take out the topmost paper /obj/item/clipboard/proc/remove_paper(obj/item/paper/paper, mob/user) @@ -61,22 +58,24 @@ paper.forceMove(user.loc) user.put_in_hands(paper) to_chat(user, span_notice("You remove [paper] from [src].")) - var/obj/item/paper/toppaper = toppaper_ref?.resolve() - if(paper == toppaper) - UnregisterSignal(toppaper, COMSIG_ATOM_UPDATED_ICON) - toppaper_ref = null - var/obj/item/paper/newtop = locate(/obj/item/paper) in src - if(newtop && (newtop != paper)) - toppaper_ref = WEAKREF(newtop) - else - toppaper_ref = null - update_icon() /obj/item/clipboard/proc/remove_pen(mob/user) pen.forceMove(user.loc) user.put_in_hands(pen) to_chat(user, span_notice("You remove [pen] from [src].")) - pen = null + +/obj/item/clipboard/Exited(atom/movable/gone, direction) + . = ..() + if (gone == pen) + pen = null + update_icon() + return + + if (gone != top_paper) + return + + UnregisterSignal(top_paper, COMSIG_ATOM_UPDATED_ICON) + top_paper = locate(/obj/item/paper) in src update_icon() /obj/item/clipboard/click_alt(mob/user) @@ -100,32 +99,29 @@ . += "clipboard_over" /obj/item/clipboard/proc/get_paper_overlay() - var/obj/item/paper/toppaper = toppaper_ref?.resolve() - if(isnull(toppaper)) + if(isnull(top_paper)) return - var/mutable_appearance/paper_overlay = mutable_appearance(icon, toppaper.icon_state, offset_spokesman = src, appearance_flags = KEEP_APART) - paper_overlay = toppaper.color_atom_overlay(paper_overlay) - paper_overlay.overlays += toppaper.overlays + var/mutable_appearance/paper_overlay = mutable_appearance(icon, top_paper.icon_state, offset_spokesman = src, appearance_flags = KEEP_APART) + paper_overlay = top_paper.color_atom_overlay(paper_overlay) + paper_overlay.overlays += top_paper.overlays return paper_overlay /obj/item/clipboard/attack_hand(mob/user, list/modifiers) if(LAZYACCESS(modifiers, RIGHT_CLICK)) - var/obj/item/paper/toppaper = toppaper_ref?.resolve() - remove_paper(toppaper, user) + remove_paper(top_paper, user) return TRUE . = ..() /obj/item/clipboard/attackby(obj/item/weapon, mob/user, params) - var/obj/item/paper/toppaper = toppaper_ref?.resolve() if(istype(weapon, /obj/item/paper)) //Add paper into the clipboard if(!user.transferItemToLoc(weapon, src)) return - if(toppaper) - UnregisterSignal(toppaper, COMSIG_ATOM_UPDATED_ICON) + if(top_paper) + UnregisterSignal(top_paper, COMSIG_ATOM_UPDATED_ICON) RegisterSignal(weapon, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_top_paper_change)) - toppaper_ref = WEAKREF(weapon) + top_paper = weapon to_chat(user, span_notice("You clip [weapon] onto [src].")) else if(istype(weapon, /obj/item/pen) && !pen) //Add a pen into the clipboard, attack (write) if there is already one @@ -133,8 +129,8 @@ return pen = weapon to_chat(usr, span_notice("You slot [weapon] into [src].")) - else if(toppaper) - toppaper.attackby(user.get_active_held_item(), user) + else if(top_paper) + top_paper.attackby(user.get_active_held_item(), user) update_appearance() /obj/item/clipboard/attack_self(mob/user) @@ -154,14 +150,13 @@ data["pen"] = "[pen]" data["integrated_pen"] = integrated_pen - var/obj/item/paper/toppaper = toppaper_ref?.resolve() - data["top_paper"] = "[toppaper]" - data["top_paper_ref"] = "[REF(toppaper)]" + data["top_paper"] = "[top_paper]" + data["top_paper_ref"] = "[REF(top_paper)]" data["paper"] = list() data["paper_ref"] = list() for(var/obj/item/paper/paper in src) - if(paper == toppaper) + if(paper == top_paper) continue data["paper"] += "[paper]" data["paper_ref"] += "[REF(paper)]" @@ -202,7 +197,7 @@ if("move_top_paper") var/obj/item/paper/paper = locate(params["ref"]) in src if(istype(paper)) - toppaper_ref = WEAKREF(paper) + top_paper = paper to_chat(usr, span_notice("You move [paper] to the top.")) update_icon() . = TRUE diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 0a4be6850393f..b39f7d2193516 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -87,7 +87,6 @@ SEND_SIGNAL(owner, COMSIG_CARBON_REMOVE_LIMB, src, special, dismembered) SEND_SIGNAL(src, COMSIG_BODYPART_REMOVED, owner, special, dismembered) - update_limb(dropping_limb = TRUE) bodypart_flags &= ~BODYPART_IMPLANTED //limb is out and about, it can't really be considered an implant owner.remove_bodypart(src, special) @@ -96,6 +95,7 @@ LAZYREMOVE(owner.all_scars, scar) var/mob/living/carbon/phantom_owner = update_owner(null) // so we can still refer to the guy who lost their limb after said limb forgets 'em + update_limb(dropping_limb = TRUE) for(var/datum/wound/wound as anything in wounds) wound.remove_wound(TRUE) diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm index 48f10a0613485..9d8ae8be5ee4f 100644 --- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm +++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm @@ -228,13 +228,13 @@ playsound(get_turf(regenerating), 'sound/mobs/humanoids/ethereal/ethereal_revive.ogg', 100) to_chat(regenerating, span_notice("You burst out of the crystal with vigour... But at a cost.")) + regenerating.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) if(prob(10)) //10% chance for a severe trauma regenerating.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_ABSOLUTE) else regenerating.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_ABSOLUTE) - regenerating.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS) // revive calls fully heal -> deletes the crystal. // this qdeleted check is just for sanity. if(!QDELETED(src)) diff --git a/code/modules/unit_tests/designs.dm b/code/modules/unit_tests/designs.dm index 0495ebdc7d9ae..729f2facf81d0 100644 --- a/code/modules/unit_tests/designs.dm +++ b/code/modules/unit_tests/designs.dm @@ -15,7 +15,7 @@ TEST_FAIL("Design [current_design.type] has default or null name var but has an ID") if ((!isnull(current_design.materials) && LAZYLEN(current_design.materials)) || (!isnull(current_design.reagents_list) && LAZYLEN(current_design.reagents_list))) //Design requires materials if ((isnull(current_design.build_path) || current_design.build_path == default_design.build_path) && (isnull(current_design.make_reagent) || current_design.make_reagent == default_design.make_reagent)) //Check if design gives any output - TEST_FAIL("Design [current_design.type] requires materials but does not have have any build_path or make_reagent set") + TEST_FAIL("Design [current_design.type] requires materials but does not have either build_path or make_reagent set") else if (!isnull(current_design.build_path) || !isnull(current_design.build_path)) // //Design requires no materials but creates stuff TEST_FAIL("Design [current_design.type] requires NO materials but has build_path or make_reagent set") if (length(current_design.reagents_list) && !(current_design.build_type & LIMBGROWER)) diff --git a/code/modules/unit_tests/ethereal_revival.dm b/code/modules/unit_tests/ethereal_revival.dm index 1420f14d0b4fe..02b73281e85e3 100644 --- a/code/modules/unit_tests/ethereal_revival.dm +++ b/code/modules/unit_tests/ethereal_revival.dm @@ -5,6 +5,7 @@ var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent) var/obj/item/organ/heart/ethereal/respawn_heart = new() respawn_heart.Insert(victim, special = TRUE, movement_flags = DELETE_IF_REPLACED) // Pretend this guy is an ethereal + victim.mock_client = new() victim.death() TEST_ASSERT_NOTNULL(respawn_heart.crystalize_timer_id, "Ethereal heart didn't respond to host death.") diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index e82a607a9bfb8..70f3b82885d23 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -21,7 +21,6 @@ /mob/living/simple_animal/bot/secbot/pingsky, /mob/living/simple_animal/hostile, /mob/living/simple_animal/hostile/asteroid, - /mob/living/simple_animal/hostile/asteroid/curseblob, /mob/living/simple_animal/hostile/asteroid/elite, /mob/living/simple_animal/hostile/asteroid/elite/broodmother, /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child, @@ -64,7 +63,6 @@ /mob/living/simple_animal/hostile/retaliate/goose, /mob/living/simple_animal/hostile/retaliate/goose/vomit, /mob/living/simple_animal/hostile/vatbeast, - /mob/living/simple_animal/hostile/zombie, /mob/living/simple_animal/soulscythe, // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index 9095197b93ea0..b9d2ccdb6533e 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -18,7 +18,7 @@ MECHA_R_ARM = 1, MECHA_UTILITY = 3, MECHA_POWER = 1, - MECHA_ARMOR = 3, + MECHA_ARMOR = 1, ) var/obj/durand_shield/shield diff --git a/code/modules/vehicles/mecha/combat/gygax.dm b/code/modules/vehicles/mecha/combat/gygax.dm index 0acb746c52d4a..638f53d9aaecf 100644 --- a/code/modules/vehicles/mecha/combat/gygax.dm +++ b/code/modules/vehicles/mecha/combat/gygax.dm @@ -18,7 +18,7 @@ MECHA_R_ARM = 1, MECHA_UTILITY = 3, MECHA_POWER = 1, - MECHA_ARMOR = 2, + MECHA_ARMOR = 1, ) step_energy_drain = 4 can_use_overclock = TRUE diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm index 39c5ef1d0e8c4..2a3da129ccd4d 100644 --- a/code/modules/vehicles/mecha/combat/honker.dm +++ b/code/modules/vehicles/mecha/combat/honker.dm @@ -57,7 +57,7 @@ MECHA_R_ARM = 1, MECHA_UTILITY = 3, MECHA_POWER = 1, - MECHA_ARMOR = 3, + MECHA_ARMOR = 2, ) /obj/vehicle/sealed/mecha/honker/dark/loaded diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm index ffc4c61e5a87f..60dad9de64ab5 100644 --- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm +++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm @@ -35,7 +35,7 @@ MECHA_R_ARM = 1, MECHA_UTILITY = 3, MECHA_POWER = 1, - MECHA_ARMOR = 3, + MECHA_ARMOR = 1, ) //no tax on flying, since the power cost is in the leap itself. phasing_energy_drain = 0 diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm index 2ad10ae028d17..092c8c1044889 100644 --- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm +++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm @@ -18,6 +18,8 @@ var/can_be_triggered = FALSE ///Whether the module is currently active var/active = TRUE + ///Can we stack multiple types of the same item? + var/unstackable = FALSE ///Label used in the ui next to the Activate/Enable/Disable buttons var/active_label = "Status" ///Chassis power cell quantity used on activation @@ -157,6 +159,13 @@ to_chat(user, span_warning("\The [mech]'s left arm is full![mech.equip_by_category[MECHA_R_ARM] || !mech.max_equip_by_category[MECHA_R_ARM] ? "" : " Try right arm!"]")) return FALSE return TRUE + if(unstackable) + var/list/obj/item/mecha_parts/mecha_equipment/contents = mech.equip_by_category[equipment_slot] + for(var/obj/equipment as anything in contents) + if(src.type == equipment.type) + to_chat(user, span_warning("You can't stack more of this item ontop itself!")) + return FALSE + if(length(mech.equip_by_category[equipment_slot]) == mech.max_equip_by_category[equipment_slot]) to_chat(user, span_warning("This equipment slot is already full!")) return FALSE diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm index 613f82fe85981..a0a1e7443acbb 100644 --- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm @@ -173,7 +173,7 @@ armor_mod = /datum/armor/mecha_equipment_ccw_boost /datum/armor/mecha_equipment_ccw_boost - melee = 15 + melee = 20 /obj/item/mecha_parts/mecha_equipment/armor/antiproj_armor_booster name = "Projectile Shielding" @@ -184,8 +184,8 @@ armor_mod = /datum/armor/mecha_equipment_ranged_boost /datum/armor/mecha_equipment_ranged_boost - bullet = 10 - laser = 10 + bullet = 15 + laser = 15 ////////////////////////////////// REPAIR DROID ////////////////////////////////////////////////// @@ -196,6 +196,7 @@ icon_state = "repair_droid" energy_drain = 50 range = 0 + unstackable = TRUE can_be_toggled = TRUE active = FALSE equipment_slot = MECHA_UTILITY diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm index c9fb6b8fdbe2a..29bc3fb4d4841 100644 --- a/code/modules/vehicles/mecha/working/ripley.dm +++ b/code/modules/vehicles/mecha/working/ripley.dm @@ -259,10 +259,11 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo) /obj/vehicle/sealed/mecha/ripley/cargo - desc = "An ailing, old, repurposed cargo hauler. Most of its equipment wires are frayed or missing and its frame is rusted." name = "\improper APLU \"Big Bess\"" + desc = "An ailing, old, repurposed cargo hauler. Most of its equipment wires are frayed or missing and its frame is rusted." icon_state = "hauler" base_icon_state = "hauler" + silicon_icon_state = "hauler-empty" max_integrity = 100 //Has half the health of a normal RIPLEY mech, so it's harder to use as a weapon. /obj/vehicle/sealed/mecha/ripley/cargo/Initialize(mapload) diff --git a/html/changelogs/AutoChangeLog-pr-88789.yml b/html/changelogs/AutoChangeLog-pr-88789.yml new file mode 100644 index 0000000000000..10f5e68880cc7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-88789.yml @@ -0,0 +1,7 @@ +author: "StrangeWeirdKitten" +delete-after: True +changes: + - balance: "Reduces armor slots to 1 for all station built mechs except the phazon." + - balance: "melee mech armor has been increased to 20 from 15." + - balance: "mech bullet and laser armor has both been increased to 15 from 10." + - balance: "You can no longer stack the repair droid on mechs." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89047.yml b/html/changelogs/AutoChangeLog-pr-89047.yml deleted file mode 100644 index 784e95a25ddc0..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-89047.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "NamelessFairy" -delete-after: True -changes: - - bugfix: "Admin fired stray syndicate cargo pods will not rebel against admin whims and launch themselves when cancelled." - - admin: "Admins have new categories to fill syndicate cargo pods with." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89095.yml b/html/changelogs/AutoChangeLog-pr-89095.yml deleted file mode 100644 index 4e52e9a2c38cc..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-89095.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Pickle-Coding" -delete-after: True -changes: - - bugfix: "Fixes HFR moderator leaking not leaking properly when a part is cracked." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89132.yml b/html/changelogs/AutoChangeLog-pr-89132.yml new file mode 100644 index 0000000000000..693684c833982 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89132.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Chasms are once again incompatible with explosive fishing." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89137.yml b/html/changelogs/AutoChangeLog-pr-89137.yml deleted file mode 100644 index bc6196b6256b8..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-89137.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AyIong" -delete-after: True -changes: - - qol: "Vending machines got new design with 2 layouts: List and Grid (List by default)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89150.yml b/html/changelogs/AutoChangeLog-pr-89150.yml new file mode 100644 index 0000000000000..685f90e5b0f25 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89150.yml @@ -0,0 +1,4 @@ +author: "Vekter" +delete-after: True +changes: + - balance: "The roundstart report will now display a more broad, less specific message about threat levels when between 0 and 80 threat." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89153.yml b/html/changelogs/AutoChangeLog-pr-89153.yml new file mode 100644 index 0000000000000..acd9df2a8fd46 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89153.yml @@ -0,0 +1,4 @@ +author: "Jacquerel" +delete-after: True +changes: + - refactor: "NPC zombies found in ruins now use the basic mob framework. Please make an issue report if they exhibit any unusual behaviour." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89156.yml b/html/changelogs/AutoChangeLog-pr-89156.yml new file mode 100644 index 0000000000000..43ad3a8538258 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89156.yml @@ -0,0 +1,4 @@ +author: "SmArtKar" +delete-after: True +changes: + - bugfix: "Clipboards should no longer retain pens that got removed via Instant Recall" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-89157.yml b/html/changelogs/AutoChangeLog-pr-89157.yml new file mode 100644 index 0000000000000..b4ab02618c6ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-89157.yml @@ -0,0 +1,4 @@ +author: "Melbert" +delete-after: True +changes: + - bugfix: "Heads with brains no longer look debrained" \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index d0707a54087d2..0fca94159883d 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -547,3 +547,39 @@ mc-oofert: - refactor: mimics (bolt of animation, malf ai Machine Override, etc) are basicmobs - bugfix: crate mimics may now be opened +2025-01-21: + AyIong: + - qol: 'Vending machines got new design with 2 layouts: List and Grid (List by default)' + NamelessFairy: + - bugfix: Admin fired stray syndicate cargo pods will not rebel against admin whims + and launch themselves when cancelled. + - admin: Admins have new categories to fill syndicate cargo pods with. + Pickle-Coding: + - bugfix: Fixes HFR moderator leaking not leaking properly when a part is cracked. + Rhials: + - rscadd: You can now ctrl-click IDs to set your Honorific, which will change your + display name to reflect your TITLE as a WORKING MAN on SPACE STATION 13. +2025-01-22: + SyncIt21: + - bugfix: pockets update their icons correctly when removing items that have storage + (e.g. box of bandages) from them + - bugfix: fishing rod auto reel won't rip of intercoms or other anchored/immovable + objects + kuricityy: + - bugfix: Blob's can no longer place their core in ruins on Icebox. + necromanceranne: + - balance: Batons now respect the armor worn by targets. Analog batons respect MELEE + armor. Cell-type batons respect ENERGY armor. + - balance: Various batons have differing amounts of armour penetration based on + what type of baton it is. + - balance: Heads of staff have color graded batons to denote penetration power. + Bronze (Quartermaster), Silver (Chief Engineer, Chief Medical Officer, Head + of Personnel, Research Director), Gold (Captain). Contractor batons are equivalent + to Gold. + - balance: Cell-type batons gain armor penetration based on their cell's quality. + The better it is, the more it penetrates. + - bugfix: The Big Bess cargo hauler no longer magically becomes (visually) a standard + Ripley exosuit. + the-og-gear: + - bugfix: Deluxe Donk Pockets (and their no-carb and vegan variants) are no longer + craftable without collecting the recipe. diff --git a/html/changelogs/bandastation/archive/2025-01.yml b/html/changelogs/bandastation/archive/2025-01.yml index c466ab3b2f7a0..6de8ea3007ce5 100644 --- a/html/changelogs/bandastation/archive/2025-01.yml +++ b/html/changelogs/bandastation/archive/2025-01.yml @@ -71,3 +71,49 @@ - config: Mood теперь включен по умолчанию dj-34: - balance: Религия Honorbound более недоступна для приобретения на Алтаре священника. +2025-01-23: + AloeNeverDie: + - balance: цена ящика с лазерными карабинами повышена до 2700 + - balance: цена ящика с винтовкой BR-38 снижена до 12000 + - balance: продажа материалов через карго-шаттл теперь приносит меньше денег — для + большинства материалов цена снижена в 4 раза + - balance: все ящики с ядрами аномалий стали стоить 5000 кредитов + - balance: пони теперь стоит 9000 кредитов вместо 800 + - balance: обновление цен в GMM увеличено с 1 минуты до 3 минут + - balance: планка коэффициента падения цен на бирже изменена с 0.5 до 0.8 + - balance: планка коэффициента повышения цен на бирже изменена с 3 до 2 + - balance: продажа материалов на бирже отключена + - balance: цена на револьвер детектива в карго увеличена с 2000 до 3000. + - balance: цена на боевой дробовик в карго увеличена с 1500 до 2250. + - balance: цена на еган в карго увеличена с 1200 до 1800. + - balance: цена на лазерную винтовку в карго увеличена с 600 до 900. + - balance: цена на двухстволку в карго увеличена с 1800 до 2700. + - balance: цена на ящик с лазерами в карго увеличена с 800 до 1200. + - balance: цена на ящик боевых дробовиков в карго увеличена с 3500 до 5200. + - balance: цена на ящик с еганами в карго увеличена с 3600 до 5400. + - balance: цена на ящик с лазерным карабином в карго увеличена с 1800 до 2700. + - balance: цена на ящик с дизейбер ПП в карго увеличена с 1400 до 2200. + - balance: цена на ящик с BR38 в карго снижена с 20 000 до 12 000. + - balance: стоимость на все типы патрон для револьвера детектива в карго была изменена + со 100 до 200, кроме резины, цена изменилась с 75 до 150 + - balance: стоимость ящика с патронами в карго изменена с 1600 до 2400 + - balance: стоимость ящика с магазинами для винтовки BR38 изменена с 1400 до 2100 + - balance: святые арбузы теперь защищают 1 раз и только с потенцией выше 95 + - balance: 'лазерный карабин получил изменение характеристик: Магазин уменьшен с + 40 до 30 выстрелов, скорость полёта снаряда снижена с 1.25 до 0.7, задержка + между выстрелами повышена с 0.15 до 0.2 секунд' +2025-01-24: + AyIong: + - code_imp: Параметры игры и персонажа, теперь переведены не только в translate + ветке + - rscadd: На вики появился актуальный список всех эмодзи для чата/мессенджера + CallmeHouston: + - map: 'Кибериада: В офис юристов добавлен дополнительный стол с камерой, диктофоном + и очками.' +2025-01-25: + CallmeHouston: + - map: 'Кибериада: перестройка турбины' + - bugfix: Фикс доступов в библиотеке на Кибериаде + HardexZ: + - map: Добавлен, гранатомет и худы в оружейку Кибериады (они есть на всех картах). + Удалены 6 барьерных гранат. diff --git a/icons/_nanomaps/Cyberiad_nanomap_z2.png b/icons/_nanomaps/Cyberiad_nanomap_z2.png index 019e304f26fc5..125f9e9e875e5 100644 Binary files a/icons/_nanomaps/Cyberiad_nanomap_z2.png and b/icons/_nanomaps/Cyberiad_nanomap_z2.png differ diff --git a/icons/mob/inhands/equipment/security_lefthand.dmi b/icons/mob/inhands/equipment/security_lefthand.dmi index 993834e0d6084..91306c0a093c1 100644 Binary files a/icons/mob/inhands/equipment/security_lefthand.dmi and b/icons/mob/inhands/equipment/security_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/security_righthand.dmi b/icons/mob/inhands/equipment/security_righthand.dmi index 7d8787e3fe68e..c6d26854eb6da 100644 Binary files a/icons/mob/inhands/equipment/security_righthand.dmi and b/icons/mob/inhands/equipment/security_righthand.dmi differ diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi index 2d5100ec4d414..6b7cbd8544ac3 100644 Binary files a/icons/obj/weapons/baton.dmi and b/icons/obj/weapons/baton.dmi differ diff --git a/modular_bandastation/autowiki/_autowiki.dm b/modular_bandastation/autowiki/_autowiki.dm new file mode 100644 index 0000000000000..a5444fc886cde --- /dev/null +++ b/modular_bandastation/autowiki/_autowiki.dm @@ -0,0 +1,16 @@ +/datum/modpack/autowiki + /// A string name for the modpack. Used for looking up other modpacks in init. + name = "Автовики" + /// A string desc for the modpack. Can be used for modpack verb list as description. + desc = "Заменяем редакторов вики кодом." + /// A string with authors of this modpack. + author = "Aylong" + +/datum/modpack/autowiki/pre_initialize() + . = ..() + +/datum/modpack/autowiki/initialize() + . = ..() + +/datum/modpack/autowiki/post_initialize() + . = ..() diff --git a/modular_bandastation/autowiki/_autowiki.dme b/modular_bandastation/autowiki/_autowiki.dme new file mode 100644 index 0000000000000..8f83ebea9e137 --- /dev/null +++ b/modular_bandastation/autowiki/_autowiki.dme @@ -0,0 +1,3 @@ +#include "_autowiki.dm" + +#include "code/autowiki_emoji.dm" diff --git a/modular_bandastation/autowiki/code/autowiki_emoji.dm b/modular_bandastation/autowiki/code/autowiki_emoji.dm new file mode 100644 index 0000000000000..db0a8baa65f03 --- /dev/null +++ b/modular_bandastation/autowiki/code/autowiki_emoji.dm @@ -0,0 +1,19 @@ +/datum/autowiki/emoji + page = "Template:Autowiki/Content/Emojis" + +/datum/autowiki/emoji/generate() + var/output = "" + var/list/icon_states = icon_states(EMOJI_SET) + + for(var/icon_state in icon_states) + var/filename = SANITIZE_FILENAME(escape_value("[icon_state]_wiki_emoji")) + + output += include_template("Autowiki/Emoji", list( + "name" = ":[escape_value(icon_state)]:", + "icon" = filename, + )) + + // It would be cool to make this support gifs someday, but not now + upload_icon(icon(EMOJI_SET, icon_state, frame = 1), filename) + + return include_template("Autowiki/EmojiTable", list("content" = output)) diff --git a/modular_bandastation/balance/_balance.dme b/modular_bandastation/balance/_balance.dme index 4221a4ce97334..4e6790437dcb3 100644 --- a/modular_bandastation/balance/_balance.dme +++ b/modular_bandastation/balance/_balance.dme @@ -3,12 +3,19 @@ #include "code/~defines.dm" #include "code/bodyparts/head.dm" +#include "code/cargo/exports/materials.dm" +#include "code/cargo/packs/goodies.dm" +#include "code/cargo/packs/livestock.dm" +#include "code/cargo/packs/science.dm" +#include "code/cargo/packs/security.dm" #include "code/crew_manifest.dm" #include "code/dynamic.dm" #include "code/events.dm" +#include "code/laser.dm" +#include "code/materials_market.dm" +#include "code/religion.dm" #include "code/speed/base_speed.dm" #include "code/speed/movespeed_modifier.dm" -#include "code/religion.dm" #include "code/station_traits.dm" #include "code/supply_packs.dm" #include "code/wounds/cranial_fissure.dm" diff --git a/modular_bandastation/balance/code/cargo/exports/materials.dm b/modular_bandastation/balance/code/cargo/exports/materials.dm new file mode 100644 index 0000000000000..a0c3dfa0d66d4 --- /dev/null +++ b/modular_bandastation/balance/code/cargo/exports/materials.dm @@ -0,0 +1,40 @@ +// MARK: EXPORT MATERIAL PRICES +/datum/export/material/plasma + cost = CARGO_CRATE_VALUE * 0.1 + +/datum/export/material/bananium + cost = CARGO_CRATE_VALUE * 0.5 + +/datum/export/material/adamantine // For whatever reason, adamantine doesn't truly exist in export list + cost = CARGO_CRATE_VALUE * 0.7 + material_id = /datum/material/adamantine + message = "cm3 of adamantine" + +/datum/export/material/mythril + cost = CARGO_CRATE_VALUE * 0.75 + +/datum/export/material/plastic + cost = CARGO_CRATE_VALUE * 0.0125 + +/datum/export/material/runite + cost = CARGO_CRATE_VALUE * 0.3 + +/datum/export/material/diamond + cost = CARGO_CRATE_VALUE * 0.7 + material_id = /datum/material/diamond // For whatever reason, in original there is adamantine instead of diamond + message = "cm3 of diamond" + +/datum/export/material/uranium + cost = CARGO_CRATE_VALUE * 0.4 + +/datum/export/material/gold + cost = CARGO_CRATE_VALUE * 0.5 + +/datum/export/material/silver + cost = CARGO_CRATE_VALUE * 0.2 + +/datum/export/material/titanium + cost = CARGO_CRATE_VALUE * 0.5 + +/datum/export/material/bscrystal + cost = CARGO_CRATE_VALUE * 0.7 diff --git a/modular_bandastation/balance/code/cargo/packs/goodies.dm b/modular_bandastation/balance/code/cargo/packs/goodies.dm new file mode 100644 index 0000000000000..bee28d0d6bc2e --- /dev/null +++ b/modular_bandastation/balance/code/cargo/packs/goodies.dm @@ -0,0 +1,31 @@ +// MARK: GUNS +/datum/supply_pack/goody/mars_single + cost = PAYCHECK_CREW * 60 // Original price: 2000 New price: 3000 + +/datum/supply_pack/goody/ballistic_single + cost = PAYCHECK_COMMAND * 22.5 // Original price: 1500 New price: 2250 + +/datum/supply_pack/goody/energy_single + cost = PAYCHECK_COMMAND * 18 // Original price: 1200 New price: 1800 + +/datum/supply_pack/goody/laser_single + cost = PAYCHECK_COMMAND * 9 // Original price: 600 New price: 900 + +/datum/supply_pack/goody/double_barrel + cost = PAYCHECK_COMMAND * 27 // Original price: 1800 New price: 2700 + +// MARK: AMMO +/datum/supply_pack/goody/dumdum38 + cost = PAYCHECK_CREW * 4 // Original price: 100 New price: 200 + +/datum/supply_pack/goody/match38 + cost = PAYCHECK_CREW * 4 // Original price: 100 New price: 200 + +/datum/supply_pack/goody/rubber + cost = PAYCHECK_CREW * 3 // Original price: 75 New price: 150 + +/datum/supply_pack/goody/dumdum38br + cost = PAYCHECK_CREW * 4 // Original price: 100 New price: 200 + +/datum/supply_pack/goody/match38br + cost = PAYCHECK_CREW * 4 // Original price: 100 New price: 200 diff --git a/modular_bandastation/balance/code/cargo/packs/livestock.dm b/modular_bandastation/balance/code/cargo/packs/livestock.dm new file mode 100644 index 0000000000000..885916bfb587c --- /dev/null +++ b/modular_bandastation/balance/code/cargo/packs/livestock.dm @@ -0,0 +1,3 @@ +// MARK: LIVESTOCK +/datum/supply_pack/critter/pony // Fun not allowed or has to be too expensive + cost = 9000 // Original price: 800 New price: 9000 diff --git a/modular_bandastation/balance/code/cargo/packs/science.dm b/modular_bandastation/balance/code/cargo/packs/science.dm new file mode 100644 index 0000000000000..09697ad95ea57 --- /dev/null +++ b/modular_bandastation/balance/code/cargo/packs/science.dm @@ -0,0 +1,27 @@ +// MARK: SCIENCE +/datum/supply_pack/science/raw_flux_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_hallucination_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_grav_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_vortex_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_ectoplasm_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_bluespace_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_pyro_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_bioscrambler_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 + +/datum/supply_pack/science/raw_dimensional_anomaly + cost = CARGO_CRATE_VALUE * 25 // Original price: 2000 New price: 5000 diff --git a/modular_bandastation/balance/code/cargo/packs/security.dm b/modular_bandastation/balance/code/cargo/packs/security.dm new file mode 100644 index 0000000000000..52179a06e2dee --- /dev/null +++ b/modular_bandastation/balance/code/cargo/packs/security.dm @@ -0,0 +1,25 @@ +// MARK: WEAPONS +/datum/supply_pack/security/laser + cost = CARGO_CRATE_VALUE * 6 // Original price: 800 New price: 1200 + +/datum/supply_pack/security/armory/ballistic + cost = CARGO_CRATE_VALUE * 26 // Original price: 3500 New price: 5200 + +/datum/supply_pack/security/armory/energy + cost = CARGO_CRATE_VALUE * 27 // Original price: 3600 New price: 5400 + +/datum/supply_pack/security/armory/laser_carbine + cost = CARGO_CRATE_VALUE * 13.5 // Original price: 1800 New price: 2700 + +/datum/supply_pack/security/armory/disabler_smg + cost = CARGO_CRATE_VALUE * 11 // Original price: 1400 New price: 2200 + +/datum/supply_pack/security/armory/battle_rifle + cost = CARGO_CRATE_VALUE * 60 // Original price: 20000 New price: 12000 + +// MARK: AMMO +/datum/supply_pack/security/ammo + cost = CARGO_CRATE_VALUE * 12 // Original price: 1600 New price: 2400 + +/datum/supply_pack/security/armory/br_mag + cost = CARGO_CRATE_VALUE * 10.5 // Original price: 1400 New price: 2100 diff --git a/modular_bandastation/balance/code/laser.dm b/modular_bandastation/balance/code/laser.dm new file mode 100644 index 0000000000000..83ad5df35e4a9 --- /dev/null +++ b/modular_bandastation/balance/code/laser.dm @@ -0,0 +1,11 @@ +// MARK: Сarbine changes +/obj/item/ammo_casing/energy/lasergun/carbine + e_cost = LASER_SHOTS(30, STANDARD_CELL_CHARGE) // Original: LASER_SHOTS(40, STANDARD_CELL_CHARGE) + +/obj/projectile/beam/laser/carbine/Initialize(mapload) + . = ..() + speed = speed * 0.7 // Original: 1.25 + +/obj/item/gun/energy/laser/carbine/Initialize(mapload) + . = ..() + AddComponent(/datum/component/automatic_fire, 0.2 SECONDS, allow_akimbo = FALSE) // Original: automatic_fire, 0.15 SECONDS diff --git a/modular_bandastation/balance/code/materials_market.dm b/modular_bandastation/balance/code/materials_market.dm new file mode 100644 index 0000000000000..00d12d2807a2b --- /dev/null +++ b/modular_bandastation/balance/code/materials_market.dm @@ -0,0 +1,13 @@ +// MARK: Override mateials market desc and opportunity to sell minerals + +/obj/machinery/materials_market + desc = "Данная машина позволяет пользователю покупать различные полезные материалы \ + по всей системе. Ещё недавно она предоставляла возможность не только покупать, но и продавать материалы. Однако после обвала рынка минералов в 2565 году механизм продажи был удалён. \ + Известно, что цены колеблются довольно часто, как правило в течение нескольких минут. Все сделки являются окончательными." + +/obj/machinery/materials_market/attackby(obj/item/attacking_item, mob/user, params) + if(is_type_in_list(attacking_item, exportable_material_items)) + say("Продажа материалов через Галактический рынок материалов невозможна из-за Красного экономического закона №0931, введённого Отделом экономического роста и развития НТ. Пожалуйста, экспортируйте материалы с использованием стандартных транспортно-грузовых отношений в соответствии с рабочими процедурами НТ.") + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, FALSE) + return TRUE + return ..() diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 877348e573e6c..410f0d8f64290 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -15,6 +15,7 @@ #include "autohiss/_autohiss.dme" #include "automapper/_automapper.dme" #include "automatic_crew_transfer/_automatic_crew_transfer.dme" +#include "autowiki/_autowiki.dme" #include "balance/_balance.dme" #include "barsigns/_barsigns.dme" #include "changelog/_changelog.dme" diff --git a/tgstation.dme b/tgstation.dme index 4ff518a0f731b..a33fff9ce825e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5075,6 +5075,7 @@ #include "code\modules\mob\living\basic\ruin_defender\mad_piano.dm" #include "code\modules\mob\living\basic\ruin_defender\skeleton.dm" #include "code\modules\mob\living\basic\ruin_defender\stickman.dm" +#include "code\modules\mob\living\basic\ruin_defender\zombie.dm" #include "code\modules\mob\living\basic\ruin_defender\mimic\mimic.dm" #include "code\modules\mob\living\basic\ruin_defender\mimic\mimic_ai.dm" #include "code\modules\mob\living\basic\ruin_defender\wizard\wizard.dm" @@ -5355,7 +5356,6 @@ #include "code\modules\mob\living\simple_animal\hostile\illusion.dm" #include "code\modules\mob\living\simple_animal\hostile\ooze.dm" #include "code\modules\mob\living\simple_animal\hostile\vatbeast.dm" -#include "code\modules\mob\living\simple_animal\hostile\zombie.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\_megafauna.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm" @@ -5366,7 +5366,6 @@ #include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm" #include "code\modules\mob\living\simple_animal\hostile\megafauna\wendigo.dm" -#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\curse_blob.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\mining_mobs.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\polarbear.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\elite.dm" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx index 3b0dc68158f28..c90efe09c1db9 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/age.tsx @@ -1,6 +1,6 @@ import { Feature, FeatureNumberInput } from '../base'; export const age: Feature = { - name: 'Age', + name: 'Возраст', component: FeatureNumberInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/body_type.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/body_type.tsx index 3746e62ceeec9..9be94c70e28e9 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/body_type.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/body_type.tsx @@ -2,6 +2,6 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const body_type: FeatureChoiced = { - name: 'Body type', + name: 'Тип тела', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/examine_panel.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/examine_panel.tsx index 0bd38dd3618d0..5971ee14aed36 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/examine_panel.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/examine_panel.tsx @@ -2,13 +2,13 @@ import { Feature } from '../base'; import { FeatureTextInput } from '../base_bandastation'; export const flavor_text: Feature = { - name: 'Flavor Text', + name: 'Описание внешности', description: 'Опишите вашего персонажа!', component: FeatureTextInput, }; export const silicon_flavor_text: Feature = { - name: 'Flavor Text (Silicon)', - description: 'Опишите вашего силикона!', + name: 'Описание внешности (Синтетик)', + description: 'Опишите вашего синтетика!', component: FeatureTextInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/glasses.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/glasses.tsx index df73451c35a20..591c7563b4975 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/glasses.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/glasses.tsx @@ -1,6 +1,6 @@ import { FeatureIconnedDropdownInput, FeatureWithIcons } from '../dropdowns'; export const glasses: FeatureWithIcons = { - name: 'Glasses', + name: 'Очки', component: FeatureIconnedDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/operative_species.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/operative_species.tsx index 82042b8efba13..cfd6868ff3172 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/operative_species.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/operative_species.tsx @@ -1,6 +1,6 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const operative_species: FeatureToggle = { - name: 'Always Human as Operative', + name: 'Всегда человек за Оперативника', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/pda.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/pda.tsx index 196dea45c5d16..0d86fbeb48d77 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/pda.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/pda.tsx @@ -2,12 +2,12 @@ import { Feature, FeatureChoiced, FeatureShortTextInput } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const pda_theme: FeatureChoiced = { - name: 'PDA Theme', + name: 'КПК: тема', category: 'GAMEPLAY', component: FeatureDropdownInput, }; export const pda_ringtone: Feature = { - name: 'PDA Ringtone', + name: 'КПК: рингтон', component: FeatureShortTextInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/persistent_scars.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/persistent_scars.tsx index fdf450f71a387..d90623f3e2720 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/persistent_scars.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/persistent_scars.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const persistent_scars: FeatureToggle = { - name: 'Persistent Scars', + name: 'Сохранение шрамов', description: - 'If checked, scars will persist across rounds if you survive to the end.', + 'Если выбрано, то шрамы будут сохраняться между раундами, если вы доживаете до их конца.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/phobia.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/phobia.tsx index f2f35f65e16df..9bb38332b7b42 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/phobia.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/phobia.tsx @@ -2,6 +2,6 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const phobia: FeatureChoiced = { - name: 'Phobia', + name: 'Фобия', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/prisoner_crime.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/prisoner_crime.tsx index b551b68ee2ec5..03f2444bcf656 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/prisoner_crime.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/prisoner_crime.tsx @@ -2,8 +2,8 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const prisoner_crime: FeatureChoiced = { - name: 'Prisoner crime', + name: 'Преступления заключенного', description: - 'When a prisoner, this will be added to your records as the reason for your arrest.', + 'Будучи заключенным, эта информация будет внесена в ваши записи как причина вашего ареста.', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/security_department.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/security_department.tsx index a1311e347c80f..4e3ab6b5488bb 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/security_department.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/security_department.tsx @@ -2,6 +2,6 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const prefered_security_department: FeatureChoiced = { - name: 'Security department', + name: 'Охрана отдела', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skin_tone.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skin_tone.tsx index 8ff9d265b0baa..b279d05b521b2 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skin_tone.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skin_tone.tsx @@ -18,7 +18,7 @@ const sortHexValues = (array: [string, HexValue][]) => sortBy(array, ([_, hexValue]) => -hexValue.lightness); export const skin_tone: Feature = { - name: 'Skin tone', + name: 'Тон кожи', component: (props: FeatureValueProps) => { const { handleSetValue, serverData } = props; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/uplink_loc.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/uplink_loc.tsx index 2b1ffe26a3289..21fdc71743321 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/uplink_loc.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/uplink_loc.tsx @@ -2,6 +2,6 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const uplink_loc: FeatureChoiced = { - name: 'Uplink Spawn Location', + name: 'Местонахождение аплинка', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/accessibility.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/accessibility.tsx index a8a782b7f212a..1552ea53c8433 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/accessibility.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/accessibility.tsx @@ -1,20 +1,20 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const darkened_flash: FeatureToggle = { - name: 'Enable darkened flashes', - category: 'ACCESSIBILITY', + name: 'Включить затемненные вспышки', + category: 'ДОСТУПНОСТЬ', description: ` - When toggled, being flashed will show a dark screen rather than a - bright one. + Если включено, яркие вспышки теперь будут затемнять + ваш экран. `, component: CheckboxInput, }; export const screen_shake_darken: FeatureToggle = { - name: 'Darken screen shake', - category: 'ACCESSIBILITY', + name: 'Замена дрожи экрана затемнением', + category: 'ДОСТУПНОСТЬ', description: ` - When toggled, experiencing screen shake will darken your screen. + Если включено, дрожь экрана будет заменена затемнением экрана. `, component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/admin.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/admin.tsx index 7888a53e0038b..3d55cb2ec5fa1 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/admin.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/admin.tsx @@ -7,49 +7,49 @@ import { import { FeatureDropdownInput } from '../dropdowns'; export const asaycolor: Feature = { - name: 'Admin chat color', - category: 'ADMIN', - description: 'The color of your messages in Adminsay.', + name: 'Цвет админских сообщений', + category: 'АДМИН', + description: 'Цвет ваших сообщений в Adminsay.', component: FeatureColorInput, }; export const brief_outfit: Feature = { - name: 'Brief outfit', - category: 'ADMIN', - description: 'The outfit to gain when spawning as the briefing officer.', + name: 'Экипировка для брифинга', + category: 'АДМИН', + description: 'Экипировка, выдаваемая вам на роли брифинг офицера.', component: FeatureDropdownInput, }; export const bypass_deadmin_in_centcom: FeatureToggle = { - name: 'Bypass deadmin options when in CentCom', - category: 'ADMIN', + name: 'Игнорировать deadmin при спавне на ЦК', + category: 'АДМИН', description: - 'Whether or not to always remain an admin when spawned in CentCom.', + 'Оставаться ли с правами администратора, когда вы появляетесь на ЦК.', component: CheckboxInput, }; export const fast_mc_refresh: FeatureToggle = { - name: 'Enable fast MC stat panel refreshes', - category: 'ADMIN', + name: 'Включить ускоренное обновление MC', + category: 'АДМИН', description: - 'Whether or not the MC tab of the Stat Panel refreshes fast. This is expensive so make sure you need it.', + 'Должна ли панель MC со стат-панели обновляться быстрее обычного. Используйте, только если она нужна!', component: CheckboxInput, }; export const ghost_roles_as_admin: FeatureToggle = { - name: 'Get ghost roles while adminned', - category: 'ADMIN', + name: 'Получать гост-роли будучи админом', + category: 'АДМИН', description: ` - If you de-select this, you will not get any ghost role pop-ups while - adminned! Every single pop-up WILL never show up for you in an adminned - state. However, this does not suppress notifications when you are - a regular player (deadminned). + Если вы отключите это, то вы не будете получать предложения о гост-ролях, + когда вы с правами администратора. НИКАКОЕ оповещение не будет повляться для вас. + Но эта опция ничего не делает, если вы являетесь обычным игроком + (deadmin). `, component: CheckboxInput, }; export const comms_notification: FeatureToggle = { - name: 'Enable comms console sound', - category: 'ADMIN', + name: 'Звуковое оповещение о факсах на ЦК', + category: 'АДМИН', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ambient_occlusion.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ambient_occlusion.tsx index 8886a5da9db95..0d0c8861827e4 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ambient_occlusion.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ambient_occlusion.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const ambientocclusion: FeatureToggle = { - name: 'Enable ambient occlusion', - category: 'GAMEPLAY', - description: 'Enable ambient occlusion, light shadows around characters.', + name: 'Включить Ambient Occlusion', + category: 'ГЕЙМПЛЕЙ', + description: 'Глобальное затенение, добавляющее легие тени вокруг объектов.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/auto_fit_viewport.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/auto_fit_viewport.tsx index 31609990f18c6..c2daf337b449e 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/auto_fit_viewport.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/auto_fit_viewport.tsx @@ -1,7 +1,7 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const auto_fit_viewport: FeatureToggle = { - name: 'Auto fit viewport', - category: 'UI', + name: 'Автоматический Fit Viewport', + category: 'ИНТЕРФЕЙС', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/donor.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/donor.tsx index a3fefa240b3c5..c5a80a37e1055 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/donor.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/donor.tsx @@ -1,9 +1,9 @@ import { CheckboxInput, FeatureToggle } from '../../base'; export const donor_public: FeatureToggle = { - name: 'Publicize Donor status', - category: 'CHAT', + name: 'Отображать статус бустера', + category: 'ЧАТ', description: - 'When enabled, a donor badge will be shown next to your name in OOC.', + 'Если включено, в OOC чате будет отображаться значок тира подписки.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/lobby_style.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/lobby_style.tsx index 88fbf2e457325..3c34f45f08d50 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/lobby_style.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/lobby_style.tsx @@ -2,7 +2,7 @@ import { Feature } from '../../base'; import { FeatureDropdownInput } from '../../dropdowns'; export const lobby_style: Feature = { - name: 'Lobby Style', - category: 'UI', + name: 'Стиль лобби', + category: 'ИНТЕРФЕЙС', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/looc.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/looc.tsx index 4bbb43b14eef2..a5ab0a991a9ec 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/looc.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/bandastation/looc.tsx @@ -1,9 +1,9 @@ import { CheckboxInput, FeatureToggle } from '../../base'; export const looc_admin_pref: FeatureToggle = { - name: 'See admin LOOC', - category: 'ADMIN', + name: 'Слышать LOOC чат', + category: 'АДМИН', description: - 'Toggles whether you want to see LOOC anywhere as an admin or not.', + 'Если включено, вы будете получать LOOC сообщения от всех мобов.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/broadcast_login_logout.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/broadcast_login_logout.tsx index 772e619bc5733..9c401e5db6c11 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/broadcast_login_logout.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/broadcast_login_logout.tsx @@ -1,10 +1,10 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const broadcast_login_logout: FeatureToggle = { - name: 'Broadcast login/logout', - category: 'GAMEPLAY', + name: 'Оповещать остальных о входе/выходе', + category: 'ГЕЙМПЛЕЙ', description: ` - When enabled, disconnecting and reconnecting will announce to deadchat. + Оповещать в чате призраков остальных, когда вы входите или выходите из сервера. `, component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/buttons_locked.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/buttons_locked.tsx index d82bc89306ea2..72bcef51c8648 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/buttons_locked.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/buttons_locked.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const buttons_locked: FeatureToggle = { - name: 'Lock action buttons', - category: 'GAMEPLAY', - description: 'When enabled, action buttons will be locked in place.', + name: 'Заблокировать кнопки действий', + category: 'ГЕЙМПЛЕЙ', + description: 'Запрещает перемещать кнопки действий.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/fps.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/fps.tsx index 636ffa9d583a3..a4c37a1dd04dc 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/fps.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/fps.tsx @@ -50,6 +50,6 @@ const FpsInput = (props: FeatureValueProps) => { export const clientfps: Feature = { name: 'FPS', - category: 'GAMEPLAY', + category: 'ГЕЙМПЛЕЙ', component: FpsInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost.tsx index c1a7c816fd9ec..fd316cf1c2340 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost.tsx @@ -15,9 +15,9 @@ import { import { FeatureDropdownInput } from '../dropdowns'; export const ghost_accs: FeatureChoiced = { - name: 'Ghost accessories', - category: 'GHOST', - description: 'Determines what adjustments your ghost will have.', + name: 'Призрак: аксессуары', + category: 'ПРИЗРАК', + description: 'Влияет на то, какие изменения будет иметь ваш призрак.', component: FeatureDropdownInput, }; @@ -92,25 +92,25 @@ const GhostFormInput = ( }; export const ghost_form: FeatureChoiced = { - name: 'Ghosts form', - category: 'GHOST', - description: 'The appearance of your ghost. Requires BYOND membership.', + name: 'Призрак: форма', + category: 'ПРИЗРАК', + description: 'Внешний вид вашего призрака. Нужна подписка BYOND.', component: GhostFormInput, }; export const ghost_hud: FeatureToggle = { - name: 'Ghost HUD', - category: 'GHOST', - description: 'Enable HUD buttons for ghosts.', + name: 'Призрак: HUD', + category: 'ПРИЗРАК', + description: 'Переключает наличие кнопок на HUD призрака.', component: CheckboxInput, }; export const ghost_orbit: FeatureChoiced = { - name: 'Ghost orbit', - category: 'GHOST', + name: 'Призрак: орбитирование', + category: 'ПРИЗРАК', description: ` - The shape in which your ghost will orbit. - Requires BYOND membership. + Форма, по которой ваш призрак будет орбитировать. + Необходима подписка BYOND. `, component: ( props: FeatureValueProps, @@ -124,30 +124,30 @@ export const ghost_orbit: FeatureChoiced = { }; export const ghost_others: FeatureChoiced = { - name: 'Ghosts of others', - category: 'GHOST', + name: 'Призрак: окружающие', + category: 'ПРИЗРАК', description: ` - Do you want the ghosts of others to show up as their own setting, as - their default sprites, or always as the default white ghost? + Должны ли призраки других показываться с их настройками, только с их + стандартным спрайтом, или только показывать их стандартным белым призраком? `, component: FeatureDropdownInput, }; export const inquisitive_ghost: FeatureToggle = { - name: 'Ghost inquisitiveness', - category: 'GHOST', - description: 'Clicking on something as a ghost will examine it.', + name: 'Призрак: осмотр', + category: 'ПРИЗРАК', + description: 'Нажатие по чему-то будет вызывать осмотр.', component: CheckboxInput, }; export const ghost_roles: FeatureToggle = { - name: 'Get ghost roles', - category: 'GHOST', + name: 'Получать гост-роли', + category: 'ПРИЗРАК', description: ` - If you de-select this, you will not get any ghost role pop-ups what-so-ever! - Every single type of these pop-ups WILL be muted for you when you are - ghosted. Very useful for those who find ghost roles or the - pop-ups annoying, use at your own peril. + Если вы отключите это, вы не будете получать оповещения о гост-ролях, вообще! + Каждое оповещение БУДЕТ заглушено для вас, когда вы являетесь призраком. + Полезная опция для тех, кто не хочет играть на гост-ролях или не любит их + оповещения, используйте на свой страх и риск. `, component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost_lighting.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost_lighting.tsx index 95202a9995b9c..4378fc3d1533d 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost_lighting.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ghost_lighting.tsx @@ -2,8 +2,8 @@ import { FeatureChoiced } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const ghost_lighting: FeatureChoiced = { - name: 'Ghost Lighting', + name: 'Освещение для призраков', component: FeatureDropdownInput, - category: 'GHOST', - description: 'Effects the brightness of lights for ghosts', + category: 'ПРИЗРАК', + description: 'Влияет на уровень освещения, когда вы призрак.', }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/hotkeys.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/hotkeys.tsx index 71374a9fa23b9..57ff2812b44be 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/hotkeys.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/hotkeys.tsx @@ -1,9 +1,9 @@ import { CheckboxInputInverse, FeatureToggle } from '../base'; export const hotkeys: FeatureToggle = { - name: 'Classic hotkeys', - category: 'GAMEPLAY', + name: 'Классические горячие клавиши', + category: 'ГЕЙМПЛЕЙ', description: - 'When enabled, will revert to the legacy hotkeys, using the input bar rather than popups.', + 'Возвращает к старым горячим клавишам, которые используют полосу ввода, а не всплывающие окна.', component: CheckboxInputInverse, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/item_outlines.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/item_outlines.tsx index d315fca51e7ee..aa4330cba0dc8 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/item_outlines.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/item_outlines.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const itemoutline_pref: FeatureToggle = { - name: 'Item outlines', - category: 'GAMEPLAY', - description: 'When enabled, hovering over items will outline them.', + name: 'Контуры предметов', + category: 'ГЕЙМПЛЕЙ', + description: 'Показывать контур предметов при наведении на них.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_chat_toggles.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_chat_toggles.tsx index 84418348d00aa..2fd68bf71ee6e 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_chat_toggles.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_chat_toggles.tsx @@ -1,88 +1,88 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const chat_bankcard: FeatureToggle = { - name: 'Enable income updates', - category: 'CHAT', - description: 'Receive notifications for your bank account.', + name: 'Оповещать о зарплате', + category: 'ЧАТ', + description: 'Оповещать об изменениях вашего банковского аккаунта.', component: CheckboxInput, }; export const chat_dead: FeatureToggle = { - name: 'Enable deadchat', - category: 'ADMIN', + name: 'Включить чат призраков', + category: 'АДМИН', component: CheckboxInput, }; export const chat_ghostears: FeatureToggle = { - name: 'Hear all messages', - category: 'GHOST', + name: 'Слышать все сообщения', + category: 'ПРИЗРАК', description: ` - When enabled, you will be able to hear all speech as a ghost. - When disabled, you will only be able to hear nearby speech. + Если включено, вы будете слышать всех мобов. + Если отключено, вы будете слышать только мобов на экране. `, component: CheckboxInput, }; export const chat_ghostlaws: FeatureToggle = { - name: 'Enable law change updates', - category: 'GHOST', - description: 'When enabled, be notified of any new law changes as a ghost.', + name: 'Оповещать о смене законов', + category: 'ПРИЗРАК', + description: 'Оповещать, если произошли какие-либо смены законов.', component: CheckboxInput, }; export const chat_ghostpda: FeatureToggle = { - name: 'Enable PDA notifications', - category: 'GHOST', - description: 'When enabled, be notified of any PDA messages as a ghost.', + name: 'Оповещать о новых сообщениях на КПК', + category: 'ПРИЗРАК', + description: 'Оповещать, когда какое-либо КПК получает сообщение.', component: CheckboxInput, }; export const chat_ghostradio: FeatureToggle = { - name: 'Enable radio', - category: 'GHOST', - description: 'When enabled, be notified of any radio messages as a ghost.', + name: 'Слышать радио', + category: 'ПРИЗРАК', + description: 'Если включено, вы будете слышать все радио-сообщения.', component: CheckboxInput, }; export const chat_ghostsight: FeatureToggle = { - name: 'See all emotes', - category: 'GHOST', - description: 'When enabled, see all emotes as a ghost.', + name: 'Слышать все эмоции', + category: 'ПРИЗРАК', + description: 'Если включено, вы будете слышать, как все мобы делают эмоции.', component: CheckboxInput, }; export const chat_ghostwhisper: FeatureToggle = { - name: 'See all whispers', - category: 'GHOST', + name: 'Слышать все шепоты', + category: 'ПРИЗРАК', description: ` - When enabled, you will be able to hear all whispers as a ghost. - When disabled, you will only be able to hear nearby whispers. + Если включено, вы будете слышать шепоты всех мобов. + Если выключено, вы будете слышать шепоты только мобов на экране. `, component: CheckboxInput, }; export const chat_login_logout: FeatureToggle = { - name: 'See login/logout messages', - category: 'GHOST', - description: 'When enabled, be notified when a player logs in or out.', + name: 'Оповещать о входе/выходе', + category: 'ПРИЗРАК', + description: 'Оповещать, когда игроки входят/выходят из сервера.', component: CheckboxInput, }; export const chat_ooc: FeatureToggle = { - name: 'Enable OOC', - category: 'CHAT', + name: 'Включить OOC чат', + category: 'ЧАТ', component: CheckboxInput, }; export const chat_prayer: FeatureToggle = { - name: 'Listen to prayers', - category: 'ADMIN', + name: 'Слышать молитвы', + category: 'АДМИН', component: CheckboxInput, }; export const chat_pullr: FeatureToggle = { - name: 'Enable pull request notifications', - category: 'CHAT', - description: 'Be notified when a pull request is made, closed, or merged.', + name: 'Оповещать о Pull-Request', + category: 'ЧАТ', + description: 'Оповещать, когда Pull-Request создан, закрыт или вмержен.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_toggles.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_toggles.tsx index fb6cbfafddae9..2cbf8f1e06489 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_toggles.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/legacy_toggles.tsx @@ -1,103 +1,103 @@ import { CheckboxInput, CheckboxInputInverse, FeatureToggle } from '../base'; export const admin_ignore_cult_ghost: FeatureToggle = { - name: 'Prevent being summoned as a cult ghost', - category: 'ADMIN', + name: 'Не появляться за призрака культа', + category: 'АДМИН', description: ` - When enabled and observing, prevents Spirit Realm from forcing you - into a cult ghost. + Если включено, и если вы призрак, не дает Spirit Realm превращать вас + в призрака культа. `, component: CheckboxInput, }; export const announce_login: FeatureToggle = { - name: 'Announce login', - category: 'ADMIN', - description: 'Admins will be notified when you login.', + name: 'Оповещать о входе', + category: 'АДМИН', + description: 'Администрация будет оповещена о вашем входе.', component: CheckboxInput, }; export const combohud_lighting: FeatureToggle = { - name: 'Enable fullbright Combo HUD', - category: 'ADMIN', + name: 'Включить Combo-HUD с полным светом', + category: 'АДМИН', component: CheckboxInput, }; export const deadmin_always: FeatureToggle = { - name: 'Auto deadmin - Always', - category: 'ADMIN', - description: 'When enabled, you will automatically deadmin.', + name: 'Авто deadmin', + category: 'АДМИН', + description: 'Автоматический deadmin при заходе в раунд.', component: CheckboxInput, }; export const deadmin_antagonist: FeatureToggle = { - name: 'Auto deadmin - Antagonist', - category: 'ADMIN', - description: 'When enabled, you will automatically deadmin as an antagonist.', + name: 'Авто deadmin - при антагонизме', + category: 'АДМИН', + description: 'Автоматический deadmin, если вы антагонист.', component: CheckboxInput, }; export const deadmin_position_head: FeatureToggle = { - name: 'Auto deadmin - Head of Staff', - category: 'ADMIN', + name: 'Авто deadmin - глава отдела', + category: 'АДМИН', description: - 'When enabled, you will automatically deadmin as a head of staff.', + 'Автоматический deadmin, если вы становитесь главой какого-либо отдела', component: CheckboxInput, }; export const deadmin_position_security: FeatureToggle = { - name: 'Auto deadmin - Security', - category: 'ADMIN', + name: 'Авто deadmin - СБ', + category: 'АДМИН', description: - 'When enabled, you will automatically deadmin as a member of security.', + 'Автоматический deadmin, если вы становитесь членом службы безопасности.', component: CheckboxInput, }; export const deadmin_position_silicon: FeatureToggle = { - name: 'Auto deadmin - Silicon', - category: 'ADMIN', - description: 'When enabled, you will automatically deadmin as a silicon.', + name: 'Авто deadmin - синтетик', + category: 'АДМИН', + description: 'Автоматический deadmin, если вы синтетик.', component: CheckboxInput, }; export const disable_arrivalrattle: FeatureToggle = { - name: 'Notify for new arrivals', - category: 'GHOST', - description: 'When enabled, you will be notified as a ghost for new crew.', + name: 'Оповещать о прибытии экипажа', + category: 'ПРИЗРАК', + description: 'Оповещать, когда вы призрак, о прибытии нового члена экипажа.', component: CheckboxInputInverse, }; export const disable_deathrattle: FeatureToggle = { - name: 'Notify for deaths', - category: 'GHOST', + name: 'Оповещать о смертях', + category: 'ПРИЗРАК', description: - 'When enabled, you will be notified as a ghost whenever someone dies.', + 'Оповещать, когда вы призрак, когда умирают другие игроки от чего-либо.', component: CheckboxInputInverse, }; export const member_public: FeatureToggle = { - name: 'Publicize BYOND membership', - category: 'CHAT', + name: 'Показывать подписку BYOND', + category: 'ЧАТ', description: - 'When enabled, a BYOND logo will be shown next to your name in OOC.', + 'При включении, показывает логотип BYOND рядом с вашим именем в OOC чате.', component: CheckboxInput, }; export const sound_adminhelp: FeatureToggle = { - name: 'Enable adminhelp sounds', - category: 'ADMIN', + name: 'Включить звуки админхелпов', + category: 'АДМИН', component: CheckboxInput, }; export const sound_prayers: FeatureToggle = { - name: 'Enable prayer sound', - category: 'ADMIN', + name: 'Включить звуки молитв', + category: 'АДМИН', component: CheckboxInput, }; export const split_admin_tabs: FeatureToggle = { - name: 'Split admin tabs', - category: 'ADMIN', - description: "When enabled, will split the 'Admin' panel into several tabs.", + name: 'Разделять админские вкладки', + category: 'АДМИН', + description: "Разделяет вкладки на панели 'Admin'", component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/mod_select.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/mod_select.tsx index 04a9e000da058..11f7217070ad8 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/mod_select.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/mod_select.tsx @@ -2,8 +2,8 @@ import { Feature } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const mod_select: Feature = { - name: 'MOD active module key', - category: 'GAMEPLAY', - description: 'The key you need to use an active MODsuit module.', + name: 'Активация модуля MOD', + category: 'ГЕЙМПЛЕЙ', + description: 'Какая клавиша вызовет функционал активного модуля MOD.', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_parallax.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_parallax.tsx index 980cc7b47e6e4..6349a209c052c 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_parallax.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_parallax.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const multiz_parallax: FeatureToggle = { - name: 'Enable multi-z parallax', - category: 'GAMEPLAY', - description: 'Enable multi-z parallax, for a 3D effect.', + name: 'Мульти-Z - параллакс', + category: 'ГЕЙМПЛЕЙ', + description: 'Добавлять 3D-эффект для мульти-Z.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_performance.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_performance.tsx index f844b9f41f2a1..0ee9f6c17e33b 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_performance.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/multiz_performance.tsx @@ -1,13 +1,13 @@ import { createDropdownInput, Feature } from '../base'; export const multiz_performance: Feature = { - name: 'Multi-Z Detail', - category: 'GAMEPLAY', - description: 'How detailed multi-z is. Lower this to improve performance', + name: 'Мульти-Z - детализация', + category: 'ГЕЙМПЛЕЙ', + description: 'Уровень детализации мульти-Z. Влияет на производительность.', component: createDropdownInput({ - [-1]: 'Standard', - 2: 'High', - 1: 'Medium', - 0: 'Low', + [-1]: 'Стандартная', + 2: 'Высокая', + 1: 'Средняя', + 0: 'Низкая', }), }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ooc.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ooc.tsx index fe551cce2f7b9..c2be1f39f9938 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ooc.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ooc.tsx @@ -1,8 +1,8 @@ import { Feature, FeatureColorInput } from '../base'; export const ooccolor: Feature = { - name: 'OOC color', - category: 'CHAT', - description: 'The color of your OOC messages.', + name: 'Цвет OOC', + category: 'ЧАТ', + description: 'Цвет ваших сообщений в чат OOC.', component: FeatureColorInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/parallax.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/parallax.tsx index 914af27c38281..7b60a3da84e4d 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/parallax.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/parallax.tsx @@ -2,7 +2,7 @@ import { Feature } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const parallax: Feature = { - name: 'Parallax (fancy space)', - category: 'GAMEPLAY', + name: 'Параллакс (красивый космос)', + category: 'ГЕЙМПЛЕЙ', component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/pixel_size.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/pixel_size.tsx index ed5fb9aafa725..b89ab5676ad2d 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/pixel_size.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/pixel_size.tsx @@ -1,8 +1,8 @@ import { createDropdownInput, Feature } from '../base'; export const pixel_size: Feature = { - name: 'Pixel Scaling', - category: 'UI', + name: 'Масштабирование пикселей', + category: 'ИНТЕРФЕЙС', component: createDropdownInput({ 0: 'Stretch to fit', 1: 'Pixel Perfect 1x', diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/preferred_map.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/preferred_map.tsx index d00ce9dd04df7..8291bbe1fb4dd 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/preferred_map.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/preferred_map.tsx @@ -2,12 +2,12 @@ import { Feature } from '../base'; import { FeatureDropdownInput } from '../dropdowns'; export const preferred_map: Feature = { - name: 'Preferred map', - category: 'GAMEPLAY', + name: 'Предпочтительная карта', + category: 'ГЕЙМПЛЕЙ', description: ` - During map rotation, prefer this map be chosen. - This does not affect the map vote, only random rotation when a vote - is not held. + Предпочитать эту карту при ротации карт. + Это влияет только тогда, когда вы не проголосовали + за выбор карты. `, component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/runechat.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/runechat.tsx index bb86e2626bf14..e5afd9ae6e475 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/runechat.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/runechat.tsx @@ -6,29 +6,29 @@ import { } from '../base'; export const chat_on_map: FeatureToggle = { - name: 'Enable Runechat', - category: 'RUNECHAT', - description: 'Chat messages will show above heads.', + name: 'Рунчат: включить', + category: 'РУНЧАТ', + description: 'Тест сообщений будет появляться над головами.', component: CheckboxInput, }; export const see_chat_non_mob: FeatureToggle = { - name: 'Enable Runechat on objects', - category: 'RUNECHAT', - description: 'Chat messages will show above objects when they speak.', + name: 'Рунчат: включить для объектов', + category: 'РУНЧАТ', + description: 'Текст сообщений будет появляться над объектами.', component: CheckboxInput, }; export const see_rc_emotes: FeatureToggle = { - name: 'Enable Runechat emotes', - category: 'RUNECHAT', - description: 'Emotes will show above heads.', + name: 'Рунчат: включить для эмоций', + category: 'РУНЧАТ', + description: 'Текст эмоций будет повляться над головами.', component: CheckboxInput, }; export const max_chat_length: FeatureNumeric = { - name: 'Max chat length', - category: 'RUNECHAT', - description: 'The maximum length a Runechat message will show as.', + name: 'Рунчат: максимальная длина', + category: 'РУНЧАТ', + description: 'Максимальная длина, показываемая рунчатом.', component: FeatureNumberInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/scaling_method.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/scaling_method.tsx index 68a4c9c87fa30..1ec9f1349d334 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/scaling_method.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/scaling_method.tsx @@ -1,8 +1,8 @@ import { createDropdownInput, Feature } from '../base'; export const scaling_method: Feature = { - name: 'Scaling method', - category: 'UI', + name: 'Метод масштабирования', + category: 'ИНТЕРФЕЙС', component: createDropdownInput({ blur: 'Bilinear', distort: 'Nearest Neighbor', diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/screentips.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/screentips.tsx index 8cdc6c0ddf105..a7764f8ac1cab 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/screentips.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/screentips.tsx @@ -8,29 +8,29 @@ import { import { FeatureDropdownInput } from '../dropdowns'; export const screentip_color: Feature = { - name: 'Screentips: Screentips color', - category: 'UI', + name: 'Подсказки на экране: цвет', + category: 'ИНТЕРФЕЙС', description: ` - The color of screen tips, the text you see when hovering over something. + Цвет ваших подсказок на экране при наведении на объект. `, component: FeatureColorInput, }; export const screentip_images: FeatureToggle = { - name: 'Screentips: Allow images', - category: 'UI', - description: `When enabled, screentip hints use images for - the mouse button rather than LMB/RMB.`, + name: 'Подсказки на экране: изображения', + category: 'ИНТЕРФЕЙС', + description: `Показывает изображения кнопок мыши при подсказках, + вместо ЛКМ/ПКМ.`, component: CheckboxInput, }; export const screentip_pref: FeatureChoiced = { - name: 'Screentips: Enable screentips', - category: 'UI', + name: 'Подсказки на экране: включить', + category: 'ИНТЕРФЕЙС', description: ` - Enables screen tips, the text you see when hovering over something. - When set to "Only with tips", will only show when there is more information - than just the name, such as what right-clicking it does. + Включает подсказки на экране, когда вы наводитесь над объектами. + Если выбрана "Только с подсказками", подсказки будут появляться, только если + есть дополнительная информация к ним, например действие на ПКМ. `, component: FeatureDropdownInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx index b1683a8ef3740..02875439c6828 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx @@ -8,118 +8,118 @@ import { import { FeatureDropdownInput } from '../dropdowns'; export const sound_ambience_volume: Feature = { - name: 'Ambience volume', - category: 'SOUND', - description: `Ambience refers to the more noticeable ambient sounds that play on occasion.`, + name: 'Громкость окружения', + category: 'ЗВУК', + description: `Различные звуки оружения, играющие по ситуации.`, component: FeatureSliderInput, }; export const sound_breathing: FeatureToggle = { - name: 'Enable breathing sounds', - category: 'SOUND', - description: 'When enabled, hear breathing sounds when using internals.', + name: 'Включить звук дыхания', + category: 'ЗВУК', + description: 'Слышать звук дыхания, когда подключен баллон.', component: CheckboxInput, }; export const sound_announcements: FeatureToggle = { - name: 'Enable announcement sounds', - category: 'SOUND', - description: 'When enabled, hear sounds for command reports, notices, etc.', + name: 'Включить звук анонсов', + category: 'ЗВУК', + description: 'Играть звук при оповещениях с ЦК, уведомлений и тд.', component: CheckboxInput, }; export const sound_combatmode: FeatureToggle = { - name: 'Enable combat mode sound', - category: 'SOUND', - description: 'When enabled, hear sounds when toggling combat mode.', + name: 'Включить звук режима боя', + category: 'ЗВУК', + description: 'Играть звук при переключении режима боя.', component: CheckboxInput, }; export const sound_endofround: FeatureToggle = { - name: 'Enable end of round sounds', - category: 'SOUND', - description: 'When enabled, hear a sound when the server is rebooting.', + name: 'Включить звук конца раунда', + category: 'ЗВУК', + description: 'Играть звук, когда сервер начинает перезапуск.', component: CheckboxInput, }; export const sound_instruments: FeatureToggle = { - name: 'Enable instruments', - category: 'SOUND', - description: 'When enabled, be able hear instruments in game.', + name: 'Включить звук музыкальных инструментов', + category: 'ЗВУК', + description: 'Играть звук музыкальных инструментов.', component: CheckboxInput, }; export const sound_tts: FeatureChoiced = { - name: 'Enable TTS', - category: 'SOUND', + name: 'TTS - включить', + category: 'ЗВУК', description: ` - When enabled, be able to hear text-to-speech sounds in game. - When set to "Blips", text to speech will be replaced with blip sounds based on the voice. + Играть звук text-to-speech. + Функция "Blips" не работает. `, component: FeatureDropdownInput, }; export const sound_tts_volume: Feature = { - name: 'TTS Volume', - category: 'SOUND', - description: 'The volume that the text-to-speech sounds will play at.', + name: 'TTS - громкость', + category: 'ЗВУК', + description: 'Громкость text-to-speech.', component: FeatureSliderInput, }; export const sound_jukebox: FeatureToggle = { - name: 'Enable jukebox music', - category: 'SOUND', - description: 'When enabled, hear music for jukeboxes, dance machines, etc.', + name: 'Включить звук музыкальных автоматов', + category: 'ЗВУК', + description: 'Играть звук музыкальных автоматов, диско-машин и тд.', component: CheckboxInput, }; export const sound_lobby_volume: Feature = { - name: 'Lobby music volume', - category: 'SOUND', + name: 'Громкость музыки в лобби', + category: 'ЗВУК', component: FeatureSliderInput, }; export const sound_midi: FeatureToggle = { - name: 'Enable admin music', - category: 'SOUND', - description: 'When enabled, admins will be able to play music to you.', + name: 'Включить звук админской музыки', + category: 'ЗВУК', + description: 'Играть звук музыки, запускаемой администрацией.', component: CheckboxInput, }; export const sound_ship_ambience_volume: Feature = { - name: 'Ship ambience volume', - category: 'SOUND', - description: `Ship ambience refers to the low ambient buzz that plays on loop.`, + name: 'Громкость звуков корабля', + category: 'ЗВУК', + description: `Зацикленный звук окружения корабля (низкий гул).`, component: FeatureSliderInput, }; export const sound_elevator: FeatureToggle = { - name: 'Enable elevator music', - category: 'SOUND', + name: 'Включить музыку в лифтах', + category: 'ЗВУК', component: CheckboxInput, }; export const sound_achievement: FeatureChoiced = { - name: 'Achievement unlock sound', - category: 'SOUND', + name: 'Звук при получении достижений', + category: 'ЗВУК', description: ` - The sound that's played when unlocking an achievement. - If disabled, no sound will be played. + Выбор звука, который будет играть при получении достижения. + При отключении звука не будет. `, component: FeatureDropdownInput, }; export const sound_radio_noise: Feature = { - name: 'Radio noise volume', - category: 'SOUND', - description: `Volume of talking and hearing radio chatter sounds.`, + name: 'Громкость оповещения рации', + category: 'ЗВУК', + description: `Громкость оповещений, когда в рацию кто-то говорит.`, component: FeatureSliderInput, }; export const sound_ai_vox: FeatureToggle = { - name: 'Enable AI VOX announcements', - category: 'SOUND', + name: 'Включить звук VOX ИИ', + category: 'ЗВУК', description: - 'When enabled, hear vocal AI announcements (also known as "VOX").', + 'Слышать краткие озвученные сообщения от ИИ (также известные, как "VOX").', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tgui.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tgui.tsx index 8b358cd1ed421..4d0de7ac0e307 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tgui.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tgui.tsx @@ -1,43 +1,43 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const tgui_fancy: FeatureToggle = { - name: 'Enable fancy TGUI', - category: 'UI', - description: 'Makes TGUI windows look better, at the cost of compatibility.', + name: 'Включить красивый TGUI', + category: 'ИНТЕРФЕЙС', + description: 'Окна TGUI будут выглядишь лучше ценой совместимости.', component: CheckboxInput, }; export const tgui_input: FeatureToggle = { - name: 'Input: Enable TGUI', - category: 'UI', - description: 'Renders input boxes in TGUI.', + name: 'Ввод: включить TGUI', + category: 'ИНТЕРФЕЙС', + description: 'Окна ввода будут иметь TGUI.', component: CheckboxInput, }; export const tgui_input_large: FeatureToggle = { - name: 'Input: Larger buttons', - category: 'UI', - description: 'Makes TGUI buttons less traditional, more functional.', + name: 'Ввод: большие кнопки', + category: 'ИНТЕРФЕЙС', + description: 'Менее традиционные, но более функциональные кнопки TGUI.', component: CheckboxInput, }; export const tgui_input_swapped: FeatureToggle = { - name: 'Input: Swap Submit/Cancel buttons', - category: 'UI', - description: 'Makes TGUI buttons less traditional, more functional.', + name: 'Ввод: инвентировать ввод/отмена', + category: 'ИНТЕРФЕЙС', + description: 'Менее традиционные, но более функциональные кнопки TGUI.', component: CheckboxInput, }; export const tgui_lock: FeatureToggle = { - name: 'Lock TGUI to main monitor', - category: 'UI', - description: 'Locks TGUI windows to your main monitor.', + name: 'TGUI только на главном дисплее', + category: 'ИНТЕРФЕЙС', + description: 'Блокирует местоположение TGUI на главном дисплее.', component: CheckboxInput, }; export const tgui_say_light_mode: FeatureToggle = { - name: 'Say: Light mode', - category: 'UI', - description: 'Sets TGUI Say to use a light mode.', + name: 'Говорить: светлая тема', + category: 'ИНТЕРФЕЙС', + description: 'TGUI поле ввода для разговора будет в светлой теме.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tooltips.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tooltips.tsx index edbdb25ef1cbf..e134d25782a49 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tooltips.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/tooltips.tsx @@ -6,19 +6,19 @@ import { } from '../base'; export const enable_tips: FeatureToggle = { - name: 'Enable tooltips', - category: 'TOOLTIPS', + name: 'Подсказки при наведении: включить', + category: 'ПОДСКАЗКИ', description: ` - Do you want to see tooltips when hovering over items? + Показывать подсказки при наведении на объект. `, component: CheckboxInput, }; export const tip_delay: Feature = { - name: 'Tooltip delay (in milliseconds)', - category: 'TOOLTIPS', + name: 'Подсказки при наведении: задержка (в мс)', + category: 'ПОДСКАЗКИ', description: ` - How long should it take to see a tooltip when hovering over items? + Задержка перед тем, как показать подсказку при наведении на объект? `, component: FeatureNumberInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/typing_indicator.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/typing_indicator.tsx index b57c864e4fc5e..c4f8ae6f1108f 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/typing_indicator.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/typing_indicator.tsx @@ -1,8 +1,8 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const typingIndicator: FeatureToggle = { - name: 'Enable typing indicators for self', - category: 'GAMEPLAY', - description: "Enable typing indicators that show you're typing a message.", + name: 'Включить индикатор печатания', + category: 'ГЕЙМПЛЕЙ', + description: 'Показывать индикатор печатания, когда вы пишите сообщение.', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ui_style.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ui_style.tsx index 69faf7d50c8a3..f5cc6be9a640c 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ui_style.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/ui_style.tsx @@ -61,7 +61,7 @@ const UIStyleInput = ( }; export const UI_style: FeatureChoiced = { - name: 'UI Style', - category: 'UI', + name: 'Стиль UI', + category: 'ИНТЕРФЕЙС', component: UIStyleInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/widescreen.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/widescreen.tsx index 052c3b68ca6c4..d15c8573f26a1 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/widescreen.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/widescreen.tsx @@ -1,7 +1,7 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const widescreenpref: FeatureToggle = { - name: 'Enable widescreen', - category: 'UI', + name: 'Включить широкоэкранный режим', + category: 'ИНТЕРФЕЙС', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/window_flashing.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/window_flashing.tsx index d8b0ce0b4ae64..2e036d858fd61 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/window_flashing.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/window_flashing.tsx @@ -1,11 +1,11 @@ import { CheckboxInput, FeatureToggle } from '../base'; export const windowflashing: FeatureToggle = { - name: 'Enable window flashing', - category: 'UI', + name: 'Включить мигание окна', + category: 'ИНТЕРФЕЙС', description: ` - When toggled, some important events will make your game icon flash on your - task tray. + Важные события в игре заставят иконку игры мигать + на панели задач. `, component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/randomization.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/randomization.tsx index 2de0d9617ab4e..08d3b613b9165 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/randomization.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/randomization.tsx @@ -7,7 +7,7 @@ import { useRandomToggleState } from '../../useRandomToggleState'; import { CheckboxInput, Feature, FeatureToggle } from './base'; export const random_body: Feature = { - name: 'Random body', + name: 'Случайное тело', component: (props) => { const [randomToggle, setRandomToggle] = useRandomToggleState(); @@ -30,19 +30,21 @@ export const random_body: Feature = { setRandomToggle(false); }} > - Randomize + Рандомизировать ) : ( - + )} @@ -51,12 +53,12 @@ export const random_body: Feature = { }; export const random_hardcore: FeatureToggle = { - name: 'Hardcore random', + name: 'Тотальный рандом', component: CheckboxInput, }; export const random_name: Feature = { - name: 'Random name', + name: 'Случайное имя', component: (props) => { return ( = { }; export const random_species: Feature = { - name: 'Random species', + name: 'Случайный вид', component: (props) => { const { act, data } = useBackend(); diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx index ba91f89372374..4372fa765a575 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx @@ -8,17 +8,17 @@ import { import { FeatureDropdownInput } from './dropdowns'; export const eye_color: Feature = { - name: 'Eye color', + name: 'Глаза: цвет', component: FeatureColorInput, }; export const facial_hair_color: Feature = { - name: 'Facial hair color', + name: 'Лицевая растительность: цвет', component: FeatureColorInput, }; export const facial_hair_gradient: FeatureChoiced = { - name: 'Facial hair gradient', + name: 'Лицевая растительность: градиент', component: ( props: FeatureValueProps, ) => { @@ -27,17 +27,17 @@ export const facial_hair_gradient: FeatureChoiced = { }; export const facial_hair_gradient_color: Feature = { - name: 'Facial hair gradient color', + name: 'Лицевая растительность: цвет градиента', component: FeatureColorInput, }; export const hair_color: Feature = { - name: 'Hair color', + name: 'Волосы: цвет', component: FeatureColorInput, }; export const hair_gradient: FeatureChoiced = { - name: 'Hair gradient', + name: 'Волосы: градиент', component: ( props: FeatureValueProps, ) => { @@ -46,12 +46,12 @@ export const hair_gradient: FeatureChoiced = { }; export const hair_gradient_color: Feature = { - name: 'Hair gradient color', + name: 'Волосы: цвет градиента', component: FeatureColorInput, }; export const feature_human_ears: FeatureChoiced = { - name: 'Ears', + name: 'Уши', component: ( props: FeatureValueProps, ) => { @@ -60,7 +60,7 @@ export const feature_human_ears: FeatureChoiced = { }; export const feature_human_tail: FeatureChoiced = { - name: 'Tail', + name: 'Хвост', component: ( props: FeatureValueProps, ) => { @@ -78,7 +78,7 @@ export const feature_monkey_tail: FeatureChoiced = { }; export const feature_lizard_legs: FeatureChoiced = { - name: 'Legs', + name: 'Ноги', component: ( props: FeatureValueProps, ) => { @@ -87,7 +87,7 @@ export const feature_lizard_legs: FeatureChoiced = { }; export const feature_lizard_spines: FeatureChoiced = { - name: 'Spines', + name: 'Шипы', component: ( props: FeatureValueProps, ) => { @@ -96,7 +96,7 @@ export const feature_lizard_spines: FeatureChoiced = { }; export const feature_lizard_tail: FeatureChoiced = { - name: 'Tail', + name: 'Хвост', component: ( props: FeatureValueProps, ) => { @@ -105,22 +105,22 @@ export const feature_lizard_tail: FeatureChoiced = { }; export const feature_mcolor: Feature = { - name: 'Mutant color', + name: 'Цвет мутанта', component: FeatureColorInput, }; export const underwear_color: Feature = { - name: 'Underwear color', + name: 'Нижнее белье: цвет', component: FeatureColorInput, }; export const feature_vampire_status: Feature = { - name: 'Vampire status', + name: 'Статус вампира', component: FeatureDropdownInput, }; export const heterochromatic: Feature = { - name: 'Heterochromatic (Right Eye) color', + name: 'Глаза: цвет гетерохромии (правый глаз)', component: FeatureColorInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts index baac865559321..93ae37f430845 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/gender.ts @@ -8,21 +8,21 @@ export enum Gender { export const GENDERS = { [Gender.Male]: { icon: 'mars', - text: 'He/Him', + text: 'Он/Его', }, [Gender.Female]: { icon: 'venus', - text: 'She/Her', + text: 'Она/Ее', }, [Gender.Other]: { icon: 'transgender', - text: 'They/Them', + text: 'Они/Их', }, [Gender.Other2]: { icon: 'neuter', - text: 'It/Its', + text: 'Оно/Его', }, }; diff --git a/tools/UpdatePaths/Scripts/88095_repaths_a357_to_c357.txt b/tools/UpdatePaths/Scripts/88095_repaths_a357_to_c357.txt index 28ad97efff1ab..0b6f5a9f39eb9 100644 --- a/tools/UpdatePaths/Scripts/88095_repaths_a357_to_c357.txt +++ b/tools/UpdatePaths/Scripts/88095_repaths_a357_to_c357.txt @@ -1,3 +1,3 @@ #comment Repaths instances of a357 with c357, so as to acknowledge that it is consistent with other casings. -/obj/item/ammo_casing/c357 : /obj/item/ammo_casing/a357{@OLD} +/obj/item/ammo_casing/a357 : /obj/item/ammo_casing/c357{@OLD} diff --git a/tools/UpdatePaths/Scripts/89153_simple_to_basic_zombies.txt b/tools/UpdatePaths/Scripts/89153_simple_to_basic_zombies.txt new file mode 100644 index 0000000000000..dbb408b60cd69 --- /dev/null +++ b/tools/UpdatePaths/Scripts/89153_simple_to_basic_zombies.txt @@ -0,0 +1,3 @@ +/mob/living/simple_animal/hostile/zombie{health=60;name="Rotting Carcass";outfit=/datum/outfit/corpse_assistant} : /mob/living/basic/zombie/rotten/assistant +/mob/living/simple_animal/hostile/zombie{health=60;name="Rotting Carcass"} : /mob/living/basic/zombie/rotten +/mob/living/simple_animal/hostile/zombie : /mob/living/basic/zombie{@OLD}