From d39ded55d593e18fd8e430711efd325066799032 Mon Sep 17 00:00:00 2001 From: Waterpig Date: Mon, 8 Jul 2024 19:05:52 +0200 Subject: [PATCH] upstream-24-07b --- .../bubber/automapper/automapper_config.toml | 16 +- .../IceBoxStation/iceboxstation_armory.dmm | 8 +- .../LimaStation/limastation_armory.dmm | 12 +- .../templates/biodome/biodome_armory.dmm | 14 +- _maps/map_files/BoxStation/BoxStation.dmm | 143 +- _maps/map_files/KiloStation/KiloStation.dmm | 1298 ++++---- _maps/map_files/LimaStation/LimaStation.dmm | 133 +- _maps/map_files/NSVBlueshift/Blueshift.dmm | 2418 +++++++------- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 2916 +++++++++-------- _maps/map_files/biodome/biodome.dmm | 118 +- .../biodome/modules/cage_4_cockroach.dmm | 2 +- _maps/map_files/moonstation/moonstation.dmm | 94 +- _maps/shuttles/arrival_biodome.dmm | 12 +- _maps/shuttles/cargo_lima.dmm | 1 - _maps/shuttles/emergency_lima.dmm | 4 +- _maps/shuttles/labour_lima.dmm | 4 +- _maps/shuttles/mining_lima.dmm | 12 +- .../emergency_imfedupwiththisworld.dmm | 4 +- .../skyrat/automapper/automapper_config.toml | 14 +- .../templates/birdshot/birdshot_armory.dmm | 121 + .../templates/northstar/northstar_armory.dmm | 129 + code/__DEFINES/~~bubber_defines/cameranets.dm | 3 + code/datums/mutations/touch.dm | 4 +- code/modules/bitrunning/objects/netpod.dm | 0 .../bitrunning/server/obj_generation.dm | 2 +- code/modules/bitrunning/server/util.dm | 11 +- ...dynamic_human_icons_syndicate_commando.png | Bin 1039 -> 1039 bytes .../lists/maintenance_loot_rare.dm | 1 - .../lists/maintenance_loot_uncommon.dm | 2 +- .../code/game/objects/items/more_pkas.dm | 13 +- .../bloodsucker/structures/objects.dm | 17 +- .../code/modules/bow_adjustments/arrow.dm | 29 +- .../code/modules/clothing/donator_clothing.dm | 2 +- .../projectiles/guns/ballistic/automatic.dm | 6 +- .../projectiles/projectile/bullets/smg.dm | 8 +- .../modules/security/security_glock/ammo.dm | 2 +- .../maps/moonstation/telescreen.dm | 8 + tgstation.dme | 2 + 38 files changed, 3786 insertions(+), 3797 deletions(-) create mode 100644 _maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm create mode 100644 _maps/skyrat/automapper/templates/northstar/northstar_armory.dmm create mode 100644 code/__DEFINES/~~bubber_defines/cameranets.dm delete mode 100644 code/modules/bitrunning/objects/netpod.dm create mode 100644 modular_zubbers/maps/moonstation/telescreen.dm diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index d5b477c5ad6..d5804150a43 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -228,15 +228,15 @@ trait_name = "Station" map_files = ["birdshot_cryo.dmm"] directory = "_maps/skyrat/automapper/templates/birdshot/" required_map = "birdshot.dmm" -coordinates = [147, 142, 1] +coordinates = [136, 157, 1] trait_name = "Station" # Birdshot Barber [templates.birdshot_barber] map_files = ["birdshot_barber.dmm"] -directory = "_maps/bubber/automapper/templates/Birdshot/barber.dmm" +directory = "_maps/skyrat/automapper/templates/birdshot/" required_map = "birdshot.dmm" -coordinates = [118, 145, 1] +coordinates = [129, 127, 1] trait_name = "Station" # Birdshot NTR Office @@ -255,12 +255,20 @@ required_map = "birdshot.dmm" coordinates = [188, 72, 1] trait_name = "Station" +# Birdshot Vacant Room (to replace the mapped barber with ours) +[templates.birdshot_vacant] +map_files = ["birdshot_vacant.dmm"] +directory = "_maps/skyrat/automapper/templates/birdshot/" +required_map = "birdshot.dmm" +coordinates = [117, 145, 1] +trait_name = "Station" + # Birdshot Supermatter Chamber [templates.birdshot_supermatter] map_files = ["birdshot_supermatter.dmm"] directory = "_maps/skyrat/automapper/templates/birdshot/" required_map = "birdshot.dmm" -coordinates = [41, 201, 1] +coordinates = [71, 211, 1] trait_name = "Station" # NORTHSTAR MAP EDITS diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_armory.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_armory.dmm index fd2ac8c79c5..5f81fdc9a9c 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_armory.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_armory.dmm @@ -60,9 +60,7 @@ /area/station/ai_monitored/security/armory) "A" = ( /obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -100,9 +98,7 @@ /area/station/ai_monitored/security/armory) "J" = ( /obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, diff --git a/_maps/bubber/automapper/templates/LimaStation/limastation_armory.dmm b/_maps/bubber/automapper/templates/LimaStation/limastation_armory.dmm index 86fa043bdaf..b847ca462ca 100644 --- a/_maps/bubber/automapper/templates/LimaStation/limastation_armory.dmm +++ b/_maps/bubber/automapper/templates/LimaStation/limastation_armory.dmm @@ -148,15 +148,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -362,15 +358,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet, /obj/item/clothing/head/helmet{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, diff --git a/_maps/bubber/automapper/templates/biodome/biodome_armory.dmm b/_maps/bubber/automapper/templates/biodome/biodome_armory.dmm index 49b79989e43..ec3fcd9db37 100644 --- a/_maps/bubber/automapper/templates/biodome/biodome_armory.dmm +++ b/_maps/bubber/automapper/templates/biodome/biodome_armory.dmm @@ -101,15 +101,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -133,9 +129,7 @@ /area/station/ai_monitored/security/armory) "v" = ( /obj/structure/rack, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, @@ -180,9 +174,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 90c3d558498..088b2e2ac42 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4910,9 +4910,7 @@ /obj/machinery/computer/security{ dir = 4 }, -/obj/machinery/computer/security/telescreen/prison{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/prison, /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) @@ -4956,10 +4954,7 @@ /obj/item/wallframe/camera, /obj/item/wallframe/camera, /obj/item/assault_pod/mining, -/obj/machinery/computer/security/telescreen/auxbase{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/computer/security/telescreen/auxbase/directional/west, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -10206,7 +10201,6 @@ /obj/structure/table, /obj/machinery/reagentgrinder, /obj/item/reagent_containers/condiment/enzyme{ - layer = 5; pixel_x = -9 }, /turf/open/floor/iron/cafeteria, @@ -10677,7 +10671,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "aVw" = ( -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/item/toy/cards/deck, /obj/effect/landmark/start/hangover, /obj/structure/chair/sofa/left/brown, @@ -13675,9 +13669,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "beW" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/table/reinforced, /obj/item/stack/wrapping_paper{ pixel_x = 3; @@ -13887,10 +13879,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /obj/effect/landmark/start/chief_medical_officer, /obj/machinery/button/door{ id = "cmoprivacy"; @@ -15215,9 +15204,7 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/pharmacy) @@ -15826,9 +15813,7 @@ dir = 4 }, /obj/machinery/chem_dispenser, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, @@ -16260,9 +16245,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "bnR" = ( -/obj/machinery/computer/security/telescreen/vault{ - pixel_y = 30 - }, +/obj/machinery/computer/security/telescreen/vault, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, @@ -16994,9 +16977,7 @@ /turf/open/floor/iron, /area/station/cargo/office) "bqp" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/table/reinforced, /obj/item/dest_tagger, /obj/item/dest_tagger, @@ -17087,9 +17068,7 @@ /area/station/hallway/primary/central) "bqM" = ( /obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/plasticflaps/opaque, /obj/structure/disposalpipe/segment{ dir = 4 @@ -17870,7 +17849,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = -8; @@ -17878,7 +17856,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = 8; @@ -19113,12 +19090,9 @@ dir = 1 }, /obj/effect/landmark/start/depsec/medical, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/cmo/directional/east{ desc = "Used for monitoring medbay to ensure patient safety."; - dir = 4; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = -32 + name = "Medbay Monitor" }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) @@ -24202,9 +24176,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos) "bQm" = ( @@ -27366,10 +27338,7 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/computer/security/telescreen/ce{ - dir = 4; - pixel_x = -24 - }, +/obj/machinery/computer/security/telescreen/ce/directional/east, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, @@ -33839,10 +33808,7 @@ /obj/machinery/computer/records/security{ dir = 8 }, -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/engine/directional/west, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -34040,10 +34006,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/engine/directional/west, /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "dul" = ( @@ -34267,10 +34230,7 @@ /turf/open/floor/plating, /area/station/maintenance/fore/lesser) "dDX" = ( -/obj/machinery/computer/security/telescreen/prison{ - dir = 1; - pixel_y = -27 - }, +/obj/machinery/computer/security/telescreen/prison/directional/north, /obj/structure/filingcabinet/employment, /obj/machinery/firealarm/directional/east, /turf/open/floor/carpet/blue, @@ -36341,9 +36301,7 @@ codes_txt = "delivery;dir=4"; location = "Medbay" }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -36386,10 +36344,8 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/computer/security/telescreen/interrogation{ - name = "isolation room monitor"; - network = list("isolation"); - pixel_y = 31 +/obj/machinery/computer/security/telescreen/isolation{ + name = "isolation room monitor" }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) @@ -38060,10 +38016,6 @@ id = "experilab"; name = "Chamber Shutters" }, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32; - network = list("test") - }, /turf/open/floor/iron, /area/station/science/explab) "gwD" = ( @@ -38786,9 +38738,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/trimline/brown/filled/end{ dir = 1 }, @@ -40544,10 +40494,7 @@ /area/station/hallway/primary/fore) "iiD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/computer/security/telescreen/research{ - pixel_x = -2; - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/research, /turf/open/floor/iron/white, /area/station/science/xenobiology) "iiZ" = ( @@ -41327,10 +41274,7 @@ pixel_x = -6; pixel_y = 9 }, -/obj/machinery/computer/security/telescreen/rd{ - dir = 8; - pixel_x = 28 - }, +/obj/machinery/computer/security/telescreen/rd/directional/west, /obj/item/stamp/coderbus/closed, /obj/item/stamp/coderbus/merged{ pixel_x = 9 @@ -43879,9 +43823,7 @@ /obj/effect/turf_decal/trimline/blue/filled/end{ dir = 1 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/spawner/random/medical/patient_stretcher, /turf/open/floor/iron, /area/station/medical/medbay/aft) @@ -44634,9 +44576,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/brown/full, /obj/structure/table, /obj/machinery/cell_charger, @@ -50531,9 +50471,7 @@ pixel_y = 3 }, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/grass, /area/station/common/cryopods) "pwL" = ( @@ -51622,7 +51560,7 @@ /area/station/maintenance/disposal/incinerator) "qmh" = ( /obj/machinery/camera/directional/east{ - network = list("test","rd"); + network = list("rd"); c_tag = "Experimentation Chamber" }, /obj/effect/turf_decal/stripes/red/line{ @@ -52229,9 +52167,7 @@ /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/hfr_room) "qHR" = ( -/obj/machinery/computer/security/telescreen/interrogation{ - pixel_y = 30 - }, +/obj/machinery/computer/security/telescreen/interrogation, /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -52601,7 +52537,7 @@ /area/station/security/prison) "qUn" = ( /obj/item/storage/box/matches, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/item/razor{ pixel_x = -4; pixel_y = 2 @@ -54705,13 +54641,9 @@ id = "briggate"; name = "Security Shutters" }, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/normal/directional/north{ desc = "Used to access the various cameras on the station."; - dir = 1; - layer = 3.1; - name = "Security Camera Monitor"; - network = list("ss13"); - pixel_y = 3 + name = "Security Camera Monitor" }, /obj/machinery/door/window/right/directional/south{ req_access = list("brig"); @@ -58084,12 +58016,8 @@ pixel_x = -3; pixel_y = -3 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/grass, /area/station/common/cryopods) "uUn" = ( @@ -59726,10 +59654,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/ordnance{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/computer/security/telescreen/ordnance/directional/west, /turf/open/floor/iron, /area/station/science/ordnance/bomb) "wed" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a772305e644..7c89bf6af08 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -486,25 +486,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) -"afC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/engine/directional/east, -/turf/open/floor/iron, -/area/station/security/checkpoint/engineering) "afH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, @@ -527,6 +508,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/port) +"afU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/west, +/turf/open/floor/engine, +/area/station/ai_monitored/turret_protected/aisat/foyer) "agc" = ( /obj/structure/table/wood, /obj/structure/cable, @@ -1277,19 +1265,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"atk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/depsec/medical, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "atu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -1802,6 +1777,20 @@ "aDD" = ( /turf/open/floor/plating, /area/station/security/prison) +"aDF" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/assault_pod/mining, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/auxbase/directional/west, +/turf/open/floor/iron/dark, +/area/station/construction/mining/aux_base) "aDL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -2437,6 +2426,17 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"aMU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/start/depsec/science, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/research/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science/research) "aNa" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/siding/red, @@ -3260,6 +3260,15 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/education) +"bdM" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "bdU" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -4346,6 +4355,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, /area/space/nearstation) +"bzc" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/prison/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/office) "bzo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5116,19 +5135,6 @@ /obj/structure/flora/grass/jungle/b/style_random, /turf/open/misc/asteroid/airless, /area/station/hallway/secondary/entry) -"bQa" = ( -/obj/effect/landmark/start/cyborg, -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/motion/directional/west{ - c_tag = "ai_upload Foyer"; - name = "upload camera"; - network = list("aiupload") - }, -/obj/machinery/computer/security/telescreen/aiupload/directional/west, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/station/ai_monitored/turret_protected/ai_upload) "bQb" = ( /obj/structure/flora/bush/leavy/style_random, /obj/structure/flora/bush/ferny/style_random, @@ -5438,11 +5444,6 @@ }, /turf/open/floor/plating/airless, /area/station/hallway/secondary/entry) -"bUQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/deathsposal, -/turf/open/floor/plating, -/area/station/medical/virology) "bUV" = ( /obj/structure/cable, /obj/structure/chair, @@ -7326,6 +7327,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"cwj" = ( +/obj/machinery/modular_computer/preset/id, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/ce/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "cwl" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -7705,23 +7712,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"cHd" = ( -/obj/structure/table, -/obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1447; - name = "Private AI Channel"; - pixel_y = -2 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/plating, -/area/station/hallway/primary/central/fore) "cHg" = ( /obj/structure/chair/pew{ dir = 8 @@ -8212,6 +8202,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard) +"cQK" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/pharmacy) "cQR" = ( /turf/closed/wall, /area/station/maintenance/department/cargo) @@ -8496,6 +8492,20 @@ }, /turf/open/floor/engine, /area/station/tcommsat/computer) +"cVn" = ( +/obj/machinery/firealarm/directional/east, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #1"; + suffix = "#1" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #1" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "cVr" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -9994,22 +10004,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"drR" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/lighter{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/cigarette/cigar, -/obj/machinery/light/directional/west, -/obj/machinery/airalarm/directional/west, -/obj/item/paper_bin, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "dsc" = ( /obj/machinery/door/airlock/command/glass{ name = "Control Room" @@ -10242,6 +10236,23 @@ "dvN" = ( /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) +"dwc" = ( +/obj/structure/table, +/obj/item/radio/intercom{ + broadcasting = 1; + frequency = 1447; + name = "Private AI Channel"; + pixel_y = -2 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/plating, +/area/station/hallway/primary/central/fore) "dwh" = ( /obj/machinery/quantum_server, /obj/effect/turf_decal/bot/left, @@ -10325,14 +10336,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"dxR" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology Test Chamber"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "dxU" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -11203,6 +11206,22 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"dNL" = ( +/obj/machinery/button/flasher{ + id = "IsolationFlash"; + pixel_x = -23; + pixel_y = 8; + req_access = list("brig") + }, +/obj/machinery/button/door/directional/west{ + id = "Isolation"; + name = "Isolation Shutter Button"; + pixel_y = -6; + req_access = list("brig") + }, +/obj/machinery/computer/security/telescreen/isolation/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) "dOg" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -12661,6 +12680,23 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"eot" = ( +/obj/structure/table, +/obj/item/stack/package_wrap{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/hand_labeler, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/item/flatpack, +/turf/open/floor/iron/dark, +/area/station/science/lab) "eoM" = ( /obj/machinery/door/poddoor/preopen{ id = "brigfrontdoor"; @@ -12937,6 +12973,22 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/engineering/main) +"etB" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/lighter{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/cigarette/cigar, +/obj/machinery/light/directional/west, +/obj/machinery/airalarm/directional/west, +/obj/item/paper_bin, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "etD" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -13027,17 +13079,6 @@ "evE" = ( /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/port/greater) -"evQ" = ( -/mob/living/simple_animal/bot/mulebot, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #2" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "ewa" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/landmark/event_spawn, @@ -13712,6 +13753,17 @@ /obj/structure/sign/departments/evac, /turf/closed/wall, /area/station/security/checkpoint/customs) +"eIb" = ( +/obj/machinery/light/directional/east, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/ordnance/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/science/ordnance) "eIi" = ( /obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -13740,6 +13792,19 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"eIP" = ( +/obj/effect/landmark/start/cyborg, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/motion/directional/west{ + c_tag = "ai_upload Foyer"; + name = "upload camera"; + network = list("aiupload") + }, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/station/ai_monitored/turret_protected/ai_upload) "eIT" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -14641,6 +14706,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) +"eZg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/deathsposal, +/turf/open/floor/plating, +/area/station/medical/virology) "eZm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14826,16 +14896,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) -"fdq" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "fdA" = ( /obj/structure/table_frame/wood, /mob/living/basic/mining/basilisk{ @@ -15658,6 +15718,19 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +"fpI" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/directional/east, +/obj/machinery/requests_console/directional/east{ + department = "Pharmacy"; + name = "Pharmacy Requests Console" + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/ore_update, +/turf/open/floor/iron/dark, +/area/station/medical/pharmacy) "fpQ" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -16508,15 +16581,6 @@ dir = 8 }, /area/station/service/chapel) -"fAO" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "fBh" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -18031,6 +18095,19 @@ /obj/structure/disposalpipe/segment, /turf/closed/mineral/random/labormineral, /area/space/nearstation) +"fYU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/depsec/medical, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "fZk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -18274,6 +18351,11 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"gcy" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "gcL" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -23259,17 +23341,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) -"hIZ" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/prison/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/warden) "hJa" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -24348,20 +24419,6 @@ /obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, /area/station/service/chapel) -"hZf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table, -/obj/machinery/requests_console/directional/west{ - department = "Security"; - name = "Security Requests Console" - }, -/obj/machinery/light_switch/directional/north, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "hZg" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -26564,6 +26621,16 @@ }, /turf/open/floor/bronze, /area/station/maintenance/department/chapel) +"iGD" = ( +/obj/structure/table, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/foyer) "iGG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -26966,6 +27033,11 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"iLX" = ( +/obj/structure/table, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/science/research) "iMr" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30026,6 +30098,24 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"jNM" = ( +/obj/structure/table/reinforced, +/obj/item/folder/blue{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/folder{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/lighter, +/obj/item/cigarette/cigar/cohiba, +/obj/item/stamp/head/ce, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "jNR" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -30783,16 +30873,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) -"kbi" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/item/radio/intercom/directional/east, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/computer/security/telescreen/tcomms/directional/east, -/turf/open/floor/engine, -/area/station/tcommsat/computer) "kbl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31988,17 +32068,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"kxR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/depsec/science, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/research/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science/research) "kxS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -32344,14 +32413,6 @@ /obj/structure/sign/poster/contraband/self_ai_liberation/directional/west, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) -"kEs" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/hand_labeler, -/obj/item/taperecorder, -/obj/machinery/computer/security/telescreen/normal/directional/east, -/turf/open/floor/carpet/green, -/area/station/security/detectives_office) "kEz" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -33556,12 +33617,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/maintenance/fore) -"kWP" = ( -/obj/machinery/modular_computer/preset/id, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/ce/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "kWW" = ( /obj/structure/barricade/wooden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34422,6 +34477,16 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"lky" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "lkB" = ( /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) @@ -35248,10 +35313,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) -"lxs" = ( -/obj/structure/table/reinforced/rglass, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) "lxu" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, @@ -35399,11 +35460,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"lAp" = ( -/obj/structure/table, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/science/research) "lAr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35732,6 +35788,20 @@ }, /turf/open/floor/carpet, /area/station/medical/psychology) +"lFS" = ( +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/colocup{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/cigarette/rollie/cannabis{ + pixel_y = -3 + }, +/turf/open/floor/plating/rust, +/area/station/maintenance/department/security) "lGa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36104,16 +36174,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"lMF" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/prison/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/office) "lMZ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -36256,6 +36316,20 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"lPh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/obj/machinery/requests_console/directional/west{ + department = "Security"; + name = "Security Requests Console" + }, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "lPU" = ( /obj/machinery/shower/directional/west, /turf/open/floor/plastic, @@ -36486,6 +36560,28 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"lUM" = ( +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/stamp/head/cmo{ + pixel_x = 8; + pixel_y = 20 + }, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, +/obj/machinery/keycard_auth/directional/south{ + pixel_x = 8 + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "lVe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/south{ @@ -36946,16 +37042,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/iron/dark, /area/station/maintenance/solars/starboard/aft) -"mbU" = ( -/obj/structure/table, -/obj/machinery/light/directional/west, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/foyer) "mbW" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -37237,6 +37323,16 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar/atrium) +"mfU" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/computer/security/telescreen/tcomms/directional/east, +/turf/open/floor/engine, +/area/station/tcommsat/computer) "mfY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38122,6 +38218,30 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/office) +"muI" = ( +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/east{ + id = "QMLoaddoor"; + name = "Off Ramp Toggle"; + pixel_y = 6; + req_access = list("cargo") + }, +/obj/machinery/button/door/directional/east{ + id = "QMLoaddoor2"; + name = "On Ramp Toggle"; + pixel_y = -6; + req_access = list("cargo") + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/iron, +/area/station/cargo/storage) "muN" = ( /obj/machinery/computer/records/medical{ dir = 8 @@ -39061,10 +39181,6 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/security/office) -"mLU" = ( -/obj/structure/sign/warning/deathsposal, -/turf/closed/wall, -/area/station/science/xenobiology) "mMa" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -39481,17 +39597,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"mRQ" = ( -/obj/machinery/firealarm/directional/east, -/mob/living/simple_animal/bot/mulebot, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #1" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "mRV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -39934,29 +40039,6 @@ "mZW" = ( /turf/closed/wall/r_wall, /area/station/service/bar/atrium) -"nab" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/radio{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/pen, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/tcomms/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/engineering) "nam" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -40825,12 +40907,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/fore) -"nrb" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "nrh" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -41164,6 +41240,17 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/lab) +"nvK" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/prison/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/warden) "nvP" = ( /obj/structure/cable, /obj/machinery/duct, @@ -42443,6 +42530,49 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +"nTz" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/computer_disk/quartermaster, +/obj/item/pen/fountain, +/obj/item/stamp{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp/head/qm{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/lighter{ + pixel_x = 11; + pixel_y = -7 + }, +/obj/item/cigarette/cigar{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/cigarette/cigar{ + pixel_x = 10; + pixel_y = -1 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/qm) "nTG" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/bot, @@ -43459,11 +43589,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"onv" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "oou" = ( /obj/machinery/telecomms/receiver/preset_right, /obj/effect/turf_decal/stripes/line{ @@ -43595,21 +43720,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"oro" = ( -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/xeno/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "orz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -44289,30 +44399,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"oCZ" = ( -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door/directional/east{ - id = "QMLoaddoor"; - name = "Off Ramp Toggle"; - pixel_y = 6; - req_access = list("cargo") - }, -/obj/machinery/button/door/directional/east{ - id = "QMLoaddoor2"; - name = "On Ramp Toggle"; - pixel_y = -6; - req_access = list("cargo") - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/cargo/storage) "oDh" = ( /obj/effect/turf_decal/delivery, /obj/machinery/recharge_station, @@ -44770,6 +44856,14 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"oMt" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology Test Chamber"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "oMA" = ( /obj/structure/cable, /obj/machinery/vending/wardrobe/gene_wardrobe, @@ -44912,17 +45006,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"oQc" = ( -/obj/machinery/light/directional/east, -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/ordnance/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/station/science/ordnance) "oQe" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/grass, @@ -45432,20 +45515,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) -"oXF" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/assault_pod/mining, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/auxbase/directional/west, -/turf/open/floor/iron/dark, -/area/station/construction/mining/aux_base) "oXK" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -45565,6 +45634,19 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) +"oZS" = ( +/obj/structure/table, +/obj/item/healthanalyzer, +/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "oZX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46561,12 +46643,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"pnU" = ( -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) "pog" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47169,23 +47245,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) -"pyZ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/toy/figure/prisoner{ - pixel_x = 3; - pixel_y = 6 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "pzc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -47802,6 +47861,12 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"pJM" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "pKf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47959,6 +48024,17 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"pLO" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/item/clipboard, +/obj/item/clothing/mask/fakemoustache, +/obj/item/cigarette/pipe, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/fore) "pLV" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -48006,22 +48082,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/server) -"pMZ" = ( -/obj/machinery/button/flasher{ - id = "IsolationFlash"; - pixel_x = -23; - pixel_y = 8; - req_access = list("brig") - }, -/obj/machinery/button/door/directional/west{ - id = "Isolation"; - name = "Isolation Shutter Button"; - pixel_y = -6; - req_access = list("brig") - }, -/obj/machinery/computer/security/telescreen/isolation/directional/north, -/turf/open/floor/iron, -/area/station/security/prison) "pNe" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -48264,23 +48324,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) -"pQs" = ( -/obj/structure/table, -/obj/item/stack/package_wrap{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/hand_labeler, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/item/flatpack, -/turf/open/floor/iron/dark, -/area/station/science/lab) "pQx" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -50113,34 +50156,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"qxW" = ( -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/directional/east, -/obj/machinery/requests_console/directional/east{ - department = "Pharmacy"; - name = "Pharmacy Requests Console" - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/ore_update, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) -"qyg" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/turbine/directional/west, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "qyn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, @@ -50304,49 +50319,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"qBq" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/computer_disk/quartermaster, -/obj/item/pen/fountain, -/obj/item/stamp{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/stamp/head/qm{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/lighter{ - pixel_x = 11; - pixel_y = -7 - }, -/obj/item/cigarette/cigar{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/cigarette/cigar{ - pixel_x = 10; - pixel_y = -1 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 7 - }, -/turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/qm) "qBs" = ( /turf/closed/wall/rust, /area/station/commons/vacant_room/commissary) @@ -51724,42 +51696,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) -"qZq" = ( -/obj/machinery/modular_computer/preset/research{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/keycard_auth/directional/east{ - pixel_y = 26 - }, -/obj/machinery/button/door/directional/north{ - id = "rdprivacy"; - name = "Director's Privacy Toggle"; - pixel_x = -8; - pixel_y = 38 - }, -/obj/machinery/button/door/directional/north{ - id = "Biohazard"; - name = "Emergency Research Lockdown"; - pixel_x = -8; - req_access = list("research") - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = 6 - }, -/obj/machinery/button/door/directional/north{ - id = "xeno_blastdoor"; - name = "Xenobiology Containment"; - pixel_x = 6; - pixel_y = 38; - req_access = list("research") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/rd/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "qZx" = ( /turf/closed/wall/r_wall/rust, /area/station/tcommsat/server) @@ -51870,6 +51806,14 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"rbH" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/hand_labeler, +/obj/item/taperecorder, +/obj/machinery/computer/security/telescreen/normal/directional/east, +/turf/open/floor/carpet/green, +/area/station/security/detectives_office) "rbO" = ( /turf/open/floor/iron, /area/station/service/hydroponics) @@ -54909,19 +54853,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/library) -"rYR" = ( -/obj/structure/table, -/obj/item/healthanalyzer, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "rZb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -55274,6 +55205,20 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"sdJ" = ( +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #2"; + suffix = "#2" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "sdT" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -55553,6 +55498,21 @@ /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"sja" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/turbine/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "sjk" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, @@ -58848,6 +58808,42 @@ /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, /area/station/security/office) +"tjR" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/keycard_auth/directional/east{ + pixel_y = 26 + }, +/obj/machinery/button/door/directional/north{ + id = "rdprivacy"; + name = "Director's Privacy Toggle"; + pixel_x = -8; + pixel_y = 38 + }, +/obj/machinery/button/door/directional/north{ + id = "Biohazard"; + name = "Emergency Research Lockdown"; + pixel_x = -8; + req_access = list("research") + }, +/obj/machinery/light_switch/directional/north{ + pixel_x = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "xeno_blastdoor"; + name = "Xenobiology Containment"; + pixel_x = 6; + pixel_y = 38; + req_access = list("research") + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/rd/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "tkp" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -61138,17 +61134,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"tWq" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/dirt, -/obj/item/clipboard, -/obj/item/clothing/mask/fakemoustache, -/obj/item/cigarette/pipe, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/fore) "tWv" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -61933,6 +61918,22 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/disposal) +"uie" = ( +/obj/structure/table, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/directional/south, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/newscaster/directional/south{ + pixel_x = 28 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "uik" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -62590,6 +62591,25 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/main) +"usp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/engine/directional/east, +/turf/open/floor/iron, +/area/station/security/checkpoint/engineering) "usr" = ( /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) @@ -63488,6 +63508,10 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"uJs" = ( +/obj/structure/table/reinforced/rglass, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "uJE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -67741,28 +67765,6 @@ /obj/structure/sign/departments/cargo, /turf/closed/wall, /area/station/hallway/primary/starboard) -"vZD" = ( -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/stamp/head/cmo{ - pixel_x = 8; - pixel_y = 20 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8 - }, -/obj/machinery/keycard_auth/directional/south{ - pixel_x = 8 - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) "wae" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 1 @@ -67897,6 +67899,29 @@ /obj/structure/table/wood, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/hop) +"wcg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/radio{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/pen, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/tcomms/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/engineering) "wcs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -68110,24 +68135,23 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai_upload) -"wfV" = ( +"wgi" = ( /obj/structure/table/reinforced, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 }, -/obj/item/folder/yellow, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/folder{ - pixel_x = -4; - pixel_y = 4 +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 }, -/obj/item/lighter, -/obj/item/cigarette/cigar/cohiba, -/obj/item/stamp/head/ce, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) +/obj/item/toy/figure/prisoner{ + pixel_x = 3; + pixel_y = 6 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "wgq" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -68343,6 +68367,10 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"wjy" = ( +/obj/structure/sign/warning/deathsposal, +/turf/closed/wall, +/area/station/science/xenobiology) "wjz" = ( /obj/machinery/light/directional/south, /obj/machinery/camera/directional/south{ @@ -69466,6 +69494,21 @@ /obj/effect/turf_decal/siding/red, /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/science/research) +"wAG" = ( +/obj/structure/chair/office/light{ + dir = 1; + pixel_y = 3 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/xeno/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "wAS" = ( /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -69495,20 +69538,6 @@ luminosity = 2 }, /area/station/ai_monitored/turret_protected/ai) -"wBt" = ( -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/colocup{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/cigarette/rollie/cannabis{ - pixel_y = -3 - }, -/turf/open/floor/plating/rust, -/area/station/maintenance/department/security) "wBJ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line, @@ -70601,13 +70630,6 @@ "wTU" = ( /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) -"wUh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/west, -/turf/open/floor/engine, -/area/station/ai_monitored/turret_protected/aisat/foyer) "wUU" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -72215,23 +72237,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/medical/paramedic) -"xwS" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/shuttle{ - pixel_x = 32 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/satellite) "xwU" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -72500,22 +72505,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"xCn" = ( -/obj/structure/table, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/light/directional/south, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/newscaster/directional/south{ - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "xCp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73817,6 +73806,23 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"xYa" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/shuttle{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/satellite) "xYr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -80479,7 +80485,7 @@ dWG dWG jLk dWG -pMZ +dNL mIW lrq gDl @@ -85631,7 +85637,7 @@ dWG jKZ rdo gSF -pyZ +wgi eOh oWI tPH @@ -88712,7 +88718,7 @@ wDz gij miS iVj -wBt +lFS wJo cwl sWM @@ -92580,7 +92586,7 @@ dUE hwJ rqs ilv -lMF +bzc vWY frP mtI @@ -93026,7 +93032,7 @@ nqX caL pVz wdn -tWq +pLO xtt xBI uiu @@ -93038,7 +93044,7 @@ buJ kAR gbB ghX -vZD +lUM qGK tOR pXf @@ -93295,7 +93301,7 @@ lWr khj pYZ wKa -lxs +uJs mfs eWd eWd @@ -93352,7 +93358,7 @@ gFD oKW mlv qCZ -drR +etB pya lsS afL @@ -94624,7 +94630,7 @@ mfd ciY tyk mlj -hIZ +nvK yjW vMg lDV @@ -95356,8 +95362,8 @@ bjk rZE rFt ddS -atk -fAO +fYU +bdM vkE mpv opL @@ -96397,7 +96403,7 @@ iyI nKC iyI qjM -bUQ +eZg hkp dEF dEF @@ -96906,7 +96912,7 @@ vQD erH gaE uNK -pnU +cQK nKC xoK evD @@ -97160,7 +97166,7 @@ jJW vss aeH xzS -qxW +fpI fKf fyZ qNL @@ -100309,7 +100315,7 @@ kCk qqJ krr ntH -onv +gcy cqA wGG dIg @@ -100533,7 +100539,7 @@ jqb gHD jqb vCG -kEs +rbH ppy gdP uNI @@ -100566,7 +100572,7 @@ kCk dyC qAx wzY -qyg +sja qoi xCy ouE @@ -102771,7 +102777,7 @@ tqQ adg eXj yiF -mbU +iGD lTc mMj uba @@ -103028,7 +103034,7 @@ kBU alV uIs afw -wUh +afU afw cit pem @@ -103572,7 +103578,7 @@ emd saz jfY pOI -cHd +dwc qNr qNr jYx @@ -104822,7 +104828,7 @@ aAg asZ rZN ihg -xwS +xYa mAj mPo pwa @@ -105631,7 +105637,7 @@ fzJ shk orT aQB -kbi +mfU vqw vqw imo @@ -105651,7 +105657,7 @@ czT czT hbE fYh -rYR +oZS hIY qXv iJN @@ -107486,7 +107492,7 @@ mVo vPU xnZ jBs -hZf +lPh sqM sFv dIX @@ -107743,7 +107749,7 @@ fbB gEo kJf nOg -nab +wcg bVp tgd wHW @@ -108000,7 +108006,7 @@ tGz vMk ipf jYd -afC +usp ljb sPG kPS @@ -108952,7 +108958,7 @@ cIV fBX ajs cJk -oXF +aDF tAI ctx ipQ @@ -110025,7 +110031,7 @@ vwQ tXg rQs tXg -bQa +eIP wwj gii arl @@ -110817,9 +110823,9 @@ cuV oQk vHF jjs -kWP +cwj cLx -wfV +jNM ueJ tav snU @@ -111781,7 +111787,7 @@ wpw xFw okt ppB -mLU +wjy gqk okt qVc @@ -112031,7 +112037,7 @@ lev lUH bqi rAD -fdq +lky luI rJO cAz @@ -112280,7 +112286,7 @@ aeu aeu aeu wuc -dxR +oMt rRz saA tGx @@ -112542,8 +112548,8 @@ qwK qmW uQF lev -nrb -oro +pJM +wAG fQr sQx xFI @@ -112812,7 +112818,7 @@ aNt ndz kYR puJ -xCn +uie lDu avo leB @@ -113092,7 +113098,7 @@ uJE vHd sIo nvI -pQs +eot rKI dfv xwJ @@ -113606,8 +113612,8 @@ iHL qGq qth awT -kxR -lAp +aMU +iLX rZV jqJ xZL @@ -113872,7 +113878,7 @@ rZV vOX kXp qFV -qBq +nTz dXJ atu iht @@ -114365,7 +114371,7 @@ lDu lDu lDu lDu -qZq +tjR nmR aeJ egr @@ -115418,8 +115424,8 @@ chT wrY tVt qAR -mRQ -evQ +cVn +sdJ sFt lmO wer @@ -115681,7 +115687,7 @@ lKq lKq wer eHJ -oCZ +muI ijH bib tOy @@ -118745,7 +118751,7 @@ rZV mtc lDu lOh -oQc +eIb seG cMD drm diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 1a11ec4d4f1..e3f064bf33d 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -4662,15 +4662,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -5835,9 +5831,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lower) "ctC" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, /turf/open/floor/plating, @@ -7205,9 +7199,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "cWu" = ( -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) "cWB" = ( @@ -7657,9 +7649,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "ddY" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w, @@ -7720,7 +7710,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/door/window/left/directional/south{ - layer = 3.1; name = "Upload Console Window"; req_access = list("ai_upload") }, @@ -11850,10 +11839,8 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) "eKG" = ( -/obj/machinery/computer/security/telescreen{ - name = "Test Chamber Monitor"; - network = list("xeno"); - pixel_y = 32 +/obj/machinery/computer/security/telescreen/test_chamber{ + name = "Test Chamber Monitor" }, /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 5 @@ -13088,7 +13075,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Supermatter - Aft"; dir = 9; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -13374,7 +13361,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Supermatter - Fore"; dir = 5; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/engine, @@ -14423,7 +14410,6 @@ "fFM" = ( /obj/effect/landmark/start/ai/secondary, /obj/machinery/door/window/brigdoor/right/directional/north{ - layer = 4.1; name = "Tertiary AI Core Access"; req_access = list("ai_upload") }, @@ -15674,9 +15660,7 @@ /area/station/medical/chemistry) "gdH" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/ordnance{ - dir = 8 - }, +/obj/machinery/computer/security/telescreen/ordnance/directional/west, /turf/open/floor/iron, /area/station/science/ordnance/testlab) "gdS" = ( @@ -17388,13 +17372,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "gLy" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the turbine vent."; - dir = 8; - name = "turbine vent monitor"; - network = list("turbine"); - pixel_x = 29 - }, +/obj/machinery/computer/security/telescreen/turbine/directional/west, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "gLC" = ( @@ -17480,10 +17458,7 @@ /obj/structure/rack, /obj/item/storage/box/lights, /obj/item/assault_pod/mining, -/obj/machinery/computer/security/telescreen/auxbase{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/computer/security/telescreen/auxbase/directional/north, /obj/structure/cable, /turf/open/floor/iron, /area/station/construction/mining/aux_base) @@ -17660,7 +17635,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Supermatter - Starboard"; dir = 8; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -17864,12 +17839,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/service) "gTO" = ( -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - network = list("sm"); - pixel_x = 27; - pixel_y = -4 - }, +/obj/machinery/computer/security/telescreen/engine/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "gTP" = ( @@ -22520,7 +22490,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table, /obj/item/reagent_containers/condiment/enzyme{ - layer = 5; pixel_y = 3 }, /obj/item/reagent_containers/cup/beaker{ @@ -22583,10 +22552,7 @@ /turf/open/floor/plating, /area/station/science/ordnance/bomb) "iLO" = ( -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -28 - }, +/obj/machinery/computer/security/telescreen/minisat/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) @@ -23650,10 +23616,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/computer/security/telescreen/interrogation{ - dir = 8; - pixel_x = 30 - }, +/obj/machinery/computer/security/telescreen/interrogation/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, @@ -26733,7 +26696,6 @@ "kjW" = ( /obj/effect/landmark/start/ai/secondary, /obj/machinery/door/window/brigdoor/right/directional/south{ - layer = 4.1; name = "Secondary AI Core Access"; req_access = list("ai_upload") }, @@ -26846,7 +26808,7 @@ /obj/structure/table/wood, /obj/item/storage/box/matches, /obj/item/reagent_containers/cup/glass/flask/gold, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, @@ -29986,7 +29948,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/door/window/left/directional/south{ - layer = 3.1; name = "Cyborg Upload Console Window"; req_access = list("ai_upload") }, @@ -30214,9 +30175,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "lwW" = ( -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 25 - }, +/obj/machinery/computer/security/telescreen/rd, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) @@ -30574,9 +30533,7 @@ /turf/open/floor/plating, /area/station/service/library/abandoned) "lEF" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, +/obj/machinery/computer/security/telescreen/entertainment, /obj/machinery/camera{ c_tag = "Command - Captain's Office"; dir = 8 @@ -33675,7 +33632,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_x = -24; pixel_y = 8; @@ -33683,7 +33639,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors 2"; pixel_x = -24; pixel_y = -8; @@ -37152,10 +37107,7 @@ /obj/structure/transit_tube/station/dispenser{ dir = 1 }, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 - }, +/obj/machinery/computer/security/telescreen/minisat/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/engineering/transit_tube) "nXB" = ( @@ -44729,7 +44681,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Supermatter - Port"; dir = 6; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -47192,10 +47144,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 8; - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/cmo) "rET" = ( @@ -51692,10 +51641,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "tiG" = ( -/obj/machinery/computer/security/telescreen/vault{ - dir = 4; - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/vault/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "tiK" = ( @@ -51880,7 +51826,7 @@ /obj/machinery/camera{ c_tag = "Atmospherics - Supermatter Entrance"; dir = 10; - network = list("ss13","engine","sm"); + network = list("ss13","engine"); view_range = 10 }, /turf/open/floor/iron, @@ -53822,15 +53768,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet, /obj/item/clothing/head/helmet{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -55126,7 +55068,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Supermatter Chamber"; dir = 8; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter) @@ -56383,10 +56325,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/chapel) "uWZ" = ( -/obj/machinery/computer/security/telescreen{ - name = "Test Chamber Monitor"; - network = list("xeno"); - pixel_y = 2 +/obj/machinery/computer/security/telescreen/test_chamber{ + name = "Test Chamber Monitor" }, /turf/closed/wall/r_wall, /area/station/science/xenobiology) @@ -56951,9 +56891,7 @@ /area/station/command/teleporter) "vir" = ( /obj/machinery/computer/apc_control, -/obj/machinery/computer/security/telescreen/ce{ - pixel_y = 28 - }, +/obj/machinery/computer/security/telescreen/ce, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "vit" = ( @@ -59325,8 +59263,7 @@ /area/station/hallway/secondary/entry) "wgF" = ( /obj/structure/table/wood, -/obj/machinery/computer/security/telescreen/prison{ - dir = 1; +/obj/machinery/computer/security/telescreen/prison/directional/north{ name = "security camera monitor" }, /obj/item/radio/intercom/directional/south, @@ -60774,9 +60711,7 @@ /turf/open/floor/iron, /area/station/security/prison) "wIo" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/entertainment, /obj/structure/toilet{ dir = 1 }, @@ -61490,9 +61425,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/computer/security/telescreen/prison{ - pixel_y = 30 - }, +/obj/machinery/computer/security/telescreen/prison, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/brig/upper) "wZl" = ( @@ -63936,7 +63869,7 @@ /area/station/maintenance/starboard/lower) "xVi" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/effect/turf_decal/siding/white, /turf/open/floor/carpet/cyan, /area/station/hallway/primary/starboard) @@ -64067,7 +64000,7 @@ /obj/machinery/camera{ c_tag = "Engineering - Emitter Room"; dir = 4; - network = list("ss13","engine","sm") + network = list("ss13","engine") }, /obj/machinery/light/directional/north, /obj/machinery/button/door{ diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index a9c79a977f9..fc8004bd081 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -511,6 +511,25 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) +"afr" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/corrections_officer, +/obj/machinery/button/flasher{ + id = "IsolationFlash2"; + pixel_x = 10; + pixel_y = -24 + }, +/obj/machinery/button/flasher{ + id = "IsolationFlash"; + pixel_x = -10; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/isolation/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/corrections_officer) "afx" = ( /obj/structure/table, /obj/item/stack/sheet/glass{ @@ -1759,6 +1778,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/courtroom) +"arT" = ( +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/research/directional/south, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) "arX" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -1902,15 +1928,6 @@ /obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) -"ats" = ( -/obj/structure/chair/office/light, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "att" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ @@ -1930,15 +1947,6 @@ }, /turf/open/floor/carpet, /area/station/security/prison/rec) -"atM" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance" - }, -/obj/effect/mapping_helpers/airlock/welded, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/plating, -/area/station/maintenance/department/security/lower) "atW" = ( /obj/effect/turf_decal/trimline/blue/corner, /obj/effect/landmark/start/assistant, @@ -2681,17 +2689,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/medical/aslyum) -"aBL" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/landmark/start/psychologist, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/iron, -/area/station/medical/psychology) "aBN" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -2820,18 +2817,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"aCU" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/chair/sofa/corp/left{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) "aCY" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/cup/bowl{ @@ -3227,26 +3212,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"aGZ" = ( -/obj/structure/table/wood, -/obj/item/cigarette/syndicate, -/obj/item/food/sandwich{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - desc = "Takes you to a whole new level of thinking."; - name = "Meta-Cider"; - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -14; - pixel_y = 1 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/prison_upper) "aHd" = ( /turf/closed/wall/rust, /area/station/maintenance/department/security/greater) @@ -3480,10 +3445,6 @@ "aJl" = ( /turf/open/floor/carpet, /area/station/common/tailoring) -"aJn" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space/openspace, -/area/space/nearstation) "aJo" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/bot, @@ -4662,16 +4623,6 @@ dir = 1 }, /area/station/hallway/primary/upper) -"aVX" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "aWh" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -5550,6 +5501,11 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) +"bet" = ( +/obj/structure/closet/secure_closet/cytology, +/obj/effect/turf_decal/stripes/white/box, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "beu" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -5817,26 +5773,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) -"bib" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/chair/sofa/bench/left{ - dir = 4 - }, -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/commons/dorms) "bie" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -6261,24 +6197,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/dorms/room2) -"blY" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/obj/item/lighter, -/obj/structure/cable, -/obj/machinery/button/door{ - id = "DetShutters"; - name = "Privacy Shutters"; - pixel_y = 14 - }, -/turf/open/floor/carpet, -/area/station/security/detectives_office) "bma" = ( /obj/structure/chair/office, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -6770,13 +6688,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/command/gateway) -"bpM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/iron, -/area/station/command/bridge) "bpN" = ( /obj/structure/closet/crate/hydroponics, /obj/item/seeds/banana, @@ -7573,6 +7484,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"bxP" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/cigarette{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "bxS" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/small/directional/west, @@ -9326,6 +9248,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) +"bOZ" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/machinery/vatgrower, +/obj/item/plunger{ + pixel_x = -7; + pixel_y = 20 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "bPe" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -9643,6 +9580,18 @@ /obj/item/reagent_containers/cup/glass/mug/britcup, /turf/open/floor/wood, /area/station/hallway/primary/central) +"bRW" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "bSa" = ( /obj/structure/table, /obj/structure/window/reinforced/spawner/directional/east, @@ -9880,6 +9829,10 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"bTZ" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/open/space/openspace, +/area/space/nearstation) "bUc" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt{ @@ -10519,22 +10472,6 @@ "cab" = ( /turf/open/floor/iron/smooth_edge, /area/station/command/secure_bunker) -"cah" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 18; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 18; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology/control) -"cas" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "caw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11478,18 +11415,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"cjM" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/chair/sofa/corp{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) "ckd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -12758,15 +12683,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"cuI" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/item/flatpack, -/turf/open/floor/iron/white, -/area/station/science/lab) "cuL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13340,6 +13256,11 @@ /obj/structure/flora/bush/flowers_pp, /turf/open/floor/grass, /area/station/service/cafeteria) +"czu" = ( +/obj/structure/table/glass, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) "czv" = ( /obj/machinery/door/airlock{ id_tag = "Toilet2"; @@ -13463,6 +13384,15 @@ /obj/structure/ladder, /turf/open/floor/plating, /area/station/maintenance/wrestle) +"cAD" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/machinery/light/directional/west, +/obj/structure/sign/warning/gas_mask/directional/south, +/turf/open/floor/plating, +/area/station/science/xenobiology) "cAJ" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/light/directional/west, @@ -14881,6 +14811,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) +"cMO" = ( +/obj/structure/railing, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/iron/dark/side, +/area/station/hallway/primary/upper) "cMP" = ( /obj/effect/turf_decal/bot, /obj/structure/table/glass, @@ -15062,6 +14999,16 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen) +"cOM" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/interrogation/directional/east, +/turf/open/floor/iron, +/area/station/security/interrogation) "cOS" = ( /obj/structure/hedge/opaque, /obj/structure/curtain/bounty, @@ -15267,6 +15214,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"cRm" = ( +/obj/machinery/power/shuttle_engine/huge, +/turf/open/space/basic, +/area/space/nearstation) "cRo" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt{ @@ -15417,11 +15368,6 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"cSy" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "cSF" = ( /obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior, /obj/effect/mapping_helpers/airlock/locked, @@ -15558,6 +15504,27 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"cTU" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_y = 4 + }, +/obj/item/cigarette/rollie/cannabis{ + pixel_x = 8; + pixel_y = 15 + }, +/obj/item/lighter, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/royalblack, +/area/station/command/heads_quarters/qm) "cTZ" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) @@ -15890,6 +15857,11 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) +"cXv" = ( +/obj/effect/turf_decal/delivery, +/obj/item/beacon, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "cXy" = ( /obj/structure/closet/secure_closet/personal, /obj/structure/window/reinforced/spawner/directional/south, @@ -16236,17 +16208,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/glass/reinforced, /area/station/security/prison/safe) -"dbd" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/item/cigarette/pipe/crackpipe, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison/upper) "dbj" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16589,6 +16550,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"deR" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "deS" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 1 @@ -16750,6 +16717,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/lobby) +"dgv" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 4; + pixel_y = 0 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) "dgw" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/south, @@ -16795,6 +16773,17 @@ /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron/dark, /area/station/hallway/primary/upper) +"dgZ" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) "dhd" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -16806,6 +16795,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"dhk" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "dhs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/computer/crew{ @@ -17419,6 +17413,22 @@ }, /turf/open/floor/grass, /area/station/security/prison/garden) +"dmZ" = ( +/obj/structure/table/wood, +/obj/item/paper/fluff/gateway, +/obj/item/coin/gold{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/phone{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/cigarette/pipe{ + pixel_x = -5 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "dnc" = ( /obj/structure/table, /obj/item/toy/gun{ @@ -20971,11 +20981,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"dWO" = ( -/obj/structure/chair/stool/directional/west, -/obj/machinery/computer/security/telescreen/disposals/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "dXb" = ( /turf/open/floor/iron/dark, /area/station/engineering/main) @@ -22959,6 +22964,10 @@ /obj/item/melee/baton/security/cattleprod, /turf/open/floor/iron, /area/station/maintenance/abandon_holding_cell) +"etb" = ( +/obj/machinery/smartfridge/petri/preloaded, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "etc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -23178,6 +23187,14 @@ "euK" = ( /turf/open/floor/engine, /area/station/science/explab) +"euL" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/bot, +/obj/machinery/modular_computer/preset/engineering, +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/turbine/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "euM" = ( /obj/structure/disposalpipe/sorting/mail{ name = "CE's Junction"; @@ -23786,6 +23803,18 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) +"eAl" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "eAm" = ( /obj/structure/table/wood, /obj/item/toner/large, @@ -24176,6 +24205,18 @@ }, /turf/open/floor/wood, /area/station/security/courtroom) +"eDR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "eDV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -24337,6 +24378,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/department/security/prison_upper) +"eFs" = ( +/obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/vault/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "eFx" = ( /obj/structure/water_source/puddle, /obj/structure/flora/bush/large{ @@ -25446,11 +25499,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/carpet/orange, /area/station/commons/dorms/room1) -"ePo" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space/openspace, -/area/space/nearstation) "ePt" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/disposalpipe/segment, @@ -25842,6 +25890,15 @@ /obj/item/crowbar, /turf/open/floor/engine, /area/station/engineering/supermatter) +"eSV" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "eSY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -26252,6 +26309,25 @@ /obj/item/plate, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) +"eWM" = ( +/obj/structure/table/reinforced, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/large, +/area/station/command/heads_quarters/ce) "eWN" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/cable, @@ -28056,6 +28132,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/security/courtroom) +"foz" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/ce) "foC" = ( /turf/closed/indestructible/riveted{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; @@ -28497,6 +28583,19 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"fsN" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "fsS" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/east, @@ -29034,6 +29133,20 @@ }, /turf/open/floor/plating, /area/station/security/checkpoint/customs) +"fxX" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar, +/obj/item/cigarette/pipe{ + pixel_y = 13 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/captain) "fye" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -29888,6 +30001,15 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/night_club) +"fIe" = ( +/obj/structure/chair/office/light, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fIi" = ( /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) @@ -31321,6 +31443,39 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance/storage) +"fXg" = ( +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access = list("security") + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access = list("brig") + }, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 9 + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access = list("armory") + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "fXh" = ( /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, @@ -31926,10 +32081,6 @@ /obj/structure/cable, /turf/open/floor/iron/shuttle/evac/airless, /area/station/solars/starboard/aft) -"gcw" = ( -/obj/machinery/power/shuttle_engine/huge, -/turf/open/space/basic, -/area/space/nearstation) "gcy" = ( /obj/machinery/door/airlock/bathroom{ name = "Restroom"; @@ -32455,6 +32606,26 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/science/circuits) +"giN" = ( +/obj/structure/table/wood, +/obj/item/cigarette/syndicate, +/obj/item/food/sandwich{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "Takes you to a whole new level of thinking."; + name = "Meta-Cider"; + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -14; + pixel_y = 1 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/security/prison_upper) "giS" = ( /obj/effect/spawner/random/trash/graffiti, /turf/closed/wall, @@ -32923,13 +33094,6 @@ dir = 1 }, /area/station/security/prison/shower) -"gmR" = ( -/obj/machinery/computer/station_alert{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/research/directional/south, -/turf/open/floor/iron/grimy, -/area/station/ai_monitored/turret_protected/aisat_interior) "gmU" = ( /obj/structure/chair/office{ dir = 1 @@ -33694,6 +33858,11 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"guo" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/computer/security/telescreen/disposals/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "guu" = ( /obj/structure/trash_pile, /obj/effect/decal/cleanable/dirt{ @@ -34161,6 +34330,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/clown_chamber) +"gyX" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/library/private) "gze" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/light/directional/east, @@ -34198,6 +34384,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"gzx" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "gzC" = ( /obj/structure/chair/plastic{ dir = 4 @@ -34547,17 +34738,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/stone, /area/station/hallway/primary/central) -"gCP" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6; - pixel_y = 16 - }, -/obj/item/cigarette{ - pixel_y = 4 - }, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "gCT" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -35054,10 +35234,18 @@ /obj/structure/flora/bush/stalky, /turf/open/floor/grass, /area/station/hallway/primary/port) -"gIG" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/open/space/openspace, -/area/space/nearstation) +"gIM" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 18; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 18; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology/control) "gIN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35358,6 +35546,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"gLI" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance"; + welded = 1 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/maintenance/department/security/lower) "gLQ" = ( /obj/machinery/seed_extractor, /obj/machinery/light/directional/west, @@ -35841,6 +36038,26 @@ dir = 8 }, /area/station/science) +"gQO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/commons/dorms) "gQU" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -35949,12 +36166,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"gRB" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "gRC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -37105,15 +37316,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"hen" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "hep" = ( /obj/machinery/photocopier, /obj/machinery/status_display/evac/directional/west, @@ -37395,6 +37597,22 @@ dir = 8 }, /area/station/engineering/atmos/hfr_room) +"hhg" = ( +/obj/structure/table/reinforced, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "hhq" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -37735,6 +37953,18 @@ /obj/effect/spawner/random/trash/moisture, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"hkw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "hkB" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -37764,16 +37994,6 @@ "hkN" = ( /turf/open/floor/wood, /area/station/service/theater/abandoned) -"hkU" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/computer/security/telescreen/interrogation/directional/east, -/turf/open/floor/iron, -/area/station/security/interrogation) "hkZ" = ( /obj/structure/table_frame, /obj/item/wrench, @@ -37789,11 +38009,6 @@ /obj/item/seeds/cannabis, /turf/open/floor/plating, /area/station/service/hydroponics/garden/abandoned) -"hlo" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/cmo) "hlp" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -38052,25 +38267,6 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, /area/station/command/meeting_room/council) -"hnu" = ( -/obj/structure/table/reinforced, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/effect/turf_decal/tile/yellow/full, -/turf/open/floor/iron/large, -/area/station/command/heads_quarters/ce) "hnz" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -38450,14 +38646,6 @@ /obj/structure/cable, /turf/open/floor/iron/checker, /area/station/service/janitor) -"hrQ" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/ordnance/directional/south, -/turf/open/floor/iron, -/area/station/science/ordnance/testlab) "hrU" = ( /obj/item/cigbutt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -39237,11 +39425,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/cargo/lobby) -"hAY" = ( -/obj/effect/turf_decal/delivery, -/obj/item/beacon, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hBc" = ( /obj/structure/table/reinforced, /obj/structure/cable, @@ -39288,9 +39471,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) -"hBA" = ( -/turf/open/space/openspace, -/area/space/nearstation) "hBC" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -39564,17 +39744,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"hDI" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/iron/grimy, -/area/station/ai_monitored/turret_protected/aisat_interior) "hDL" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -41036,19 +41205,6 @@ /obj/structure/closet/cardboard, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"hQV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/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, -/obj/machinery/door/airlock/public/glass{ - name = "Central Upper Hallway" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/upper) "hQZ" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -41355,6 +41511,12 @@ }, /turf/open/floor/grass, /area/station/security/prison/garden) +"hUp" = ( +/obj/structure/hoop{ + pixel_y = 17 + }, +/turf/open/floor/iron, +/area/station/security/prison/workout) "hUs" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -41534,10 +41696,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/checker, /area/station/service/janitor) -"hWt" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "hWy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -42280,6 +42438,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"iea" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "iej" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -42399,10 +42563,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/maintenance/aft/upper) -"ifh" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/engine, -/area/station/science/xenobiology) "ifi" = ( /obj/machinery/button/door/directional/north{ id = "portbow_maint_shutters"; @@ -42530,15 +42690,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/abandon_diner) -"igj" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "igE" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -42622,24 +42773,6 @@ /obj/machinery/shower/directional/north, /turf/open/floor/iron/checker, /area/station/engineering/gravity_generator) -"ihd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/chair/sofa/bench/right{ - dir = 4 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/commons/dorms) "ihg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42919,13 +43052,6 @@ /obj/machinery/duct, /turf/open/floor/carpet/green, /area/station/commons/dorms/room2) -"ijT" = ( -/obj/structure/railing, -/obj/structure/chair/plastic{ - dir = 8 - }, -/turf/open/floor/iron/dark/side, -/area/station/hallway/primary/upper) "ijZ" = ( /obj/structure/window/reinforced/tinted/spawner/directional/west, /obj/item/toy/plush/nukeplushie{ @@ -43234,6 +43360,11 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/room1) +"inb" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space/openspace, +/area/space/nearstation) "inc" = ( /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron/dark, @@ -44536,6 +44667,17 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) +"iAu" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "iAG" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -45069,19 +45211,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint) -"iFK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "iFM" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -45241,12 +45370,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"iHf" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "iHj" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/side{ @@ -45318,22 +45441,6 @@ /obj/machinery/duct, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"iHN" = ( -/obj/structure/table/reinforced, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "iHQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -45458,6 +45565,11 @@ /obj/machinery/duct, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) +"iJi" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space/openspace, +/area/space/nearstation) "iJw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, @@ -45811,10 +45923,6 @@ dir = 8 }, /area/station/hallway/primary/central/fore) -"iMW" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/open/space/basic, -/area/space/nearstation) "iNb" = ( /obj/effect/turf_decal/vg_decals/numbers/two, /turf/open/floor/iron/dark/side{ @@ -45939,16 +46047,6 @@ }, /turf/open/floor/engine, /area/station/science/ordnance) -"iOM" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/machinery/computer/station_alert{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/ce/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/ce) "iON" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -46370,18 +46468,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) -"iUa" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "iUc" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/power/shuttle_engine/heater{ @@ -47394,14 +47480,6 @@ }, /turf/open/floor/grass, /area/station/medical/exam_room) -"jcL" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/bot, -/obj/machinery/modular_computer/preset/engineering, -/obj/structure/cable, -/obj/machinery/computer/security/telescreen/turbine/directional/east, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "jcN" = ( /obj/machinery/rnd/production/techfab/department/service, /obj/effect/turf_decal/bot, @@ -47562,6 +47640,19 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"jeS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/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, +/obj/machinery/door/airlock/public/glass{ + name = "Central Upper Hallway" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/upper) "jeT" = ( /obj/structure/table, /obj/item/storage/fancy/coffee_condi_display{ @@ -48304,6 +48395,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"jmt" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jmD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -48695,6 +48796,17 @@ /obj/effect/turf_decal/tile/red/real_red/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"jpY" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/psychologist, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/iron, +/area/station/medical/psychology) "jqa" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Ports" @@ -49822,32 +49934,6 @@ /obj/structure/grandfatherclock, /turf/open/floor/wood, /area/station/medical/patients_rooms) -"jBh" = ( -/obj/structure/showcase/cyborg/old{ - dir = 4; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; - icon_state = "control_stun"; - name = "AI Upload turret control"; - pixel_y = 32 - }, -/obj/item/radio/intercom/directional/north{ - broadcasting = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -26 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/aiupload/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload_foyer) "jBj" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/bot, @@ -50330,6 +50416,14 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"jFL" = ( +/obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/ordnance/directional/south, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) "jFN" = ( /obj/structure/cable, /obj/item/radio/intercom/directional/north, @@ -50618,11 +50712,6 @@ dir = 1 }, /area/station/science/research) -"jIK" = ( -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "jIV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51949,20 +52038,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/large, /area/station/cargo/lobby) -"jUL" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar, -/obj/item/cigarette/pipe{ - pixel_y = 13 - }, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/captain) "jUM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52578,6 +52653,12 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"jZv" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "jZy" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -52966,6 +53047,10 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/primary/central) +"kev" = ( +/obj/structure/shipping_container/donk_co, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "key" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -53366,6 +53451,17 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/maintenance/console_room) +"kha" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/cytology, +/obj/item/biopsy_tool, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "khb" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/effect/turf_decal/bot, @@ -55123,6 +55219,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"kxI" = ( +/obj/machinery/smartfridge/organ, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "kxK" = ( /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ @@ -55350,6 +55450,13 @@ dir = 4 }, /area/station/tcommsat/computer) +"kzH" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/table/reinforced, +/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/engineering/transit_tube) "kzI" = ( /turf/open/floor/iron, /area/station/science/xenobiology) @@ -57819,6 +57926,15 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) +"lbi" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/flatpack, +/turf/open/floor/iron/white, +/area/station/science/lab) "lbm" = ( /turf/open/openspace, /area/station/service/barber) @@ -59479,11 +59595,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"lrr" = ( -/obj/structure/table/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/security/interrogation) "lrs" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck" @@ -59923,15 +60034,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"lwe" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/effect/turf_decal/stripes{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/gas_mask/directional/south, -/turf/open/floor/plating, -/area/station/science/xenobiology) "lwf" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -60737,14 +60839,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) -"lEh" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "lEj" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -60871,10 +60965,6 @@ dir = 4 }, /area/station/hallway/primary/central) -"lFJ" = ( -/obj/machinery/power/shuttle_engine/huge, -/turf/open/space/openspace, -/area/space/nearstation) "lFL" = ( /obj/structure/grille, /obj/structure/window/reinforced/spawner/directional/west, @@ -61344,18 +61434,6 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) -"lKs" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 4 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) "lKw" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs{ @@ -62927,15 +63005,6 @@ /obj/effect/spawner/random/contraband/cannabis/lizardsgas, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"lZc" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/plumbing/input, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "lZe" = ( /obj/machinery/duct, /turf/open/floor/iron, @@ -63065,6 +63134,13 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/science/genetics) +"maG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/iron, +/area/station/command/bridge) "maI" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -63199,10 +63275,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/thruster_room/central) -"mcw" = ( -/obj/structure/shipping_container/donk_co, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "mcz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -63329,16 +63401,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/library) -"mdw" = ( -/obj/structure/dresser{ - pixel_y = -11 - }, -/obj/structure/mirror{ - pixel_x = 1; - pixel_y = 4 - }, -/turf/closed/wall, -/area/station/common/tailoring) "mdx" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/delivery, @@ -64070,13 +64132,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"mlt" = ( -/obj/machinery/light/floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/computer/security/telescreen/minisat/directional/north, -/turf/open/floor/iron, -/area/station/engineering/transit_tube) "mlw" = ( /obj/effect/turf_decal/loading_area/white{ dir = 4 @@ -64124,6 +64179,10 @@ /obj/machinery/vending/sovietsoda, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"mlV" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/engine, +/area/station/science/xenobiology) "mlX" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt{ @@ -64280,25 +64339,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"mnx" = ( -/obj/machinery/button/door{ - id = "cargounload"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/machinery/button/door{ - id = "cargoload"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = 8 - }, -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/small, -/area/station/cargo/storage) "mnG" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/disposal/bin, @@ -65878,6 +65918,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, /area/station/medical/patients_rooms) +"mEE" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/plumbing/input, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "mER" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, @@ -66578,13 +66627,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"mLh" = ( -/obj/structure/window/spawner/directional/north, -/obj/structure/table/reinforced, -/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/engineering/transit_tube) "mLj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66976,6 +67018,12 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"mPs" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "mPt" = ( /obj/machinery/door/window/brigdoor/right/directional/west{ req_access = list("security"); @@ -68377,6 +68425,17 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +"ndi" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "ndp" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -69652,6 +69711,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"nri" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/open/space/basic, +/area/space/nearstation) "nrv" = ( /obj/structure/bookcase/random/reference, /obj/machinery/digital_clock/directional/north, @@ -69846,6 +69909,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"ntx" = ( +/obj/structure/dresser{ + pixel_y = -11 + }, +/obj/structure/mirror{ + pixel_x = 1; + pixel_y = 4 + }, +/turf/closed/wall, +/area/station/common/tailoring) "nty" = ( /obj/effect/turf_decal/stripes/box, /obj/structure/closet/emcloset, @@ -70449,11 +70522,6 @@ "nzp" = ( /turf/open/floor/iron, /area/station/cargo/drone_bay) -"nzu" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space/openspace, -/area/space/nearstation) "nzv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -70748,6 +70816,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/teleporter) +"nCn" = ( +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/station/service/bar/atrium) "nCq" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -71588,6 +71662,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"nKr" = ( +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/station/service/theater) "nKs" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -73211,18 +73291,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/white/small, /area/station/medical/break_room) -"nZS" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/obj/item/lighter, -/turf/open/floor/carpet, -/area/station/command/meeting_room/council) "nZT" = ( /obj/machinery/power/smes{ capacity = 9e+006; @@ -73419,6 +73487,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ocq" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space/openspace, +/area/space/nearstation) "ocu" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -73495,10 +73567,6 @@ /obj/structure/cable, /turf/open/floor/iron/stairs/old, /area/station/security/execution/transfer) -"odi" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "odj" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -74309,6 +74377,18 @@ /obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"ojP" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/obj/item/lighter, +/turf/open/floor/carpet, +/area/station/command/meeting_room/council) "ojR" = ( /obj/structure/marker_beacon/burgundy, /obj/structure/lattice/catwalk, @@ -74333,12 +74413,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) -"ojV" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "ojW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -75546,21 +75620,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/port/central) -"ovi" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/machinery/vatgrower, -/obj/item/plunger{ - pixel_x = -7; - pixel_y = 20 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "ovj" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -75873,6 +75932,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/closed/wall, /area/station/engineering/atmos/pumproom) +"oyb" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "oyh" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/siding/wood, @@ -76620,6 +76683,14 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/fore) +"oGh" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "oGm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77338,16 +77409,16 @@ dir = 4 }, /area/station/security/lockers) -"oMH" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/space/openspace, -/area/space/nearstation) "oML" = ( /obj/structure/railing{ dir = 6 }, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) +"oMM" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "oMQ" = ( /mob/living/basic/garden_gnome, /turf/open/floor/grass, @@ -77806,12 +77877,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"oRk" = ( -/obj/structure/hoop{ - pixel_y = 17 - }, -/turf/open/floor/iron, -/area/station/security/prison/workout) "oRn" = ( /obj/structure/hedge/opaque, /obj/structure/railing{ @@ -77967,18 +78032,6 @@ dir = 1 }, /area/station/hallway/secondary/exit) -"oTj" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "oTk" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -78352,6 +78405,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/maintenance/abandon_office) +"oWH" = ( +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/commons/dorms) "oWJ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -78583,6 +78651,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"oZs" = ( +/obj/structure/table/glass, +/obj/structure/microscope, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/obj/item/knife{ + pixel_x = 16 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "oZu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -79096,6 +79177,23 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos) +"pfs" = ( +/obj/structure/table/reinforced, +/obj/item/aicard, +/obj/item/circuitboard/aicore, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Research Director's Office"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/south, +/obj/item/taperecorder, +/obj/machinery/computer/security/telescreen/rd/directional/south, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "pfx" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/extinguisher_cabinet/directional/south, @@ -79172,6 +79270,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/courtroom) +"pgs" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/item/storage/box/petridish{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/petridish, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "pgz" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/service/bar, @@ -79601,6 +79715,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"pjT" = ( +/turf/open/space/openspace, +/area/space/nearstation) "pjV" = ( /turf/closed/wall, /area/station/common/night_club/back_stage) @@ -79995,19 +80112,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"poe" = ( -/obj/structure/table/glass, -/obj/item/petri_dish{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/petri_dish, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "pog" = ( /turf/closed/wall, /area/station/science/xenobiology/control) @@ -81488,6 +81592,25 @@ /obj/effect/mapping_helpers/airlock/access/all/security/court, /turf/open/floor/wood, /area/station/security/courtroom) +"pEu" = ( +/obj/machinery/button/door{ + id = "cargounload"; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/machinery/button/door{ + id = "cargoload"; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = 8 + }, +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/small, +/area/station/cargo/storage) "pEA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -81982,6 +82105,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/department/eva) +"pKb" = ( +/obj/machinery/light/directional/south, +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/library/private) "pKc" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -82646,11 +82776,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/library/lower) -"pQj" = ( -/obj/structure/table/glass, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) "pQr" = ( /obj/structure/cable, /turf/open/floor/iron/dark/side{ @@ -83073,12 +83198,6 @@ /obj/structure/chair/comfy, /turf/open/floor/iron, /area/station/hallway/primary/upper) -"pUA" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "pUB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -85914,10 +86033,6 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"quh" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/engine, -/area/station/science/xenobiology) "qum" = ( /obj/structure/closet, /obj/effect/turf_decal/delivery, @@ -86050,6 +86165,18 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"quQ" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 4 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "quW" = ( /obj/structure/showcase/cyborg/old{ pixel_y = 20 @@ -87352,6 +87479,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) +"qHx" = ( +/obj/structure/rack, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/assault_pod/mining, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/auxbase/directional/east, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "qHy" = ( /obj/effect/spawner/random/structure/crate, /obj/structure/grille/broken, @@ -88026,6 +88172,18 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"qOI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/chair/sofa/corp{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "qOJ" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -88564,6 +88722,11 @@ dir = 4 }, /area/station/security/prison) +"qUm" = ( +/obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) "qUp" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -89551,10 +89714,6 @@ "reb" = ( /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/lab) -"reg" = ( -/obj/structure/musician/piano, -/turf/open/floor/wood, -/area/station/service/bar/atrium) "rej" = ( /obj/machinery/door/airlock/public/glass{ name = "Bar" @@ -89689,6 +89848,10 @@ /obj/item/clothing/head/utility/hardhat, /turf/open/floor/plating, /area/station/security/execution/transfer) +"reR" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/openspace, +/area/space/nearstation) "reW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -89944,10 +90107,6 @@ dir = 8 }, /area/station/security/prison) -"rhr" = ( -/obj/structure/musician/piano, -/turf/open/floor/wood, -/area/station/service/theater) "rhs" = ( /obj/structure/chair/office/light, /obj/effect/turf_decal/stripes/white/corner{ @@ -90171,6 +90330,24 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"rjL" = ( +/obj/structure/railing, +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/iron/dark/side, +/area/station/hallway/primary/upper) +"rjM" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rjO" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -90340,17 +90517,6 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/blueshield) -"rlk" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "rlp" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -90532,6 +90698,15 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/wood, /area/station/command/captain_dining) +"rmY" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rnl" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/iron/dark, @@ -90591,10 +90766,6 @@ }, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) -"rnZ" = ( -/obj/machinery/smartfridge/petri/preloaded, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "roc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -91095,18 +91266,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron/dark, /area/station/security/brig) -"rsY" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "rsZ" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -91216,21 +91375,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"rtM" = ( -/obj/structure/chair/sofa/bench{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/commons/dorms) "rtN" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -92617,25 +92761,6 @@ /obj/item/trash/chips, /turf/open/floor/plating, /area/station/maintenance/department/science/upper) -"rHE" = ( -/obj/structure/rack, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/assault_pod/mining, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/auxbase/directional/east, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "rHG" = ( /obj/item/stack/sheet/cardboard, /obj/item/storage/box/lights, @@ -93313,16 +93438,15 @@ }, /turf/closed/wall, /area/station/service/chapel) -"rPx" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 4 +"rPv" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rPy" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue" @@ -93938,6 +94062,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +"rWh" = ( +/obj/machinery/power/shuttle_engine/huge, +/turf/open/space/openspace, +/area/space/nearstation) "rWk" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -94432,10 +94560,6 @@ /obj/effect/spawner/random/trash/mopbucket, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"sbb" = ( -/obj/machinery/smartfridge/organ, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "sbg" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -94597,6 +94721,13 @@ dir = 8 }, /area/station/hallway/secondary/command) +"sco" = ( +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/security/telescreen/minisat/directional/north, +/turf/open/floor/iron, +/area/station/engineering/transit_tube) "scr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -96355,6 +96486,24 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/office) +"suA" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/obj/item/lighter, +/obj/structure/cable, +/obj/machinery/button/door{ + id = "DetShutters"; + name = "Privacy Shutters"; + pixel_y = 14 + }, +/turf/open/floor/carpet, +/area/station/security/detectives_office) "suE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -96708,16 +96857,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"sxt" = ( -/obj/structure/cable, -/obj/structure/statue/sandstone/venus, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "sxu" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, @@ -97392,6 +97531,11 @@ /obj/item/target/alien, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"sEy" = ( +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "sEz" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/coffee, @@ -97607,18 +97751,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"sGB" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "sGD" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -98744,39 +98876,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"sQY" = ( -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access = list("security") - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access = list("brig") - }, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 9 - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access = list("armory") - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) "sRd" = ( /obj/machinery/computer/security{ dir = 4 @@ -98802,6 +98901,18 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"sRw" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "sRx" = ( /obj/structure/table, /obj/machinery/power/shuttle_engine/heater{ @@ -98827,6 +98938,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sRS" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/cigarette/pipe/crackpipe, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "sRV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -99365,6 +99487,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"sXb" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/xeno/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology/control) "sXk" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "lawyerprivacy"; @@ -100814,11 +100942,6 @@ /obj/structure/inflatable, /turf/open/floor/plating, /area/station/maintenance/department/security/lower) -"tki" = ( -/obj/structure/closet/secure_closet/cytology, -/obj/effect/turf_decal/stripes/white/box, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "tkj" = ( /obj/structure/rack/shelf, /obj/effect/turf_decal/bot, @@ -101725,6 +101848,18 @@ }, /turf/open/floor/wood, /area/station/security/prison/mess) +"tuu" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/chair/sofa/corp/left{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "tuv" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -102313,6 +102448,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"tzO" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "tzR" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/extinguisher_cabinet/directional/south, @@ -102715,17 +102854,6 @@ }, /turf/open/floor/engine/o2, /area/station/engineering/atmos) -"tDh" = ( -/obj/machinery/disposal/delivery_chute{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "tDi" = ( /obj/machinery/modular_computer/preset/civilian, /turf/open/floor/iron/dark, @@ -103996,15 +104124,6 @@ /obj/effect/spawner/random/contraband/permabrig_gear, /turf/open/floor/plating, /area/station/security/prison/mess) -"tQd" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tQg" = ( /obj/effect/turf_decal/vg_decals/numbers/four, /obj/effect/landmark/start/prisoner, @@ -105144,17 +105263,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/shuttle/evac/airless, /area/space/nearstation) -"ucG" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "ucK" = ( /obj/machinery/griddle, /obj/effect/turf_decal/bot, @@ -108645,6 +108753,32 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"uKd" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload turret control"; + pixel_y = 32 + }, +/obj/item/radio/intercom/directional/north{ + broadcasting = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -26 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) "uKe" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -108953,6 +109087,10 @@ /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/station/common/cryopods) +"uNX" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/engine, +/area/station/science/xenobiology) "uNZ" = ( /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, @@ -110174,11 +110312,6 @@ dir = 1 }, /area/station/security/prison/upper) -"vaJ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "vaK" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -111951,12 +112084,6 @@ /obj/machinery/power/shieldwallgen, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva/upper) -"vss" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "vsv" = ( /obj/machinery/nuclearbomb/selfdestruct, /turf/open/floor/iron/smooth, @@ -113086,15 +113213,6 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"vBO" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "vBP" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, @@ -113378,6 +113496,12 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"vEE" = ( +/obj/structure/chair/office/light, +/obj/machinery/light/floor, +/obj/machinery/computer/security/telescreen/tcomms/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "vEF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -114057,23 +114181,6 @@ /obj/machinery/duct, /turf/open/floor/carpet, /area/station/commons/dorms/vacantroom) -"vLn" = ( -/obj/structure/table/reinforced, -/obj/item/aicard, -/obj/item/circuitboard/aicore, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Research Director's Office"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/machinery/light/directional/south, -/obj/item/taperecorder, -/obj/machinery/computer/security/telescreen/rd/directional/south, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "vLv" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/test_chambers) @@ -115017,19 +115124,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs/old, /area/station/cargo/office) -"vUQ" = ( -/obj/structure/table/glass, -/obj/structure/microscope, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/obj/item/knife{ - pixel_x = 16 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "vUW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -115157,6 +115251,15 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"vVU" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "vVV" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -116748,6 +116851,24 @@ /obj/effect/mapping_helpers/airlock/access/all/security/court, /turf/open/floor/carpet, /area/station/security/courtroom) +"wkU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/commons/dorms) "wkY" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/bot, @@ -117721,6 +117842,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/security/prison_upper) +"wtZ" = ( +/obj/structure/cable, +/obj/structure/statue/sandstone/venus, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "wub" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -117808,6 +117939,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/security/prison/upper) +"wuI" = ( +/obj/structure/table/glass, +/obj/item/petri_dish{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/petri_dish, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "wuM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -117957,10 +118101,6 @@ }, /turf/open/floor/plating, /area/station/cargo/miningdock) -"wwd" = ( -/obj/structure/shipping_container/nanotrasen, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "www" = ( /turf/closed/wall, /area/station/maintenance/department/security/lesser) @@ -120388,38 +120528,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engineering/atmos_aux_port) -"wTZ" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/cytology, -/obj/item/biopsy_tool, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) -"wUa" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_y = 4 - }, -/obj/item/cigarette/rollie/cannabis{ - pixel_x = 8; - pixel_y = 15 - }, -/obj/item/lighter, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/qm) "wUb" = ( /obj/structure/cable, /turf/open/floor/iron/dark/side{ @@ -120644,13 +120752,6 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) -"wXa" = ( -/obj/structure/railing, -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/iron/dark/side, -/area/station/hallway/primary/upper) "wXc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -121882,6 +121983,10 @@ /obj/machinery/pdapainter/research, /turf/open/floor/wood, /area/station/command/heads_quarters/rd) +"xjE" = ( +/obj/structure/shipping_container/nanotrasen, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "xjF" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Maintenance" @@ -121890,22 +121995,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"xjM" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/item/storage/box/petridish{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/petridish, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "xjV" = ( /obj/structure/window/spawner/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -122624,12 +122713,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) -"xrq" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/xeno/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology/control) "xrx" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -122881,24 +122964,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/grass, /area/station/hallway/primary/central) -"xtK" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/newscaster/directional/south, -/obj/item/folder, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "xtL" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/chair/sofa/bench/right{ @@ -123425,24 +123490,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/station/engineering/atmos/test_chambers) -"xyl" = ( -/obj/structure/chair/office/light, -/obj/machinery/light/floor, -/obj/machinery/computer/security/telescreen/tcomms/directional/south, -/turf/open/floor/iron, -/area/station/tcommsat/computer) -"xyt" = ( -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/vault/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "xyx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance, @@ -123453,22 +123500,6 @@ /obj/structure/lattice, /turf/open/openspace, /area/station/maintenance/aft/upper) -"xyP" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff/gateway, -/obj/item/coin/gold{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/phone{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/cigarette/pipe{ - pixel_x = -5 - }, -/turf/open/floor/carpet/green, -/area/station/command/heads_quarters/nt_rep) "xyS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -124714,18 +124745,6 @@ }, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) -"xLi" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "xLj" = ( /obj/machinery/biogenerator, /obj/item/reagent_containers/cup/beaker{ @@ -125533,25 +125552,6 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/prison/mess) -"xUN" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/corrections_officer, -/obj/machinery/button/flasher{ - id = "IsolationFlash2"; - pixel_x = 10; - pixel_y = -24 - }, -/obj/machinery/button/flasher{ - id = "IsolationFlash"; - pixel_x = -10; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/isolation/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/corrections_officer) "xUR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -127267,6 +127267,12 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"yiY" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "yja" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -145168,7 +145174,7 @@ fZI rUF ojX nuU -gcw +cRm fZI fZI fZI @@ -146197,7 +146203,7 @@ jtq tfY ojX nuU -gcw +cRm fZI fZI fZI @@ -148383,7 +148389,7 @@ mjE mjE mjE mjE -atM +gLI mjE ltN cDn @@ -148465,9 +148471,9 @@ cUE bEW ptO oeQ -aCU -cjM -lKs +tuu +qOI +quQ vIV upX hmn @@ -148522,7 +148528,7 @@ kZg kZg wMq ojX -iMW +nri fZI fZI fZI @@ -149554,7 +149560,7 @@ jtq hKw ojX ojX -gcw +cRm fZI fZI fZI @@ -150585,7 +150591,7 @@ sAe pDz ojX nuU -gcw +cRm fZI fZI fZI @@ -151614,7 +151620,7 @@ sAe pDz ojX nuU -gcw +cRm fZI fZI fZI @@ -151789,7 +151795,7 @@ nJc aKq iXC aVJ -mdw +ntx rqt wYH cbs @@ -152628,8 +152634,8 @@ pFN pFN jas pFN -xyl -odi +vEE +tzO nds tku dbY @@ -152642,7 +152648,7 @@ sAe pDz ojX nuU -gcw +cRm fZI fZI fZI @@ -153673,7 +153679,7 @@ sAe pDz ojX nuU -gcw +cRm fZI fZI fZI @@ -153857,7 +153863,7 @@ oHU qlY sJE jzJ -xtK +gyX qlY tbS oMk @@ -154114,7 +154120,7 @@ kWy qlY qfV jbI -jIK +pKb qlY snu gbw @@ -154323,7 +154329,7 @@ dMN tUg tzJ ylq -hkU +cOM fzJ jOn fAw @@ -154580,7 +154586,7 @@ sXy fAw juQ wPb -lrr +qUm udU eya fAw @@ -154703,7 +154709,7 @@ sAe pDz ojX ojX -gcw +cRm fZI fZI fZI @@ -155206,7 +155212,7 @@ lzd lzd lzd gON -iOM +foz sHR lzd lzd @@ -155433,7 +155439,7 @@ vVX nyD sXZ dAT -rHE +qHx eCU fIw onL @@ -155976,7 +155982,7 @@ bRe qhV wTj jmk -hnu +eWM bqH dFZ fhB @@ -156776,7 +156782,7 @@ eFZ eFZ hIY aML -iMW +nri fZI fZI fZI @@ -156901,7 +156907,7 @@ jhS mxi obU lHW -blY +suA awo tez juG @@ -159177,7 +159183,7 @@ fZI ugq jHk efd -iHN +hhg dSH kac lZg @@ -161053,7 +161059,7 @@ jZJ nge rZM wna -rPx +dgv kGp mQS nYP @@ -161068,7 +161074,7 @@ qJJ cUu jMU pgb -reg +nCn oAu vET hPM @@ -161145,7 +161151,7 @@ eFZ eFZ hIY aML -iMW +nri fZI fZI fZI @@ -163798,9 +163804,9 @@ fZI xJH xOu lcD -pUA -pUA -pUA +iea +iea +iea gJW xJH fZI @@ -163812,7 +163818,7 @@ gHt mcE nQK xez -sQY +fXg usE qeT ktT @@ -163889,7 +163895,7 @@ wPA wtf bZp qBm -wUa +cTU sJC lUP vms @@ -164570,7 +164576,7 @@ bsG gfW bsG bsG -vss +jZv fZI tci eAw @@ -165341,7 +165347,7 @@ bsG oek bsG bsG -ojV +yiY fZI tci eAw @@ -165651,7 +165657,7 @@ dVy mrV dVy ifi -iHf +deR xYg dVy pdU @@ -166769,7 +166775,7 @@ nuU nuU fth fYp -jcL +euL ecj tHX aSG @@ -168515,7 +168521,7 @@ pMw bJC bQX qfc -mnx +pEu uXP eJa axj @@ -168756,11 +168762,11 @@ sWA sWA fAl eFp -dWO +guo mqR txp sMx -tDh +iAu eFn qIm qyM @@ -168784,15 +168790,15 @@ bld lVQ ktY bDS -wwd +xjE ktY djJ djJ ktY -mcw +kev pXg txY -gCP +bxP djJ leG kyD @@ -169013,7 +169019,7 @@ jUp mou jUp ctp -gRB +mPs ocA pbG ejr @@ -169222,7 +169228,7 @@ rtH nes qCL oDC -xUN +afr vwF nes oqT @@ -169253,9 +169259,9 @@ baE dzs rtr ddd -oTj -iFK -xLi +hkw +fsN +eDR tfe rtr rtr @@ -169722,7 +169728,7 @@ eXo lWC ffG hVk -dbd +sRS jGp lkn hiH @@ -171025,7 +171031,7 @@ fYU qkw xxz lSv -oRk +hUp mNQ fhf cxL @@ -171253,7 +171259,7 @@ fZI fZI fZI tfU -aGZ +giN jNq jZy lSv @@ -210705,7 +210711,7 @@ spk hFB ojX ojX -lFJ +rWh ulx ulx ulx @@ -210962,7 +210968,7 @@ tcq tcq ojX ojX -hBA +pjT ulx ulx ulx @@ -211734,7 +211740,7 @@ spk hFB ojX ojX -lFJ +rWh ulx ulx ulx @@ -211991,7 +211997,7 @@ tcq tcq ojX ojX -hBA +pjT ulx ulx ulx @@ -212248,7 +212254,7 @@ mkZ rkF ojX ojX -hBA +pjT ulx ulx ulx @@ -212763,7 +212769,7 @@ spk hFB ojX ojX -lFJ +rWh ulx ulx ulx @@ -213020,7 +213026,7 @@ tcq tcq ojX ojX -hBA +pjT ulx ulx ulx @@ -213277,7 +213283,7 @@ mkZ rkF ojX ojX -hBA +pjT ulx ulx ulx @@ -214059,7 +214065,7 @@ iVF lVY wVE ojX -gIG +bTZ ulx ulx ulx @@ -214316,7 +214322,7 @@ iVF sXD wVE ojX -hBA +pjT ulx ulx ulx @@ -216548,9 +216554,9 @@ xEX tFc jqe vXi -bib -rtM -ihd +gQO +oWH +wkU vXi iAN vVu @@ -219394,7 +219400,7 @@ jCN ooa uUk pey -rhr +nKr sTk qjg aZe @@ -219423,7 +219429,7 @@ aOY qZR sCa adx -vLn +pfs pzS ipo nBN @@ -219612,7 +219618,7 @@ hSQ fKQ vqW goe -xyP +dmZ oTn qJL ide @@ -220211,8 +220217,8 @@ nYY qTC nYY nYY -rnZ -sbb +etb +kxI fDT sTz krV @@ -220467,10 +220473,10 @@ prZ aXs fEY nYY -tki -tQd -igj -rlk +bet +rPv +rmY +rjM ggt krV paj @@ -220724,9 +220730,9 @@ eNZ umx iDx nYY -ovi -hen -sGB +bOZ +vVU +sRw fDT czk fDT @@ -220981,9 +220987,9 @@ mkR gjh pfx nYY -lZc -lEh -iUa +mEE +oGh +eAl krV vcr uWb @@ -221238,9 +221244,9 @@ thj ydp ltW nYY -ucG -ats -vUQ +ndi +fIe +oZs krV miB sWX @@ -221250,8 +221256,8 @@ bDn oKA bDn bDn -hAY -lwe +cXv +cAD fDT euU euU @@ -221495,13 +221501,13 @@ rtX nYY xqe nYY -aVX -poe -wTZ +jmt +wuI +kha krV uxR wvi -xjM +pgs eRv tMs iHQ @@ -221752,7 +221758,7 @@ snw gOs snw nYY -rsY +bRW fDT krV krV @@ -221768,8 +221774,8 @@ oEB cJl pux mzy -quh -ifh +uNX +mlV euU fcE fDT @@ -221939,7 +221945,7 @@ xai xai hCo sIz -wXa +rjL cJU aWU mDA @@ -222187,7 +222193,7 @@ wJQ nAH mMZ qES -xyt +eFs hSo hRG pQs @@ -222313,19 +222319,19 @@ vXQ vXQ vXQ qYX -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn -aJn +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR ulx ulx ulx @@ -222453,7 +222459,7 @@ fMF njk cyR lRs -ijT +cMO cJU aWU fSN @@ -222583,8 +222589,8 @@ van van van hVx -cSy -aJn +dhk +reR ulx ulx ulx @@ -222828,21 +222834,21 @@ duP duP fjw fjw -oMH -oMH -oMH +ocq +ocq +ocq pvi -oMH -oMH +ocq +ocq pvi -oMH -oMH +ocq +ocq pvi -ePo +iJi guU van hVx -cSy +dhk ulx ulx ulx @@ -223096,11 +223102,11 @@ dFU ulx czg ulx -oMH -ePo +ocq +iJi guU hVx -cas +oMM ulx ulx ulx @@ -223355,9 +223361,9 @@ dFU dFU ulx ulx -ePo +iJi oIO -cSy +dhk ulx ulx ulx @@ -223615,7 +223621,7 @@ czg rHM guU hVx -cas +oMM ulx ulx ulx @@ -223870,9 +223876,9 @@ dFU dFU ulx ulx -ePo +iJi oIO -cSy +dhk ulx ulx ulx @@ -224127,10 +224133,10 @@ dFU dFU dFU ulx -nzu +inb ilP hVx -cSy +dhk ulx ulx ulx @@ -224230,7 +224236,7 @@ ckV gJh gBh jiu -jBh +uKd vNL tNU fnq @@ -224388,7 +224394,7 @@ bRf aaG aaG hVx -cas +oMM ulx ulx ulx @@ -224578,8 +224584,8 @@ geG vRO oWi kLg -xrq -cah +sXb +gIM byl lap mAg @@ -224598,8 +224604,8 @@ aYz fDT kyV nsy -mLh -mlt +kzH +sco iyl ldA tgW @@ -224617,7 +224623,7 @@ dZA qyl yiC iQN -gmR +arT fge rEy qnM @@ -224645,7 +224651,7 @@ aaG kSe kSe acJ -cas +oMM ulx ulx ulx @@ -224874,7 +224880,7 @@ aiq qyl wxK mRw -hDI +dgZ fge quW pLF @@ -224902,7 +224908,7 @@ dQF aaG aaG xfa -cas +oMM ulx ulx ulx @@ -225155,10 +225161,10 @@ dFU dFU dFU ulx -ePo +iJi ilP xfa -vaJ +gzx fZI ulx ulx @@ -225412,9 +225418,9 @@ dFU dFU ulx ulx -nzu +inb oIO -vaJ +gzx ulx ulx ulx @@ -225508,7 +225514,7 @@ xmO dEJ idB wFN -bpM +maG mrZ jiu jiu @@ -225671,7 +225677,7 @@ czg rHM iub xfa -cas +oMM ulx ulx ulx @@ -225787,7 +225793,7 @@ iUz sXV auH xFQ -nZS +ojP hsQ nKZ ikt @@ -225925,9 +225931,9 @@ dFU dFU ulx ulx -nzu +inb oIO -vaJ +gzx ulx ulx ulx @@ -226060,7 +226066,7 @@ tXu imD cbB bcA -hQV +jeS afh eTA xTW @@ -226101,7 +226107,7 @@ cIt aTJ lAM reZ -cuI +lbi lsu drm gxG @@ -226138,7 +226144,7 @@ lLv euU aYz fDT -pQj +czu pVW lrQ lVR @@ -226180,11 +226186,11 @@ dFU ulx czg ulx -aJn -nzu +reR +inb iub xfa -cas +oMM ulx ulx ulx @@ -226426,21 +226432,21 @@ vXQ vXQ qYX qYX -aJn -aJn -aJn +reR +reR +reR bGK -aJn -aJn +reR +reR bGK -aJn -aJn +reR +reR bGK -nzu +inb iub van xfa -vaJ +gzx ulx ulx ulx @@ -226695,8 +226701,8 @@ van van van xfa -vaJ -oMH +gzx +ocq ulx ulx ulx @@ -226838,7 +226844,7 @@ glI kHl tpR kHl -vBO +eSV eaQ bst frF @@ -226939,19 +226945,19 @@ duP duP duP fjw -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH -oMH +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq ulx ulx ulx @@ -228093,7 +228099,7 @@ aqQ hTp vEz bnU -jUL +fxX uWC kdU gfL @@ -229373,7 +229379,7 @@ heq bVU pTH oLd -sxt +wtZ bTN vtt nwo @@ -231235,7 +231241,7 @@ pSd qoV aQY npE -aBL +jpY hBc jsj hFR @@ -232290,8 +232296,8 @@ scR elb vir qfl -hrQ -hWt +jFL +oyb eQK ulx ulx @@ -234365,7 +234371,7 @@ rDS aqy tvm bqk -gIG +bTZ ulx ulx ulx @@ -234568,7 +234574,7 @@ nrv izM xCf eeW -hlo +sEy bcQ kPf sbR @@ -234622,7 +234628,7 @@ kta lQX tvm bqk -hBA +pjT ulx ulx ulx @@ -235137,7 +235143,7 @@ oON oON bqk hMF -lFJ +rWh ulx ulx ulx @@ -235394,7 +235400,7 @@ tzf tzf hMF hMF -hBA +pjT ulx ulx ulx @@ -235651,7 +235657,7 @@ rnF rnF bqk hMF -hBA +pjT ulx ulx ulx @@ -236164,7 +236170,7 @@ aqy dpl tvm bqk -gIG +bTZ ulx ulx ulx @@ -236421,7 +236427,7 @@ aqy cIB tvm bqk -hBA +pjT ulx ulx ulx @@ -238982,8 +238988,8 @@ soz soz soz nvJ -hBA -hBA +pjT +pjT ulx ulx ulx @@ -239239,7 +239245,7 @@ nvJ nvJ nvJ nvJ -hBA +pjT ulx ulx ulx diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index d13d3e69d37..14b55904071 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -847,27 +847,6 @@ /obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/large, /area/station/service/hydroponics) -"alZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "amD" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1045,14 +1024,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/science/ordnance/storage) -"aoU" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/flora/bush/sunny, -/mob/living/carbon/human/species/monkey, -/obj/structure/sign/poster/official/fruit_bowl/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/grass, -/area/station/science/genetics) "apl" = ( /obj/structure/spider/stickyweb, /obj/machinery/power/port_gen/pacman, @@ -1620,26 +1591,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/medical/pharmacy) -"axR" = ( -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/rack/shelf, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "axU" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio3"; @@ -2044,33 +1995,6 @@ dir = 4 }, /area/station/hallway/primary/fore) -"aCR" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = -5 - }, -/obj/structure/table/wood, -/obj/structure/secure_safe/directional/east, -/obj/item/lighter{ - color = "#d4af37"; - desc = "Cap's Lucky Lighter. Given to him by NT staff for being the most capable person to secure the disk."; - name = "The Captain's Lucky Lighter"; - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4 - }, -/obj/item/cigarette/cigar{ - pixel_x = 7 - }, -/obj/item/cigarette/cigar{ - pixel_x = 10 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/captain) "aCW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -2295,10 +2219,6 @@ "aFY" = ( /turf/closed/wall, /area/station/engineering/atmos/storage/gas) -"aGk" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/pod/dark, -/area/station/service/chapel/funeral) "aGu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -2980,21 +2900,6 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"aRv" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs{ - pixel_y = 7 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/item/gun/energy/laser/carbine/practice, -/turf/open/floor/engine, -/area/station/security/range) "aRA" = ( /obj/structure/transit_tube/curved/flipped, /obj/structure/lattice, @@ -3250,6 +3155,19 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"aVq" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposaloutlet{ + name = "Prisoner Doomp" + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig) "aVN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4149,20 +4067,6 @@ }, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) -"bgX" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/large, -/area/station/security/courtroom) -"bhg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/cold/directional/west, -/obj/machinery/computer/security/telescreen/tcomms/directional/west, -/turf/open/floor/engine, -/area/station/tcommsat/computer) "bhv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/airalarm/directional/west, @@ -4248,6 +4152,14 @@ }, /turf/closed/wall/r_wall, /area/station/science/xenobiology) +"biD" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "biU" = ( /obj/structure/table, /obj/item/clipboard, @@ -4908,6 +4820,14 @@ /obj/item/flashlight, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"bul" = ( +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/medical/virology) "bup" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5544,15 +5464,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"bEj" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/white/smooth_corner{ - dir = 1 - }, -/area/station/science/xenobiology) "bEm" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 8 @@ -6211,12 +6122,6 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/power_room) -"bPb" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/hop) "bPc" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -7289,6 +7194,22 @@ "cgZ" = ( /turf/closed/wall, /area/station/maintenance/port/greater) +"chg" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/storage/photo_album, +/obj/item/camera{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "chq" = ( /obj/structure/chair/office{ dir = 8 @@ -7881,19 +7802,6 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"cqs" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - dir = 4; - location = "QM #1" - }, -/obj/effect/turf_decal/box, -/mob/living/simple_animal/bot/mulebot, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/storage) "cqt" = ( /obj/structure/table, /obj/item/mmi, @@ -7993,6 +7901,10 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/pumproom) +"crN" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) "csd" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -8459,6 +8371,26 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/engineering) +"czH" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "cAd" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/power/shieldwallgen/anchored{ @@ -8650,20 +8582,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/security/interrogation) -"cDh" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "cDj" = ( /turf/closed/wall/r_wall, /area/station/security/execution/transfer) @@ -8688,25 +8606,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/lesser) -"cDI" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast DOors"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) "cDV" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -8971,6 +8870,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"cHg" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/hop) "cHh" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -9625,20 +9530,6 @@ dir = 1 }, /area/station/science/xenobiology) -"cQO" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "cQZ" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/shuttle{ @@ -10864,23 +10755,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, /area/station/maintenance/department/engine/atmos/lesser) -"djP" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/machinery/requests_console/directional/south{ - department = "Pharmacy"; - name = "Pharmacy Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/turf_decal/bot_red, -/obj/machinery/chem_dispenser, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "djR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 4 @@ -11128,28 +11002,6 @@ /obj/effect/turf_decal/box/white, /turf/open/floor/iron/small, /area/station/commons/dorms) -"dnw" = ( -/obj/item/clothing/shoes/magboots{ - pixel_x = -4 - }, -/obj/item/clothing/shoes/magboots{ - pixel_x = 3 - }, -/obj/item/clothing/shoes/magboots{ - pixel_y = 4 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/rack/shelf, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 5 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "dnE" = ( /obj/machinery/airalarm/directional/south, /obj/structure/closet/l3closet/scientist, @@ -11160,6 +11012,12 @@ }, /turf/open/floor/iron/white/diagonal, /area/station/science/xenobiology) +"dnO" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) "dnW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp{ @@ -11434,6 +11292,28 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/science/research/abandoned) +"dsV" = ( +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/carpet/royalblack, +/area/station/command/heads_quarters/hos) "dsW" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/large, @@ -12561,14 +12441,6 @@ /mob/living/basic/pet/cat/jerry, /turf/open/floor/wood, /area/station/security/prison/garden) -"dHY" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "dIf" = ( /obj/machinery/modular_computer/preset/civilian{ dir = 4 @@ -13144,12 +13016,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/art) -"dPt" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/siding/wood, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "dPv" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -13181,14 +13047,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"dPG" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/modular_computer/preset/id{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/rd) "dPO" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14837,14 +14695,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/mess) -"elS" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/chair{ - dir = 1; - name = "Accused" - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/courtroom) "emc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/garbage, @@ -15417,6 +15267,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) +"euI" = ( +/obj/structure/table/wood/poker, +/obj/item/cigarette/pipe, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) "evd" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -15795,20 +15650,6 @@ /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/execution/transfer) -"eAZ" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "eBa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15999,20 +15840,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/supply) -"eDy" = ( -/obj/structure/disposaloutlet{ - dir = 1; - name = "Cargo Deliveries" - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/structure/plasticflaps, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/storage) "eDF" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/power/apc/auto_name/directional/south, @@ -17175,6 +17002,13 @@ }, /turf/open/floor/iron/smooth_large, /area/station/hallway/primary/aft) +"eUs" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/engine, +/area/station/science/xenobiology) "eUu" = ( /obj/docking_port/stationary/public_mining_dock{ dir = 2 @@ -17318,6 +17152,15 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/station/common/pool) +"eWi" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/stripes/red/corner, +/obj/machinery/computer/security/telescreen/ordnance/directional/west, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/science/ordnance/testlab) "eWs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18085,14 +17928,6 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"fju" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "fjM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19293,25 +19128,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"fBH" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) "fCd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19370,26 +19186,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) -"fCC" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8; - initialize_directions = 4; - name = "euthanization chamber freezer" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "fCM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/graffiti, @@ -19472,15 +19268,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) -"fDG" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "fDJ" = ( /obj/machinery/rnd/server, /obj/effect/turf_decal/bot_red, @@ -19717,11 +19504,6 @@ dir = 4 }, /area/station/hallway/primary/fore) -"fIj" = ( -/obj/machinery/mass_driver/chapelgun, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/pod/dark, -/area/station/service/chapel/funeral) "fIK" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/siding/wood{ @@ -20032,6 +19814,21 @@ /obj/item/crowbar/red, /turf/open/floor/iron/white, /area/station/medical/virology) +"fOh" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/item/gun/energy/laser/practice, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/engine, +/area/station/security/range) "fOm" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/structure/disposalpipe/segment{ @@ -20061,13 +19858,6 @@ /obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/medical/medbay/central) -"fOP" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "fOR" = ( /obj/machinery/camera/directional/south{ c_tag = "Bridge - Captain's Quarters"; @@ -20467,6 +20257,23 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/lounge) +"fVm" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/structure/rack, +/obj/item/storage/box/syringes{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/box/beakers{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fVn" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -20580,6 +20387,20 @@ dir = 6 }, /area/station/service/chapel) +"fWQ" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "fXl" = ( /obj/docking_port/stationary/random{ name = "lavaland"; @@ -20659,26 +20480,6 @@ "fXP" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/storage/gas) -"fXX" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/item/stock_parts/matter_bin{ - pixel_x = -10; - pixel_y = 4 - }, -/obj/item/stock_parts/matter_bin{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/stock_parts/micro_laser{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/flatpack, -/turf/open/floor/iron/white/smooth_edge, -/area/station/science/lab) "fXZ" = ( /obj/effect/turf_decal/siding/red{ dir = 1 @@ -20797,14 +20598,6 @@ dir = 8 }, /area/station/engineering/gravity_generator) -"fZJ" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "fZM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21062,6 +20855,26 @@ "gei" = ( /turf/open/floor/iron/large, /area/station/hallway/primary/central/aft) +"geo" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/machinery/recharger{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/machinery/computer/security/telescreen/prison/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/warden) "gep" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/server/presets/common, @@ -21425,17 +21238,6 @@ }, /turf/open/floor/plating, /area/station/science/research) -"gja" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/structure/cable, -/obj/machinery/button/door/directional/west{ - id = "Xtestlab"; - name = "Secure Creature Pen Blast Door"; - req_access = list("xenobiology") - }, -/obj/structure/sign/warning/gas_mask/directional/west, -/turf/open/floor/engine, -/area/station/science/xenobiology) "gjj" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/modular_computer/preset/research, @@ -21763,6 +21565,12 @@ "gmz" = ( /turf/closed/wall, /area/station/service/hydroponics/garden/abandoned) +"gmB" = ( +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/grass, +/area/station/medical/virology) "gmD" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -22107,23 +21915,6 @@ dir = 4 }, /area/station/cargo/drone_bay) -"gsq" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/box, -/obj/machinery/button/door/directional/west{ - id = "xenobio1"; - name = "Xenobio Pen 1 Blast Door"; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "gsL" = ( /obj/structure/showcase/cyborg/old{ dir = 8; @@ -22764,6 +22555,20 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"gBQ" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/chemistry) "gCm" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 @@ -23208,18 +23013,6 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white/smooth_large, /area/station/command/heads_quarters/rd) -"gIn" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/item/knife/kitchen, -/obj/item/wrench, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "gIo" = ( /obj/item/binoculars, /obj/structure/table/reinforced/plastitaniumglass, @@ -24459,6 +24252,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) +"gYT" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/medbay/lobby) "gZb" = ( /obj/structure/lattice/catwalk, /obj/structure/closet/crate, @@ -25010,14 +24818,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) -"hhn" = ( -/obj/structure/chair/comfy/brown{ - color = "#A46106" - }, -/obj/effect/landmark/start/quartermaster, -/obj/machinery/computer/security/telescreen/vault/directional/north, -/turf/open/floor/carpet/black, -/area/station/command/heads_quarters/qm) "hhs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -25234,6 +25034,17 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/iron, /area/station/commons/lounge) +"hjR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "hjT" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -25495,6 +25306,25 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) +"hnT" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "hnU" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /obj/structure/fluff/metalpole/anchor{ @@ -25549,6 +25379,23 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/commons/storage/art) +"hpd" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box, +/obj/machinery/button/door/directional/west{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hpe" = ( /turf/open/floor/iron/smooth_large, /area/station/security/checkpoint/engineering) @@ -26029,6 +25876,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"hxg" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/item/stock_parts/matter_bin{ + pixel_x = -10; + pixel_y = 4 + }, +/obj/item/stock_parts/matter_bin{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/flatpack, +/turf/open/floor/iron/white/smooth_edge, +/area/station/science/lab) "hxh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26174,6 +26041,28 @@ "hzk" = ( /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"hzl" = ( +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Bay - Starboard"; + name = "cargo camera" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/button/door/directional/east{ + id = 68; + name = "Unloading Doors"; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = 69; + name = "Loading Doors"; + pixel_y = -6 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/storage) "hzm" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26462,6 +26351,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"hBZ" = ( +/obj/machinery/pdapainter/research, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/rd/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/command/heads_quarters/rd) "hCh" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -26782,6 +26678,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) +"hGn" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/pod/dark, +/area/station/service/chapel/funeral) "hGq" = ( /obj/structure/chair/office{ dir = 1 @@ -26914,6 +26814,18 @@ }, /turf/open/floor/iron/smooth, /area/station/science/ordnance/storage) +"hIy" = ( +/obj/structure/flora/bush/lavendergrass, +/obj/structure/window/reinforced/spawner/directional/west, +/mob/living/carbon/human/species/monkey, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/south{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/turf/open/floor/grass, +/area/station/science/genetics) "hIA" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) @@ -27654,6 +27566,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) +"hTQ" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/conveyor{ + id = "cargodisposals" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo Bay - Delivery Office Port"; + name = "cargo camera" + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "hTW" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/delivery, @@ -27815,6 +27742,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/engine/atmos/lesser) +"hWm" = ( +/obj/structure/table, +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/trimline/purple/filled, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) "hWF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -27858,17 +27811,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth_edge, /area/station/science/ordnance) -"hXL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "hXP" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable/red, @@ -28327,6 +28269,17 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/upper) +"ifj" = ( +/obj/effect/turf_decal/siding/dark_blue/corner, +/obj/machinery/shuttle_manipulator{ + desc = "A holographic display of the ship we're on right now."; + name = "ship holographic display" + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "ifq" = ( /turf/closed/wall/r_wall, /area/station/medical/pharmacy) @@ -28657,10 +28610,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) -"ilk" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/engine, -/area/station/science/xenobiology) "ilm" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/machinery/meter, @@ -28723,6 +28672,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) +"imd" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/cmo) "imh" = ( /obj/structure/sign/departments/xenobio/directional/west, /obj/item/kirbyplants/monkey, @@ -29273,6 +29229,24 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/prison) +"iso" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/hooded/ablative{ + pixel_y = 7 + }, +/obj/item/gun/energy/temperature/security{ + pixel_y = 5 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "isr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, @@ -29581,6 +29555,33 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/medical/psychology) +"iwk" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = -5 + }, +/obj/structure/table/wood, +/obj/structure/secure_safe/directional/east, +/obj/item/lighter{ + color = "#d4af37"; + desc = "Cap's Lucky Lighter. Given to him by NT staff for being the most capable person to secure the disk."; + name = "The Captain's Lucky Lighter"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4 + }, +/obj/item/cigarette/cigar{ + pixel_x = 7 + }, +/obj/item/cigarette/cigar{ + pixel_x = 10 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/captain) "iwq" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -29593,6 +29594,13 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"iwH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/ce/directional/south, +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/ce) "iwV" = ( /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -30011,6 +30019,20 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"iCV" = ( +/obj/structure/disposaloutlet{ + dir = 1; + name = "Cargo Deliveries" + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/structure/plasticflaps, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/storage) "iCW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30352,20 +30374,6 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) -"iHY" = ( -/obj/structure/plasticflaps{ - name = "Deliveries" - }, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/right/directional/north{ - name = "Deliveries"; - req_access = list("shipping") - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "iIn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30742,18 +30750,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"iOA" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/door/window/right/directional/north{ - name = "Warehouse Deliveries"; - req_access = list("cargo") - }, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/warehouse) "iOB" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table/wood/fancy, @@ -30769,11 +30765,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/smooth, /area/station/engineering/power_room) -"iPf" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "iPh" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30885,24 +30876,6 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"iQH" = ( -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; - icon_state = "control_stun"; - name = "AI Upload turret control"; - pixel_y = 32 - }, -/obj/structure/table, -/obj/item/folder/blue{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/security/telescreen/aiupload/directional/west, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/ai_upload) "iQV" = ( /obj/machinery/light_switch/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31197,6 +31170,14 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"iUM" = ( +/obj/structure/chair/comfy/brown{ + color = "#A46106" + }, +/obj/effect/landmark/start/quartermaster, +/obj/machinery/computer/security/telescreen/vault/directional/north, +/turf/open/floor/carpet/black, +/area/station/command/heads_quarters/qm) "iVa" = ( /turf/open/floor/engine, /area/station/security/range) @@ -31848,6 +31829,26 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"jdJ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8; + initialize_directions = 4; + name = "euthanization chamber freezer" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jdN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/generic_maintenance_landmark, @@ -32538,28 +32539,6 @@ }, /turf/open/floor/iron/smooth, /area/station/science/research/abandoned) -"jol" = ( -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo Bay - Starboard"; - name = "cargo camera" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/button/door/directional/east{ - id = 68; - name = "Unloading Doors"; - pixel_y = 6 - }, -/obj/machinery/button/door/directional/east{ - id = 69; - name = "Loading Doors"; - pixel_y = -6 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/storage) "jom" = ( /obj/item/circuitboard/computer/operating, /obj/effect/decal/cleanable/dirt, @@ -32620,6 +32599,14 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"jpk" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "jpv" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32867,6 +32854,18 @@ }, /turf/open/floor/iron/smooth_large, /area/station/command/cc_dock) +"jsf" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/item/knife/kitchen, +/obj/item/wrench, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "jsm" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -33236,6 +33235,10 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/lesser) +"jwN" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/engine, +/area/station/science/xenobiology) "jwV" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/smooth, @@ -33676,6 +33679,15 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) +"jDb" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "jDe" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -34663,6 +34675,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/vaporwave, /area/station/service/barber) +"jQQ" = ( +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/white/smooth_corner{ + dir = 1 + }, +/area/station/science/xenobiology) "jQR" = ( /obj/machinery/door/window/left/directional/south{ name = "Research Test Chamber"; @@ -35905,6 +35926,20 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"kjX" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "kkk" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/sorting/mail{ @@ -37238,20 +37273,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"kCJ" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "kCM" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -37740,17 +37761,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"kHX" = ( -/obj/effect/turf_decal/siding/dark_blue/corner, -/obj/machinery/shuttle_manipulator{ - desc = "A holographic display of the ship we're on right now."; - name = "ship holographic display" - }, -/obj/effect/turf_decal/tile/blue/half{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "kIc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, @@ -38511,14 +38521,6 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/hallway/primary/aft) -"kTN" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/south, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "kTR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -39630,6 +39632,20 @@ /obj/machinery/rnd/experimentor, /turf/open/floor/engine, /area/station/science/explab) +"ljG" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/medical/medbay/lobby) "ljI" = ( /turf/closed/wall, /area/station/medical/morgue) @@ -40483,6 +40499,35 @@ /obj/effect/turf_decal/tile/red/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/office) +"lvU" = ( +/obj/structure/table, +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/digital_clock/directional/north{ + pixel_y = 37 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) "lvX" = ( /obj/structure/closet, /obj/item/crowbar, @@ -41636,10 +41681,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/central) -"lMy" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/station/science/xenobiology) "lML" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -42865,16 +42906,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/lesser) -"mdh" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/north, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "mdo" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/south, @@ -43660,32 +43691,6 @@ dir = 1 }, /area/station/hallway/secondary/entry) -"moQ" = ( -/obj/structure/table, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/trimline/purple/filled, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/storage) "moV" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -43752,28 +43757,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation/entertainment) -"mpX" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/storage/box/trackimp{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/gun/energy/ionrifle{ - pixel_y = -6 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "mqd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/closet_empty, @@ -43992,12 +43975,6 @@ dir = 8 }, /area/station/cargo/storage) -"muW" = ( -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/grass, -/area/station/medical/virology) "muX" = ( /obj/machinery/button/curtain{ id = "russianbar"; @@ -44039,6 +44016,17 @@ }, /turf/open/floor/iron/smooth_large, /area/station/construction/mining/aux_base) +"mvu" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "Xtestlab"; + name = "Secure Creature Pen Blast Door"; + req_access = list("xenobiology") + }, +/obj/structure/sign/warning/gas_mask/directional/west, +/turf/open/floor/engine, +/area/station/science/xenobiology) "mvz" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/structure/disposalpipe/segment{ @@ -44966,21 +44954,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) -"mIS" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs{ - pixel_y = 7 - }, -/obj/item/gun/energy/laser/practice, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/engine, -/area/station/security/range) "mJs" = ( /obj/structure/cable, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -45062,38 +45035,6 @@ }, /turf/open/floor/grass, /area/station/service/chapel) -"mKC" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Bridge - Starboard"; - name = "command camera" - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 6 - }, -/obj/structure{ - density = 1; - icon = 'icons/obj/machines/shuttle_manipulator.dmi'; - icon_state = "hologram_on"; - light_color = "#2cb2e8"; - light_range = 2; - mouse_opacity = 0; - name = "holographic projection"; - pixel_x = -32; - pixel_y = 17 - }, -/obj/structure{ - desc = "This is the ship we're on. It's amazing what Nanotrasen can do once they actually put more than ten seconds of effort into their projects."; - icon = 'icons/obj/machines/shuttle_manipulator.dmi'; - icon_state = "hologram_whiteship"; - light_color = "#2cb2e8"; - light_range = 7; - name = "Ship Hologram"; - pixel_x = -32; - pixel_y = 27 - }, -/obj/machinery/incident_display/delam/directional/south, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "mKU" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -46575,6 +46516,22 @@ }, /turf/open/floor/plating, /area/station/command/cc_dock) +"nge" = ( +/obj/item/paper/fluff/gateway, +/obj/item/coin/gold{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/phone{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/cigarette/pipe{ + pixel_x = -5 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "ngt" = ( /obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line{ @@ -46602,13 +46559,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"ngU" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/crew, -/obj/machinery/computer/security/telescreen/cmo/directional/north, -/turf/open/floor/iron/freezer, -/area/station/security/checkpoint/medical) "ngZ" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -47150,12 +47100,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft) -"nnq" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/plating, -/area/space/nearstation) "nnr" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -47175,22 +47119,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"nnK" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/storage/photo_album, -/obj/item/camera{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/west, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "nnS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47386,17 +47314,6 @@ dir = 8 }, /area/station/security/prison) -"nqP" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/rd) "nqS" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -47445,35 +47362,6 @@ }, /turf/open/floor/pod/dark, /area/station/engineering/storage/tech) -"nrA" = ( -/obj/structure/table, -/obj/item/storage/medkit/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/digital_clock/directional/north{ - pixel_y = 37 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/storage) "nrE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -48084,14 +47972,6 @@ /obj/item/clothing/suit/armor/riot, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) -"nzN" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "nzP" = ( /obj/effect/turf_decal/vg_decals/department/med, /obj/effect/landmark/event_spawn, @@ -48247,13 +48127,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/lobby) -"nDw" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "nDx" = ( /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 9 @@ -48345,12 +48218,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"nFc" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/plating, -/area/space/nearstation) "nFg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/grille_or_waste, @@ -48402,22 +48269,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/vaporwave, /area/station/service/barber) -"nFO" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/directional/north, -/obj/machinery/computer/security/telescreen/tcomms/directional/west, -/turf/open/floor/iron/smooth, -/area/station/security/checkpoint/engineering) +"nFL" = ( +/obj/machinery/mass_driver/chapelgun, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/pod/dark, +/area/station/service/chapel/funeral) "nFQ" = ( /obj/machinery/barsign/all_access/directional/north, /obj/machinery/light/warm/directional/north, @@ -48490,10 +48346,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/bar) -"nGJ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/carpet, -/area/station/security/courtroom) "nGM" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -48528,18 +48380,6 @@ dir = 4 }, /area/station/cargo/bitrunning/den) -"nGU" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/plasticflaps, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "nGX" = ( /obj/structure/chair/sofa/right/brown{ dir = 8 @@ -49390,6 +49230,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/diagonal, /area/station/science/research) +"nSB" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/corner, +/area/station/hallway/primary/central) "nSE" = ( /obj/machinery/light/warm/directional/north, /obj/effect/turf_decal/siding/green, @@ -49665,6 +49514,20 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/auxlab/firing_range) +"nVG" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nVO" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron/dark, @@ -49718,16 +49581,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron/smooth, /area/station/maintenance/port/fore) -"nWo" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/ce/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/security/checkpoint/engineering) "nWq" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -49756,17 +49609,6 @@ }, /turf/open/floor/iron/large, /area/station/service/bar) -"nWP" = ( -/obj/machinery/door/window/left/directional/east{ - name = "Medbay Deliveries"; - req_access = list("medical") - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/firedoor, -/obj/structure/sign/calendar/directional/south, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/storage) "nWY" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/structure/disposalpipe/segment, @@ -49823,6 +49665,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"nXH" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/chair/office, +/obj/effect/landmark/start/science_guard, +/obj/machinery/computer/security/telescreen/research/directional/east, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/security/checkpoint/science/research) "nXM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -50157,22 +50010,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"odL" = ( -/obj/item/paper/fluff/gateway, -/obj/item/coin/gold{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/phone{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/cigarette/pipe{ - pixel_x = -5 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/station/command/heads_quarters/nt_rep) "odX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50718,25 +50555,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/robotics/lab) -"okS" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio2"; - name = "Xenobio Pen 2 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "okV" = ( /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 10 @@ -51263,21 +51081,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"osh" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/delivery_chute{ - dir = 1; - name = "Prisoner Doomp" - }, -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Prisoner Doomp" - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/brig) "osm" = ( /obj/structure/chair/office, /obj/effect/turf_decal/trimline/brown/filled/warning{ @@ -51602,6 +51405,16 @@ dir = 1 }, /area/station/engineering/atmos) +"owU" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "oxa" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall, @@ -51694,6 +51507,13 @@ "oyg" = ( /turf/open/floor/engine, /area/station/science/explab) +"oym" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "oyq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -51842,28 +51662,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/exit/departure_lounge) -"oAT" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/machinery/light_switch/directional/east{ - pixel_y = 11 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/machinery/button/door/directional/east{ - id = "chemistry_shutters"; - name = "Shutters Control"; - req_access = list("pharmacy") - }, -/obj/effect/turf_decal/bot_red, -/obj/machinery/chem_dispenser, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "oAV" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -51986,20 +51784,6 @@ }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) -"oCL" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/medical/medbay/lobby) "oCM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52312,6 +52096,11 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"oGH" = ( +/obj/machinery/light/cold/directional/south, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "oGI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52796,6 +52585,15 @@ dir = 1 }, /area/station/hallway/primary/fore) +"oOw" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "oOG" = ( /obj/structure/sign/warning/electric_shock/directional/north, /obj/effect/turf_decal/bot, @@ -52848,6 +52646,27 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"oPu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "oPM" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /turf/open/floor/carpet, @@ -53378,6 +53197,22 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/ce) +"oWu" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/north, +/obj/machinery/computer/security/telescreen/tcomms/directional/west, +/turf/open/floor/iron/smooth, +/area/station/security/checkpoint/engineering) "oWD" = ( /obj/structure/flora/bush/pointy/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -53441,6 +53276,20 @@ }, /turf/open/floor/grass, /area/station/command/heads_quarters/nt_rep) +"oXF" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "oXG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/popcorn, @@ -54076,11 +53925,6 @@ }, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) -"pfg" = ( -/obj/machinery/light/cold/directional/south, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "pfm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/requests_console/auto_name/directional/north, @@ -54264,33 +54108,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"pgU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/window/right/directional/south{ - name = "Shuttle Deliveries"; - req_access = list("cargo") - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/brown/half, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "pgZ" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/structure/bed/double, @@ -54563,6 +54380,10 @@ }, /turf/open/floor/carpet/blue, /area/station/command/bridge) +"plc" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/station/science/xenobiology) "plm" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -55022,13 +54843,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"psy" = ( -/obj/machinery/pdapainter/research, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/rd/directional/north, -/turf/open/floor/iron/white/smooth_large, -/area/station/command/heads_quarters/rd) "psA" = ( /obj/structure/filingcabinet, /turf/open/floor/pod/dark, @@ -55195,6 +55009,21 @@ dir = 8 }, /area/station/engineering/atmos) +"put" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/delivery_chute{ + dir = 1; + name = "Prisoner Doomp" + }, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Prisoner Doomp" + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig) "puw" = ( /obj/structure/sign/painting/parting{ pixel_x = -32 @@ -55369,13 +55198,6 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/security/checkpoint/science/research) -"pxz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/ce/directional/south, -/turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/ce) "pxK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55494,6 +55316,28 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"pzF" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/storage/box/trackimp{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/gun/energy/ionrifle{ + pixel_y = -6 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "pzG" = ( /obj/structure/table/wood, /obj/item/restraints/handcuffs, @@ -56037,6 +55881,26 @@ dir = 1 }, /area/station/commons/fitness/recreation/entertainment) +"pHx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "pHz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57290,19 +57154,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"pYX" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposaloutlet{ - name = "Prisoner Doomp" - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/brig) "pYY" = ( /obj/machinery/libraryscanner, /obj/machinery/light_switch/directional/east, @@ -57441,6 +57292,28 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/pod/dark, /area/station/service/chapel) +"qaf" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = 11 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/machinery/button/door/directional/east{ + id = "chemistry_shutters"; + name = "Shutters Control"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/bot_red, +/obj/machinery/chem_dispenser, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "qai" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -57512,15 +57385,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/lesser) -"qaV" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "qaX" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/circuit, @@ -57763,6 +57627,14 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) +"qcQ" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "qcR" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_blue{ @@ -57849,17 +57721,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/maintenance/disposal) -"qev" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/chair/office, -/obj/effect/landmark/start/science_guard, -/obj/machinery/computer/security/telescreen/research/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/security/checkpoint/science/research) "qex" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -58190,24 +58051,6 @@ }, /turf/open/floor/engine, /area/station/security/range) -"qij" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/hooded/ablative{ - pixel_y = 7 - }, -/obj/item/gun/energy/temperature/security{ - pixel_y = 5 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "qil" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -58389,6 +58232,28 @@ "qlN" = ( /turf/closed/wall/r_wall, /area/station/science/robotics/lab) +"qlQ" = ( +/obj/item/clothing/shoes/magboots{ + pixel_x = -4 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 3 + }, +/obj/item/clothing/shoes/magboots{ + pixel_y = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/rack/shelf, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 5 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "qlS" = ( /obj/machinery/door/airlock/research{ name = "Circuit Testing Lab" @@ -58633,6 +58498,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit, /area/station/science/research/abandoned) +"qoU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/security/checkpoint/engineering) "qoV" = ( /obj/structure/table/wood/fancy/cyan, /obj/effect/turf_decal/siding/wood{ @@ -58780,6 +58655,33 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/engineering/main) +"qrc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/window/right/directional/south{ + name = "Shuttle Deliveries"; + req_access = list("cargo") + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/brown/half, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qrF" = ( /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/smooth_large, @@ -59420,6 +59322,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/storage) +"qAA" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/sunny, +/mob/living/carbon/human/species/monkey, +/obj/structure/sign/poster/official/fruit_bowl/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/grass, +/area/station/science/genetics) "qAD" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -59516,6 +59426,12 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/hallway/secondary/entry) +"qCq" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/wood, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "qCB" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -59775,6 +59691,20 @@ dir = 8 }, /area/station/hallway/primary/fore) +"qGR" = ( +/obj/structure/plasticflaps{ + name = "Deliveries" + }, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/right/directional/north{ + name = "Deliveries"; + req_access = list("shipping") + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qGT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59892,15 +59822,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/dorms) -"qHR" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/corner, -/area/station/hallway/primary/central) "qHT" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/box, @@ -60741,6 +60662,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/station/cargo/drone_bay) +"qUc" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/rd) "qUl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -60823,26 +60752,17 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/prison/work) -"qUX" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 +"qVb" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv{ + pixel_y = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/plaque/static_plaque/golden/captain{ + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/captain) "qVj" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60962,6 +60882,18 @@ }, /turf/open/floor/wood/large, /area/station/security/courtroom) +"qWG" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/plasticflaps, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qWR" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -61008,6 +60940,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, /area/station/command/gateway) +"qXs" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "qXG" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /obj/structure/disposalpipe/segment, @@ -61095,17 +61035,6 @@ }, /turf/open/floor/plating, /area/station/security/lockers) -"qYy" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv{ - pixel_y = 8 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/plaque/static_plaque/golden/captain{ - pixel_y = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/captain) "qYA" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random/maintenance/two, @@ -61358,6 +61287,38 @@ "rcl" = ( /turf/closed/wall, /area/station/medical/coldroom) +"rcq" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Bridge - Starboard"; + name = "command camera" + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 6 + }, +/obj/structure{ + density = 1; + icon = 'icons/obj/machines/shuttle_manipulator.dmi'; + icon_state = "hologram_on"; + light_color = "#2cb2e8"; + light_range = 2; + mouse_opacity = 0; + name = "holographic projection"; + pixel_x = -32; + pixel_y = 17 + }, +/obj/structure{ + desc = "This is the ship we're on. It's amazing what Nanotrasen can do once they actually put more than ten seconds of effort into their projects."; + icon = 'icons/obj/machines/shuttle_manipulator.dmi'; + icon_state = "hologram_whiteship"; + light_color = "#2cb2e8"; + light_range = 7; + name = "Ship Hologram"; + pixel_x = -32; + pixel_y = 27 + }, +/obj/machinery/incident_display/delam/directional/south, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "rcr" = ( /obj/effect/spawner/random/structure/closet_empty, /turf/open/floor/iron/smooth, @@ -61463,11 +61424,41 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) +"rfc" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/rd) "rfk" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/cone, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) +"rfn" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "rfo" = ( /obj/effect/turf_decal/vg_decals/atmos/air, /turf/open/floor/engine/air, @@ -61614,6 +61605,19 @@ /obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white/diagonal, /area/station/science/research) +"rhi" = ( +/obj/structure/cable, +/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/warning{ + dir = 10 + }, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "rhr" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -61812,19 +61816,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"rjz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/dropper, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "rjI" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -62157,6 +62148,23 @@ /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"rob" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/machinery/requests_console/directional/south{ + department = "Pharmacy"; + name = "Pharmacy Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/turf_decal/bot_red, +/obj/machinery/chem_dispenser, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "rog" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -62278,6 +62286,32 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/service) +"rpN" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 12 + }, +/obj/machinery/button/door/directional/east{ + id = "brigprison"; + name = "Prison Lockdown"; + req_access = list("brig") + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/computer/security/telescreen/isolation/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/corrections_officer) "rpS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63315,12 +63349,6 @@ /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) -"rGA" = ( -/mob/living/carbon/human/species/monkey, -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/grass, -/area/station/medical/virology) "rGH" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -64210,6 +64238,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation/entertainment) +"rTT" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "rTW" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 @@ -64817,11 +64850,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/space/nearstation) -"sdY" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "sea" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/message_server/preset, @@ -64877,11 +64905,6 @@ }, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) -"seV" = ( -/obj/structure/table/wood/poker, -/obj/item/cigarette/pipe, -/turf/open/floor/iron/grimy, -/area/station/commons/lounge) "sfc" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -65336,18 +65359,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"slP" = ( -/obj/structure/flora/bush/lavendergrass, -/obj/structure/window/reinforced/spawner/directional/west, -/mob/living/carbon/human/species/monkey, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/south{ - name = "Monkey Pen"; - req_access = list("genetics") - }, -/turf/open/floor/grass, -/area/station/science/genetics) "slS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -66190,15 +66201,6 @@ }, /turf/open/floor/pod/dark, /area/station/engineering/storage/tech) -"syy" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/stripes/red/corner, -/obj/machinery/computer/security/telescreen/ordnance/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/science/ordnance/testlab) "syE" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) @@ -66520,26 +66522,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/security/prison/mess) -"sDr" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/machinery/recharger{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/machinery/computer/security/telescreen/prison/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/warden) "sDw" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 1 @@ -67284,6 +67266,24 @@ }, /turf/open/floor/iron/freezer, /area/station/medical/pharmacy) +"sLq" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload turret control"; + pixel_y = 32 + }, +/obj/structure/table, +/obj/item/folder/blue{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/ai_upload) "sLs" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -67550,20 +67550,6 @@ /obj/effect/turf_decal/plaque, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) -"sOk" = ( -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/chemistry) "sOp" = ( /obj/effect/turf_decal/plaque{ icon_state = "L7" @@ -68216,20 +68202,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"sXy" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - dir = 4; - location = "QM #4" - }, -/obj/effect/turf_decal/box, -/mob/living/simple_animal/bot/mulebot, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/storage) "sXF" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -68251,12 +68223,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood/large, /area/station/service/theater) -"sXV" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/station/command/heads_quarters/qm) "sXX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68305,21 +68271,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/greater) -"sYz" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/medical/medbay/lobby) "sYC" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 @@ -68881,6 +68832,12 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"tfX" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating, +/area/space/nearstation) "tga" = ( /obj/structure/drain, /obj/item/soap/deluxe, @@ -69329,6 +69286,46 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +"tms" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/lockbox/loyalty{ + pixel_y = -11 + }, +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/item/storage/box/flashbangs{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/teargas{ + pixel_x = 6; + pixel_y = -6 + }, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "tmu" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/landmark/secequipment, @@ -70760,6 +70757,23 @@ }, /turf/open/floor/plating, /area/station/science/ordnance/storage) +"tEH" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + dir = 4; + location = "QM #4" + }, +/obj/effect/turf_decal/box, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #1"; + suffix = "#1" + }, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/storage) "tEI" = ( /obj/structure/table, /obj/item/food/ready_donk/mac_n_cheese{ @@ -71972,6 +71986,16 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) +"tZm" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/turf/open/floor/carpet/black, +/area/station/service/chapel/office) "tZx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72481,26 +72505,6 @@ /obj/structure/window/fulltile, /turf/open/floor/grass, /area/station/commons/fitness/recreation/entertainment) -"ufH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio3"; - name = "Xenobio Pen 3 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "ufS" = ( /turf/closed/wall, /area/station/hallway/primary/aft) @@ -72603,6 +72607,19 @@ /obj/structure/closet/firecloset, /turf/open/floor/pod, /area/station/service/chapel/office) +"uhH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "uhK" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -73145,21 +73162,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation/entertainment) -"upw" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/conveyor{ - id = "cargodisposals" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo Bay - Delivery Office Port"; - name = "cargo camera" - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "upF" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced/plasma, @@ -73652,6 +73654,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage) +"uuh" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/chair{ + dir = 1; + name = "Accused" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/courtroom) "uup" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -74212,6 +74222,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) +"uBX" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "uCe" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -74586,6 +74604,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"uHn" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/crew, +/obj/machinery/computer/security/telescreen/cmo/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/checkpoint/medical) "uHq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -74612,6 +74637,11 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/eva_shed/starboard) +"uHA" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "uHB" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -75119,6 +75149,21 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library) +"uOA" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/item/gun/energy/laser/carbine/practice, +/turf/open/floor/engine, +/area/station/security/range) "uOO" = ( /turf/open/floor/wood/large, /area/station/service/theater) @@ -76140,12 +76185,26 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) +"veR" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/south, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "vfc" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood/large, /area/station/security/courtroom) +"vfg" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/station/command/heads_quarters/qm) "vfn" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -77727,13 +77786,6 @@ /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/execution/transfer) -"vDz" = ( -/obj/machinery/computer/records/medical{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/hop) "vDG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78270,6 +78322,12 @@ }, /turf/open/floor/iron/herringbone, /area/station/service/theater) +"vKi" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/space/nearstation) "vKz" = ( /obj/structure/disposalpipe/junction{ dir = 2 @@ -80483,6 +80541,10 @@ }, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"wpJ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/carpet, +/area/station/security/courtroom) "wpK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -80608,6 +80670,25 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/glass/reinforced, /area/station/security/execution/transfer) +"wrN" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "wrO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron/smooth_edge{ @@ -80962,6 +81043,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/freezer, /area/station/medical/pharmacy) +"wwv" = ( +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack/shelf, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "wwA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -81263,13 +81364,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) -"wzj" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/cmo) "wzn" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/segment{ @@ -81403,16 +81497,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/stairs/medium, /area/station/hallway/secondary/command) -"wBm" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/turf/open/floor/carpet/black, -/area/station/service/chapel/office) "wBy" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/structure/sign/poster/contraband/random/directional/north, @@ -82026,6 +82110,17 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"wKH" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Medbay Deliveries"; + req_access = list("medical") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/firedoor, +/obj/structure/sign/calendar/directional/south, +/obj/effect/turf_decal/delivery/blue, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) "wKP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -82365,46 +82460,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/fore) -"wNX" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/lockbox/loyalty{ - pixel_y = -11 - }, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/item/storage/box/flashbangs{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/teargas{ - pixel_x = 6; - pixel_y = -6 - }, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "wOo" = ( /obj/structure/sign/warning/no_smoking/directional/north, /turf/closed/wall/r_wall, @@ -82846,6 +82901,22 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"wVQ" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + dir = 4; + location = "QM #1" + }, +/obj/effect/turf_decal/box, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #3"; + suffix = "#3" + }, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/storage) "wWw" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/chair/office{ @@ -83212,6 +83283,13 @@ }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) +"xfA" = ( +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/hop) "xfB" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/landmark/start/hangover, @@ -83361,32 +83439,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"xhA" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 12 - }, -/obj/machinery/button/door/directional/east{ - id = "brigprison"; - name = "Prison Lockdown"; - req_access = list("brig") - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/computer/security/telescreen/isolation/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/corrections_officer) "xhS" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, @@ -83557,6 +83609,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/station/hallway/primary/central/aft) +"xkt" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/right/directional/north{ + name = "Warehouse Deliveries"; + req_access = list("cargo") + }, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) "xkA" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -84941,6 +85005,12 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) +"xEU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/cold/directional/west, +/obj/machinery/computer/security/telescreen/tcomms/directional/west, +/turf/open/floor/engine, +/area/station/tcommsat/computer) "xFd" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -84949,14 +85019,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/small, /area/station/hallway/primary/central) -"xFj" = ( -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/grass, -/area/station/medical/virology) "xFo" = ( /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) @@ -85032,19 +85094,6 @@ "xFH" = ( /turf/open/floor/iron/grimy, /area/station/service/lawoffice) -"xFJ" = ( -/obj/structure/cable, -/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/warning{ - dir = 10 - }, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "xFM" = ( /obj/structure/table/reinforced/rglass, /obj/structure/window/reinforced/spawner/directional/south, @@ -85219,23 +85268,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/rd) -"xIv" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/structure/rack, -/obj/item/storage/box/syringes{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/storage/box/beakers{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "xIF" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -86109,28 +86141,6 @@ /obj/structure/liquid_pump, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"xWb" = ( -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -8; - pixel_y = -3 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 13 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/hos) "xWf" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain/cloth/fancy/mechanical{ @@ -86625,10 +86635,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"ydI" = ( -/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, -/turf/open/floor/engine, -/area/station/science/xenobiology) "ydJ" = ( /obj/structure/chair/stool/directional/north, /obj/machinery/power/apc/auto_name/directional/west, @@ -101052,7 +101058,7 @@ jkZ jkZ shM vFF -pfg +oGH uQV uQV uQV @@ -103976,11 +103982,11 @@ vnu mDd pCd vnu -rGA -muW +dnO +gmB cmO -xFj -rGA +bul +dnO vnu iHU oUn @@ -104944,10 +104950,10 @@ kVR kVR kVR kVR -xIv +fVm nRo -qaV -gIn +jDb +jsf oMs hKy hKy @@ -105199,9 +105205,9 @@ hNw uiw uiw aIs -gja +mvu wYK -bEj +jQQ bxT wFV gtM @@ -105452,11 +105458,11 @@ dfs lSP kVR uiw -lMy +plc uiw hdS vRS -fDG +oOw sYn vBO ktF @@ -105468,7 +105474,7 @@ xMq xMq tdv hCr -syy +eWi nMV tdv lZV @@ -105709,7 +105715,7 @@ ajP ajP kVR jRP -ydI +jwN nlj mIH rCy @@ -105970,7 +105976,7 @@ uiw uiw wxE aIs -fOP +eUs iMC tDI rjU @@ -106476,13 +106482,13 @@ kVR uiw sYU uiw -ilk +crN sYU oGz -ilk +crN sYU uiw -ilk +crN sYU uiw oMs @@ -106733,13 +106739,13 @@ kVR uiw agX uiw -ilk +crN tAl uiw -ilk +crN tAl uiw -ilk +crN agX uiw oMs @@ -106990,13 +106996,13 @@ kVR raP uiw iVS -fZJ +biD uiw iVS -fZJ +biD uiw iVS -fZJ +biD uiw iVS oMs @@ -107501,16 +107507,16 @@ bMr oRY vEz pdg -gsq +hpd sig xNR -okS +rfn ckQ sLA -ufH +pHx gbf iIn -alZ +oPu gbf bLi ykd @@ -108015,16 +108021,16 @@ bMr oRY bie efz -fCC +jdJ xyc bwJ -fBH +hnT jcW bwJ -qUX +czH jcW bwJ -cDI +wrN jcW kJT ldB @@ -108274,16 +108280,16 @@ oRY kVR mom mQW -cDh +nVG biy lEa -cQO +fWQ biy mXv -eAZ +oXF biy meR -kCJ +kjX xtW oMs gdS @@ -108532,13 +108538,13 @@ kVR lXQ uiw jSr -dHY +qcQ uiw jSr -dHY +qcQ uiw jSr -dHY +qcQ uiw jSr oMs @@ -108789,13 +108795,13 @@ kVR uiw tAl uiw -ilk +crN agX uiw -ilk +crN xXU uiw -ilk +crN tAl uiw oMs @@ -109046,13 +109052,13 @@ kVR uiw hsn uiw -ilk +crN hsn uba -ilk +crN hsn uiw -ilk +crN hsn uiw oMs @@ -110912,10 +110918,10 @@ sAM ahd rba sAM -nrA +lvU ady gJm -moQ +hWm sAM sAM sAM @@ -111176,7 +111182,7 @@ kam aQC aZe kyH -nWP +wKH uyk mCM fsR @@ -111700,7 +111706,7 @@ wqx mdP cVG ino -wzj +imd lAB rPx lAB @@ -115199,7 +115205,7 @@ ipH cuA prO sOq -qYy +qVb ria iqc sfj @@ -115537,7 +115543,7 @@ vQf cnC abF lZg -ngU +uHn fch tKO ivR @@ -115560,7 +115566,7 @@ vFl pPp xPa xnl -bhg +xEU kKL jCB pzK @@ -115746,7 +115752,7 @@ sms cuZ dje hMD -qev +nXH lDz dje lPo @@ -115971,7 +115977,7 @@ iAb ejU sOq vOF -aCR +iwk vNT itN npP @@ -115979,11 +115985,11 @@ hIA xMq cas cRe -iQH +sLq toU nya bFO -psy +hBZ lKw ted uHB @@ -116245,8 +116251,8 @@ bcn vWw kFf rMc -nqP -dPG +rfc +qUc glp vkJ cLi @@ -117591,8 +117597,8 @@ xFM sHA bVR nCl -oCL -hXL +ljG +hjR tWj kqY tQF @@ -117883,8 +117889,8 @@ iGy pEX dYi xnw -nFO -nWo +oWu +qoU jWq joZ hxy @@ -118039,13 +118045,13 @@ imR wMT eoq vBP -aoU -slP +qAA +hIy hlx ujy uhX lTE -fXX +hxg abG wOJ stA @@ -118105,8 +118111,8 @@ cdR cdR cdR cdR -sYz -xFJ +gYT +rhi hxh wMl lVF @@ -119358,7 +119364,7 @@ oUR fUT sAA kfu -seV +euI nPI wlp nPB @@ -119398,7 +119404,7 @@ twU wwr mJB eil -rjz +uhH mAC nIJ ifq @@ -119565,7 +119571,7 @@ kYF nag wav dTL -nnK +chg yeg bee fHb @@ -119657,7 +119663,7 @@ sUt daB mYW kyV -djP +rob ifq fvW yiT @@ -119907,7 +119913,7 @@ gLN itW jWg rUf -oAT +qaf wEK pKg nXW @@ -119919,7 +119925,7 @@ eEq xkq xkq fiN -sOk +gBQ lLk xgA fiN @@ -121185,7 +121191,7 @@ iLL jiu vMa atS -qHR +nSB tVg fmp aeN @@ -121619,7 +121625,7 @@ sXl lSU ekt tuU -kHX +ifj gSK umJ rju @@ -121876,7 +121882,7 @@ xbj ydE qcR oTz -mKC +rcq xlE xlE xlE @@ -122148,13 +122154,13 @@ vJT xjX jOs pWq -mdh -dPt -nGJ +owU +qCq +wpJ kmg -nGJ -bgX -kTN +wpJ +qXs +veR eFF abN oCY @@ -122173,9 +122179,9 @@ uND vZb gIK fWD -osh +put vHZ -pYX +aVq dcg pzr lcT @@ -122911,9 +122917,9 @@ jlB xlE lPh kyd -dnw +qlQ jDE -axR +wwv ygP uOg pwX @@ -123676,7 +123682,7 @@ oaA dzx eRV cXb -odL +nge sfv ujJ xlE @@ -123696,7 +123702,7 @@ sah boH dBW ugu -elS +uuh nkn uXb tpZ @@ -124737,7 +124743,7 @@ xBE bCE ntX owg -sDr +geo bki oEC qXR @@ -125109,7 +125115,7 @@ wfL mWh oWn dJr -pxz +iwH dhx rTf sxN @@ -125237,7 +125243,7 @@ xMq ttw oEn xbH -xWb +dsV ftA ngD ngD @@ -125326,8 +125332,8 @@ xud xud qok xud -nGU -upw +qWG +hTQ vwl brl wwf @@ -125584,7 +125590,7 @@ cxF qok xud kpq -pgU +qrc txh fTO gjv @@ -126094,7 +126100,7 @@ vwJ wKg fdP cJR -iOA +xkt vHg hCV ioP @@ -126246,8 +126252,8 @@ lGY kEv cIS iEv -bPb -bPb +cHg +cHg xSq tAU aNG @@ -126598,7 +126604,7 @@ cYz onP bnV nTW -sXV +vfg gnh koK fyT @@ -126615,7 +126621,7 @@ atg jTg uBW jhD -iHY +qGR fwW mnR iQy @@ -126761,7 +126767,7 @@ lGY lgF iyK ntp -vDz +xfA qNc tAU hBH @@ -126853,9 +126859,9 @@ ryo xud cYz onP -hhn +iUM lZh -sXV +vfg hRM yhD cpg @@ -127040,9 +127046,9 @@ frc vnb vwn ewC -wNX -mpX -qij +tms +pzF +iso pKY nRV iqx @@ -129433,7 +129439,7 @@ gjq nyf gZb wuW -cqs +wVQ udn aRn fun @@ -130204,7 +130210,7 @@ aUA pjT xMq sFi -sXy +tEH udn cLG sny @@ -130677,9 +130683,9 @@ eON aZX kSB tuq -fju +jpk pvA -nDw +oym skC hqK udg @@ -130723,13 +130729,13 @@ tKA uHr oQK xJt -jol +hzl xJt qAu xbQ qVt xbQ -eDy +iCV sFi bwv wbf @@ -131678,7 +131684,7 @@ qtc wnu vei hsu -mIS +fOh iVa iVa jFA @@ -131935,7 +131941,7 @@ mpF nnj tdY mpu -aRv +uOA iVa iVa mVl @@ -132179,7 +132185,7 @@ aBX qsw tod xTY -xhA +rpN pcq mbW vWY @@ -139936,7 +139942,7 @@ npZ uzo erR wab -wBm +tZm okt npZ npZ @@ -139948,8 +139954,8 @@ qyC qyC qyC qyC -iPf -sdY +uHA +rTT xMq ttw ttw @@ -140207,7 +140213,7 @@ xvm qyC tGk tGk -nzN +uBX xMq ttw ttw @@ -140976,8 +140982,8 @@ cyA gCp jxh afD -fIj -aGk +nFL +hGn cwn xMq ttw @@ -142778,7 +142784,7 @@ dKO sEf qtL qtL -nFc +vKi puG ttw ttw @@ -143292,7 +143298,7 @@ ntY sEf qtL qtL -nnq +tfX sxf ttw ttw @@ -143805,7 +143811,7 @@ omg omg sEf qtL -nFc +vKi puG ttw ttw @@ -144319,7 +144325,7 @@ cFz cGp sEf qtL -nnq +tfX sxf ttw ttw diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index c278473c781..446786ebc32 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -2064,7 +2064,6 @@ "aKi" = ( /obj/machinery/button/door/directional/east{ id = "xenobio6"; - layer = 4; name = "Xenobio Pen 6 Blast DOors"; req_access = list("xenobiology") }, @@ -4135,7 +4134,6 @@ "bvV" = ( /obj/machinery/button/door/directional/east{ id = "xenobio8"; - layer = 4; name = "Xenobio Pen 8 Blast DOors"; req_access = list("xenobiology") }, @@ -4344,9 +4342,7 @@ /area/station/cargo/warehouse) "bzb" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/research{ - dir = 1 - }, +/obj/machinery/computer/security/telescreen/research/directional/north, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, @@ -6174,9 +6170,7 @@ /turf/open/floor/plating/rust, /area/station/cargo/miningdock) "chx" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/structure/transit_tube/station/dispenser/reverse, /turf/open/floor/plating, /area/station/engineering/transit_tube) @@ -8711,10 +8705,7 @@ /area/station/hallway/primary/aft) "daE" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/computer/security/telescreen/rd{ - pixel_x = -30; - pixel_y = 30 - }, +/obj/machinery/computer/security/telescreen/rd, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, @@ -8884,9 +8875,7 @@ "deH" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/white, /area/station/science/xenobiology) "deL" = ( @@ -10276,7 +10265,7 @@ "dCX" = ( /obj/structure/table/wood, /obj/item/newspaper, -/obj/item/clothing/mask/cigarette/pipe, +/obj/item/cigarette/pipe, /turf/open/floor/wood/large, /area/station/commons/lounge) "dDa" = ( @@ -12910,9 +12899,7 @@ /obj/machinery/computer/warrant{ dir = 1 }, -/obj/machinery/computer/security/telescreen/interrogation{ - pixel_y = -30 - }, +/obj/machinery/computer/security/telescreen/interrogation, /turf/open/floor/wood, /area/station/security/brig) "eAT" = ( @@ -13004,9 +12991,7 @@ /turf/open/floor/wood/large, /area/station/biodome/fore) "eCo" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 5 }, @@ -18874,7 +18859,6 @@ "gzR" = ( /obj/machinery/button/door/directional/west{ id = "xenobio3"; - layer = 4; name = "Xenobio Pen 3 Blast Door"; req_access = list("xenobiology") }, @@ -19416,10 +19400,7 @@ /area/station/science/xenobiology) "gJD" = ( /obj/structure/cable, -/obj/machinery/computer/security/telescreen/ce{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/ce/directional/west, /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) @@ -22682,7 +22663,6 @@ "hXj" = ( /obj/machinery/button/door/directional/east{ id = "xenobio5"; - layer = 4; name = "Xenobio Pen 5 Blast DOors"; req_access = list("xenobiology") }, @@ -22716,7 +22696,6 @@ "hXT" = ( /obj/machinery/button/door/directional/west{ id = "xenobio2"; - layer = 4; name = "Xenobio Pen 2 Blast Door"; req_access = list("xenobiology") }, @@ -23090,10 +23069,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "ifq" = ( -/obj/machinery/computer/security/telescreen/cmo{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, @@ -23481,10 +23457,7 @@ /obj/machinery/computer/records/security{ dir = 8 }, -/obj/machinery/computer/security/telescreen/engine{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/computer/security/telescreen/engine/directional/west, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 @@ -24565,15 +24538,11 @@ pixel_y = -3 }, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt{ - layer = 3.00001 - }, -/obj/item/clothing/head/helmet/alt{ - layer = 3.00001; pixel_x = 3; pixel_y = -3 }, @@ -25091,7 +25060,6 @@ /obj/machinery/door/window/left/directional/west{ atom_integrity = 300; base_state = "leftsecure"; - layer = 4.1; name = "Tertiary AI Core Access"; pixel_x = -3; req_access = list("ai_upload") @@ -28790,9 +28758,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/half{ dir = 8 }, @@ -38212,10 +38178,7 @@ /turf/open/floor/plating, /area/station/maintenance/central/greater) "nkE" = ( -/obj/machinery/computer/security/telescreen/minisat{ - dir = 8; - pixel_x = 26 - }, +/obj/machinery/computer/security/telescreen/minisat/directional/west, /obj/effect/turf_decal/siding/yellow{ dir = 8 }, @@ -45339,9 +45302,7 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/central) "pHD" = ( -/obj/machinery/computer/security/telescreen/vault{ - pixel_y = 30 - }, +/obj/machinery/computer/security/telescreen/vault, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) "pHT" = ( @@ -45954,7 +45915,7 @@ pixel_x = -4; pixel_y = 2 }, -/obj/item/clothing/mask/cigarette/cigar, +/obj/item/cigarette/cigar, /obj/item/reagent_containers/cup/glass/flask/gold, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/camera/directional/north{ @@ -49777,7 +49738,6 @@ "ris" = ( /obj/machinery/button/door/directional/east{ id = "xenobio7"; - layer = 4; name = "Xenobio Pen 7 Blast DOors"; req_access = list("xenobiology") }, @@ -54342,12 +54302,9 @@ /turf/open/floor/grass, /area/station/service/kitchen/diner) "sNP" = ( -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/cmo/directional/west{ desc = "Used for monitoring medbay to ensure patient safety."; - dir = 8; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = 26 + name = "Medbay Monitor" }, /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -57079,7 +57036,6 @@ /obj/machinery/door/window/left/directional/east{ atom_integrity = 300; base_state = "rightsecure"; - layer = 4.1; name = "Secondary AI Core Access"; pixel_x = 4; req_access = list("ai_upload") @@ -57096,13 +57052,7 @@ /obj/machinery/computer/shuttle/mining{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for the Auxiliary Mining Base."; - dir = 4; - name = "Auxiliary Base Monitor"; - network = list("auxbase"); - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/auxbase/directional/east, /turf/open/floor/iron, /area/station/construction/mining/aux_base) "tIJ" = ( @@ -59490,7 +59440,6 @@ "uFX" = ( /obj/machinery/button/door/directional/west{ id = "xenobio1"; - layer = 4; name = "Xenobio Pen 1 Blast Door"; req_access = list("xenobiology") }, @@ -60754,9 +60703,7 @@ /turf/open/floor/iron/dark, /area/station/medical/storage) "vdm" = ( -/obj/machinery/computer/security/telescreen/prison{ - pixel_y = -32 - }, +/obj/machinery/computer/security/telescreen/prison, /obj/structure/chair/office{ dir = 1 }, @@ -63340,11 +63287,7 @@ /obj/structure/rack, /obj/item/screwdriver, /obj/item/wirecutters, -/obj/machinery/computer/security/telescreen{ - name = "Xenobio Monitor"; - network = list("xeno"); - pixel_y = 26 - }, +/obj/machinery/computer/security/telescreen/test_chamber, /turf/open/floor/iron, /area/station/science/xenobiology) "vZj" = ( @@ -64451,9 +64394,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, @@ -66235,9 +66176,7 @@ c_tag = "Research - Ordnance Launch Lab"; network = list("ss13","rd") }, -/obj/machinery/computer/security/telescreen/ordnance{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/ordnance, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "wTK" = ( @@ -66866,7 +66805,6 @@ "xeN" = ( /obj/machinery/button/door/directional/west{ id = "xenobio4"; - layer = 4; name = "Xenobio Pen 4 Blast Door"; req_access = list("xenobiology") }, @@ -68435,15 +68373,7 @@ /turf/open/space, /area/space/nearstation) "xHr" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used to access the various cameras on the station."; - dir = 4; - layer = 3.1; - name = "Security Camera Monitor"; - network = list("ss13"); - pixel_x = -24; - pixel_y = 2 - }, +/obj/machinery/computer/security/telescreen/normal/directional/east, /obj/machinery/computer/warrant{ dir = 4 }, @@ -68790,14 +68720,12 @@ "xMa" = ( /obj/machinery/button/door/directional/east{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors"; pixel_y = 8; req_access = list("cargo") }, /obj/machinery/button/door/directional/east{ id = "QMLoaddoor2"; - layer = 4; name = "Loading Doors"; pixel_y = -8; req_access = list("cargo") diff --git a/_maps/map_files/biodome/modules/cage_4_cockroach.dmm b/_maps/map_files/biodome/modules/cage_4_cockroach.dmm index 1cd01edfc0a..7433b47563a 100644 --- a/_maps/map_files/biodome/modules/cage_4_cockroach.dmm +++ b/_maps/map_files/biodome/modules/cage_4_cockroach.dmm @@ -27,7 +27,7 @@ /area/station/maintenance/aft/upper) "x" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/clothing/mask/cigarette/rollie, +/obj/item/cigarette/rollie, /turf/open/floor/plating, /area/station/maintenance/aft/upper) "z" = ( diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 117572a0e72..eaf62e0cd3a 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -1254,9 +1254,7 @@ /area/station/hallway/secondary/exit) "arM" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/engine{ - dir = 1 - }, +/obj/machinery/computer/security/telescreen/engine/directional/north, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/south, @@ -11392,10 +11390,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/computer/security/telescreen/interrogation{ - dir = 4; - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/interrogation/directional/east, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -19080,7 +19075,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio3"; - layer = 3.3; name = "Xenobio Pen 3 Blast Doors"; pixel_y = 1; req_access = list("xenobiology") @@ -19458,7 +19452,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio5"; - layer = 3.3; name = "Xenobio Pen 5 Blast Doors"; pixel_y = 4; req_access = list("xenobiology") @@ -31441,9 +31434,7 @@ /turf/open/floor/plating/lavaland_atmos, /area/lavaland/underground) "iRf" = ( -/obj/machinery/chem_dispenser{ - layer = 2.7 - }, +/obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, @@ -32383,9 +32374,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/machinery/computer/security/telescreen/prison{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/prison, /turf/open/floor/iron/dark, /area/station/security/prison) "jcw" = ( @@ -32894,11 +32883,7 @@ pixel_y = 4 }, /obj/item/watertank/pepperspray, -/obj/machinery/computer/security/telescreen/interrogation{ - name = "isolation room monitor"; - network = list("isolation"); - pixel_y = 31 - }, +/obj/machinery/computer/security/telescreen/isolation/interrogation, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) "jjk" = ( @@ -34920,11 +34905,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/computer/security/telescreen/rd{ - dir = 8; - pixel_x = 24; - network = list("rd","aicore","aiupload","minisat","xeno","ordnance","toxins") - }, +/obj/machinery/computer/security/telescreen/rd/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "jOj" = ( @@ -37656,9 +37637,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/computer/security/telescreen/aiupload{ - pixel_x = -32 - }, +/obj/machinery/computer/security/telescreen/aiupload, /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/aisat/teleporter) "kBx" = ( @@ -37874,7 +37853,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/mask/cigarette, +/obj/item/cigarette, /turf/open/floor/grass, /area/station/service/hydroponics) "kDX" = ( @@ -39579,7 +39558,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio2"; - layer = 3.3; name = "Xenobio Pen 2 Blast Doors"; pixel_y = 1; req_access = list("xenobiology") @@ -40657,12 +40635,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "lry" = ( -/obj/machinery/computer/security/telescreen{ - dir = 1; - network = list("commandbunker"); - name = "\improper Command Bunker Monitor"; - pixel_y = -28 - }, +/obj/machinery/computer/security/telescreen/commandbunker/directional/north, /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/dim/directional/east, /obj/effect/decal/cleanable/dirt/dust, @@ -41625,9 +41598,7 @@ /area/station/medical/pharmacy) "lFk" = ( /obj/machinery/modular_computer/preset/id, -/obj/machinery/computer/security/telescreen/ce{ - pixel_y = 28 - }, +/obj/machinery/computer/security/telescreen/ce, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) @@ -42885,10 +42856,7 @@ /obj/structure/closet/secure_closet/quartermaster, /obj/item/reagent_containers/spray/spraytan, /obj/machinery/light/warm/directional/south, -/obj/machinery/computer/security/telescreen/vault{ - dir = 8; - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/vault/directional/west, /obj/machinery/status_display/department_balance{ pixel_y = -32 }, @@ -54665,7 +54633,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio6"; - layer = 3.3; name = "Xenobio Pen 6 Blast Doors"; pixel_y = 1; req_access = list("xenobiology") @@ -56296,7 +56263,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio4"; - layer = 3.3; name = "Xenobio Pen 4 Blast Doors"; pixel_y = 4; req_access = list("xenobiology"); @@ -61297,7 +61263,7 @@ /mob/living/basic/chicken/teshari, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, -/obj/item/clothing/mask/cigarette, +/obj/item/cigarette, /turf/open/floor/grass, /area/station/service/hydroponics) "rej" = ( @@ -67920,9 +67886,7 @@ /area/station/engineering/storage/tech) "sWm" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/research{ - dir = 4 - }, +/obj/machinery/computer/security/telescreen/research, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) @@ -68048,7 +68012,7 @@ /area/station/maintenance/port/aft) "sYf" = ( /obj/structure/chair/comfy/brown, -/obj/item/clothing/mask/cigarette/space_cigarette, +/obj/item/cigarette/space_cigarette, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "sYl" = ( @@ -68677,9 +68641,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/safe) "the" = ( -/obj/machinery/computer/security/telescreen/minisat{ - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/minisat, /turf/open/floor/iron/dark/small, /area/station/command/bridge) "thF" = ( @@ -73385,7 +73347,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, /obj/machinery/holopad, -/obj/item/clothing/mask/cigarette/candy/nicotine, +/obj/item/cigarette/candy/nicotine, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -77523,13 +77485,7 @@ /obj/machinery/computer/crew{ dir = 1 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - dir = 1; - name = "Prison Monitor"; - network = list("prison"); - pixel_y = -30 - }, +/obj/machinery/computer/security/telescreen/prison/directional/north, /obj/machinery/light/warm/directional/west, /turf/open/floor/iron/dark/small, /area/station/security/warden) @@ -80029,9 +79985,7 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "wtb" = ( -/obj/machinery/computer/security/telescreen/engine{ - pixel_y = 32 - }, +/obj/machinery/computer/security/telescreen/engine, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -81157,10 +81111,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, -/obj/machinery/computer/security/telescreen/ordnance{ - dir = 8; - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/ordnance/directional/west, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "wJK" = ( @@ -81841,7 +81792,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/button/door{ id = "xenobio1"; - layer = 3.3; name = "Xenobio Pen 1 Blast Doors"; pixel_y = 1; req_access = list("xenobiology") @@ -82030,10 +81980,7 @@ /obj/effect/turf_decal/siding/yellow{ dir = 8 }, -/obj/machinery/computer/security/telescreen/cmo{ - dir = 8; - pixel_x = 32 - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /obj/structure/extinguisher_cabinet/directional/north, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, @@ -82604,7 +82551,6 @@ /obj/effect/turf_decal/siding/wideplating_new/dark, /obj/structure/table, /obj/structure/desk_bell/speed_demon{ - layer = 2.8; pixel_y = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ diff --git a/_maps/shuttles/arrival_biodome.dmm b/_maps/shuttles/arrival_biodome.dmm index 385f4a04aba..be49cce9f63 100644 --- a/_maps/shuttles/arrival_biodome.dmm +++ b/_maps/shuttles/arrival_biodome.dmm @@ -18,9 +18,7 @@ /turf/open/floor/iron/terracotta/small, /area/shuttle/arrival) "c" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/structure/table, /obj/effect/spawner/random/food_or_drink/island_booze{ pixel_x = 2; @@ -83,9 +81,7 @@ /turf/open/floor/iron/terracotta/small, /area/shuttle/arrival) "k" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south{ pixel_y = 2 }, @@ -225,9 +221,7 @@ /turf/open/floor/glass/reinforced, /area/shuttle/arrival) "H" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 2 }, diff --git a/_maps/shuttles/cargo_lima.dmm b/_maps/shuttles/cargo_lima.dmm index 933f2f24f0b..8a169017c95 100644 --- a/_maps/shuttles/cargo_lima.dmm +++ b/_maps/shuttles/cargo_lima.dmm @@ -50,7 +50,6 @@ }, /obj/machinery/button/door{ id = "QMLoaddoor"; - layer = 4; name = "Loading Doors North"; pixel_x = 24; pixel_y = 8; diff --git a/_maps/shuttles/emergency_lima.dmm b/_maps/shuttles/emergency_lima.dmm index 2a55ca85bb1..714b690b074 100644 --- a/_maps/shuttles/emergency_lima.dmm +++ b/_maps/shuttles/emergency_lima.dmm @@ -350,9 +350,7 @@ /area/shuttle/escape) "BU" = ( /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/grass, diff --git a/_maps/shuttles/labour_lima.dmm b/_maps/shuttles/labour_lima.dmm index 9044016b33c..f8502742a2a 100644 --- a/_maps/shuttles/labour_lima.dmm +++ b/_maps/shuttles/labour_lima.dmm @@ -76,9 +76,7 @@ "F" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating/airless, /area/shuttle/labor) "H" = ( diff --git a/_maps/shuttles/mining_lima.dmm b/_maps/shuttles/mining_lima.dmm index dc310b4ff1e..ad6ce6bbb56 100644 --- a/_maps/shuttles/mining_lima.dmm +++ b/_maps/shuttles/mining_lima.dmm @@ -1,15 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "d" = ( /obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/west{ - layer = 2.9 - }, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - layer = 2.9 - }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/shuttle/mining) "h" = ( diff --git a/_maps/shuttles/zubbers/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/zubbers/emergency_imfedupwiththisworld.dmm index f3c0121d795..4528300b44a 100644 --- a/_maps/shuttles/zubbers/emergency_imfedupwiththisworld.dmm +++ b/_maps/shuttles/zubbers/emergency_imfedupwiththisworld.dmm @@ -112,9 +112,7 @@ /area/shuttle/escape) "vG" = ( /obj/structure/bed/double, -/obj/structure/curtain/cloth{ - layer = 3.8 - }, +/obj/structure/curtain/cloth, /obj/item/bedsheet/hos/double, /turf/open/floor/carpet, /area/shuttle/escape) diff --git a/_maps/skyrat/automapper/automapper_config.toml b/_maps/skyrat/automapper/automapper_config.toml index 973f956c19c..d452001a3e1 100644 --- a/_maps/skyrat/automapper/automapper_config.toml +++ b/_maps/skyrat/automapper/automapper_config.toml @@ -239,13 +239,13 @@ required_map = "birdshot.dmm" coordinates = [136, 157, 1] trait_name = "Station" -# Birdshot Barber - BUBBER REMOVED -## [templates.birdshot_barber] -## map_files = ["birdshot_barber.dmm"] -## directory = "_maps/skyrat/automapper/templates/birdshot/" -## required_map = "birdshot.dmm" -## coordinates = [129, 127, 1] -## trait_name = "Station" +# Birdshot Barber +[templates.birdshot_barber] +map_files = ["birdshot_barber.dmm"] +directory = "_maps/skyrat/automapper/templates/birdshot/" +required_map = "birdshot.dmm" +coordinates = [129, 127, 1] +trait_name = "Station" # Birdshot NTR Office [templates.birdshot_ntrep_office] diff --git a/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm b/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm new file mode 100644 index 00000000000..eef058070d4 --- /dev/null +++ b/_maps/skyrat/automapper/templates/birdshot/birdshot_armory.dmm @@ -0,0 +1,121 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/microfusion, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"f" = ( +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"z" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/rack/gunrack, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/armory_spawn/smg, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"A" = ( +/obj/structure/rack, +/obj/item/clothing/head/helmet/sec{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/sec, +/obj/item/clothing/head/helmet/sec{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/clothing/suit/armor/vest/alt/sec{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/alt/sec, +/obj/item/clothing/suit/armor/vest/alt/sec{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"B" = ( +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/structure/table, +/obj/item/storage/barricade{ + pixel_y = -5 + }, +/obj/item/storage/barricade, +/obj/item/storage/barricade{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"Q" = ( +/obj/structure/closet/secure_closet/armory_kiboko, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) +"R" = ( +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +B +z +a +f +R +R +"} +(2,1,1) = {" +R +R +R +R +R +R +"} +(3,1,1) = {" +Q +R +R +R +R +R +"} +(4,1,1) = {" +R +R +R +R +R +A +"} diff --git a/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm b/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm new file mode 100644 index 00000000000..3c8ea12baed --- /dev/null +++ b/_maps/skyrat/automapper/templates/northstar/northstar_armory.dmm @@ -0,0 +1,129 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"y" = ( +/obj/structure/rack/gunrack, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/spawner/armory_spawn/smg, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"F" = ( +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/shotguns, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"I" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/closet/secure_closet/armory_kiboko, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"O" = ( +/obj/structure/rack/gunrack, +/obj/effect/spawner/armory_spawn/microfusion, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) +"Z" = ( +/obj/structure/table/reinforced, +/obj/item/storage/barricade{ + pixel_y = 10 + }, +/obj/item/storage/barricade{ + pixel_y = 5 + }, +/obj/item/storage/barricade, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +Z +a +a +a +a +"} +(5,1,1) = {" +a +a +a +y +a +a +a +a +"} +(6,1,1) = {" +a +a +a +F +a +a +a +a +"} +(7,1,1) = {" +a +a +a +O +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +I +a +"} diff --git a/code/__DEFINES/~~bubber_defines/cameranets.dm b/code/__DEFINES/~~bubber_defines/cameranets.dm new file mode 100644 index 00000000000..99b56919297 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/cameranets.dm @@ -0,0 +1,3 @@ + +// Moonstation exclusive camera +#define CAMERANET_NETWORK_COMMANDBUNKER "commandbunker" diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index 98d3d18807f..3644b8d9d59 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -311,7 +311,7 @@ if(!blood_to_hurtguy) return . // We ignore incompatibility here. - mendicant.transfer_blood_to(hurtguy, blood_to_hurtguy, forced = TRUE, ignore_incompatibility = TRUE) + mendicant.transfer_blood_to(hurtguy, blood_to_hurtguy, forced = TRUE) to_chat(mendicant, span_notice("Your veins (and brain) feel a bit lighter.")) . = TRUE // Because we do our own spin on it! @@ -328,7 +328,7 @@ // mender always gonna have blood // We ignore incompatibility here. - hurtguy.transfer_blood_to(mendicant, hurtguy.blood_volume - BLOOD_VOLUME_EXCESS, forced = TRUE, ignore_incompatibility = TRUE) + hurtguy.transfer_blood_to(mendicant, hurtguy.blood_volume - BLOOD_VOLUME_EXCESS, forced = TRUE) to_chat(hurtguy, span_notice("Your veins don't feel quite so swollen anymore.")) . = TRUE // Because we do our own spin on it! diff --git a/code/modules/bitrunning/objects/netpod.dm b/code/modules/bitrunning/objects/netpod.dm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm index 9c299dfbf64..4f54f739e4e 100644 --- a/code/modules/bitrunning/server/obj_generation.dm +++ b/code/modules/bitrunning/server/obj_generation.dm @@ -38,7 +38,7 @@ /// Generates a new avatar for the bitrunner. -/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs) // BUBBER EDIT - Prefs argument +/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs, load_loadout = FALSE) // BUBBER EDIT - Prefs argument var/mob/living/carbon/human/avatar = new(destination) // BUBBER EDIT BEGIN - PREFS! diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm index 4d275105a6f..21c712c8a43 100644 --- a/code/modules/bitrunning/server/util.dm +++ b/code/modules/bitrunning/server/util.dm @@ -154,8 +154,15 @@ var/atom/entry_atom = get_avatar_destination() if(isnull(entry_atom)) return - - var/mob/living/carbon/new_avatar = generate_avatar(get_turf(entry_atom), netsuit) + // BUBBER EDIT BEGIN - PREFS! + var/datum/preferences/pref + var/load_loadout = FALSE + var/obj/item/bitrunning_disk/prefs/prefdisk = locate() in neo.get_contents() + if(prefdisk) + load_loadout = prefdisk.include_loadout + pref = prefdisk.loaded_preference + var/mob/living/carbon/new_avatar = generate_avatar(get_turf(entry_atom), netsuit, prefs = pref, load_loadout = load_loadout) // Added the prefs argument + // BUBBER EDIT END stock_gear(new_avatar, neo, generated_domain) // Cleanup for domains with one time use custom spawns diff --git a/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png b/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png index c29a1e742f1f426812c1129dbe612b46bdc81d97..adc462ace50d158885c4a02912b57195e3a98828 100644 GIT binary patch delta 30 lcmeC@=;xRaCM;r-q7idMLCqi_G{wNwO=Y!g)5gqY%m9kw33mVh delta 30 mcmeC@=;xRaCfuxSx6v_7LCqi_G{wNw?aKPgOdB(oF#`aYo(h=& diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm index dacfdbb1f26..ab052a87bb4 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_rare.dm @@ -71,7 +71,6 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items - TODO: FIND THE NE /obj/item/construction/plumbing = 1, /obj/item/construction/plumbing/engineering = 1, /obj/item/construction/plumbing/mining = 1, - /obj/item/construction/plumbing/research = 1, /obj/item/construction/plumbing/service = 1, /obj/item/construction/rcd = 1, /obj/item/construction/rld = 10, diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm index bb82942deee..a2e608a9860 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm @@ -395,7 +395,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/mod/module/mister/atmos = 25, /obj/item/mod/module/mouthhole = 100, /obj/item/mod/module/orebag = 25, - /obj/item/mod/module/organ_thrower = 100, + /obj/item/mod/module/organizer = 100, /obj/item/mod/module/paper_dispenser = 100, /obj/item/mod/module/pathfinder = 5, /obj/item/mod/module/plasma_stabilizer = 50, diff --git a/modular_zubbers/code/game/objects/items/more_pkas.dm b/modular_zubbers/code/game/objects/items/more_pkas.dm index 41345352072..7112a8266f9 100644 --- a/modular_zubbers/code/game/objects/items/more_pkas.dm +++ b/modular_zubbers/code/game/objects/items/more_pkas.dm @@ -18,7 +18,6 @@ item_flags = NONE obj_flags = UNIQUE_RENAME weapon_weight = WEAPON_HEAVY - can_bayonet = TRUE max_mod_capacity = 15 // A crumb of mod capacity as a treat recoil = 3 //railgun go brrrrr gun_flags = NOT_A_REAL_GUN @@ -38,9 +37,6 @@ item_flags = NONE obj_flags = UNIQUE_RENAME weapon_weight = WEAPON_LIGHT - can_bayonet = TRUE - knife_x_offset = 20 - knife_y_offset = 12 max_mod_capacity = 75 /obj/item/gun/energy/recharge/kinetic_accelerator/shotgun @@ -58,9 +54,6 @@ item_flags = NONE obj_flags = UNIQUE_RENAME weapon_weight = WEAPON_LIGHT - can_bayonet = TRUE - knife_x_offset = 20 - knife_y_offset = 12 max_mod_capacity = 75 /obj/item/gun/energy/recharge/kinetic_accelerator/glock @@ -78,7 +71,6 @@ item_flags = NONE obj_flags = UNIQUE_RENAME weapon_weight = WEAPON_LIGHT - can_bayonet = TRUE max_mod_capacity = 200 /obj/item/gun/energy/recharge/kinetic_accelerator/shockwave @@ -95,7 +87,6 @@ item_flags = NONE obj_flags = UNIQUE_RENAME weapon_weight = WEAPON_LIGHT - can_bayonet = TRUE max_mod_capacity = 75 /obj/item/gun/energy/recharge/kinetic_accelerator/m79 @@ -113,10 +104,12 @@ obj_flags = UNIQUE_RENAME w_class = WEIGHT_CLASS_HUGE weapon_weight = WEAPON_HEAVY - can_bayonet = FALSE max_mod_capacity = 0 disablemodification = TRUE +/obj/item/gun/energy/recharge/kinetic_accelerator/m79/add_bayonet_point() + return + //Accelerator Casing //Fixed maths to use new standards /obj/item/ammo_casing/energy/kinetic/railgun diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm index 8f342a96f32..0c88ae6ec66 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm @@ -112,6 +112,9 @@ return TRUE return FALSE +/datum/embed_data/stake + embed_chance = 20 + /obj/item/stake name = "wooden stake" desc = "A simple wooden stake carved to a sharp point." @@ -126,7 +129,7 @@ attack_verb_continuous = list("staked", "stabbed", "tore into") attack_verb_simple = list("staked", "stabbed", "tore into") sharpness = SHARP_EDGED - embedding = list("embed_chance" = 20) + embed_data = /datum/embed_data/stake force = 6 throwforce = 10 max_integrity = 30 @@ -192,6 +195,10 @@ return TRUE return FALSE +/datum/embed_data/stake/hardened + embed_chance = 35 + fall_chance = 0 + /// Created by welding and acid-treating a simple stake. /obj/item/stake/hardened name = "hardened stake" @@ -200,13 +207,17 @@ force = 8 throwforce = 12 armour_penetration = 10 - embedding = list("embed_chance" = 35, "fall_chance" = 0) + embed_data = /datum/embed_data/stake/hardened staketime = 12 SECONDS /obj/item/stake/hardened/examine_more(mob/user) . = ..() . += span_notice("The [src] won't fall out by itself, if embedded in someone.") +/datum/embed_data/stake/silver + embed_chance = 65 + fall_chance = 0 + /obj/item/stake/hardened/silver name = "silver stake" desc = "Polished and sharp at the end. For when some mofo is always trying to iceskate uphill." @@ -216,7 +227,7 @@ force = 9 armour_penetration = 25 custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT) - embedding = list("embed_chance" = 65, "fall_chance" = 0) + embed_data = /datum/embed_data/stake/silver staketime = 15 SECONDS kills_blodsuckers = TRUE diff --git a/modular_zubbers/code/modules/bow_adjustments/arrow.dm b/modular_zubbers/code/modules/bow_adjustments/arrow.dm index 05ae67a79fd..89d01e18726 100644 --- a/modular_zubbers/code/modules/bow_adjustments/arrow.dm +++ b/modular_zubbers/code/modules/bow_adjustments/arrow.dm @@ -1,20 +1,17 @@ -#define BOW_EMBED_STATS list( \ - embed_chance = 100, \ - fall_chance = 0, \ - jostle_chance = 0, \ - ignore_throwspeed_threshold = TRUE, \ - pain_stam_pct = 0.5, \ - pain_mult = 1, \ - jostle_pain_mult = 1, \ - rip_time = 1 SECONDS \ - ) +/datum/embed_data/arrow + embed_chance = 100 + fall_chance = 0 + jostle_chance = 0 + pain_mult = 3 + jostle_pain_mult = 3 + rip_time = 1 SECONDS /obj/projectile/bullet/arrow damage = 20 weak_against_armour = TRUE wound_bonus = CANT_WOUND range = 16 - embedding = BOW_EMBED_STATS + embed_type = /datum/embed_data/arrow var/tribal_damage_bonus = 20 //If you're an icemoon dweller, or an ashwalker. faction_bonus_force = 10 //Bonus force dealt against certain factions nemesis_paths = list( @@ -36,26 +33,24 @@ /obj/projectile/bullet/arrow/holy damage = 25 // Increase from 20 - embedding = BOW_EMBED_STATS + embed_type = /datum/embed_data/arrow /obj/projectile/bullet/arrow/ash damage = 20 armour_penetration = 20 // Buff from 0 faction_bonus_force = 20 // Nerf from 60 - embedding = BOW_EMBED_STATS + embed_type = /datum/embed_data/arrow /obj/projectile/bullet/arrow/bone damage = 25 armour_penetration = 30 // Buff from 20 wound_bonus = CANT_WOUND faction_bonus_force = 30 // Nerf from 35 - embedding = BOW_EMBED_STATS + embed_type = /datum/embed_data/arrow /obj/projectile/bullet/arrow/bronze damage = 30 armour_penetration = 30 wound_bonus = CANT_WOUND faction_bonus_force = 90 - embedding = BOW_EMBED_STATS - -#undef BOW_EMBED_STATS + embed_type = /datum/embed_data/arrow diff --git a/modular_zubbers/code/modules/clothing/donator_clothing.dm b/modular_zubbers/code/modules/clothing/donator_clothing.dm index 7eeec31fd54..fe0674facd3 100644 --- a/modular_zubbers/code/modules/clothing/donator_clothing.dm +++ b/modular_zubbers/code/modules/clothing/donator_clothing.dm @@ -66,7 +66,7 @@ /obj/item/stack/medical, /obj/item/storage/pill_bottle, /obj/item/assembly/flash/handheld, - /obj/item/clothing/mask/cigarette, + /obj/item/cigarette, /obj/item/disk, /obj/item/lighter, /obj/item/melee, diff --git a/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm index 6416ea3b945..2a74762f3eb 100644 --- a/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/modular_zubbers/code/modules/projectiles/guns/ballistic/automatic.dm @@ -1,7 +1,9 @@ /obj/item/gun/ballistic/automatic/wt550 - can_bayonet = FALSE can_suppress = FALSE +/obj/item/gun/ballistic/automatic/wt550/add_bayonet_point() + return + /obj/item/gun/ballistic/automatic/wt550/security name = "\improper WT-551 Autorifle" desc = "A heavier, bulkier automatic variant of the WT-550, and now with 99% less discombobulation! It's back, baby. Uses 4.6x30mm rounds. Recommended to hold with two hands." @@ -16,4 +18,4 @@ spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/flathead /obj/item/gun/ballistic/automatic/wt550/security/rubber //What you get from cargo. - spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/rubber \ No newline at end of file + spawn_magazine_type = /obj/item/ammo_box/magazine/wt550m9/rubber diff --git a/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm index b52a3913b88..8a120617b13 100644 --- a/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm +++ b/modular_zubbers/code/modules/projectiles/projectile/bullets/smg.dm @@ -9,7 +9,7 @@ name = "4.6x30mm armor-piercing bullet" damage = 15 armour_penetration = 40 - embedding = null + embed_type = null /obj/projectile/bullet/incendiary/c46x30mm //Not a typo. /obj/projectile/bullet/incendiary is a type. name = "4.6x30mm incendiary bullet" @@ -28,7 +28,7 @@ weak_against_armour = TRUE sharpness = NONE shrapnel_type = null - embedding = null + embed_type = null /obj/projectile/bullet/c46x30mm/rubber name = "4.6x30mm rubber-tipped bullet" @@ -41,9 +41,9 @@ weak_against_armour = TRUE sharpness = NONE shrapnel_type = null - embedding = null + embed_type = null ricochets_max = 3 ricochet_incidence_leeway = 0 ricochet_chance = 75 - ricochet_decay_damage = 0.8 \ No newline at end of file + ricochet_decay_damage = 0.8 diff --git a/modular_zubbers/code/modules/security/security_glock/ammo.dm b/modular_zubbers/code/modules/security/security_glock/ammo.dm index e22293b7f09..232d1fb31a0 100644 --- a/modular_zubbers/code/modules/security/security_glock/ammo.dm +++ b/modular_zubbers/code/modules/security/security_glock/ammo.dm @@ -10,7 +10,7 @@ weak_against_armour = TRUE sharpness = NONE shrapnel_type = null - embedding = null + embed_type = null /obj/item/ammo_casing/c9mm/flathead diff --git a/modular_zubbers/maps/moonstation/telescreen.dm b/modular_zubbers/maps/moonstation/telescreen.dm new file mode 100644 index 00000000000..b384c05cdfa --- /dev/null +++ b/modular_zubbers/maps/moonstation/telescreen.dm @@ -0,0 +1,8 @@ +/obj/machinery/computer/security/telescreen/commandbunker + name = "Command Bunker Monitor" + network = list(CAMERANET_NETWORK_COMMANDBUNKER) + +/obj/item/wallframe/telescreen/commandbunker + name = "command bunker telescreen frame" + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/commandbunker, 32) diff --git a/tgstation.dme b/tgstation.dme index 466d81c03e4..9ad4c7ed963 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -487,6 +487,7 @@ #include "code\__DEFINES\~skyrat_defines\signals\signals_human.dm" #include "code\__DEFINES\~skyrat_defines\traits\declarations.dm" #include "code\__DEFINES\~~bubber_defines\access.dm" +#include "code\__DEFINES\~~bubber_defines\cameranets.dm" #include "code\__DEFINES\~~bubber_defines\changeling_zombie.dm" #include "code\__DEFINES\~~bubber_defines\combat.dm" #include "code\__DEFINES\~~bubber_defines\cooldowns.dm" @@ -9062,6 +9063,7 @@ #include "modular_zubbers\maps\biodome\turfs.dm" #include "modular_zubbers\maps\biodome\vendcation.dm" #include "modular_zubbers\maps\biodome\weapons.dm" +#include "modular_zubbers\maps\moonstation\telescreen.dm" #include "modular_zubbers\maps\offstation\mob_spawns.dm" #include "modular_zubbers\maps\offstation\seedvault.dm" #include "modular_zubbers\maps\offstation\dauntless\areas.dm"