From 18dc1abc43c32f3edb29a305e787d14e43d95d7c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 17 Jan 2023 02:37:02 +0100 Subject: [PATCH] [MIRROR] Refactor lighting items that use fuel [MDB IGNORE] (#18545) * Refactor lighting items that use fuel (#72146) Fixes #71826 This does the following: - Makes candles a subtype of flare - Fixes candles having lighting inconsistencies - Fixes burning items (welder, candles, flares, etc.) not causing ignition effects when held in hand - Adds burnt flares and melted candles to maint loot and trash spawners - Add match lighting sound when candles are lit - Add time defines for fuel amounts and rounded them (ex. instead of 32.3333 minutes, it's now 35 minutes) - Light sources that burn will now spawn a trash item once fuel is spent - Light sources that burn now have a welder hitsound - Light sources that burn can now be extinguished by a fire extinguisher (except flares) - Light sources that burn can now be used to ignite another object on fire (ex. a lit candle can be used to light a cigarette) - Light sources that burn and are lit now do `BURN` damage while attacking Code is more cleaner and consistent. Also fixes some bugs. :cl: soundadd: Candles will now use the match lighting sound when lit soundadd: Light sources that burn will now have a welding hitsound fix: Fix candle light behaving erratically fix: Fix burning items that are held in hand will now have an ignition effect on the turf. (ex. lit welders in hand will now ignite plasma in the air) balance: Light sources that burn and are lit now do `BURN` damage while attacking balance: Light sources fuel amounts were rounded to exact numbers (ex. instead of 32.3333 minutes, it's now 35 minutes) qol: Light items that burn can now be extinguished by a fire extinguisher (except flares), used to ignite another object on fire, and will now leave a trash item once fuel is used qol: Add burnt flares and melted candles to trash spawners refactor: Refactor lighting items that use fuel to be more robust /:cl: Co-authored-by: Kylerace * Modular! * Toggle Light Co-authored-by: Tim Co-authored-by: Kylerace Co-authored-by: Funce --- ...cemoon_underground_abandoned_homestead.dmm | 4 +- ..._underground_abandoned_plasma_facility.dmm | 44 +- ...icemoon_underground_ash_walker1_skyrat.dmm | 10 +- .../lavaland_surface_ash_walker1_skyrat.dmm | 16 +- _maps/RandomRuins/SpaceRuins/derelict2.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 131 +- .../SpaceRuins/spacehotel_skyrat.dmm | 10 +- _maps/RandomZLevels/SnowCabin.dmm | 180 +- _maps/RandomZLevels/mothership_astrum.dmm | 4 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 1630 ++++++------- _maps/map_files/KiloStation/KiloStation.dmm | 216 +- _maps/map_files/MetaStation/MetaStation.dmm | 392 ++-- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 10 +- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 20 +- ...nance_lowerservicecargo_attachment_b_2.dmm | 2 +- _maps/map_files/tramstation/tramstation.dmm | 2064 ++++++++--------- _maps/shuttles/emergency_casino.dmm | 2 +- _maps/shuttles/emergency_cruise.dmm | 60 +- _maps/shuttles/emergency_medisim.dmm | 4 +- _maps/shuttles/emergency_monastery.dmm | 6 +- _maps/shuttles/emergency_narnar.dmm | 4 +- _maps/shuttles/emergency_wabbajack.dmm | 2 +- _maps/templates/lazy_templates/ninja_den.dmm | 48 +- code/_globalvars/lists/maintenance_loot.dm | 2 + .../objects/effects/spawners/random/trash.dm | 1 + code/game/objects/items.dm | 8 +- code/game/objects/items/candle.dm | 90 - code/game/objects/items/devices/flashlight.dm | 189 +- code/game/objects/items/storage/fancy.dm | 2 +- code/game/objects/items/trash.dm | 7 +- .../antagonists/heretic/heretic_knowledge.dm | 2 +- .../antagonists/heretic/knowledge/ash_lore.dm | 2 +- .../heretic/knowledge/side_ash_flesh.dm | 2 +- code/modules/cargo/exports/tools.dm | 2 +- code/modules/clothing/suits/chaplainsuits.dm | 10 +- code/modules/clothing/suits/costume.dm | 2 +- .../recipes/tablecraft/recipes_cake.dm | 2 +- .../recipes/tablecraft/recipes_guide.dm | 2 +- .../reagents/chemistry/recipes/others.dm | 2 +- code/modules/religion/religion_sects.dm | 6 +- code/modules/religion/rites.dm | 2 +- .../code/game/objects/items/holy_weapons.dm | 2 +- .../modules/cell_component/code/flashlight.dm | 11 +- .../pollution/code/fancy_storage_items.dm | 10 +- .../modules/pollution/code/scented_candles.dm | 10 +- tgstation.dme | 1 - tools/UpdatePaths/Scripts/72146_candles.txt | 4 + 47 files changed, 2623 insertions(+), 2609 deletions(-) delete mode 100644 code/game/objects/items/candle.dm create mode 100644 tools/UpdatePaths/Scripts/72146_candles.txt diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm index 1e52d577e07..2972bf7ae84 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm @@ -128,7 +128,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_x = -8; pixel_y = 13 }, @@ -191,7 +191,7 @@ /obj/item/storage/book/bible{ pixel_y = 5 }, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_x = -10; pixel_y = 5 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm index 157a34c8ae2..54abf3e6bb2 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm @@ -422,6 +422,15 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"fV" = ( +/obj/structure/bed/maint, +/obj/item/bedsheet/dorms, +/obj/item/flashlight/flare/candle{ + pixel_x = 12; + pixel_y = 9 + }, +/turf/open/floor/plating/icemoon, +/area/ruin/plasma_facility/operations) "gd" = ( /mob/living/simple_animal/hostile/asteroid/wolf, /turf/open/misc/asteroid/snow/icemoon, @@ -661,6 +670,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/large, /area/ruin/plasma_facility/commons) +"jb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/lights/mixed{ + pixel_x = 15; + pixel_y = 14 + }, +/mob/living/basic/frog{ + name = "Peter Jr." + }, +/turf/open/floor/plating/icemoon, +/area/ruin/plasma_facility/operations) "js" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -1614,15 +1634,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/smooth_half, /area/ruin/plasma_facility/operations) -"Ak" = ( -/obj/structure/bed/maint, -/obj/item/bedsheet/dorms, -/obj/item/candle{ - pixel_x = 12; - pixel_y = 9 - }, -/turf/open/floor/plating/icemoon, -/area/ruin/plasma_facility/operations) "An" = ( /obj/effect/turf_decal/tile/brown/half{ dir = 1 @@ -2219,17 +2230,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/icemoon, /area/ruin/plasma_facility/operations) -"KF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/lights/mixed{ - pixel_x = 15; - pixel_y = 14 - }, -/mob/living/basic/frog{ - name = "Peter Jr." - }, -/turf/open/floor/plating/icemoon, -/area/ruin/plasma_facility/operations) "KO" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -3888,7 +3888,7 @@ pd XI Hv SR -Ak +fV hR oc rs @@ -3958,7 +3958,7 @@ vt hR qW EZ -KF +jb QY rk rs diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm index 19223c30baf..456439ae635 100644 --- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm +++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_ash_walker1_skyrat.dmm @@ -79,7 +79,7 @@ /area/ruin/unpowered/ash_walkers) "bI" = ( /obj/structure/table/wood, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /obj/effect/turf_decal/siding/wideplating/dark/end{ dir = 8 }, @@ -423,7 +423,7 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 }, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/ash_walkers) "jE" = ( @@ -481,7 +481,7 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 6 }, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/stone/icemoon, /area/ruin/unpowered/ash_walkers) "mM" = ( @@ -1177,7 +1177,7 @@ /area/ruin/unpowered/ash_walkers) "Fk" = ( /obj/structure/table/wood, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -7 }, /obj/item/reagent_containers/cup/glass/bottle/hooch{ @@ -1270,7 +1270,7 @@ "Hn" = ( /obj/effect/turf_decal/siding/wood/end, /obj/structure/table/wood, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/wood/icemoon, /area/ruin/unpowered/ash_walkers) "Ho" = ( diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm index d6885ef7edf..37eebbe791a 100644 --- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm +++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm @@ -166,7 +166,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "iP" = ( -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "iZ" = ( @@ -212,7 +212,7 @@ dir = 1 }, /obj/structure/stone_tile/cracked, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "ky" = ( @@ -317,7 +317,7 @@ /obj/structure/stone_tile{ dir = 8 }, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "nI" = ( @@ -445,7 +445,7 @@ /area/ruin/unpowered/ash_walkers) "qW" = ( /obj/structure/stone_tile/surrounding_tile, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "rE" = ( @@ -665,7 +665,7 @@ /area/ruin/unpowered/ash_walkers) "zV" = ( /obj/structure/table/wood, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 5; pixel_y = -2 }, @@ -749,7 +749,7 @@ /area/ruin/unpowered/ash_walkers) "Ch" = ( /obj/structure/stone_tile/slab/cracked, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "Cl" = ( @@ -875,7 +875,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "HF" = ( @@ -1273,7 +1273,7 @@ /area/ruin/unpowered/ash_walkers) "SX" = ( /obj/structure/table/wood, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 11; pixel_y = 12 }, diff --git a/_maps/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/RandomRuins/SpaceRuins/derelict2.dmm index bad1f03635e..169f864e9b6 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict2.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict2.dmm @@ -65,7 +65,7 @@ /area/ruin/space/has_grav/powered/dinner_for_two) "n" = ( /obj/structure/table, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_y = 5 }, /obj/item/plate{ diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 9cae0f89b7e..bcaf298d19f 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -566,25 +566,6 @@ /obj/structure/dresser, /turf/open/floor/wood/parquet, /area/ruin/space/has_grav/hotel/guestroom/room_4) -"fZ" = ( -/obj/structure/table/wood, -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/item/candle/infinite{ - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/stone, -/area/ruin/space/has_grav/hotel/bar) "gc" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1594,6 +1575,24 @@ }, /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/pool) +"nN" = ( +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/stone, +/area/ruin/space/has_grav/hotel/bar) "nP" = ( /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance" @@ -1678,6 +1677,19 @@ /obj/structure/filingcabinet, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel) +"oL" = ( +/obj/structure/table/wood, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/hotel/bar) "oZ" = ( /obj/machinery/atmospherics/components/tank/air{ dir = 4 @@ -2894,19 +2906,6 @@ /obj/structure/window/fulltile, /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) -"EC" = ( -/obj/structure/table/wood, -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 7; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/bar) "ED" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -2947,6 +2946,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/guestroom/room_5) +"EU" = ( +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood, +/area/ruin/space/has_grav/hotel/bar) "EY" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood/corner, @@ -3654,22 +3660,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/sepia, /area/ruin/space/has_grav/hotel/guestroom/room_5) -"OJ" = ( -/obj/structure/table/wood, -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 7; - pixel_y = 5 - }, -/obj/item/candle/infinite{ - pixel_y = 6 - }, -/turf/open/floor/iron/grimy, -/area/ruin/space/has_grav/hotel/bar) "OM" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -3702,6 +3692,21 @@ /obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/ruin/space/has_grav/hotel/guestroom/room_4) +"OZ" = ( +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 6 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/iron/grimy, +/area/ruin/space/has_grav/hotel/bar) "Pj" = ( /obj/structure/window{ dir = 4 @@ -4375,14 +4380,6 @@ }, /turf/open/floor/wood/tile, /area/ruin/space/has_grav/hotel) -"WZ" = ( -/obj/structure/table/wood, -/obj/structure/table/wood/fancy, -/obj/item/candle/infinite{ - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/ruin/space/has_grav/hotel/bar) "Xd" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -5502,23 +5499,23 @@ LD LD LD Mn -OJ +OZ gw ku -OJ +OZ gu Ki zz Qq -EC +oL iw vL Ki Df -OJ +OZ gw ku -OJ +OZ VS Ki Xi @@ -5583,7 +5580,7 @@ Ex iT zb Qq -WZ +EU iw zb iT @@ -5648,10 +5645,10 @@ hN mF LD eK -OJ +OZ VS Mn -OJ +OZ VS iT zb @@ -5661,10 +5658,10 @@ cb zb iT Mn -OJ +OZ VS Mn -OJ +OZ VS WD Ru @@ -5794,7 +5791,7 @@ Lb ae LD yG -fZ +nN go Dy HH diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm index edde37a037c..a5814b7a4e4 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm @@ -750,7 +750,7 @@ /area/ruin/space/has_grav/hotel/dock) "eH" = ( /obj/structure/table/glass, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 6; pixel_y = 5 }, @@ -4046,11 +4046,11 @@ /area/ruin/space/has_grav/hotel/guestroom/room_4) "vn" = ( /obj/structure/table/glass, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -5; pixel_y = 5 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 6; pixel_y = 5 }, @@ -5902,11 +5902,11 @@ /area/ruin/space/has_grav/hotel/guestroom/room_6) "HO" = ( /obj/structure/table/glass, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -5; pixel_y = 5 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 6; pixel_y = 5 }, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 991592d7dc8..e956f948290 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -337,6 +337,11 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/awaymission/cabin) +"bc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/mug/britcup, +/turf/open/floor/carpet, +/area/awaymission/cabin) "bd" = ( /obj/structure/chair/office, /turf/open/floor/carpet, @@ -3563,32 +3568,6 @@ /obj/effect/decal/remains/human, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) -"pi" = ( -/obj/structure/statue/snow/snowman{ - anchored = 1; - name = "Who" - }, -/obj/item/clothing/head/helmet/knight/yellow{ - armor = list("melee" = 11, "bullet" = 2, "laser" = 1, "energy" = 1, "bomb" = 5, "bio" = 2, "fire" = 0, "acid" = 10); - desc = "A classic metal helmet. The cold has made it unreliable though."; - name = "old medieval helmet"; - pixel_y = 7 - }, -/obj/item/claymore/weak/ceremonial{ - desc = "Brought to you by the guys in charge of making replica katana toys!"; - force = 1; - layer = 3.01; - name = "replica claymore"; - pixel_x = 5; - pixel_y = 8; - throwforce = 2 - }, -/obj/item/shield/roman/fake{ - layer = 3.01; - pixel_x = -7 - }, -/turf/open/misc/asteroid/snow/snow_cabin, -/area/awaymission/cabin/snowforest) "pj" = ( /obj/structure/sign/warning/engine_safety{ desc = "A sign detailing the various safety protocols when working on-site to ensure a safe shift. It seems to particularly focus on how dangerous the sawblade is."; @@ -3624,14 +3603,6 @@ /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/snowforest) -"pQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/fulltile{ - desc = "Enjoy the view."; - name = "window" - }, -/turf/open/floor/plating, -/area/awaymission/cabin/caves/mountain) "qe" = ( /obj/effect/light_emitter{ name = "outdoor light"; @@ -3691,23 +3662,36 @@ }, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) +"rd" = ( +/obj/structure/statue/snow/snowman{ + anchored = 1; + name = "Who" + }, +/obj/item/clothing/head/helmet/knight/yellow{ + armor = list("melee" = 11, "bullet" = 2, "laser" = 1, "energy" = 1, "bomb" = 5, "bio" = 2, "fire" = 0, "acid" = 10); + desc = "A classic metal helmet. The cold has made it unreliable though."; + name = "old medieval helmet"; + pixel_y = 7 + }, +/obj/item/claymore/weak/ceremonial{ + desc = "Brought to you by the guys in charge of making replica katana toys!"; + force = 1; + layer = 3.01; + name = "replica claymore"; + pixel_x = 5; + pixel_y = 8; + throwforce = 2 + }, +/obj/item/shield/roman/fake{ + layer = 3.01; + pixel_x = -7 + }, +/turf/open/misc/asteroid/snow/snow_cabin, +/area/awaymission/cabin/snowforest) "rH" = ( /mob/living/simple_animal/pet/penguin/emperor, /turf/open/misc/ice/smooth, /area/awaymission/cabin/snowforest) -"rR" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/glitter/blue{ - desc = "It looks like fancy glitter to me."; - name = "icy wind" - }, -/obj/item/clothing/head/helmet/skull{ - armor = list("melee" = 15, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 10, "bio" = 5, "fire" = 20, "acid" = 20); - desc = "It's not bloody for some reason. Dear god."; - name = "human skull" - }, -/turf/open/misc/asteroid/snow/snow_cabin, -/area/awaymission/cabin/caves) "so" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/displaycase{ @@ -3787,6 +3771,23 @@ }, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) +"tR" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/clothing/shoes/sneakers/brown, +/obj/item/clothing/head/hats/warden/police{ + armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 15, "bio" = 0, "fire" = 20, "acid" = 20); + desc = "I am the law!" + }, +/obj/structure/closet{ + anchored = 1; + name = "uniform closet" + }, +/obj/item/clothing/under/rank/security/officer/spacepol{ + armor = list("melee" = 2, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "fire" = 10, "acid" = 10); + desc = "Anyone enjoying their time while working in a megacorporation, planetary government, or band of pirates is under the jurisdiction of the fun police." + }, +/turf/open/floor/iron/dark, +/area/awaymission/cabin/caves/mountain) "ud" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/showcase/mecha/marauder{ @@ -3898,11 +3899,6 @@ /obj/item/food/fishmeat/carp, /turf/open/misc/ice/smooth, /area/awaymission/cabin/snowforest) -"xo" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/mug/britcup, -/turf/open/floor/carpet, -/area/awaymission/cabin) "xs" = ( /mob/living/simple_animal/hostile/tree{ desc = "I am death. I will have my vengeance upon my enemies."; @@ -4104,6 +4100,19 @@ }, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) +"BK" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/glitter/blue{ + desc = "It looks like fancy glitter to me."; + name = "icy wind" + }, +/obj/item/clothing/head/helmet/skull{ + armor = list("melee" = 15, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 10, "bio" = 5, "fire" = 20, "acid" = 20); + desc = "It's not bloody for some reason. Dear god."; + name = "human skull" + }, +/turf/open/misc/asteroid/snow/snow_cabin, +/area/awaymission/cabin/caves) "BR" = ( /mob/living/simple_animal/hostile/skeleton/ice{ desc = "A reanimated skeleton covered in thick sheet of natural ice. It is obvious to tell that they look really slow."; @@ -4216,6 +4225,10 @@ /obj/structure/barricade/wooden/snowed, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) +"GS" = ( +/obj/item/flashlight/flare/candle/infinite, +/turf/open/floor/plating/snowed, +/area/awaymission/cabin/caves) "Hn" = ( /obj/structure/flora{ desc = "Looks frozen."; @@ -4263,23 +4276,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/indestructible, /area/awaymission/cabin/caves/mountain) -"JI" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/clothing/shoes/sneakers/brown, -/obj/item/clothing/head/hats/warden/police{ - armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 2, "bomb" = 15, "bio" = 0, "fire" = 20, "acid" = 20); - desc = "I am the law!" - }, -/obj/structure/closet{ - anchored = 1; - name = "uniform closet" - }, -/obj/item/clothing/under/rank/security/officer/spacepol{ - armor = list("melee" = 2, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "fire" = 10, "acid" = 10); - desc = "Anyone enjoying their time while working in a megacorporation, planetary government, or band of pirates is under the jurisdiction of the fun police." - }, -/turf/open/floor/iron/dark, -/area/awaymission/cabin/caves/mountain) "JL" = ( /turf/open/misc/asteroid/snow/snow_cabin{ floor_variance = 0; @@ -4444,6 +4440,13 @@ }, /turf/open/floor/wood, /area/awaymission/cabin) +"NZ" = ( +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/cup/glass/bottle/juice/smallcarton{ + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/awaymission/cabin) "Oe" = ( /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) @@ -4474,10 +4477,6 @@ }, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/snowforest) -"Oz" = ( -/obj/item/candle/infinite, -/turf/open/floor/plating/snowed, -/area/awaymission/cabin/caves) "OF" = ( /obj/structure/table/wood, /obj/structure/sign/warning/no_smoking/circle{ @@ -4625,13 +4624,6 @@ }, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) -"RV" = ( -/obj/structure/table/wood/fancy, -/obj/item/reagent_containers/cup/glass/bottle/juice/smallcarton{ - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/awaymission/cabin) "RY" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/sign/poster/official/do_not_question{ @@ -4888,6 +4880,14 @@ /obj/item/shovel, /turf/open/misc/asteroid/snow/snow_cabin, /area/awaymission/cabin/caves) +"XT" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/fulltile{ + desc = "Enjoy the view."; + name = "window" + }, +/turf/open/floor/plating, +/area/awaymission/cabin/caves/mountain) "Yc" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/melee/baseball_bat, @@ -8273,7 +8273,7 @@ cx cx td Xy -JI +tR cx co co @@ -9809,7 +9809,7 @@ fr fq fJ fN -pQ +XT Pd cx cx @@ -28140,7 +28140,7 @@ ab jm Oe RC -pi +rd RC nE RC @@ -29231,7 +29231,7 @@ hb bU ev eu -RV +NZ cD an aq @@ -35391,7 +35391,7 @@ ed hu an aY -xo +bc bg an nU @@ -47873,9 +47873,9 @@ gx gx gx hM -Oz +GS hQ -Oz +GS wI PV Oe @@ -48387,9 +48387,9 @@ gx gx gx hM -Oz +GS hQ -Oz +GS Rz PV PV @@ -51858,7 +51858,7 @@ Lj tC Dw tC -rR +BK gx Oe gx diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index 906036c00f7..1bcab495b86 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -1636,7 +1636,7 @@ /area/awaymission/mothership_astrum/deck1) "zQ" = ( /obj/structure/table/wood, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/plastic, /area/awaymission/mothership_astrum/deck2) "zX" = ( @@ -3885,7 +3885,7 @@ /area/awaymission/mothership_astrum/deck1) "XE" = ( /obj/structure/table/wood, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /obj/item/organ/internal/cyberimp/chest/reviver, /turf/open/floor/plastic, /area/awaymission/mothership_astrum/deck2) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 1caa592479f..3b61f9c7096 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -145,11 +145,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"acP" = ( -/obj/structure/chair/sofa/corner/brown, -/obj/structure/cable, -/turf/open/floor/carpet/blue, -/area/station/security/prison/work) "adr" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -230,14 +225,6 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron/smooth, /area/mine/living_quarters) -"aeO" = ( -/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/machinery/light_switch/directional/east, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "aeV" = ( /obj/structure/sign/warning, /turf/closed/wall, @@ -246,12 +233,6 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"afr" = ( -/obj/structure/bed/dogbed/lia, -/mob/living/basic/carp/pet/lia, -/obj/structure/cable, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/hos) "afs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -578,13 +559,6 @@ "alM" = ( /turf/closed/wall, /area/station/maintenance/aft/lesser) -"alS" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) "alT" = ( /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) @@ -3060,6 +3034,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) +"aXh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "aXF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -3590,6 +3571,22 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"bfM" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/break_room) "bfN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3642,6 +3639,17 @@ "bgx" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) +"bgy" = ( +/obj/item/gun/energy/laser/practice{ + pixel_y = 5 + }, +/obj/item/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice{ + pixel_y = -5 + }, +/obj/structure/rack, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) "bgE" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -3730,6 +3738,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/iron/white, /area/station/medical/virology) +"bhK" = ( +/obj/structure/table, +/obj/item/folder/blue, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "bie" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 @@ -4189,6 +4202,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/locker) +"boO" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) "boP" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/light/directional/south, @@ -4310,21 +4331,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) -"bqC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/medical{ - name = "Surgery North" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay/aft) "bqF" = ( /obj/structure/chair{ dir = 4 @@ -4486,17 +4492,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"bsR" = ( -/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{ - name = "Burn Chamber Interior Airlock" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/airlock_controller/incinerator_ordmix{ - pixel_x = 24 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/turf/open/floor/engine, -/area/station/science/ordnance/burnchamber) "bsV" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5283,6 +5278,12 @@ }, /turf/open/openspace/icemoon/keep_below, /area/icemoon/underground/explored) +"bDR" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "bDX" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, @@ -5651,6 +5652,17 @@ "bID" = ( /turf/closed/wall/r_wall, /area/station/engineering/lobby) +"bIH" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) "bIU" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -6779,14 +6791,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"cac" = ( -/obj/machinery/modular_computer/console/preset/id, -/obj/item/paper/fluff/ids_for_dummies, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "caj" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -7258,6 +7262,10 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +"cgC" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "cgR" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -7391,17 +7399,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"cjd" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/chair/sofa/left/brown{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/break_room) "cjj" = ( /obj/machinery/holopad, /turf/open/floor/wood/parquet, @@ -8069,14 +8066,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"cuh" = ( -/obj/structure/chair/sofa/left/brown{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/structure/cable, -/turf/open/floor/carpet/blue, -/area/station/security/prison/work) "cum" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 1 @@ -8882,6 +8871,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"cFN" = ( +/obj/structure/bed/dogbed/ian, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "cFR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -9701,6 +9695,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"cRq" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/orange, +/obj/item/restraints/handcuffs, +/obj/item/reagent_containers/spray/pepper, +/turf/open/floor/iron/smooth, +/area/station/security/execution/transfer) "cRy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -10716,14 +10717,6 @@ }, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) -"dhQ" = ( -/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/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "dhS" = ( /obj/machinery/door/airlock{ name = "Permabrig Showers" @@ -11315,10 +11308,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"dqc" = ( -/obj/machinery/holopad, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "dqd" = ( /obj/machinery/iv_drip, /obj/structure/mirror/directional/north{ @@ -12121,6 +12110,14 @@ "dDw" = ( /turf/closed/wall, /area/station/medical/surgery/fore) +"dDx" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Courtroom" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "dDy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -12822,13 +12819,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/mine/storage) -"dOt" = ( -/obj/structure/chair/sofa/right/brown, -/obj/item/toy/plush/moth{ - name = "Dr. Moff" - }, -/turf/open/floor/carpet/blue, -/area/station/medical/psychology) "dOw" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -13173,13 +13163,6 @@ /obj/machinery/shieldgen, /turf/open/floor/plating, /area/station/engineering/engine_smes) -"dUp" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "dUv" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -13589,6 +13572,13 @@ /obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"ebk" = ( +/obj/structure/bed/dogbed/ian, +/mob/living/basic/pet/dog/corgi/ian{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "ebq" = ( /obj/effect/landmark/start/clown, /obj/structure/disposalpipe/segment, @@ -13627,10 +13617,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"ebR" = ( -/obj/effect/mapping_helpers/ianbirthday, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "ebX" = ( /obj/structure/fence/corner{ dir = 1 @@ -13838,6 +13824,19 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"efX" = ( +/obj/structure/table/wood, +/obj/item/clothing/under/suit/red, +/obj/item/flashlight/flare/candle{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/flashlight/flare/candle{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/engine/cult, +/area/station/service/library) "ega" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, @@ -14441,12 +14440,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"eqd" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "eqj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria{ @@ -14491,17 +14484,6 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/starboard) -"eqy" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "hopqueue"; - name = "HoP Queue Shutters" - }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "eqH" = ( /obj/machinery/camera{ c_tag = "Chapel North"; @@ -15021,6 +15003,22 @@ }, /turf/open/floor/plating, /area/station/medical/virology) +"ezD" = ( +/obj/structure/table, +/obj/item/food/spaghetti/meatballspaghetti{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = -11; + pixel_y = 11 + }, +/obj/item/trash/candle{ + pixel_x = 9; + pixel_y = -1 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore/lesser) "ezJ" = ( /obj/machinery/light/directional/east, /turf/open/floor/glass/reinforced, @@ -15085,13 +15083,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"eAI" = ( -/obj/structure/bed/dogbed/ian, -/mob/living/basic/pet/dog/corgi/ian{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "eAS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15104,6 +15095,12 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"eAV" = ( +/obj/machinery/light/directional/south, +/obj/effect/mapping_helpers/trapdoor_placer, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "eBa" = ( /obj/effect/turf_decal/siding/white, /turf/open/floor/iron/white/smooth_large, @@ -16118,13 +16115,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"ePU" = ( -/obj/structure/closet/secure_closet/hop, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "eQx" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -16363,14 +16353,6 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) -"eUx" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/directional/east, -/obj/structure/sign/warning/electric_shock/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "eUD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/east, @@ -16542,6 +16524,16 @@ /obj/item/ai_module/reset, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"eWc" = ( +/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{ + dir = 10 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "eWh" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -17662,6 +17654,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos) +"fnF" = ( +/obj/structure/chair/sofa/middle/brown, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) "fnL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -18371,6 +18367,16 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +"fzz" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Courtroom Audience" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "fzA" = ( /obj/effect/spawner/random/maintenance, /obj/structure/disposalpipe/segment, @@ -18434,19 +18440,6 @@ /obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron/large, /area/station/service/kitchen/diner) -"fAo" = ( -/obj/structure/table/wood, -/obj/item/clothing/under/suit/red, -/obj/item/candle{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/candle{ - pixel_x = 8; - pixel_y = 4 - }, -/turf/open/floor/engine/cult, -/area/station/service/library) "fAF" = ( /obj/structure/rack, /obj/item/clothing/gloves/boxing/green, @@ -18790,12 +18783,6 @@ /obj/structure/sign/warning/cold_temp, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"fHc" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "fHg" = ( /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron/dark/side, @@ -18943,6 +18930,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/engineering/atmos) +"fJl" = ( +/obj/machinery/computer/accounting{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "fJm" = ( /obj/structure/railing{ dir = 8 @@ -19252,11 +19249,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) -"fNJ" = ( -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "fNK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19780,6 +19772,17 @@ /obj/structure/barricade/wooden/crude/snow, /turf/open/floor/wood, /area/station/maintenance/space_hut/cabin) +"fWU" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/chair/sofa/left/brown{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) "fWX" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating/snowed/icemoon, @@ -20178,11 +20181,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory/upper) -"gbK" = ( -/obj/machinery/ticket_machine/directional/east, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "gbL" = ( /obj/machinery/door/airlock/external{ glass = 1; @@ -20232,6 +20230,20 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/security/processing) +"gcl" = ( +/obj/machinery/button/door/directional/east{ + id = "kanyewest"; + name = "Privacy Shutters" + }, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/security/detectives_office) "gcy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -20950,20 +20962,6 @@ "gpp" = ( /turf/open/floor/iron, /area/station/hallway/primary/port) -"gpt" = ( -/obj/machinery/button/door/directional/east{ - id = "kanyewest"; - name = "Privacy Shutters" - }, -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/firealarm/directional/south, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/security/detectives_office) "gpK" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -21271,32 +21269,6 @@ dir = 9 }, /area/station/science/research) -"gwr" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/left/directional/north{ - dir = 8; - name = "Reception Window" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "hop"; - name = "Privacy Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Head of Personnel's Desk"; - req_access = list("hop") - }, -/obj/machinery/flasher/directional/south{ - pixel_y = -23 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "gwy" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -21722,6 +21694,14 @@ }, /turf/open/floor/iron/dark, /area/mine/storage) +"gCn" = ( +/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/machinery/light_switch/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "gCu" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -21817,19 +21797,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"gEl" = ( -/obj/structure/chair/sofa/right/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "gEn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22211,10 +22178,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/dorms) -"gJL" = ( -/obj/machinery/pdapainter, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "gJM" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -22360,6 +22323,15 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"gMu" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "gMK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23726,17 +23698,6 @@ /obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"hiB" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/chair/sofa/right/brown{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/grimy, -/area/station/commons/lounge) "hiF" = ( /obj/machinery/light/floor, /turf/open/floor/iron/white, @@ -23868,10 +23829,6 @@ /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) -"hlz" = ( -/obj/structure/chair/sofa/middle/brown, -/turf/open/floor/carpet/blue, -/area/station/security/prison/work) "hlJ" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -24150,14 +24107,6 @@ }, /turf/open/floor/plating, /area/station/security/processing) -"hqk" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Courtroom" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "hqm" = ( /obj/structure/table, /obj/item/storage/crayons, @@ -24260,6 +24209,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/service) +"hsi" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/obj/machinery/light/directional/east, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "hsl" = ( /obj/structure/table, /obj/effect/turf_decal/tile/brown{ @@ -24915,6 +24872,15 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"hCN" = ( +/obj/structure/chair/sofa/right/brown{ + desc = "Hey, did you know you can get a pineapple on your burger here?"; + dir = 1; + name = "The Regular's Sofa" + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/stone, +/area/station/commons/lounge) "hCV" = ( /obj/structure/table/wood, /obj/item/hand_tele, @@ -25495,16 +25461,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"hNN" = ( -/obj/machinery/computer/cargo{ - dir = 4 - }, -/obj/machinery/keycard_auth/directional/west, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "hOc" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -25848,6 +25804,10 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"hTc" = ( +/obj/item/trash/sosjerky, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "hTm" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/meter, @@ -26026,6 +25986,11 @@ /obj/machinery/light/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) +"hWE" = ( +/obj/structure/table, +/obj/item/flashlight/flare/candle, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "hWI" = ( /obj/effect/turf_decal/box, /obj/structure/closet/crate/maint, @@ -26155,6 +26120,13 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"hYW" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "hZe" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -26236,6 +26208,14 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"iaS" = ( +/obj/machinery/modular_computer/console/preset/id, +/obj/item/paper/fluff/ids_for_dummies, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "iaT" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -26330,36 +26310,6 @@ }, /turf/open/floor/iron, /area/station/cargo/office) -"ibv" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/machinery/button/flasher{ - pixel_y = -32; - id = "hopflash"; - pixel_x = 8 - }, -/obj/machinery/button/door/directional/south{ - pixel_x = -8; - req_access = list("hop"); - id = "hopqueue"; - name = "Queue Shutters Control" - }, -/obj/machinery/button/door/directional/south{ - pixel_x = 8; - name = "Privacy Shutters Control"; - req_access = list("hop"); - id = "hop" - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/button/ticket_machine{ - pixel_x = -8; - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "ibw" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -27047,6 +26997,13 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/security/courtroom) +"ilp" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/chair/sofa/right/brown, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) "ily" = ( /turf/open/openspace, /area/station/science/xenobiology) @@ -27432,6 +27389,36 @@ dir = 8 }, /area/station/service/chapel) +"isa" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/button/flasher{ + pixel_y = -32; + id = "hopflash"; + pixel_x = 8 + }, +/obj/machinery/button/door/directional/south{ + pixel_x = -8; + req_access = list("hop"); + id = "hopqueue"; + name = "Queue Shutters Control" + }, +/obj/machinery/button/door/directional/south{ + pixel_x = 8; + name = "Privacy Shutters Control"; + req_access = list("hop"); + id = "hop" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/button/ticket_machine{ + pixel_x = -8; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "isb" = ( /obj/machinery/atmospherics/components/binary/pump/off{ dir = 1; @@ -27736,13 +27723,6 @@ }, /turf/open/floor/iron/large, /area/station/engineering/main) -"ixV" = ( -/obj/structure/bed/dogbed/mcgriff, -/obj/item/food/beef_wellington_slice, -/obj/structure/cable, -/mob/living/basic/pet/dog/pug/mcgriff, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "ixZ" = ( /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer" @@ -28004,6 +27984,16 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"iBw" = ( +/obj/structure/table/wood, +/obj/machinery/libraryscanner{ + pixel_y = 5; + pixel_x = -3 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/service/library) "iBz" = ( /obj/structure/sign/warning/no_smoking/directional/south, /turf/open/openspace, @@ -28193,6 +28183,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_half, /area/station/security/prison/work) +"iFg" = ( +/obj/structure/bed/dogbed/mcgriff, +/obj/item/food/beef_wellington_slice, +/obj/structure/cable, +/mob/living/basic/pet/dog/pug/mcgriff, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "iFm" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/dirt/dust, @@ -29560,6 +29557,19 @@ /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/iron/dark/side, /area/station/security/prison/workout) +"iZp" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "iZq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29642,6 +29652,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +"jaq" = ( +/obj/effect/landmark/start/head_of_personnel, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "jaw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29712,17 +29726,6 @@ /obj/structure/chair/comfy/beige, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) -"jbn" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/sofa/left/brown{ - desc = "Hey, did you know you can get a pineapple on your burger here?"; - dir = 1; - name = "The Regular's Sofa" - }, -/turf/open/floor/stone, -/area/station/commons/lounge) "jbt" = ( /obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/north, @@ -29955,19 +29958,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"jew" = ( -/obj/item/candle{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/storage/book{ - name = "Tales from the First"; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/table/wood, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "jeF" = ( /obj/effect/landmark/start/security_officer, /turf/open/floor/glass/reinforced, @@ -30121,18 +30111,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) -"jiG" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 8; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red/full, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/checkpoint/medical) "jiI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30287,11 +30265,28 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/station/science/xenobiology) +"jkG" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Security - Equipment Room" + }, +/turf/open/floor/glass/reinforced, +/area/station/security/lockers) "jkH" = ( /obj/structure/training_machine, /obj/effect/landmark/blobstart, /turf/open/floor/engine, /area/station/science/explab) +"jkQ" = ( +/obj/machinery/requests_console/directional/south{ + announcementConsole = 1; + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Head of Personnel's Desk"; + departmentType = 5; + name = "Head of Personnel's Requests Console" + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "jkS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -32185,12 +32180,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) -"jPz" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "jPB" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -32608,6 +32597,17 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron, /area/station/service/hydroponics) +"jVD" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 24; + name = "SS13: Auxiliary Dock, Station-Port"; + shuttle_id = "whiteship_home"; + width = 35 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "jVE" = ( /obj/effect/turf_decal/box/white, /turf/open/floor/engine, @@ -32867,6 +32867,18 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"jZU" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 8; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/checkpoint/medical) "jZY" = ( /obj/structure/tank_holder/extinguisher, /obj/effect/turf_decal/stripes/line{ @@ -33139,10 +33151,6 @@ dir = 4 }, /area/station/command/gateway) -"keN" = ( -/obj/machinery/vending/cart, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "keP" = ( /turf/closed/wall, /area/station/engineering/atmos/storage/gas) @@ -34956,17 +34964,6 @@ /obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) -"kIa" = ( -/obj/item/gun/energy/laser/practice{ - pixel_y = 5 - }, -/obj/item/gun/energy/laser/practice, -/obj/item/gun/energy/laser/practice{ - pixel_y = -5 - }, -/obj/structure/rack, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "kIi" = ( /obj/machinery/door/airlock{ name = "Perma Overlook Entrance" @@ -35133,17 +35130,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) -"kKd" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) "kKe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -35157,17 +35143,6 @@ /obj/item/plant_analyzer, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"kKs" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 24; - name = "SS13: Auxiliary Dock, Station-Port"; - shuttle_id = "whiteship_home"; - width = 35 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kKy" = ( /obj/structure/tank_holder/oxygen, /obj/effect/turf_decal/tile/blue{ @@ -35245,16 +35220,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage) -"kLm" = ( -/obj/machinery/computer/accounting{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "kLr" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, @@ -35909,18 +35874,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/lobby) -"kTV" = ( -/obj/structure/table/wood, -/obj/item/phone{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_x = 8; - pixel_y = 8 - }, -/turf/open/floor/carpet/red, -/area/station/commons/vacant_room/office) "kUb" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -36198,11 +36151,6 @@ "kYA" = ( /turf/open/floor/circuit, /area/mine/living_quarters) -"kYE" = ( -/obj/structure/table, -/obj/item/candle, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "kYF" = ( /obj/structure/light_construct/directional/west, /mob/living/simple_animal/hostile/retaliate/goose/vomit, @@ -36267,6 +36215,15 @@ "kZu" = ( /turf/closed/wall, /area/mine/production) +"kZz" = ( +/obj/machinery/computer/order_console/cook{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/hallway/secondary/service) "kZC" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot_white, @@ -36316,6 +36273,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"lal" = ( +/obj/structure/chair/sofa/right/brown, +/obj/item/toy/plush/moth{ + name = "Dr. Moff" + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "law" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Vestibule" @@ -37104,6 +37068,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"lmR" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "lnc" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -37982,6 +37950,15 @@ /obj/effect/landmark/start/roboticist, /turf/open/floor/iron, /area/station/science/robotics/lab) +"lCA" = ( +/obj/machinery/computer/order_console/mining, +/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch/directional/south, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/production) "lCC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38097,6 +38074,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/cryo) +"lEa" = ( +/obj/structure/chair/sofa/corner/brown, +/obj/structure/cable, +/turf/open/floor/carpet/blue, +/area/station/security/prison/work) "lEg" = ( /obj/machinery/door/window{ dir = 1; @@ -38913,6 +38895,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"lTL" = ( +/obj/machinery/dna_infuser, +/obj/item/infuser_book, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "lTN" = ( /obj/structure/table, /obj/machinery/recharger, @@ -39067,6 +39054,12 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) +"lWK" = ( +/obj/structure/chair/sofa/left/brown, +/obj/machinery/light/directional/north, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "lWU" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/blue{ @@ -39947,13 +39940,21 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"mmN" = ( -/obj/structure/window/reinforced{ - dir = 8 +"mmB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/medical{ + name = "Surgery South" }, -/obj/structure/chair/sofa/right/brown, -/turf/open/floor/carpet/blue, -/area/station/security/prison/work) +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/aft) "mmR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40211,11 +40212,6 @@ /obj/structure/sign/warning/gas_mask/directional/south, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"mrk" = ( -/obj/structure/table, -/obj/item/folder/blue, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "mro" = ( /obj/structure/curtain/cloth, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -40552,6 +40548,14 @@ /obj/item/clothing/ears/earmuffs, /turf/open/floor/iron/dark/textured, /area/station/security/range) +"mxN" = ( +/obj/machinery/computer/order_console/mining, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) "myb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41334,6 +41338,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"mLX" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/north{ + dir = 8; + name = "Reception Window" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hop"; + name = "Privacy Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Head of Personnel's Desk"; + req_access = list("hop") + }, +/obj/machinery/flasher/directional/south{ + pixel_y = -23 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "mMa" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -41802,22 +41832,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"mUh" = ( -/obj/structure/table, -/obj/item/food/spaghetti/meatballspaghetti{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/candle/infinite{ - pixel_x = -11; - pixel_y = 11 - }, -/obj/item/trash/candle{ - pixel_x = 9; - pixel_y = -1 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore/lesser) "mUs" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -41875,14 +41889,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"mVT" = ( -/obj/machinery/computer/order_console/mining, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/turf/open/floor/iron/dark, -/area/station/cargo/miningdock) "mVY" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -42950,16 +42956,6 @@ "njJ" = ( /turf/closed/wall, /area/mine/laborcamp) -"njM" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Courtroom Audience" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "njO" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -42985,29 +42981,11 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/science/ordnance/testlab) -"nkq" = ( -/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{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "nks" = ( /obj/effect/turf_decal/stripes/white/line, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/workout) -"nku" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "nkI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43247,6 +43225,10 @@ }, /turf/open/floor/iron/white, /area/mine/laborcamp) +"nnR" = ( +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "noi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/airalarm/directional/east, @@ -43440,6 +43422,17 @@ dir = 10 }, /area/station/science/research) +"nqU" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "hopqueue"; + name = "HoP Queue Shutters" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "nqX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, @@ -43870,6 +43863,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"nyy" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "nyA" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -44636,17 +44636,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"nJi" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/chair/sofa/left/brown{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/grimy, -/area/station/commons/lounge) "nJm" = ( /obj/structure/fluff/fokoff_sign, /turf/open/misc/asteroid/snow/icemoon, @@ -45632,16 +45621,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"nVD" = ( -/obj/structure/table/wood, -/obj/machinery/libraryscanner{ - pixel_y = 5; - pixel_x = -3 - }, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/station/service/library) "nVR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria{ @@ -45898,12 +45877,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"oaw" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Security - Equipment Room" - }, -/turf/open/floor/glass/reinforced, -/area/station/security/lockers) "oaG" = ( /obj/effect/turf_decal/tile/dark{ dir = 1 @@ -46724,16 +46697,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) -"ont" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/airlock_controller/incinerator_atmos{ - pixel_x = -24 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "onv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -47319,6 +47282,12 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"oxJ" = ( +/obj/structure/bed/dogbed/lia, +/mob/living/basic/carp/pet/lia, +/obj/structure/cable, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) "oxO" = ( /turf/open/floor/plating, /area/station/maintenance/aft/lesser) @@ -48109,15 +48078,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"oJU" = ( -/obj/machinery/computer/order_console/mining, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/iron/dark, -/area/station/cargo/miningdock) "oKv" = ( /obj/item/trash/popcorn, /turf/open/floor/plating, @@ -48333,6 +48293,16 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/station/science/research) +"oOx" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/airlock_controller/incinerator_atmos{ + pixel_x = -24 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "oOD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -48546,10 +48516,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp) -"oSj" = ( -/obj/item/trash/sosjerky, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "oSk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -49181,13 +49147,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/station/medical/break_room) -"pcb" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/orange, -/obj/item/restraints/handcuffs, -/obj/item/reagent_containers/spray/pepper, -/turf/open/floor/iron/smooth, -/area/station/security/execution/transfer) "pcg" = ( /obj/machinery/computer/apc_control{ dir = 4 @@ -49320,6 +49279,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/commons/dorms) +"pec" = ( +/obj/machinery/vending/cart, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "pee" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -53206,6 +53169,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/storage) +"qrJ" = ( +/obj/machinery/ticket_machine/directional/east, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "qsd" = ( /obj/structure/sign/warning/secure_area/directional/west, /obj/structure/disposalpipe/segment, @@ -53702,12 +53670,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"qAO" = ( -/obj/structure/chair/sofa/left/brown, -/obj/machinery/light/directional/north, -/obj/effect/landmark/start/psychologist, -/turf/open/floor/carpet/blue, -/area/station/medical/psychology) "qAQ" = ( /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) @@ -53882,6 +53844,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"qDL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "qEa" = ( /obj/structure/cable/layer3, /turf/open/floor/iron/dark, @@ -55422,6 +55389,17 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/textured, /area/mine/mechbay) +"qZW" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/obj/structure/chair/sofa/left/brown{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) "rab" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -55648,17 +55626,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/gateway) -"rcU" = ( -/obj/machinery/requests_console/directional/south{ - announcementConsole = 1; - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Head of Personnel's Desk"; - departmentType = 5; - name = "Head of Personnel's Requests Console" - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "rcY" = ( /obj/structure/fence{ dir = 4 @@ -55994,16 +55961,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"rjS" = ( -/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{ - dir = 10 - }, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "rjT" = ( /obj/machinery/button/door/directional/west{ id = "xenobio3"; @@ -56137,6 +56094,19 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white/side, /area/mine/living_quarters) +"rlv" = ( +/obj/item/flashlight/flare/candle{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/item/storage/book{ + name = "Tales from the First"; + pixel_x = 5; + pixel_y = 5 + }, +/obj/structure/table/wood, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "rlS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56915,6 +56885,10 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) +"rAA" = ( +/obj/machinery/pdapainter, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "rAC" = ( /obj/structure/chair, /obj/effect/landmark/start/hangover, @@ -57414,17 +57388,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"rHF" = ( -/obj/machinery/computer/order_console/mining, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera{ - c_tag = "Mining Bunks"; - dir = 6 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/mine/production) "rHH" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/snack/lizard, @@ -58133,6 +58096,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"rVb" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/sofa/left/brown{ + desc = "Hey, did you know you can get a pineapple on your burger here?"; + dir = 1; + name = "The Regular's Sofa" + }, +/turf/open/floor/stone, +/area/station/commons/lounge) "rVd" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -58436,32 +58410,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rZC" = ( -/obj/structure/table, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -5 - }, -/obj/item/storage/box/bodybags{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/storage/box/disks{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -5 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "rZE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -58536,6 +58484,11 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"sbi" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/photocopier, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "sby" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -58693,19 +58646,6 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"sdk" = ( -/obj/structure/chair/sofa/left/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "sdl" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 @@ -58877,22 +58817,6 @@ dir = 5 }, /area/station/science/research) -"sgt" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/right/brown{ - dir = 1 - }, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/break_room) "sgA" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58949,6 +58873,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"shl" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "shB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59421,6 +59351,32 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"spg" = ( +/obj/structure/table, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, +/obj/item/storage/box/bodybags{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/storage/box/disks{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "spq" = ( /obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 @@ -60498,6 +60454,18 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +"sEM" = ( +/obj/structure/table/wood, +/obj/item/phone{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/carpet/red, +/area/station/commons/vacant_room/office) "sEU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/closed/wall/r_wall, @@ -61101,6 +61069,15 @@ /obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/iron, /area/mine/laborcamp) +"sPB" = ( +/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{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "sPG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -61732,12 +61709,6 @@ dir = 1 }, /area/station/engineering/atmos) -"tbo" = ( -/obj/machinery/light/directional/south, -/obj/effect/mapping_helpers/trapdoor_placer, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "tbI" = ( /obj/machinery/power/shieldwallgen, /obj/structure/window/reinforced{ @@ -62569,21 +62540,6 @@ /obj/item/key/janitor, /turf/open/floor/iron, /area/station/service/janitor) -"tqB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/medical{ - name = "Surgery South" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay/aft) "tqQ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -62885,6 +62841,19 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"tuz" = ( +/obj/structure/cable, +/obj/structure/table, +/obj/item/trapdoor_remote/preloaded{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "tuH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63252,13 +63221,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/commons/storage/mining) -"tAj" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red{ - dir = 4 +"tAk" = ( +/obj/structure/closet/secure_closet/hop, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/central) +/area/station/command/heads_quarters/hop) "tAx" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/structure/disposalpipe/segment, @@ -64186,15 +64155,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/mine/laborcamp) -"tMC" = ( -/obj/machinery/computer/order_console/mining, -/obj/machinery/light/small/directional/south, -/obj/machinery/light_switch/directional/south, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/mine/production) "tMD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -64286,11 +64246,6 @@ /obj/structure/sign/warning/electric_shock, /turf/open/floor/plating, /area/station/science/xenobiology) -"tOh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) "tOi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66112,15 +66067,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/research) -"urO" = ( -/obj/machinery/computer/order_console/cook{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/hallway/secondary/service) "uso" = ( /obj/structure/closet/crate/trashcart, /obj/effect/spawner/random/contraband/prison, @@ -67212,6 +67158,12 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/engineering/storage_shared) +"uLC" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "uLF" = ( /turf/open/floor/carpet, /area/station/security/processing) @@ -67400,12 +67352,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"uOF" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "uOH" = ( /obj/effect/turf_decal/tile/red/full, /obj/effect/turf_decal/siding/white{ @@ -67561,6 +67507,15 @@ }, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"uRa" = ( +/obj/machinery/computer/order_console/mining, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/station/cargo/miningdock) "uRi" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -68800,11 +68755,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/theater) -"vlQ" = ( -/obj/structure/bed/dogbed/ian, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "vlS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -69064,6 +69014,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/parquet, /area/station/commons/lounge) +"vpI" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 8 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors/nospawn) "vpR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -69273,6 +69229,21 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"vuh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/medical{ + name = "Surgery North" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/aft) "vuq" = ( /obj/machinery/modular_computer/console/preset/civilian, /obj/structure/fireaxecabinet/mechremoval/directional/north, @@ -70735,10 +70706,6 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/engine/cult, /area/station/service/library) -"vRh" = ( -/obj/docking_port/stationary/escape_pod, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "vRo" = ( /obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/blue/line{ @@ -72016,6 +71983,16 @@ /obj/effect/turf_decal/tile/dark_green, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"wjv" = ( +/obj/machinery/computer/cargo{ + dir = 4 + }, +/obj/machinery/keycard_auth/directional/west, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "wjy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72318,19 +72295,6 @@ }, /turf/open/floor/plating, /area/station/science/lab) -"wnY" = ( -/obj/structure/cable, -/obj/structure/table, -/obj/item/trapdoor_remote/preloaded{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/machinery/recharger{ - pixel_x = 5; - pixel_y = 2 - }, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "wob" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73331,11 +73295,6 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/station/engineering/lobby) -"wCD" = ( -/obj/machinery/newscaster/directional/north, -/obj/machinery/photocopier, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "wCK" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/dark_blue/corner{ @@ -73881,10 +73840,6 @@ /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) -"wKh" = ( -/obj/effect/landmark/start/head_of_personnel, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "wKm" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/structure/cable, @@ -74205,6 +74160,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"wPC" = ( +/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{ + name = "Burn Chamber Interior Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/airlock_controller/incinerator_ordmix{ + pixel_x = 24 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/turf/open/floor/engine, +/area/station/science/ordnance/burnchamber) "wPD" = ( /obj/machinery/door/airlock/security/glass{ name = "Evidence Storage" @@ -74583,6 +74549,19 @@ /obj/effect/turf_decal/bot, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"wUY" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "wVe" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -75660,6 +75639,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"xlQ" = ( +/obj/machinery/computer/order_console/mining, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera{ + c_tag = "Mining Bunks"; + dir = 6 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/mine/production) "xmf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75904,6 +75894,14 @@ /obj/item/stack/sheet/leather, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"xpJ" = ( +/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/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "xpP" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -75959,11 +75957,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/service) -"xqN" = ( -/obj/machinery/dna_infuser, -/obj/item/infuser_book, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "xqY" = ( /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, @@ -76068,12 +76061,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"xtl" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/security/courtroom) "xtn" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -77116,6 +77103,17 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"xJK" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "xKd" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -77278,6 +77276,10 @@ }, /turf/open/floor/plating/elevatorshaft, /area/mine/storage) +"xMQ" = ( +/obj/effect/mapping_helpers/ianbirthday, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "xMT" = ( /turf/closed/wall, /area/station/science/research) @@ -77675,6 +77677,12 @@ }, /turf/open/openspace, /area/station/science/ordnance/office) +"xUl" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/security/courtroom) "xUm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -77923,10 +77931,6 @@ /obj/structure/cable, /turf/open/floor/iron/chapel, /area/station/service/chapel) -"xXG" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "xXQ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -78301,6 +78305,11 @@ "ydI" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/entry) +"ydT" = ( +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "ydU" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -78423,15 +78432,6 @@ /obj/machinery/computer/holodeck, /turf/open/floor/iron, /area/station/commons/fitness) -"yfZ" = ( -/obj/structure/chair/sofa/right/brown{ - desc = "Hey, did you know you can get a pineapple on your burger here?"; - dir = 1; - name = "The Regular's Sofa" - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/stone, -/area/station/commons/lounge) "ygd" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -163994,8 +163994,8 @@ pve vSi kZu pAT -rHF -tMC +xlQ +lCA kZu aNg kzH @@ -165995,7 +165995,7 @@ gjq gjq cMT vhB -mUh +ezD ych dkT gjq @@ -167531,7 +167531,7 @@ ucN ryl nfj hzJ -gpt +gcl ucN iDt iDt @@ -168564,10 +168564,10 @@ jtx gKQ gKQ kkN -xtl +xUl gKQ gKQ -kKd +xJK ppS wMt udC @@ -168821,10 +168821,10 @@ qzV gKQ gVS bqF -nku -njM -hqk -alS +gMu +fzz +dDx +aXh qQN wMt udC @@ -169079,7 +169079,7 @@ gKQ jbt cBT dyf -tOh +qDL gKQ eGW qQN @@ -169302,7 +169302,7 @@ iDt hPs gBX hPs -mmN +ilp vxM vnT una @@ -169559,7 +169559,7 @@ iDt iDt iDt oqL -hlz +fnF gBc erY clR @@ -169816,8 +169816,8 @@ iDt iDt iDt oqL -acP -cuh +lEa +boO pdT klv cIc @@ -170862,7 +170862,7 @@ yiL qLD bbY hgM -pcb +cRq hBg hgM vIH @@ -179366,8 +179366,8 @@ udC udC xMq mdZ -sdk -gEl +wUY +iZp mdZ oGR pIQ @@ -179638,7 +179638,7 @@ ydZ jBU mqr mqr -nJi +fWU dMS rZN cjK @@ -179895,7 +179895,7 @@ lrN jBU eDi doJ -hiB +bIH dMS dre dMS @@ -181693,7 +181693,7 @@ hzQ hzQ nro hzQ -jbn +rVb dMS dEB dMS @@ -181950,7 +181950,7 @@ wun dOQ lZG fDt -yfZ +hCN dMS dEB dMS @@ -185547,7 +185547,7 @@ jre jre jre jre -jew +rlv aCo hMw jre @@ -193805,7 +193805,7 @@ sDA mYd mIC aWs -bsR +wPC qSk qSk rEh @@ -218172,7 +218172,7 @@ bln sEB bln sEB -eqd +vpI sEB bln bln @@ -218186,7 +218186,7 @@ bln bln bln sEB -eqd +vpI sEB bln bln @@ -219485,7 +219485,7 @@ uVf uQS cJt dBj -kKs +jVD bln bln bln @@ -224617,7 +224617,7 @@ nwT hkb aaT fFT -kTV +sEM bPw tKI lgr @@ -229525,8 +229525,8 @@ ajw maT maT qjQ -oJU -mVT +uRa +mxN qjQ fZb qjQ @@ -234842,7 +234842,7 @@ tGr tGr bDu grh -oaw +jkG igB wRs lTN @@ -234908,14 +234908,14 @@ ljp gHe mVb bep -gbK -uOF +qrJ +uLC xzh dnq dnq qcu -fHc -tAj +bDR +hYW bep ylU dnq @@ -235166,7 +235166,7 @@ gfb pYB gfb gfb -eqy +nqU rcE rcE rcE @@ -235423,12 +235423,12 @@ odN iZq dpH gfb -fNJ +ydT iIA -eUx +hsi iIA iIA -tbo +eAV jII okb ylU @@ -235685,7 +235685,7 @@ cpm cpm gtq gtq -gwr +mLX cpm pzb cRF @@ -235936,13 +235936,13 @@ iYb dkb kmi iYb -ePU -dUp -hNN -keN -kLm -cac -ibv +tAk +nyy +wjv +pec +fJl +iaS +isa cpm dnq ylU @@ -236193,13 +236193,13 @@ iYb txI xvZ iYb -wCD +sbi jWP ool jRC -xXG -wKh -rcU +cgC +jaq +jkQ cpm gQZ ylU @@ -236401,7 +236401,7 @@ cMA wkr eRO ven -ixV +iFg kyy kTz lbk @@ -236451,12 +236451,12 @@ iYb iYb iYb rpu -vlQ -dqc -wnY +cFN +nnR +tuz vEA -mrk -gJL +bhK +rAA cpm mpy sYu @@ -236709,11 +236709,11 @@ jle jfc vYm qBt -ebR +xMQ jRC nvs edW -eAI +ebk cpm bHy ylU @@ -236964,13 +236964,13 @@ clP clP clP shP -rjS +eWc nDA vvi -dhQ +xpJ vYs nDA -aeO +gCn pJN mjY aNs @@ -237159,7 +237159,7 @@ egm rzr wGW tJN -kIa +bgy feJ feJ gPn @@ -238446,7 +238446,7 @@ lQc nbp mgU nlz -afr +oxJ nBx azx tDw @@ -241273,7 +241273,7 @@ xiI bln bln bln -vRh +lmR pDC clq qgO @@ -243695,7 +243695,7 @@ kcG qwF wYJ sEB -jPz +shl sEB nyA njm @@ -245936,7 +245936,7 @@ gzw kiB kQX xLn -urO +kZz mdZ rth hid @@ -248577,7 +248577,7 @@ uqH qXk qSC ldr -ont +oOx mgD pmb hPD @@ -249033,14 +249033,14 @@ ecZ fkk lmG onv -kYE +hWE lso cbs nGA nKa seE rNF -jiG +jZU kXM nKa xXV @@ -249069,7 +249069,7 @@ tQc tQc qQp hRA -dOt +lal rkL cga rTv @@ -249326,7 +249326,7 @@ iML iML nHX hRA -qAO +lWK rkL uFz kJC @@ -250087,11 +250087,11 @@ cTJ klc aSo aSo -bqC +vuh aSo aSo aSo -tqB +mmB aSo aSo tMO @@ -250869,7 +250869,7 @@ dpr klk vxE hyd -cjd +qZW tMO jYy sZF @@ -251126,7 +251126,7 @@ aFR lVR rbK tsY -sgt +bfM tMO cAA sZF @@ -254934,13 +254934,13 @@ poy poy vvJ hUD -fAo +efX xUH dYt nyl prg tyv -nVD +iBw cHh cHh nuw @@ -255512,8 +255512,8 @@ dmt jCl jCl vzD -nkq -oSj +sPB +hTc vzD vzD vzD @@ -258815,7 +258815,7 @@ pUy eSJ pUy mzG -rZC +spg sca xiC ciS @@ -259329,7 +259329,7 @@ ouX ero itj fXu -xqN +lTL mEJ oXJ fbl diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 78fb6dcc769..bec6ac9c5a2 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8258,14 +8258,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/station/maintenance/port/fore) -"cvZ" = ( -/mob/living/basic/carp{ - environment_smash = 0; - name = "Tuna"; - real_name = "Tuna" - }, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "cwj" = ( /obj/machinery/modular_computer/console/preset/id, /obj/effect/turf_decal/bot, @@ -15491,6 +15483,10 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison) +"eEt" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space) "eEz" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -16188,10 +16184,6 @@ "ePm" = ( /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"ePI" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/space/basic, -/area/space/nearstation) "ePU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18640,6 +18632,21 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) +"fwe" = ( +/obj/structure/table, +/obj/item/flashlight/flare/candle/infinite{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/food/spaghetti/meatballspaghetti{ + pixel_y = 5 + }, +/obj/item/kitchen/fork, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "fwf" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -22837,12 +22844,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"gCs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "gCu" = ( /obj/structure/chair{ dir = 8 @@ -31681,10 +31682,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"iSY" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "iTj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -39517,21 +39514,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/grass, /area/station/science/genetics) -"lhT" = ( -/obj/structure/table, -/obj/item/candle/infinite{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/food/spaghetti/meatballspaghetti{ - pixel_y = 5 - }, -/obj/item/kitchen/fork, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "lia" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -40801,6 +40783,10 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"lzW" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "lAk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -41966,17 +41952,6 @@ }, /turf/open/floor/plating, /area/station/cargo/warehouse) -"lSY" = ( -/obj/effect/spawner/random/structure/table, -/obj/item/candle{ - pixel_x = -5 - }, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ - pixel_x = 5; - pixel_y = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/bar) "lTc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -42613,6 +42588,17 @@ }, /turf/open/floor/iron, /area/station/service/janitor) +"mca" = ( +/obj/effect/spawner/random/structure/table, +/obj/item/flashlight/flare/candle{ + pixel_x = -5 + }, +/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ + pixel_x = 5; + pixel_y = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/crew_quarters/bar) "mcs" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -45145,6 +45131,12 @@ /obj/structure/window/reinforced, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"mPb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "mPo" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -54268,12 +54260,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"pzk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "pzm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61176,11 +61162,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"rwY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/ghost, -/turf/open/floor/wood, -/area/station/maintenance/starboard/fore) "rxi" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63199,6 +63180,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"sbs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "sby" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -64603,10 +64590,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/aft) -"svA" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space) "svC" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -67365,6 +67348,17 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/office) +"thC" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 24; + name = "SS13: Auxiliary Dock, Station-Fore"; + shuttle_id = "whiteship_home"; + width = 35 + }, +/turf/open/space/basic, +/area/space) "thG" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -68361,15 +68355,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"tvS" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/mob/living/basic/ghost, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/fore) "twc" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" @@ -69930,17 +69915,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/fore) -"tUA" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 24; - name = "SS13: Auxiliary Dock, Station-Fore"; - shuttle_id = "whiteship_home"; - width = 35 - }, -/turf/open/space/basic, -/area/space) "tUO" = ( /obj/structure/railing{ dir = 1 @@ -76849,6 +76823,15 @@ "vOX" = ( /turf/closed/wall/rust, /area/station/maintenance/starboard) +"vOZ" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/structure/bed/dogbed/cayenne{ + name = "Lia's bed" + }, +/mob/living/basic/carp/pet/lia, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "vPd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -78742,6 +78725,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) +"woH" = ( +/mob/living/basic/carp{ + environment_smash = 0; + name = "Tuna"; + real_name = "Tuna" + }, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "woJ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -79708,6 +79699,15 @@ "wDz" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/lesser) +"wDA" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/ghost, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/fore) "wDF" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -79773,6 +79773,10 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison/safe) +"wEB" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/space/basic, +/area/space/nearstation) "wEI" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -80296,15 +80300,6 @@ "wJo" = ( /turf/open/floor/plating, /area/station/maintenance/department/security) -"wJs" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/structure/bed/dogbed/cayenne{ - name = "Lia's bed" - }, -/mob/living/basic/carp/pet/lia, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "wJw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -80501,6 +80496,11 @@ /obj/item/gun/energy/e_gun/mini, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) +"wNc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/basic/ghost, +/turf/open/floor/wood, +/area/station/maintenance/starboard/fore) "wNf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -96670,9 +96670,9 @@ wDI aeu aeu aDT -gCs +sbs lHD -gCs +sbs sRm aeu ycx @@ -99982,7 +99982,7 @@ aeu aeU aeU coy -cvZ +woH aDS tpp bFI @@ -101314,7 +101314,7 @@ bJv bJv iTq tKt -lhT +fwe iMA xad cnM @@ -102631,7 +102631,7 @@ aaa aaa aaa cry -ePI +wEB acK aaa aaa @@ -103145,7 +103145,7 @@ aaa aaa aaa cry -ePI +wEB acK aaa aaa @@ -105967,7 +105967,7 @@ lZr jPG sYu mIR -wJs +vOZ afL aeu aeU @@ -111840,7 +111840,7 @@ jCm cXT jCm fPN -lSY +mca cXT dVb uyl @@ -118230,7 +118230,7 @@ cIX cIX fvU plG -tvS +wDA yaY iBv wxI @@ -118489,7 +118489,7 @@ fvU nUi iVF elc -rwY +wNc jre rsZ qaI @@ -126178,7 +126178,7 @@ aaa aaa aaa acK -pzk +mPb cry aaa aaa @@ -126692,7 +126692,7 @@ aaB aaa aaa acK -pzk +mPb cry aaa aaa @@ -129759,7 +129759,7 @@ tZh mdB nOL suj -tUA +thC aaa aaa aaa @@ -131350,9 +131350,9 @@ cmU aeU aeU aaQ -svA -iSY -svA +eEt +lzW +eEt acm aeu aeu diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8df5b09ef54..a1a730e84da 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -83,6 +83,25 @@ }, /turf/open/floor/carpet, /area/station/commons/dorms) +"aaK" = ( +/obj/structure/safe, +/obj/item/storage/secure/briefcase/riches, +/obj/item/storage/backpack/duffelbag/syndie/hitman, +/obj/item/card/id/advanced/silver/reaper, +/obj/item/lazarus_injector, +/obj/item/gun/energy/disabler, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/clothing/neck/stethoscope, +/obj/item/book{ + desc = "An undeniably handy book."; + icon_state = "bookknock"; + name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" + }, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "abI" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -778,6 +797,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"apY" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Surgery C Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "apZ" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -2918,21 +2944,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"aZv" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "ordnancebridge" - }, -/obj/machinery/button/door{ - id = "ordnancebridge"; - pixel_x = -24; - req_one_access = list("maint_tunnels","science") - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "aZL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7823,19 +7834,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison) -"cUp" = ( -/obj/structure/table, -/obj/item/plate, -/obj/item/candle, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; - pixel_y = 15 - }, -/turf/open/floor/plating, -/area/station/maintenance/space_hut) "cUw" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -9531,12 +9529,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/service/hydroponics) -"dBV" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "dBZ" = ( /obj/item/clothing/head/cone{ pixel_x = -4; @@ -9888,6 +9880,15 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) +"dIJ" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "dIK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11101,10 +11102,6 @@ "ecO" = ( /turf/open/floor/carpet, /area/station/service/library) -"edl" = ( -/obj/docking_port/stationary/escape_pod, -/turf/open/space/basic, -/area/space) "edo" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -13675,15 +13672,6 @@ /obj/effect/spawner/random/decoration/showcase, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"faB" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "faD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15125,6 +15113,20 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +"fFK" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "fGb" = ( /obj/machinery/door/airlock/security/glass{ name = "Prison Sanitarium" @@ -17010,20 +17012,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"gpv" = ( -/obj/structure/cable, -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, -/obj/effect/landmark/navigate_destination/janitor, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "gpB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -19765,6 +19753,17 @@ }, /turf/open/floor/plating, /area/station/engineering/main) +"hnU" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "hod" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -21700,17 +21699,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"hYh" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "hYr" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -23058,11 +23046,6 @@ /obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"iuD" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) "iuJ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -25693,16 +25676,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"jkE" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/obj/structure/table, -/obj/item/clipboard, -/obj/item/holosign_creator/atmos, -/obj/item/holosign_creator/atmos, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) "jkT" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -29878,13 +29851,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood, /area/station/service/library) -"kJT" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Surgery C Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "kKd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -30412,21 +30378,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port) -"kRF" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "ordnancebridge" - }, -/obj/machinery/button/door{ - id = "ordnancebridge"; - pixel_y = 24; - req_one_access = list("maint_tunnels","science") - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "kRV" = ( /obj/structure/window/reinforced{ dir = 4 @@ -33694,6 +33645,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"lZJ" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/structure/table, +/obj/item/clipboard, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/turf/open/floor/iron/white, +/area/station/science/ordnance/office) "lZM" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/shaker, @@ -38254,6 +38215,19 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +"nCt" = ( +/obj/structure/table, +/obj/item/plate, +/obj/item/flashlight/flare/candle, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/radio{ + desc = "An old handheld radio. You could use it, if you really wanted to."; + icon_state = "radio"; + name = "old radio"; + pixel_y = 15 + }, +/turf/open/floor/plating, +/area/station/maintenance/space_hut) "nCu" = ( /obj/structure/chair/office{ dir = 1 @@ -42664,12 +42638,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"pig" = ( -/obj/structure/table, -/obj/item/candle, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "piw" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/holopad/secure, @@ -46442,6 +46410,16 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/wood, /area/station/service/library) +"qzV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window/right/directional/south{ + dir = 8; + name = "Jim Norton's Quebecois Coffee"; + req_one_access = list("service","maint_tunnels") + }, +/obj/effect/turf_decal/trimline/green/line, +/turf/open/floor/iron/dark, +/area/station/service/cafeteria) "qAc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -46705,14 +46683,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"qER" = ( -/obj/item/candle, -/obj/machinery/light_switch/directional/west, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/chapel) "qFj" = ( /obj/structure/table, /obj/effect/turf_decal/delivery, @@ -48144,6 +48114,10 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"rec" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/space/basic, +/area/space) "ret" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -50101,6 +50075,21 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"rMx" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_x = -24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "rMz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/green{ @@ -50319,6 +50308,21 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) +"rQO" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "ordnancebridge" + }, +/obj/machinery/button/door{ + id = "ordnancebridge"; + pixel_y = 24; + req_one_access = list("maint_tunnels","science") + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "rQS" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -52906,6 +52910,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/tools) +"sKA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/cigbutt/cigarbutt, +/obj/item/flashlight/flare/candle{ + pixel_x = -5 + }, +/obj/item/storage/box/matches{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) "sKJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59432,6 +59450,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"uVt" = ( +/obj/structure/table, +/obj/item/flashlight/flare/candle, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "uVv" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -59699,6 +59723,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/range) +"vaF" = ( +/obj/item/flashlight/flare/candle, +/obj/machinery/light_switch/directional/west, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) "vaH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60021,14 +60053,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) -"vhE" = ( -/obj/item/candle, -/obj/machinery/light_switch/directional/north, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/chapel) "vhI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -62608,6 +62632,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"waq" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) "was" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64688,25 +64718,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"wOQ" = ( -/obj/structure/safe, -/obj/item/storage/secure/briefcase/riches, -/obj/item/storage/backpack/duffelbag/syndie/hitman, -/obj/item/card/id/advanced/silver/reaper, -/obj/item/lazarus_injector, -/obj/item/gun/energy/disabler, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/item/clothing/neck/stethoscope, -/obj/item/book{ - desc = "An undeniably handy book."; - icon_state = "bookknock"; - name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" - }, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "wOR" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66519,20 +66530,6 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"xvT" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/reinforced, -/obj/item/storage/box/lights/mixed, -/obj/item/cigbutt/cigarbutt, -/obj/item/candle{ - pixel_x = -5 - }, -/obj/item/storage/box/matches{ - pixel_x = 1; - pixel_y = -1 - }, -/turf/open/floor/iron/white, -/area/station/medical/abandoned) "xvZ" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/freezer, @@ -66625,6 +66622,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xxV" = ( +/obj/item/flashlight/flare/candle, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/chapel) "xxZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -68518,6 +68523,11 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"yfp" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "yfq" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -68723,7 +68733,7 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ykp" = ( +"ykH" = ( /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" }, @@ -68742,16 +68752,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"ykR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/window/right/directional/south{ - dir = 8; - name = "Jim Norton's Quebecois Coffee"; - req_one_access = list("service","maint_tunnels") - }, -/obj/effect/turf_decal/trimline/green/line, -/turf/open/floor/iron/dark, -/area/station/service/cafeteria) "ykS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -78461,7 +78461,7 @@ tkr aaa aaa aaa -edl +rec cSk auJ jMZ @@ -80318,7 +80318,7 @@ tsd tsd tsd hUN -cUp +nCt jIR lMJ gQK @@ -87522,7 +87522,7 @@ tzE ucc tSw tSw -kJT +apY tSw tSw tSw @@ -87787,7 +87787,7 @@ bEL keq scb suz -xvT +sKA tSw vUM bhS @@ -88287,7 +88287,7 @@ sWO oxW dqN vlH -ykp +ykH miy tFr nMf @@ -90529,7 +90529,7 @@ rlU vis mCi ixT -wOQ +aaK rlU aaa aEH @@ -90831,7 +90831,7 @@ sVY sVY sVY sVY -iuD +yfp xxk ahr bMY @@ -91054,7 +91054,7 @@ vvH cFp guX mgl -ykR +qzV wAj pPH hSg @@ -91648,7 +91648,7 @@ bsZ rJI taX tSw -qER +vaF gmX lHK tey @@ -93190,7 +93190,7 @@ tSw tSw xWF tSw -vhE +xxV iZi kVN qri @@ -93704,10 +93704,10 @@ tSw tSw sGA tSw -pig +uVt fgl btx -pig +uVt otu otu otu @@ -94093,7 +94093,7 @@ isc aaa aaa aaa -edl +rec tYS lgS jKq @@ -97033,7 +97033,7 @@ cId rQl oIg wBq -hYh +hnU vKW jNX jxW @@ -98057,7 +98057,7 @@ bBo gwf gfZ gqm -faB +dIJ cDA jrb lkL @@ -99100,7 +99100,7 @@ wna oFX lWN hND -aZv +rMx iKL nFa nFa @@ -101161,7 +101161,7 @@ svS svS svS svS -kRF +rQO dKC anS lMJ @@ -102168,7 +102168,7 @@ fnh mMX moF klT -jkE +lZJ svS dKC lMW @@ -106259,7 +106259,7 @@ unL uNd unL unL -gpv +fFK unL tUn tUn @@ -106697,7 +106697,7 @@ aaa aaa szp aaa -dBV +waq aaa szp szp @@ -114709,7 +114709,7 @@ dgm dgB fJy aaa -dBV +waq aaa fJy oAQ diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 688638e5f3b..6080c8489f5 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -33093,11 +33093,11 @@ /area/station/cargo/storage) "jxh" = ( /obj/structure/table/wood/fancy, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_x = 6; pixel_y = 8 }, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_x = -8; pixel_y = 6 }, @@ -33105,7 +33105,7 @@ pixel_x = -3; pixel_y = 8 }, -/obj/item/candle, +/obj/item/flashlight/flare/candle, /turf/open/floor/carpet/stellar, /area/station/service/chapel/funeral) "jxp" = ( @@ -51106,7 +51106,7 @@ "omw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/candle, +/obj/item/flashlight/flare/candle, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/bar) "omB" = ( @@ -83753,7 +83753,7 @@ "xnZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/table, -/obj/item/candle, +/obj/item/flashlight/flare/candle, /obj/effect/spawner/random/entertainment/lighter{ pixel_x = 9 }, diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 2f5529bb273..6b6ccd0d857 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -1987,11 +1987,11 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -19; pixel_y = -10 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -16 }, /turf/open/floor/bamboo, @@ -2472,7 +2472,7 @@ /obj/structure/bed/double{ pixel_y = -9 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 9; pixel_y = 29 }, @@ -6651,7 +6651,7 @@ /turf/open/misc/asteroid, /area/cruiser_dock) "grr" = ( -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 19; pixel_y = -22 }, @@ -6790,7 +6790,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 15 }, /obj/machinery/button/door{ @@ -10002,7 +10002,7 @@ /turf/open/floor/iron/dark, /area/centcom/interlink) "pkJ" = ( -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -19; pixel_y = -23 }, @@ -12347,7 +12347,7 @@ /area/centcom/interlink) "uIf" = ( /obj/effect/turf_decal/siding/wood, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -12; pixel_y = -45 }, @@ -12821,11 +12821,11 @@ /obj/structure/table/wood/fancy/orange{ pixel_y = -3 }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = -7; pixel_y = -2 }, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /obj/machinery/light/warm/directional/east, /turf/open/floor/bamboo, /area/centcom/holding/cafedorms) @@ -13647,7 +13647,7 @@ /obj/structure/beebox{ name = "Shrine" }, -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ pixel_x = 17; pixel_y = -22 }, diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_2.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_2.dmm index b6d9c4fe80a..f696df20489 100644 --- a/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_2.dmm +++ b/_maps/map_files/tramstation/modular_pieces/maintenance_lowerservicecargo_attachment_b_2.dmm @@ -119,7 +119,7 @@ /obj/item/trash/candle, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/food_or_drink/booze, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_y = 4; pixel_x = -7 }, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index af48f4673ba..2067a7aeb47 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -46,6 +46,21 @@ "abE" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/tram/center) +"abT" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "acd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -487,6 +502,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"aiW" = ( +/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/spawner/xmastree, +/turf/open/floor/carpet, +/area/station/service/chapel) "ajj" = ( /obj/structure/table/wood, /obj/effect/landmark/event_spawn, @@ -926,11 +949,6 @@ /obj/item/seeds/tower, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"asv" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/left) "asw" = ( /obj/machinery/computer/monitor{ dir = 8 @@ -1002,13 +1020,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat/foyer) -"auK" = ( -/obj/structure/chair/sofa/left{ - dir = 8 - }, -/obj/structure/sign/clock/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) "avr" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1217,12 +1228,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"azO" = ( -/obj/structure/fluff/tram_rail, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/left, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "azX" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, @@ -1576,6 +1581,19 @@ "aIi" = ( /turf/open/floor/iron, /area/station/security/prison/work) +"aIx" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "aIA" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -1760,6 +1778,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"aMY" = ( +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/obj/structure/sign/calendar/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "aNd" = ( /obj/machinery/meter{ name = "Mixed Air Tank Out" @@ -2264,6 +2289,16 @@ }, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"aYM" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "aYN" = ( /obj/structure/reflector/box/anchored{ dir = 1 @@ -2575,19 +2610,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"bfJ" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 1" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "bfM" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -2601,13 +2623,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/research) -"bga" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/left{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "bgg" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -2806,6 +2821,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/service/chapel) +"biX" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "bja" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east{ @@ -3029,6 +3051,13 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"bmp" = ( +/obj/structure/chair/sofa{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "bmE" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -3044,6 +3073,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) +"bmI" = ( +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "bmU" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -3068,6 +3101,16 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/station/service/lawoffice) +"bnj" = ( +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/solo{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "bnt" = ( /obj/structure/chair/office{ dir = 1 @@ -3906,6 +3949,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) +"bBF" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "bBK" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -4119,6 +4168,11 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/prison/garden) +"bED" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "bEM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -4577,12 +4631,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"bMP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/kirbyplants/random, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "bMX" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -4704,13 +4752,6 @@ dir = 4 }, /area/station/service/theater) -"bOO" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/firealarm/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "bOR" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -4778,17 +4819,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) -"bPP" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 8 - }, -/turf/open/space/openspace, -/area/space) -"bPX" = ( -/obj/structure/industrial_lift/tram, -/obj/effect/landmark/start/hangover, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "bPZ" = ( /obj/machinery/camera/motion{ c_tag = "Secure - AI Upper External South"; @@ -5258,11 +5288,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) -"bXU" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/right, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "bYa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -6001,12 +6026,6 @@ "cjy" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) -"cjE" = ( -/obj/machinery/computer/robotics, -/obj/structure/sign/clock/directional/north, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "cjG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -6041,14 +6060,6 @@ /obj/structure/sign/clock/directional/north, /turf/open/floor/iron/white, /area/station/science/ordnance) -"cjX" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/window/reinforced/shuttle/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ckb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -6211,6 +6222,11 @@ "cmr" = ( /turf/open/floor/iron/stairs/medium, /area/station/engineering/transit_tube) +"cmw" = ( +/obj/structure/industrial_lift/tram/white, +/obj/structure/tramwall/titanium, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "cnv" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -6619,6 +6635,11 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"ctx" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ctA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -6721,16 +6742,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"cvz" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "cvF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -6811,13 +6822,6 @@ /obj/structure/chair, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"cxd" = ( -/obj/structure/table/wood, -/obj/item/candle, -/turf/open/floor/iron/chapel{ - dir = 4 - }, -/area/station/service/chapel) "cxg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -6988,6 +6992,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"czu" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "czB" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 @@ -7367,31 +7384,11 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/mid) -"cEB" = ( -/obj/machinery/modular_computer/console/preset/id{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "cEC" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) -"cEH" = ( -/obj/item/kirbyplants/dead, -/obj/machinery/requests_console/directional/north{ - announcementConsole = 1; - department = "Research Director's Desk"; - departmentType = 5; - name = "Research Director's Requests Console"; - pixel_x = 30; - receive_ore_updates = 1 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "cEN" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -7949,6 +7946,13 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"cQq" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/right{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "cQr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8365,13 +8369,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) -"cXW" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "cYh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -8584,6 +8581,14 @@ /obj/structure/window/reinforced/spawner, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"dbz" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/corner, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "dbK" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -9623,10 +9628,6 @@ "duU" = ( /turf/closed/wall/r_wall, /area/lavaland/surface) -"duZ" = ( -/obj/structure/industrial_lift/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "dvn" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, @@ -9771,6 +9772,16 @@ }, /turf/open/floor/plating/airless, /area/lavaland/surface) +"dwE" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "dwK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11111,6 +11122,14 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +"dWs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "dWK" = ( /turf/open/floor/iron, /area/station/service/janitor) @@ -12006,6 +12025,17 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/qm) +"elT" = ( +/obj/structure/table/glass, +/obj/machinery/microwave, +/obj/machinery/camera{ + c_tag = "Science - Break Room"; + dir = 9; + network = list("ss13","rd") + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "elW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12028,6 +12058,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"emx" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/landmark/start/research_director, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "emP" = ( /obj/structure/railing/corner{ dir = 4 @@ -12368,6 +12405,10 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/warden) +"etL" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "etO" = ( /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -12637,13 +12678,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"ezQ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/right) "ezX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -12782,6 +12816,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"eCz" = ( +/obj/structure/table/wood, +/obj/item/flashlight/flare/candle, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/station/service/chapel) "eCA" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -12946,13 +12987,6 @@ /obj/structure/cable, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"eED" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "eEK" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ dir = 1 @@ -13278,13 +13312,10 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"eLw" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/obj/structure/sign/calendar/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) +"eLS" = ( +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "eLY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13470,6 +13501,11 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"ePa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/blobstart, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ePi" = ( /obj/machinery/vending/dinnerware, /obj/effect/turf_decal/bot_white, @@ -13487,13 +13523,6 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"ePl" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ePw" = ( /obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -13503,6 +13532,12 @@ /obj/structure/sign/clock/directional/west, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +"ePF" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail, +/obj/structure/chair/sofa/bench/tram/right, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ePZ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -13966,6 +14001,17 @@ /obj/effect/turf_decal/trimline/red/corner, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"eXZ" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "eYa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/machinery/door/poddoor/preopen{ @@ -13975,10 +14021,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/atmos) -"eYe" = ( -/obj/machinery/suit_storage_unit/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "eYn" = ( /obj/docking_port/stationary{ dir = 8; @@ -14311,12 +14353,17 @@ /obj/machinery/food_cart, /turf/open/floor/iron/kitchen_coldroom, /area/station/service/kitchen/coldroom) -"fhe" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/fluff/tram_rail, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) +"fgL" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "fhg" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -14850,6 +14897,15 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) +"fpW" = ( +/obj/structure/table/reinforced, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/item/computer_disk/ordnance, +/obj/effect/landmark/event_spawn, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "fql" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -16364,6 +16420,13 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"fUH" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "fUQ" = ( /obj/machinery/door/airlock/hatch{ name = "Ladder Access Hatch" @@ -16597,15 +16660,6 @@ /obj/item/storage/bag/tray/cafeteria, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"fZz" = ( -/obj/structure/table/reinforced, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, -/obj/item/computer_disk/ordnance, -/obj/effect/landmark/event_spawn, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "fZI" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Recharge Bay" @@ -16916,15 +16970,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron, /area/station/maintenance/port/central) -"ggi" = ( -/obj/structure/table/reinforced, -/obj/item/stamp/rd{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "ggp" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 @@ -17042,10 +17087,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/smooth, /area/station/service/hydroponics/garden) -"gil" = ( -/obj/structure/closet/secure_closet/research_director, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "gio" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -17338,13 +17379,6 @@ /obj/structure/destructible/cult/item_dispenser/archives/library, /turf/open/floor/engine/cult, /area/station/service/library) -"gmN" = ( -/obj/machinery/vending/cigarette, -/obj/structure/sign/flag{ - pixel_x = -32 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "gmP" = ( /obj/structure/rack, /obj/item/storage/box/lights/tubes{ @@ -17409,11 +17443,6 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) -"gom" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "goR" = ( /obj/machinery/door/airlock/public/glass{ name = "Chapel Office" @@ -17890,6 +17919,12 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"gxM" = ( +/obj/machinery/keycard_auth{ + pixel_y = -24 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "gxN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -18137,19 +18172,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"gAY" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "gBr" = ( /obj/structure/chair/pew, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18276,11 +18298,12 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) -"gFJ" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) +"gFy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "gFV" = ( /obj/machinery/computer/operating{ dir = 1 @@ -18383,13 +18406,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"gGL" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "gGU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -18854,6 +18870,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) +"gOk" = ( +/obj/structure/chair/sofa/left{ + dir = 8 + }, +/obj/structure/sign/clock/directional/east, +/turf/open/floor/carpet, +/area/station/medical/psychology) "gPb" = ( /obj/structure/mirror/directional/north, /obj/structure/sink{ @@ -19339,6 +19362,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"gWD" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "gWE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -19525,6 +19556,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"gZj" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/mob/living/basic/pet/dog/pug{ + desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping."; + name = "Spaghetti" + }, +/obj/structure/bed/dogbed/ian, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gZk" = ( /turf/closed/wall, /area/station/science/auxlab) @@ -19653,6 +19695,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) +"hcs" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "hcu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19862,20 +19917,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"hgS" = ( -/obj/machinery/computer/rdconsole, -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 30 - }, -/obj/machinery/camera{ - c_tag = "Science - Research Director's Office"; - dir = 9; - network = list("ss13","rd") - }, -/obj/machinery/light/directional/north, -/obj/item/folder/white, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "hhc" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -20053,6 +20094,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"hku" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "hkF" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -20209,6 +20258,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) +"hpz" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 8 + }, +/turf/open/space/openspace, +/area/space) "hpF" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -20813,6 +20868,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard) +"hDg" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "hDz" = ( /obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/trimline/dark_blue/corner{ @@ -21085,10 +21147,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/commons/fitness) -"hHv" = ( -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "hHw" = ( /obj/machinery/door/airlock/security{ name = "Interrogation Monitoring" @@ -21468,6 +21526,19 @@ /obj/effect/landmark/start/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) +"hPY" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Western Tram Bridge 2" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "hQf" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21826,11 +21897,6 @@ dir = 9 }, /area/station/service/chapel) -"hWi" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "hWl" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -22069,6 +22135,9 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/lower) +"iaE" = ( +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "iaJ" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable, @@ -22376,17 +22445,6 @@ "igy" = ( /turf/closed/wall, /area/station/engineering/supermatter/room) -"igB" = ( -/obj/structure/table/glass, -/obj/machinery/microwave, -/obj/machinery/camera{ - c_tag = "Science - Break Room"; - dir = 9; - network = list("ss13","rd") - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "igN" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22532,13 +22590,6 @@ /obj/item/screwdriver, /turf/open/floor/iron, /area/station/cargo/warehouse) -"iiH" = ( -/obj/structure/fluff/tram_rail, -/obj/effect/landmark/start/hangover, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/solo, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "iiJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23301,6 +23352,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"iwX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "ixa" = ( /obj/structure/table/wood, /obj/machinery/light/warm/directional/north, @@ -23573,10 +23631,13 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"iBB" = ( +"iBD" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) +/area/station/science/breakroom) "iBP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23599,12 +23660,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"iCz" = ( -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/left) "iCA" = ( /obj/structure/fluff{ desc = "What, you think the water just magically soaks into the metallic flooring?"; @@ -23861,16 +23916,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/science/xenobiology) -"iHW" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "iIm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23991,6 +24036,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"iKM" = ( +/obj/structure/industrial_lift/tram/accessible/north, +/obj/structure/fluff/tram_rail, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "iKQ" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -24122,6 +24175,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"iNz" = ( +/obj/machinery/modular_computer/console/preset/id{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "iNH" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -24691,29 +24751,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/commons/lounge) -"iYa" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) -"iYi" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "iYm" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -25069,9 +25106,6 @@ /obj/structure/railing/corner, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) -"jgD" = ( -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "jgM" = ( /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium, @@ -25180,6 +25214,13 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +"jir" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "jiy" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -25422,16 +25463,6 @@ "jnq" = ( /turf/closed/wall, /area/station/maintenance/central/lesser) -"jnw" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "jnD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -25537,6 +25568,10 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"jpc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "jpp" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, @@ -26172,16 +26207,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) -"jAu" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "jAF" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -26259,12 +26284,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/lavaland/surface) -"jCQ" = ( -/obj/effect/landmark/tram/middle_part, -/obj/structure/industrial_lift/tram, -/obj/structure/sign/plaques/tram, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "jCT" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -26539,6 +26558,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"jIr" = ( +/obj/structure/fluff/tram_rail/floor, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "jIx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -26636,14 +26661,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"jJM" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/center) "jJO" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -26827,10 +26844,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"jMD" = ( -/obj/structure/table/glass, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "jMH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -27069,6 +27082,10 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"jRn" = ( +/obj/machinery/suit_storage_unit/rd, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "jRr" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27285,6 +27302,12 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"jUN" = ( +/obj/structure/table/glass, +/obj/structure/sign/calendar/directional/east, +/obj/machinery/coffeemaker, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "jUO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -27397,11 +27420,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) -"jXk" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/left, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "jXn" = ( /obj/machinery/door/airlock/security/glass{ name = "Prisoner Processing" @@ -28066,6 +28084,14 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/engine, /area/station/science/explab) +"kjD" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/right, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "kjK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28607,11 +28633,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"krX" = ( -/obj/structure/fluff/tram_rail, -/obj/structure/industrial_lift/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ksa" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -28843,11 +28864,6 @@ /obj/machinery/power/energy_accumulator/grounding_rod/anchored, /turf/open/floor/engine, /area/station/engineering/supermatter) -"kwA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "kwD" = ( /obj/effect/landmark/start/cargo_technician, /turf/open/floor/glass, @@ -29321,6 +29337,11 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"kEz" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "kEA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29413,6 +29434,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"kGx" = ( +/obj/effect/landmark/tram/middle_part, +/obj/structure/industrial_lift/tram, +/obj/structure/sign/plaques/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "kGA" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -29427,10 +29454,6 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"kGQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "kGR" = ( /obj/effect/turf_decal/trimline/white/tram{ dir = 1 @@ -29981,13 +30004,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"kRa" = ( -/obj/structure/chair/sofa{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/carpet, -/area/station/medical/psychology) "kRi" = ( /obj/machinery/telecomms/relay/preset/station, /obj/effect/turf_decal/box, @@ -30548,11 +30564,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) -"kYX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/center) "kYZ" = ( /obj/machinery/airalarm/server{ dir = 4; @@ -30573,6 +30584,16 @@ /obj/effect/spawner/random/aimodule/harmless, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) +"kZo" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "kZt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -31002,16 +31023,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"lhA" = ( -/obj/structure/table/glass, -/obj/structure/sign/calendar/directional/east, -/obj/machinery/coffeemaker, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) -"lhB" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lhM" = ( /obj/effect/turf_decal/trimline/white/tram, /obj/structure/disposalpipe/segment{ @@ -31069,6 +31080,13 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"liQ" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/left{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ljv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -31212,13 +31230,6 @@ "lml" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) -"lmm" = ( -/obj/structure/industrial_lift/tram/white, -/obj/machinery/door/window/tram/right{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "lms" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -31244,11 +31255,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"lmK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lmZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31302,6 +31308,11 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"lnx" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lnC" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -32291,6 +32302,12 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"lEx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/kirbyplants/random, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lEE" = ( /obj/machinery/power/solar_control{ dir = 8; @@ -32454,11 +32471,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"lJn" = ( -/obj/structure/chair/stool/directional/west, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "lJu" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = -32 @@ -32540,6 +32552,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) +"lJK" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "lJU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32607,12 +32623,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"lKP" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/window/reinforced/shuttle/tram, -/obj/machinery/computer/tram_controls/directional/north, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "lLd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -32765,14 +32775,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"lNy" = ( -/obj/structure/industrial_lift/tram/accessible/north, -/obj/structure/fluff/tram_rail, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "lNJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, @@ -32786,10 +32788,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"lOb" = ( -/obj/structure/sign/collision_counter, -/turf/closed/wall, -/area/station/medical/treatment_center) "lOt" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -33351,17 +33349,6 @@ "lZW" = ( /turf/closed/wall, /area/station/maintenance/department/cargo) -"lZX" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "lZY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/corner, @@ -33409,6 +33396,19 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/prison) +"mbb" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "mbm" = ( /obj/structure/rack, /obj/item/pickaxe, @@ -33518,10 +33518,6 @@ /obj/machinery/suit_storage_unit/medical, /turf/open/floor/iron/dark, /area/station/medical/storage) -"mdW" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/right) "mdY" = ( /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron, @@ -33600,13 +33596,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics) -"meY" = ( -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/industrial_lift/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "mfC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33817,21 +33806,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"miQ" = ( -/obj/machinery/door/airlock/command{ - name = "Research Director's Office" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "miU" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/binary/pump{ @@ -33926,6 +33900,16 @@ /obj/item/hand_labeler, /turf/open/floor/iron/white, /area/station/service/kitchen) +"mkm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/science{ + pixel_x = 32 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "mky" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -34383,6 +34367,12 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/engineering/main) +"msr" = ( +/obj/machinery/computer/robotics, +/obj/structure/sign/clock/directional/north, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "msx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34463,6 +34453,11 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"muQ" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "muR" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 @@ -34690,12 +34685,19 @@ /obj/item/radio/off, /turf/open/floor/iron, /area/station/command/gateway) -"mxV" = ( -/obj/structure/table/glass, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) +"mxP" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/right) "myb" = ( /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, @@ -34779,13 +34781,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) -"mzQ" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/research_director, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "mzX" = ( /obj/effect/turf_decal/trimline/white/tram{ dir = 1 @@ -35223,6 +35218,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"mGJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "mGN" = ( /obj/effect/turf_decal/siding/thinplating/end, /obj/machinery/button/door{ @@ -35849,17 +35849,16 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/right) +"mRi" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/right, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "mRs" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron, /area/station/engineering/atmos) -"mRy" = ( -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "mRE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -36149,6 +36148,11 @@ /obj/effect/turf_decal/weather/snow, /turf/open/floor/iron/kitchen_coldroom, /area/station/service/kitchen/coldroom) +"mXp" = ( +/obj/structure/industrial_lift/tram, +/obj/effect/landmark/lift_id, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "mXu" = ( /obj/structure/sign/warning/vacuum{ pixel_y = -32 @@ -36743,18 +36747,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"nhc" = ( -/obj/machinery/light_switch/directional/north{ - pixel_x = 12 - }, -/obj/machinery/newscaster/directional/north, -/obj/machinery/fax{ - fax_name = "Research Director's Office"; - name = "Research Director's Fax Machine" - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "nhm" = ( /turf/closed/wall, /area/station/security/prison/shower) @@ -37107,14 +37099,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"nnn" = ( -/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/spawner/xmastree, -/turf/open/floor/carpet, -/area/station/service/chapel) "nns" = ( /obj/machinery/computer/operating{ dir = 1; @@ -37356,13 +37340,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/service/kitchen) -"nqX" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, -/area/lavaland/surface) "nra" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, @@ -38646,17 +38623,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/right) -"nTr" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "nTz" = ( /obj/machinery/holopad{ pixel_y = 16 @@ -38982,12 +38948,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"nZs" = ( -/obj/machinery/computer/mecha, -/obj/structure/sign/calendar/directional/north, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "nZx" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -39583,6 +39543,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/left) +"ojY" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "okf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39910,12 +39880,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"orI" = ( -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "orL" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 1 @@ -40331,6 +40295,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) +"oAu" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/tramwall/titanium, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "oAy" = ( /obj/docking_port/stationary{ dwidth = 5; @@ -40412,16 +40381,6 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) -"oCu" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/chair/sofa/bench/tram/left{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "oCO" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -40553,6 +40512,12 @@ }, /turf/open/space/basic, /area/space/nearstation) +"oFI" = ( +/obj/machinery/computer/mecha, +/obj/structure/sign/calendar/directional/north, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "oFJ" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Telecomms Relay Access" @@ -40910,6 +40875,20 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/atmos) +"oLV" = ( +/obj/machinery/computer/rdconsole, +/obj/machinery/computer/security/telescreen/rd{ + pixel_y = 30 + }, +/obj/machinery/camera{ + c_tag = "Science - Research Director's Office"; + dir = 9; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/north, +/obj/item/folder/white, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "oLX" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 @@ -41036,6 +41015,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/engine, /area/station/science/xenobiology) +"oOC" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/window/reinforced/shuttle/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "oOF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -41259,16 +41246,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"oTm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/structure/sign/poster/official/science{ - pixel_x = 32 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "oTn" = ( /obj/structure/toilet{ dir = 1 @@ -41478,6 +41455,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) +"oXd" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/machinery/camera/directional/south{ + c_tag = "Hallway - Eastern Tram Bridge 1" + }, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "oXe" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -41524,6 +41514,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) +"oYr" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/fluff/tram_rail, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "oYu" = ( /obj/structure/chair/stool/directional/north, /obj/machinery/button/door/directional/west{ @@ -41589,11 +41585,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) -"oZE" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/tramwall/titanium, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "oZG" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 @@ -42136,12 +42127,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/engine_smes) -"pkw" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "pkF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -42281,6 +42266,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) +"pmD" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/tram/right{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "pmQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -42651,6 +42646,14 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/science/server) +"psU" = ( +/obj/structure/industrial_lift/tram/accessible/south, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ptb" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/geneticist, @@ -42659,6 +42662,15 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) +"ptl" = ( +/obj/structure/table/reinforced, +/obj/item/stamp/rd{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "ptp" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -43165,6 +43177,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"pAa" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/tramwall/titanium, +/obj/machinery/destination_sign{ + dir = 1; + layer = 3.4 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "pAc" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -43224,6 +43245,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/maintenance/tram/left) +"pBf" = ( +/obj/structure/chair/sofa/corner{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "pBp" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/deck, @@ -43371,17 +43398,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"pEB" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 24; - name = "SS13: Auxiliary Dock, Station-Port"; - shuttle_id = "whiteship_home"; - width = 35 - }, -/turf/open/space/openspace, -/area/space) "pEH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44760,16 +44776,6 @@ "qfs" = ( /turf/open/floor/glass, /area/station/service/kitchen) -"qfz" = ( -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/industrial_lift/tram, -/obj/structure/chair/sofa/bench/tram/solo{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "qfO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -44929,6 +44935,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/dorms) +"qia" = ( +/obj/structure/industrial_lift/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "qif" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -45176,6 +45186,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) +"qmE" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/right) "qmH" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -45466,6 +45480,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"qqR" = ( +/obj/structure/window/reinforced/tinted/fulltile, +/obj/structure/grille, +/turf/open/floor/plating, +/area/station/science/breakroom) "qqT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/decal/cleanable/dirt, @@ -46491,6 +46510,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"qHi" = ( +/obj/machinery/modular_computer/console/preset/research{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "qHl" = ( /obj/machinery/door/airlock/research{ name = "Cytology Access" @@ -47044,12 +47069,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"qRs" = ( -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "qRA" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -47359,13 +47378,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/prison/safe) -"qXN" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "qXX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/structure/disposalpipe/segment{ @@ -47469,14 +47481,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/construction/mining/aux_base) -"qZI" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/right, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "qZJ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -47629,19 +47633,6 @@ "rcm" = ( /turf/open/floor/wood, /area/station/service/lawoffice) -"rcr" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 1" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "rcD" = ( /obj/structure/chair/comfy/brown, /obj/machinery/airalarm/directional/north, @@ -47687,11 +47678,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"rdm" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "rdn" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47706,6 +47692,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +"reF" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/left) "reO" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -48200,19 +48197,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/dorms) -"rnp" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "rnA" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, @@ -48392,6 +48376,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) +"rrz" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "rrE" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -48399,6 +48393,11 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/dark, /area/station/medical/storage) +"rrF" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/industrial_lift/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "rrM" = ( /obj/machinery/photocopier{ pixel_y = 3 @@ -48956,6 +48955,13 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) +"rBh" = ( +/obj/structure/fluff/tram_rail, +/obj/effect/landmark/start/hangover, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/solo, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "rBy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49164,6 +49170,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) +"rEn" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/industrial_lift/tram, +/obj/structure/chair/sofa/bench/tram/left, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "rEu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49389,16 +49401,6 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/station/cargo/storage) -"rIz" = ( -/obj/machinery/button/door{ - id = "rdoffice"; - name = "Privacy Shutter Control"; - pixel_x = -6; - pixel_y = -25; - req_access = list("research") - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "rIP" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -49870,6 +49872,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"rOr" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/window/reinforced/shuttle/tram, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "rOs" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -49957,6 +49964,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/commons/dorms) +"rPU" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "rQl" = ( /obj/structure/chair/stool/directional/south, /obj/effect/landmark/start/assistant, @@ -49985,17 +49997,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/miningdock) -"rQL" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "rQN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -50208,6 +50209,10 @@ }, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"rUF" = ( +/obj/structure/sign/collision_counter, +/turf/closed/wall, +/area/station/medical/treatment_center) "rUQ" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, @@ -50604,10 +50609,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"sdf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "sdo" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -50883,6 +50884,11 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"sjd" = ( +/obj/structure/industrial_lift/tram, +/obj/effect/landmark/start/hangover, +/turf/open/floor/noslip/tram_plate, +/area/station/hallway/primary/tram/center) "sjf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50939,6 +50945,16 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"smz" = ( +/obj/machinery/button/door{ + id = "rdoffice"; + name = "Privacy Shutter Control"; + pixel_x = -6; + pixel_y = -25; + req_access = list("research") + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "smF" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -51176,15 +51192,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) -"sqW" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/tramwall/titanium, -/obj/machinery/destination_sign{ - dir = 1; - layer = 3.4 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "srb" = ( /obj/machinery/door/airlock/hatch{ name = "Ladder Access Hatch" @@ -51927,17 +51934,6 @@ /obj/machinery/telecomms/broadcaster/preset_right, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"sFL" = ( -/obj/machinery/door/airlock/command{ - name = "Research Director's Office" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "sGp" = ( /obj/structure/rack, /obj/item/clothing/glasses/meson{ @@ -52100,6 +52096,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/science) +"sJo" = ( +/obj/structure/table/glass, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "sJS" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -52369,6 +52371,17 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"sOi" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 11; + height = 24; + name = "SS13: Auxiliary Dock, Station-Port"; + shuttle_id = "whiteship_home"; + width = 35 + }, +/turf/open/space/openspace, +/area/space) "sOq" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/status_display/ai/directional/west, @@ -53566,19 +53579,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"tlu" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Eastern Tram Bridge 2" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/right) "tlF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54086,6 +54086,23 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/cargo/warehouse) +"trO" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/sign/clock/directional/east, +/obj/item/storage/fancy/coffee_cart_rack{ + pixel_x = -7; + pixel_y = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "trY" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/effect/spawner/random/contraband/armory, @@ -54336,11 +54353,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit) -"txc" = ( -/obj/structure/industrial_lift/tram, -/obj/effect/landmark/lift_id, -/turf/open/floor/noslip/tram_plate, -/area/station/hallway/primary/tram/center) "txd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54411,16 +54423,6 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"tyU" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/left) "tze" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -54904,11 +54906,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"tGU" = ( -/obj/structure/window/reinforced/tinted/fulltile, -/obj/structure/grille, -/turf/open/floor/plating, -/area/station/science/breakroom) "tGW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -55809,6 +55806,12 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/engineering/atmos) +"uba" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/window/reinforced/shuttle/tram, +/obj/machinery/computer/tram_controls/directional/north, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "ubc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -55947,6 +55950,11 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"ucQ" = ( +/obj/structure/industrial_lift/tram/white, +/obj/machinery/door/window/tram/left, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "udb" = ( /obj/structure/table/glass, /obj/item/paper_bin, @@ -55993,6 +56001,11 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/right) +"udM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/center) "udP" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/trimline/red/filled/line, @@ -56027,12 +56040,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"uep" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/window/reinforced/shuttle/tram, -/obj/machinery/computer/tram_controls/directional/south, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ueE" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -56384,11 +56391,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/ordnance/testlab) -"ukL" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ukM" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -57669,14 +57671,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) -"uIC" = ( -/obj/structure/fluff/tram_rail/floor{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/left) "uIO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -57918,6 +57912,10 @@ }, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"uNw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "uNC" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes/corner{ @@ -58102,19 +58100,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/warning, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"uQJ" = ( -/obj/effect/turf_decal/delivery/white, -/obj/structure/holosign/barrier/atmos/tram, -/obj/machinery/camera/directional/south{ - c_tag = "Hallway - Western Tram Bridge 2" - }, -/turf/open/floor/vault{ - base_icon_state = "tram2"; - icon_state = "tram2"; - desc = "A sturdy looking tram platform."; - name = "tram platform" - }, -/area/station/hallway/primary/tram/center) "uQK" = ( /obj/effect/landmark/event_spawn, /obj/structure/chair/stool/directional/east, @@ -58147,12 +58132,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) -"uRh" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail, -/obj/structure/chair/sofa/bench/tram/right, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "uRx" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -58265,6 +58244,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"uUq" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/sofa/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningdock/cafeteria) "uUs" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -58596,17 +58585,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"uZP" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/mob/living/basic/pet/dog/pug{ - desc = "A pug with an insatiable appetite for pasta and pasta-adjacent piping."; - name = "Spaghetti" - }, -/obj/structure/bed/dogbed/ian, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uZQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -58834,6 +58812,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vdB" = ( +/obj/effect/turf_decal/delivery/white, +/obj/structure/holosign/barrier/atmos/tram, +/obj/structure/fluff/tram_rail/floor, +/turf/open/floor/vault{ + base_icon_state = "tram2"; + icon_state = "tram2"; + desc = "A sturdy looking tram platform."; + name = "tram platform" + }, +/area/station/hallway/primary/tram/center) "vdQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -59076,6 +59065,13 @@ }, /turf/open/floor/wood, /area/station/service/library) +"viA" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "viW" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/crayon{ @@ -59172,6 +59168,13 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/service/chapel/monastery) +"vkm" = ( +/obj/machinery/vending/cigarette, +/obj/structure/sign/flag{ + pixel_x = -32 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "vkq" = ( /obj/structure/table, /obj/machinery/light/directional/north, @@ -59402,6 +59405,16 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) +"vqF" = ( +/obj/structure/industrial_lift/tram, +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/tram/left{ + dir = 1 + }, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "vqI" = ( /obj/effect/landmark/start/depsec/science, /obj/effect/turf_decal/trimline/red/arrow_cw, @@ -59972,14 +59985,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"vzr" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/sofa/corner, -/turf/open/floor/iron, -/area/station/cargo/miningdock/cafeteria) "vzt" = ( /obj/item/flashlight/flare, /turf/open/misc/asteroid, @@ -60205,14 +60210,6 @@ "vCZ" = ( /turf/closed/wall, /area/station/service/chapel/monastery) -"vDw" = ( -/obj/structure/industrial_lift/tram/subfloor, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/window/reinforced/shuttle/tram, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "vDG" = ( /obj/structure/filingcabinet/chestdrawer{ pixel_y = 2 @@ -60384,6 +60381,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) +"vHk" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "vHq" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60485,12 +60488,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"vJU" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/obj/structure/cable, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/center) "vKb" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -60714,6 +60711,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/office) +"vOv" = ( +/obj/item/kirbyplants/dead, +/obj/machinery/requests_console/directional/north{ + announcementConsole = 1; + department = "Research Director's Desk"; + departmentType = 5; + name = "Research Director's Requests Console"; + pixel_x = 30; + receive_ore_updates = 1 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "vOD" = ( /obj/effect/turf_decal/siding/thinplating/corner, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -60778,6 +60788,9 @@ }, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"vPq" = ( +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "vPB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -61567,10 +61580,9 @@ }, /area/station/commons/fitness) "wew" = ( -/obj/structure/industrial_lift/tram/white, -/obj/structure/tramwall/titanium, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) +/obj/structure/closet/secure_closet/research_director, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "weI" = ( /obj/structure/cable, /obj/machinery/light/small/directional/south, @@ -62399,6 +62411,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/lobby) +"wvL" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "wvN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -62407,6 +62424,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"wvY" = ( +/obj/structure/table/glass, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "wwc" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -63035,6 +63056,12 @@ /obj/effect/turf_decal/trimline/neutral/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"wHA" = ( +/obj/structure/chair/sofa/right{ + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/science/breakroom) "wHM" = ( /obj/effect/turf_decal/trimline/purple/filled/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -63207,6 +63234,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/engineering/engine_smes) +"wJB" = ( +/obj/structure/industrial_lift/tram/subfloor, +/obj/structure/window/reinforced/shuttle/tram, +/obj/machinery/computer/tram_controls/directional/south, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "wJM" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63297,12 +63330,6 @@ /obj/structure/table/wood/fancy/royalblue, /turf/open/floor/wood/large, /area/station/service/library) -"wLP" = ( -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "wLR" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 @@ -63538,11 +63565,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"wQO" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/fluff/tram_rail/floor, -/turf/open/floor/glass/reinforced/tram, -/area/station/hallway/primary/tram/right) "wQP" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -63675,6 +63697,18 @@ /obj/structure/weightmachine/stacklifter, /turf/open/floor/iron, /area/station/security/prison/workout) +"wSY" = ( +/obj/machinery/light_switch/directional/north{ + pixel_x = 12 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/fax{ + fax_name = "Research Director's Office"; + name = "Research Director's Fax Machine" + }, +/obj/structure/table/reinforced, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "wTy" = ( /obj/machinery/button/crematorium{ id = "crematoriumChapel"; @@ -65004,6 +65038,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/maintenance/tram/mid) +"xqH" = ( +/obj/structure/fluff/tram_rail/floor{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/glass/reinforced/tram, +/area/station/hallway/primary/tram/left) "xqJ" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner, /obj/machinery/duct, @@ -65641,6 +65683,13 @@ /obj/machinery/pdapainter/engineering, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"xBF" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/command/heads_quarters/rd) "xBG" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 1 @@ -66174,9 +66223,6 @@ /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) -"xNQ" = ( -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "xNR" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -66418,16 +66464,6 @@ /obj/item/paper_bin, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) -"xSu" = ( -/obj/structure/industrial_lift/tram, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/chair/sofa/bench/tram/right{ - dir = 1 - }, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "xSv" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -66532,10 +66568,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) -"xUs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "xUw" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -66576,12 +66608,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) -"xVz" = ( -/obj/machinery/modular_computer/console/preset/research{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/command/heads_quarters/rd) "xVE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -66771,6 +66797,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) +"xXs" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/airless, +/area/lavaland/surface) "xXC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/closed/wall/r_wall, @@ -66838,6 +66871,13 @@ /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron, /area/station/commons/dorms) +"xZu" = ( +/obj/structure/fluff/tram_rail{ + dir = 1 + }, +/obj/structure/industrial_lift/tram, +/turf/open/openspace, +/area/station/hallway/primary/tram/center) "xZx" = ( /obj/machinery/power/terminal{ dir = 1 @@ -66854,14 +66894,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"xZZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "yan" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, @@ -66932,14 +66964,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"ybz" = ( -/obj/structure/industrial_lift/tram/accessible/south, -/obj/structure/fluff/tram_rail{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/openspace, -/area/station/hallway/primary/tram/center) "ybY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67020,13 +67044,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"ydF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ydS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -67430,23 +67447,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"yky" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/structure/sign/clock/directional/east, -/obj/item/storage/fancy/coffee_cart_rack{ - pixel_x = -7; - pixel_y = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/science/breakroom) "ykN" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -102629,7 +102629,7 @@ bia hZr gdJ hRj -uZP +gZj mwK xtu beG @@ -111099,11 +111099,11 @@ xtu xtu xtu oys -lhB -gFJ -gmN -cXW -bOO +lJK +lnx +vkm +fUH +viA qig kwK xtS @@ -111356,12 +111356,12 @@ xtu xtu xtu oys -bMP -xUs -lmK -ydF -hHv -tGU +lEx +uNw +ePa +iwX +eLS +qqR xOv xBB eiC @@ -111613,11 +111613,11 @@ xtu xtu xtu oys -igB -xNQ -kwA -xZZ -ePl +elT +vPq +mGJ +hku +iBD sPy egP khl @@ -111870,12 +111870,12 @@ xtu xtu xtu oys -mxV -lJn -sdf -jMD -orI -tGU +sJo +ctx +jpc +wvY +bBF +qqR nbq iyC eQy @@ -112127,11 +112127,11 @@ xtu xtu xtu oys -yky -lhA -oTm -qRs -wLP +trO +jUN +mkm +wHA +pBf qig bnS rGx @@ -112347,10 +112347,10 @@ dhe dhe dhe unl -qZI +kjD nTG nTG -cvz +kZo unl qaV kDi @@ -112604,10 +112604,10 @@ dhe dhe dhe unl -vzr -jAu -jAu -jnw +dbz +dwE +dwE +uUq unl gxw kDi @@ -116487,7 +116487,7 @@ dDG dhe qxm aRN -nqX +xXs aRN qxm dhe @@ -141403,7 +141403,7 @@ jhd avE jhd jhd -bPP +hpz jhd jhd jhd @@ -141431,7 +141431,7 @@ jhd jhd jhd jhd -bPP +hpz jhd jhd jhd @@ -142720,7 +142720,7 @@ vcI gYz tCT oTC -pEB +sOi jhd jhd jhd @@ -152493,7 +152493,7 @@ tDT ylF mSw pUw -cxd +eCz jLf oYR jLf @@ -153008,7 +153008,7 @@ bdz mSw ckb gyt -nnn +aiW iUs iUs iUs @@ -155036,11 +155036,11 @@ yiM jUu xwC eNO -asv -iCz +bED +jIr qoE -uIC -asv +xqH +bED eOr aKp sTs @@ -158076,7 +158076,7 @@ dDG dDG iZb aRN -nqX +xXs aRN uIt dhe @@ -158633,13 +158633,13 @@ dDG dDG dOi klT -tyU -tyU -nTr +ojY +ojY +reF fbM -rnp -tyU -bfJ +mbb +ojY +hcs klT aRN dDG @@ -159404,13 +159404,13 @@ cuX dDG dOi pdW -iHW -iHW -rQL +rrz +rrz +vdB dns -iYi -iHW -uQJ +aIx +rrz +hPY pdW aRN dDG @@ -163003,11 +163003,11 @@ eSz kQF tGW jJw -kYX -vJU +udM +gFy eGA -jJM -kYX +dWs +udM hke lNj dVP @@ -163774,11 +163774,11 @@ izU jpv aEM cRU -oZE -fhe -gom -cjX -oZE +oAu +oYr +rOr +oOC +oAu lyv eOi agt @@ -164031,11 +164031,11 @@ vyH qGw wHs gej -sqW -iiH -duZ -oCu -sqW +pAa +rBh +qia +vqF +pAa sqz oej vJF @@ -164288,11 +164288,11 @@ vyH qGw bqI izU -oZE -lNy -duZ -xSu -oZE +oAu +iKM +qia +pmD +oAu izU gYR vJF @@ -164545,11 +164545,11 @@ mlx nfD bip dtC -bga -ukL -duZ -qXN -jXk +liQ +rPU +qia +biX +ucQ wFw qLh vJF @@ -164802,11 +164802,11 @@ beW vrF bip wFw -lmm -ukL -txc -qXN -bXU +cQq +rPU +mXp +biX +mRi pZm eTp eHk @@ -165059,11 +165059,11 @@ vyH vRL vjl fld -uep -krX -jCQ -meY -lKP +wJB +rrF +kGx +xZu +uba jEO anS uwY @@ -165316,11 +165316,11 @@ beW gKo bip wFw -bga -ukL -bPX -qXN -jXk +liQ +rPU +sjd +biX +ucQ wFw fug buT @@ -165573,11 +165573,11 @@ gWq wMY bip wFw -lmm -ukL -duZ -qXN -bXU +cQq +rPU +qia +biX +mRi pWK eyS vJF @@ -165830,11 +165830,11 @@ vyH jfC kBX izU -oZE -uRh -duZ -ybz -oZE +oAu +ePF +qia +psU +oAu izU nWl vJF @@ -166087,11 +166087,11 @@ vyH jfC waf odj -sqW -azO -duZ -qfz -sqW +pAa +rEn +qia +bnj +pAa kXK qms vJF @@ -166344,11 +166344,11 @@ izU vtp dUC cRU -wew -fhe -gom -vDw -oZE +cmw +oYr +rOr +gWD +oAu lyv ebF vsR @@ -166365,7 +166365,7 @@ pnU itk jtr jtr -lOb +rUF xSZ lJC xSZ @@ -167115,11 +167115,11 @@ eSz rMA fmf bxy -kYX -vJU +udM +gFy bwZ -jJM -kYX +dWs +udM ipd vbL gMZ @@ -168678,9 +168678,9 @@ dvK bLQ bFq qgd -eLw -kRa -auK +aMY +bmp +gOk kcZ ugt pbn @@ -170712,13 +170712,13 @@ dhe dDG dOi pdW -iHW -iHW -rQL +rrz +rrz +vdB dns -iYi -iHW -rcr +aIx +rrz +oXd pdW aRN dDG @@ -171483,13 +171483,13 @@ dhe dDG dOi pev -iYa -iYa -lZX +aYM +aYM +fgL uZg -gAY -iYa -tlu +mxP +aYM +czu pev aRN dDG @@ -175082,11 +175082,11 @@ wkz xHd xPU nXJ -mdW -wQO +qmE +kEz oSW -ezQ -mdW +hDg +qmE qsl aNP czl @@ -176137,7 +176137,7 @@ gyB oPT bSE bSE -miQ +abT bSE bSE oPT @@ -176392,11 +176392,11 @@ wAt tby hTG oPT -nhc -jgD -eED -iBB -rdm +wSY +iaE +jir +bmI +wvL oPT uDW xjr @@ -176649,11 +176649,11 @@ efT kpG hTG bSE -gil -jgD -pkw -kGQ -gGL +wew +iaE +vHk +etL +xBF bSE joR xjr @@ -176906,9 +176906,9 @@ ezw jIC hTG oPT -nZs -mRy -ggi +oFI +gxM +ptl gip hJW bSE @@ -177163,9 +177163,9 @@ ezw jIC ocz oPT -hgS -mzQ -cEB +oLV +emx +iNz fIR lyq oPT @@ -177420,9 +177420,9 @@ ezw jIC hTG oPT -cjE -rIz -fZz +msr +smz +fpW xYj wwn bSE @@ -177677,11 +177677,11 @@ rrc jhi hTG bSE -eYe -jgD -hWi -jgD -xVz +jRn +iaE +muQ +iaE +qHi bSE joR xjr @@ -177934,10 +177934,10 @@ dvH tby hTG oPT -cEH -jgD -jgD -jgD +vOv +iaE +iaE +iaE cqS oPT joR @@ -178193,7 +178193,7 @@ tUm oPT bSE bSE -sFL +eXZ bSE bSE oPT diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index 514da314e01..fabf3b1f04b 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -1565,7 +1565,7 @@ /area/shuttle/escape) "YN" = ( /obj/structure/table/wood, -/obj/item/candle, +/obj/item/flashlight/flare/candle, /turf/open/floor/wood, /area/shuttle/escape) "YS" = ( diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index 372308a67d1..4caf95890a1 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -102,6 +102,19 @@ /obj/structure/table/wood/fancy, /turf/open/floor/wood, /area/shuttle/escape) +"iO" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = 8; + pixel_y = -1 + }, +/obj/item/storage/medkit/regular{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/shuttle/escape) "iP" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -155,6 +168,16 @@ "kd" = ( /turf/template_noop, /area/template_noop) +"kE" = ( +/obj/structure/table/wood/fancy, +/obj/item/flashlight/flare/candle/infinite{ + desc = "A synthetic candle that won't melt down."; + name = "crimson red candle"; + pixel_x = 1; + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/shuttle/escape) "kJ" = ( /obj/structure/table/wood/fancy, /obj/item/food/burger/baconburger{ @@ -410,19 +433,6 @@ }, /turf/open/floor/iron/white, /area/shuttle/escape) -"tJ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_x = 8; - pixel_y = -1 - }, -/obj/item/storage/medkit/regular{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white, -/area/shuttle/escape) "uV" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) @@ -800,16 +810,6 @@ }, /turf/open/floor/iron/white, /area/shuttle/escape) -"Hi" = ( -/obj/structure/table/wood/fancy, -/obj/item/candle/infinite{ - desc = "A synthetic candle that won't melt down."; - name = "crimson red candle"; - pixel_x = 1; - pixel_y = 6 - }, -/turf/open/floor/wood, -/area/shuttle/escape) "Ho" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -1237,7 +1237,7 @@ en jt jt EC -Hi +kE Me jt aY @@ -1266,7 +1266,7 @@ kd kd en EC -Hi +kE WT WT WT @@ -1290,7 +1290,7 @@ WT WT WT EC -Hi +kE Me jt jt @@ -1655,7 +1655,7 @@ qw Nv VO Gv -tJ +iO SK cf tB @@ -1956,7 +1956,7 @@ kd kd en EC -Hi +kE WT WT WT @@ -1980,7 +1980,7 @@ WT WT WT EC -Hi +kE Me jt jt @@ -2019,7 +2019,7 @@ en jt jt EC -Hi +kE Me jt qE diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index a307ff9e67e..60fc6978fde 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -126,7 +126,7 @@ /turf/template_noop, /area/shuttle/escape) "gt" = ( -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ anchored = 1; pixel_y = 8 }, @@ -721,7 +721,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "Fs" = ( -/obj/item/candle/infinite{ +/obj/item/flashlight/flare/candle/infinite{ anchored = 1; pixel_y = 8 }, diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 35e46f8ef79..ce4baf61062 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -3334,12 +3334,12 @@ /area/shuttle/escape) "Sq" = ( /obj/structure/table/wood/fancy, -/obj/item/candle, -/obj/item/candle{ +/obj/item/flashlight/flare/candle, +/obj/item/flashlight/flare/candle{ pixel_x = 6; pixel_y = 8 }, -/obj/item/candle{ +/obj/item/flashlight/flare/candle{ pixel_x = -8; pixel_y = 6 }, diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm index 3f10b239f62..d0a55caed13 100644 --- a/_maps/shuttles/emergency_narnar.dmm +++ b/_maps/shuttles/emergency_narnar.dmm @@ -120,7 +120,7 @@ /area/shuttle/escape) "y" = ( /obj/effect/decal/cleanable/blood/gibs/up, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/cult, /area/shuttle/escape) "z" = ( @@ -128,7 +128,7 @@ /turf/open/floor/cult, /area/shuttle/escape) "A" = ( -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/cult, /area/shuttle/escape) "B" = ( diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index d2de01445c2..b06dbd1bb4a 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -63,7 +63,7 @@ /area/shuttle/escape/brig) "an" = ( /obj/structure/table/wood, -/obj/item/candle/infinite, +/obj/item/flashlight/flare/candle/infinite, /turf/open/floor/cult, /area/shuttle/escape) "ao" = ( diff --git a/_maps/templates/lazy_templates/ninja_den.dmm b/_maps/templates/lazy_templates/ninja_den.dmm index 052e37c3c86..08b9d9d9fd2 100644 --- a/_maps/templates/lazy_templates/ninja_den.dmm +++ b/_maps/templates/lazy_templates/ninja_den.dmm @@ -765,18 +765,6 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) -"rW" = ( -/obj/structure/bed/dogbed/cayenne{ - name = "Paprika's bed" - }, -/mob/living/basic/carp/pet/cayenne{ - desc = "It's Paprika! One of the Spider Clan's lovable Space Carp!"; - faction = list("neutral"); - name = "Paprika"; - real_name = "Paprika" - }, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "sc" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -802,16 +790,6 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/holding) -"ti" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood/fancy/green, -/obj/item/candle/infinite{ - pixel_y = 6 - }, -/turf/open/floor/carpet/black, -/area/centcom/central_command_areas/holding) "ts" = ( /obj/item/food/meat/slab/chicken, /obj/item/food/meat/slab/chicken, @@ -1166,6 +1144,18 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/holding) +"Cr" = ( +/obj/structure/bed/dogbed/cayenne{ + name = "Paprika's bed" + }, +/mob/living/basic/carp/pet/cayenne{ + desc = "It's Paprika! One of the Spider Clan's lovable Space Carp!"; + faction = list("neutral"); + name = "Paprika"; + real_name = "Paprika" + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "CD" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1956,6 +1946,16 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/holding) +"UW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood/fancy/green, +/obj/item/flashlight/flare/candle/infinite{ + pixel_y = 6 + }, +/turf/open/floor/carpet/black, +/area/centcom/central_command_areas/holding) "UY" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall/mineral/wood, @@ -2789,7 +2789,7 @@ XP dg PX hO -ti +UW jf hO hO @@ -3159,7 +3159,7 @@ xw So dg xi -rW +Cr dg iH mw diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 4cfdbd71f9c..3bed269cc35 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -24,6 +24,8 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/trash/popcorn = 1, /obj/item/trash/raisins = 1, /obj/item/trash/sosjerky = 1, + /obj/item/trash/flare = 1, + /obj/item/trash/candle = 1, /obj/item/c_tube = 1, /obj/item/disk/data = 1, diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index e6edf365d9c..63448d487c9 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -19,6 +19,7 @@ /obj/item/stack/cable_coil = 5, /obj/item/food/deadmouse = 1, /obj/item/trash/candle = 1, + /obj/item/trash/flare = 1, /obj/item/popsicle_stick = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/reagent_containers/cup/glass/sillycup = 1, diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 61368081a7b..b745b5f53cd 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -900,18 +900,20 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e else . = SFX_DESECRATION +/// Creates an ignition hotspot if item is lit and located on turf, in mask, or in hand /obj/item/proc/open_flame(flame_heat=700) var/turf/location = loc if(ismob(location)) - var/mob/M = location + var/mob/pyromanic = location var/success = FALSE - if(src == M.get_item_by_slot(ITEM_SLOT_MASK)) + if(src == pyromanic.get_item_by_slot(ITEM_SLOT_MASK) || (src in pyromanic.held_items)) success = TRUE if(success) - location = get_turf(M) + location = get_turf(pyromanic) if(isturf(location)) location.hotspot_expose(flame_heat, 5) +/// If an object can successfully be used as a fire starter it will return a message /obj/item/proc/ignition_effect(atom/A, mob/user) if(get_temperature()) . = span_notice("[user] lights [A] with [src].") diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm deleted file mode 100644 index 12e9612fa25..00000000000 --- a/code/game/objects/items/candle.dm +++ /dev/null @@ -1,90 +0,0 @@ -#define CANDLE_LUMINOSITY 2 -/obj/item/candle - name = "red candle" - desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \ - humankind. The jewelry he kept for himself." - icon = 'icons/obj/candle.dmi' - icon_state = "candle1" - inhand_icon_state = null - w_class = WEIGHT_CLASS_TINY - light_color = LIGHT_COLOR_FIRE - heat = 1000 - /// How many seconds it burns for - var/wax = 2000 - var/lit = FALSE - var/infinite = FALSE - var/start_lit = FALSE - - - var/scented_type //SKYRAT EDIT ADDITION /// Pollutant type for scented candles - -/obj/item/candle/Initialize(mapload) - . = ..() - if(start_lit) - light() - -/obj/item/candle/update_icon_state() - icon_state = "candle[(wax > 800) ? ((wax > 1500) ? 1 : 2) : 3][lit ? "_lit" : ""]" - return ..() - -/obj/item/candle/attackby(obj/item/W, mob/user, params) - var/msg = W.ignition_effect(src, user) - if(msg) - light(msg) - else - return ..() - -/obj/item/candle/fire_act(exposed_temperature, exposed_volume) - if(!lit) - light() //honk - return ..() - -/obj/item/candle/get_temperature() - return lit * heat - -/obj/item/candle/proc/light(show_message) - if(!lit) - lit = TRUE - if(show_message) - usr.visible_message(show_message) - set_light(CANDLE_LUMINOSITY) - START_PROCESSING(SSobj, src) - update_appearance() - -/obj/item/candle/proc/put_out_candle() - if(!lit) - return - lit = FALSE - update_appearance() - set_light(0) - return TRUE - -/obj/item/candle/extinguish() - put_out_candle() - return ..() - -/obj/item/candle/process(delta_time) - if(!lit) - return PROCESS_KILL - if(!infinite) - wax -= delta_time - if(wax <= 0) - new /obj/item/trash/candle(loc) - qdel(src) - //SKYRAT EDIT ADDITION - if(scented_type) - var/turf/my_turf = get_turf(src) - my_turf.pollute_turf(scented_type, 5) - //SKYRAT EDIT END - update_appearance() - open_flame() - -/obj/item/candle/attack_self(mob/user) - if(put_out_candle()) - user.visible_message(span_notice("[user] snuffs [src].")) - -/obj/item/candle/infinite - infinite = TRUE - start_lit = TRUE - -#undef CANDLE_LUMINOSITY diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 0a1a1f80144..63e352b6c4b 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -51,7 +51,7 @@ // SKYRAT EDIT REMOVAL BEGIN - MOVED TO MODUALR FLASHLIGHT.DM /* -/obj/item/flashlight/proc/update_brightness(mob/user) +/obj/item/flashlight/proc/update_brightness() if(on) icon_state = "[initial(icon_state)]-on" else @@ -60,14 +60,15 @@ if(light_system == STATIC_LIGHT) update_light() -/obj/item/flashlight/proc/toggle_light(mob/user) +/obj/item/flashlight/proc/toggle_light() on = !on - playsound(user, on ? sound_on : sound_off, 40, TRUE) - update_brightness(user) + playsound(src, on ? sound_on : sound_off, 40, TRUE) + update_brightness() update_item_action_buttons() + return TRUE /obj/item/flashlight/attack_self(mob/user) - toggle_light(user) + toggle_light() */ // SKYRAT EDIT REMOVAL END @@ -301,65 +302,153 @@ toggle_context = FALSE /// How many seconds of fuel we have left var/fuel = 0 + /// Do we randomize the fuel when initialized + var/randomize_fuel = TRUE + /// How much damage it does when turned on var/on_damage = 7 - var/produce_heat = 1500 + /// Type of atom thats spawns after fuel is used up + var/trash_type = /obj/item/trash/flare + /// If the light source can be extinguished + var/can_be_extinguished = FALSE /obj/item/flashlight/flare/Initialize(mapload) . = ..() - fuel = rand(1600, 2000) + if(randomize_fuel) + fuel = rand(25 MINUTES, 35 MINUTES) + if(on) + attack_verb_continuous = string_list(list("burns", "singes")) + attack_verb_simple = string_list(list("burn", "singe")) + hitsound = 'sound/items/welder.ogg' + force = on_damage + damtype = BURN + update_brightness() -/obj/item/flashlight/flare/process(delta_time) - open_flame(heat) - fuel = max(fuel -= delta_time, 0) - if(fuel <= 0 || !on) - turn_off() - if(!fuel) - icon_state = "[initial(icon_state)]-empty" - STOP_PROCESSING(SSobj, src) +/obj/item/flashlight/flare/toggle_light() + if(on || !fuel) + return FALSE -/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user) - . = fuel && on ? span_notice("[user] lights [A] with [src] like a real badass.") : "" + name = "lit [initial(name)]" + attack_verb_continuous = string_list(list("burns", "singes")) + attack_verb_simple = string_list(list("burn", "singe")) + hitsound = 'sound/items/welder.ogg' + force = on_damage + damtype = BURN + . = ..() /obj/item/flashlight/flare/turn_off() //SKYRAT EDIT CHANGE //on = FALSE SKYRAT EDIT REMOVAL - force = initial(src.force) - damtype = initial(src.damtype) - /* SKYRAT EDIT REMOVAL - if(ismob(loc)) - var/mob/U = loc - update_brightness(U) - else - update_brightness(null) - */ - . = ..() + name = initial(name) + attack_verb_continuous = initial(attack_verb_continuous) + attack_verb_simple = initial(attack_verb_simple) + hitsound = initial(hitsound) + force = initial(force) + damtype = initial(damtype) + //update_brightness() - SKYRAT EDIT MOVED TO PARENT + . = ..() //SKYRAT EDIT - MODULAR PARENT PROC -/obj/item/flashlight/flare/update_brightness(mob/user = null) +/obj/item/flashlight/flare/extinguish() + if(fuel != INFINITY && can_be_extinguished) + turn_off() + return ..() + +/obj/item/flashlight/flare/update_brightness() ..() - if(on) - inhand_icon_state = "[initial(inhand_icon_state)]-on" - else - inhand_icon_state = "[initial(inhand_icon_state)]" + inhand_icon_state = "[initial(inhand_icon_state)]" + (on ? "-on" : "") + update_appearance() + +/obj/item/flashlight/flare/process(delta_time) + open_flame(heat) + fuel = max(fuel - delta_time * (1 SECONDS), 0) + + if(!fuel || !on) + turn_off() + STOP_PROCESSING(SSobj, src) + + if(!fuel && trash_type) + new trash_type(loc) + qdel(src) + +/obj/item/flashlight/flare/ignition_effect(atom/A, mob/user) + if(get_temperature()) + . = span_notice("[user] lights [A] with [src].") + +/obj/item/flashlight/flare/proc/ignition(mob/user) + if(user && !fuel) + to_chat(user, span_warning("[src] is out of fuel!")) + return FALSE + if(user && on) + to_chat(user, span_warning("[src] is already lit!")) + return FALSE + if(!toggle_light()) + return FALSE + + if(fuel != INFINITY) + START_PROCESSING(SSobj, src) + + return TRUE + +/obj/item/flashlight/flare/fire_act(exposed_temperature, exposed_volume) + ignition() + return ..() /obj/item/flashlight/flare/attack_self(mob/user) - // Usual checks - if(fuel <= 0) - to_chat(user, span_warning("[src] is out of fuel!")) - return - if(on) - to_chat(user, span_warning("[src] is already on!")) - return - - . = ..() - // All good, turn it on. - if(.) + if(ignition(user)) user.visible_message(span_notice("[user] lights \the [src]."), span_notice("You light \the [src]!")) - force = on_damage - damtype = BURN - START_PROCESSING(SSobj, src) /obj/item/flashlight/flare/get_temperature() return on * heat +/obj/item/flashlight/flare/candle + name = "red candle" + desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \ + humankind. The jewelry he kept for himself." + icon = 'icons/obj/candle.dmi' + icon_state = "candle1" + inhand_icon_state = null + w_class = WEIGHT_CLASS_TINY + light_color = LIGHT_COLOR_FIRE + light_range = 2 + fuel = 35 MINUTES + randomize_fuel = FALSE + trash_type = /obj/item/trash/candle + can_be_extinguished = TRUE + var/scented_type //SKYRAT EDIT ADDITION /// Pollutant type for scented candles + +/obj/item/flashlight/flare/candle/update_icon_state() + . = ..() + var/wax_level + switch(fuel) + if(25 MINUTES to INFINITY) + wax_level = 1 + if(15 MINUTES to 25 MINUTES) + wax_level = 2 + if(0 to 15 MINUTES) + wax_level = 3 + icon_state = "candle[wax_level][on ? "_lit" : ""]" + +/obj/item/flashlight/flare/candle/attackby(obj/item/fire_starter, mob/user, params) + var/success_msg = fire_starter.ignition_effect(src, user) + if(success_msg && ignition(user)) + user.visible_message(success_msg) + else + return ..() + +/obj/item/flashlight/flare/candle/attack_self(mob/user) + if(on && fuel != INFINITY && !can_be_extinguished) // can't extinguish eternal candles + turn_off() + user.visible_message(span_notice("[user] snuffs [src].")) + +/obj/item/flashlight/flare/candle/process(delta_time) + . = ..() + update_appearance() + +/obj/item/flashlight/flare/candle/infinite + name = "eternal candle" + fuel = INFINITY + on = TRUE + randomize_fuel = FALSE + can_be_extinguished = FALSE + /obj/item/flashlight/flare/torch name = "torch" desc = "A torch fashioned from some leaves and a log." @@ -372,6 +461,8 @@ light_color = LIGHT_COLOR_ORANGE on_damage = 10 slot_flags = null + trash_type = /obj/effect/decal/cleanable/ash + can_be_extinguished = TRUE /obj/item/flashlight/lantern name = "lantern" @@ -491,7 +582,7 @@ var/fuel = 0 /obj/item/flashlight/glowstick/Initialize(mapload) - fuel = rand(3200, 4000) + fuel = rand(50 MINUTES, 60 MINUTES) set_light_color(color) return ..() @@ -500,7 +591,7 @@ return ..() /obj/item/flashlight/glowstick/process(delta_time) - fuel = max(fuel - delta_time, 0) + fuel = max(fuel - delta_time * (1 SECONDS), 0) if(fuel <= 0) turn_off() STOP_PROCESSING(SSobj, src) @@ -623,7 +714,7 @@ ///Variable to preserve old lighting behavior in flashlights, to handle darkness. var/dark_light_power = -3 -/obj/item/flashlight/flashdark/update_brightness(mob/user) +/obj/item/flashlight/flashdark/update_brightness() . = ..() if(on) set_light(dark_light_range, dark_light_power) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 9d6135f983d..667b08a6eb7 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -162,7 +162,7 @@ worn_icon_state = "cigpack" throwforce = 2 slot_flags = ITEM_SLOT_BELT - spawn_type = /obj/item/candle + spawn_type = /obj/item/flashlight/flare/candle spawn_count = 5 is_open = TRUE contents_tag = "candle" diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 6085770b5e9..53b8f4c4dcd 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -102,10 +102,15 @@ resistance_flags = NONE /obj/item/trash/candle - name = "candle" + name = "melted candle" icon = 'icons/obj/candle.dmi' icon_state = "candle4" +/obj/item/trash/flare + name = "burnt flare" + icon = 'icons/obj/lighting.dmi' + icon_state = "flare-empty" + /obj/item/trash/can name = "crushed can" icon_state = "cola" diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index ca01b023361..5d9675e1ac9 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -574,7 +574,7 @@ var/static/list/potential_easy_items = list( /obj/item/shard, - /obj/item/candle, + /obj/item/flashlight/flare/candle, /obj/item/book, /obj/item/pen, /obj/item/paper, diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index f2972a6a7cf..b158475f0e9 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -137,7 +137,7 @@ /obj/item/organ/internal/liver = 1, /obj/item/melee/baton/security = 1, // Technically means a cattleprod is valid /obj/item/clothing/mask = 1, - /obj/item/candle = 4, + /obj/item/flashlight/flare/candle = 4, ) result_atoms = list(/obj/item/clothing/mask/madness_mask) cost = 1 diff --git a/code/modules/antagonists/heretic/knowledge/side_ash_flesh.dm b/code/modules/antagonists/heretic/knowledge/side_ash_flesh.dm index bd4c3e75112..5d3d56244d8 100644 --- a/code/modules/antagonists/heretic/knowledge/side_ash_flesh.dm +++ b/code/modules/antagonists/heretic/knowledge/side_ash_flesh.dm @@ -11,7 +11,7 @@ required_atoms = list( /obj/item/organ/internal/eyes = 1, /obj/item/shard = 1, - /obj/item/candle = 1, + /obj/item/flashlight/flare/candle = 1, ) result_atoms = list(/obj/item/clothing/neck/eldritch_amulet) cost = 1 diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm index c7595daebcc..7dbeb70fa0e 100644 --- a/code/modules/cargo/exports/tools.dm +++ b/code/modules/cargo/exports/tools.dm @@ -155,4 +155,4 @@ /datum/export/candle cost = CARGO_CRATE_VALUE * 0.125 unit_name = "candle" - export_types = list(/obj/item/candle) + export_types = list(/obj/item/flashlight/flare/candle) diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 2ec40c5a333..fe49a435607 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -1,7 +1,7 @@ //Chaplain Suit Subtypes //If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) icon = 'icons/obj/clothing/suits/chaplain.dmi' worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' @@ -24,7 +24,7 @@ wound = 20 /obj/item/clothing/suit/hooded/chaplainsuit - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) //Suits /obj/item/clothing/suit/chaplainsuit/holidaypriest @@ -134,7 +134,7 @@ desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." icon_state = "clockwork_cuirass" inhand_icon_state = null - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) slowdown = 0 clothing_flags = NONE @@ -164,7 +164,7 @@ desc = "God wills it!" icon_state = "knight_templar" inhand_icon_state = null - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) slowdown = 0 clothing_flags = NONE @@ -242,7 +242,7 @@ worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' inhand_icon_state = null body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) hoodtype = /obj/item/clothing/head/hooded/chaplain_hood /obj/item/clothing/head/hooded/chaplain_hood diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index aef6b5b9a58..1917c9ddf30 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -126,7 +126,7 @@ inhand_icon_state = "imperium_monk" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen) /obj/item/clothing/suit/costume/chickensuit name = "chicken suit" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 46ca289512e..3d326d3c101 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -70,7 +70,7 @@ name = "Birthday cake" reqs = list( /obj/item/food/cake/plain = 1, - /obj/item/candle = 1, + /obj/item/flashlight/flare/candle = 1, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/caramel = 2 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index cb2e846ace2..8f900657244 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -49,7 +49,7 @@ /datum/crafting_recipe/food/reaction/candle reaction = /datum/chemical_reaction/candlefication - result = /obj/item/candle + result = /obj/item/flashlight/flare/candle category = CAT_CAKE /datum/crafting_recipe/food/reaction/tofu diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index adc41c03947..7f3f2e3e0d7 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -119,7 +119,7 @@ /datum/chemical_reaction/candlefication/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/location = get_turf(holder.my_atom) for(var/i in 1 to created_volume) - new /obj/item/candle(location) + new /obj/item/flashlight/flare/candle(location) /datum/chemical_reaction/meatification required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10) diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index b6b8adc3aa7..4ba7250f0de 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -204,7 +204,7 @@ tgui_icon = "fire-alt" alignment = ALIGNMENT_NEUT max_favor = 10000 - desired_items = list(/obj/item/candle = "already lit") + desired_items = list(/obj/item/flashlight/flare/candle = "already lit") rites_list = list(/datum/religion_rites/fireproof, /datum/religion_rites/burning_sacrifice, /datum/religion_rites/infinite_candle) altar_icon_state = "convertaltar-red" @@ -212,10 +212,10 @@ /datum/religion_sect/pyre/sect_bless(mob/living/target, mob/living/chap) return TRUE -/datum/religion_sect/pyre/on_sacrifice(obj/item/candle/offering, mob/living/user) +/datum/religion_sect/pyre/on_sacrifice(obj/item/flashlight/flare/candle/offering, mob/living/user) if(!istype(offering)) return - if(!offering.lit) + if(!offering.on) to_chat(user, span_notice("The candle needs to be lit to be offered!")) return to_chat(user, span_notice("[GLOB.deity] is pleased with your sacrifice.")) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index f634f1380c0..d3e45cf5a62 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -253,7 +253,7 @@ ..() var/altar_turf = get_turf(religious_tool) for(var/i in 1 to 5) - new /obj/item/candle/infinite(altar_turf) + new /obj/item/flashlight/flare/candle/infinite(altar_turf) playsound(altar_turf, 'sound/magic/fireball.ogg', 50, TRUE) return TRUE diff --git a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm index ed81df0e26e..65952f55c6b 100644 --- a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm +++ b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm @@ -56,7 +56,7 @@ inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS armor_type = /datum/armor/hooded_cultlain_robe - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) hoodtype = /obj/item/clothing/head/hooded/cultlain_hood /datum/armor/hooded_cultlain_robe diff --git a/modular_skyrat/modules/cell_component/code/flashlight.dm b/modular_skyrat/modules/cell_component/code/flashlight.dm index bff524dd658..9b151811bc0 100644 --- a/modular_skyrat/modules/cell_component/code/flashlight.dm +++ b/modular_skyrat/modules/cell_component/code/flashlight.dm @@ -61,17 +61,20 @@ set_light_power(initial(light_power)) to_chat(user, span_notice("You set [src] to low.")) -/obj/item/flashlight/attack_self(mob/user) - . = ..() +/obj/item/flashlight/proc/toggle_light() if(on) turn_off() else - if(uses_battery && !(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS)) + if(uses_battery && !(item_use_power(power_use_amount, TRUE) & COMPONENT_POWER_SUCCESS)) return turn_on(makes_noise_when_lit) - playsound(user, on ? sound_on : sound_off, 40, TRUE) + playsound(src, on ? sound_on : sound_off, 40, TRUE) return TRUE +/obj/item/flashlight/attack_self(mob/user) + . = ..() + toggle_light() + /** * Handles turning on the flashlight. * Parameters: diff --git a/modular_skyrat/modules/pollution/code/fancy_storage_items.dm b/modular_skyrat/modules/pollution/code/fancy_storage_items.dm index 15ddd0ed800..da666f57de2 100644 --- a/modular_skyrat/modules/pollution/code/fancy_storage_items.dm +++ b/modular_skyrat/modules/pollution/code/fancy_storage_items.dm @@ -1,19 +1,19 @@ /obj/item/storage/fancy/candle_box/vanilla name = "vanilla candle pack" - spawn_type = /obj/item/candle/vanilla + spawn_type = /obj/item/flashlight/flare/candle/vanilla /obj/item/storage/fancy/candle_box/pear name = "pear candle pack" - spawn_type = /obj/item/candle/pear + spawn_type = /obj/item/flashlight/flare/candle/pear /obj/item/storage/fancy/candle_box/amber name = "amber candle pack" - spawn_type = /obj/item/candle/amber + spawn_type = /obj/item/flashlight/flare/candle/amber /obj/item/storage/fancy/candle_box/jasmine name = "jasmine candle pack" - spawn_type = /obj/item/candle/jasmine + spawn_type = /obj/item/flashlight/flare/candle/jasmine /obj/item/storage/fancy/candle_box/mint name = "mint candle pack" - spawn_type = /obj/item/candle/mint + spawn_type = /obj/item/flashlight/flare/candle/mint diff --git a/modular_skyrat/modules/pollution/code/scented_candles.dm b/modular_skyrat/modules/pollution/code/scented_candles.dm index 2f590ab3445..49fdedf2584 100644 --- a/modular_skyrat/modules/pollution/code/scented_candles.dm +++ b/modular_skyrat/modules/pollution/code/scented_candles.dm @@ -1,19 +1,19 @@ -/obj/item/candle/vanilla +/obj/item/flashlight/flare/candle/vanilla name = "vanilla scented candle" scented_type = /datum/pollutant/fragrance/vanilla -/obj/item/candle/pear +/obj/item/flashlight/flare/candle/pear name = "pear scented candle" scented_type = /datum/pollutant/fragrance/pear -/obj/item/candle/amber +/obj/item/flashlight/flare/candle/amber name = "amber scented candle" scented_type = /datum/pollutant/fragrance/amber -/obj/item/candle/jasmine +/obj/item/flashlight/flare/candle/jasmine name = "jasmine scented candle" scented_type = /datum/pollutant/fragrance/jasmine -/obj/item/candle/mint +/obj/item/flashlight/flare/candle/mint name = "mint scented candle" scented_type = /datum/pollutant/fragrance/mint diff --git a/tgstation.dme b/tgstation.dme index d78ff03d544..48f829cb819 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1759,7 +1759,6 @@ #include "code\game\objects\items\bouquets.dm" #include "code\game\objects\items\boxcutter.dm" #include "code\game\objects\items\broom.dm" -#include "code\game\objects\items\candle.dm" #include "code\game\objects\items\cardboard_cutouts.dm" #include "code\game\objects\items\cards_ids.dm" #include "code\game\objects\items\chainsaw.dm" diff --git a/tools/UpdatePaths/Scripts/72146_candles.txt b/tools/UpdatePaths/Scripts/72146_candles.txt new file mode 100644 index 00000000000..12d5d836ddd --- /dev/null +++ b/tools/UpdatePaths/Scripts/72146_candles.txt @@ -0,0 +1,4 @@ +#comment This repaths candles to be a subtype of a flares. + +/obj/item/candle : /obj/item/flashlight/flare/candle{@OLD} +/obj/item/candle/infinite : /obj/item/flashlight/flare/candle/infinite{@OLD}