From 33a0709a42f29f25f790ce6728c2c400368c0cf8 Mon Sep 17 00:00:00 2001 From: GySgtMurphy <79298976+GySgtMurphy@users.noreply.github.com> Date: Fri, 15 Nov 2024 00:14:39 -0500 Subject: [PATCH 1/2] Ahem.. NSV Endeavour Fixes 2 (#6830) ## About The Pull Request Working on Disposals! ## Why It's Good For The Game ## Changelog :cl: add: Added more things /:cl: --------- Co-authored-by: AlphaM01 Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- _mapload/{victory.dm => endeavour.dm} | 2 +- code/game/area/Space Station 13 areas.dm | 27 + code/game/area/endeavour_areas.dm | 4 + maps/endeavour/endeavour-overmap.dm | 2 +- maps/endeavour/endeavour-turbolifts.dm | 8 +- maps/endeavour/endeavour.dm | 2 +- maps/endeavour/engines/rust.dmm | 264 +- maps/endeavour/levels/deck1.dmm | 5710 ++++---- maps/endeavour/levels/deck2.dmm | 12034 +++++++++++----- maps/endeavour/levels/deck3.dmm | 9427 ++++++++---- maps/endeavour/levels/deck4.dmm | 2679 ++-- .../tradeport_192/levels/tradeport_192.dmm | 2 +- 12 files changed, 20265 insertions(+), 9896 deletions(-) rename _mapload/{victory.dm => endeavour.dm} (71%) diff --git a/_mapload/victory.dm b/_mapload/endeavour.dm similarity index 71% rename from _mapload/victory.dm rename to _mapload/endeavour.dm index f42b00e15e4d..4aec4d64d0ff 100644 --- a/_mapload/victory.dm +++ b/_mapload/endeavour.dm @@ -2,4 +2,4 @@ #error Duplicate FORCE_MAP, what are you doing!? #endif -#define FORCE_MAP "victory" +#define FORCE_MAP "endeavour" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 4c08ba001639..34f41b19f3f3 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -3351,6 +3351,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station var/arrival_sound = 'sound/machines/ding.ogg' var/delay_time = 2 SECONDS +// deck names for Triumph + /area/turbolift/t_ship/level1 name = "Deck 1" lift_floor_label = "Deck 1" @@ -3375,6 +3377,31 @@ NOTE: there are two lists of areas in the end of this file: centcom and station lift_floor_name = "Exploration, Arrivals & Departures, Security, Command, Chapel, Sauna, Docking Arm, Library, Garden, Tool Storage" lift_announce_str = "Arriving at Deck 4." +// Deck names for Endeavour + +/area/turbolift/e_ship/level4 + name = "Deck 1" + lift_floor_label = "Deck 1" + lift_floor_name = "Exploration, Arrivals & Departures, Command, Chapel, Sauna, Docking Bay, Library, Garden, Tool Storage" + lift_announce_str = "Arriving at Deck 1." + +/area/turbolift/e_ship/level3 + name = "Deck 2" + lift_floor_label = "Deck 2" + lift_floor_name = "Medical, Science, Holo Deck, Teleporter" + lift_announce_str = "Arriving at Deck 3." + +/area/turbolift/e_ship/level2 + name = "Deck 3" + lift_floor_label = "Deck 3" + lift_floor_name = "Dorms, Cargo, Security, Mining, Bar, Cafe, Solars, Shops" + lift_announce_str = "Arriving at Deck 2." + +/area/turbolift/e_ship/level1 + name = "Deck 4" + lift_floor_label = "Deck 4" + lift_floor_name = "Engineering, Reactor, Telecomms, Trash Pit, Atmospherics, Main Battery, Small Craft Fabrication, Secondary Bridge" + lift_announce_str = "Arriving at Deck 1." //Debug/Code areas diff --git a/code/game/area/endeavour_areas.dm b/code/game/area/endeavour_areas.dm index be966a203b35..66cf348013cd 100644 --- a/code/game/area/endeavour_areas.dm +++ b/code/game/area/endeavour_areas.dm @@ -213,6 +213,10 @@ name = "\improper Robotics Morgue" icon_state = "robotics" +/area/rnd/robotics/smallcraft + name = "\improper Small Craft and Probe Assembly" + icon_state = "robotics" + /** Exploration */ /area/endeavour/exploration diff --git a/maps/endeavour/endeavour-overmap.dm b/maps/endeavour/endeavour-overmap.dm index 8566746986e8..d979a0511617 100644 --- a/maps/endeavour/endeavour-overmap.dm +++ b/maps/endeavour/endeavour-overmap.dm @@ -8,7 +8,7 @@ [b]Notice[/b]: Nanotrasen Vessel, authorized personnel only"} icon_state = "ship" - vessel_mass = 18500 // temporarily buffed by 3x due to vorestation fucking up large gas thruster code + vessel_mass = 48500 // temporarily buffed by 5x due to vorestation fucking up large gas thruster code burn_delay = 2 SECONDS fore_dir = EAST // Which direction the ship/z-level is facing. It will move dust particles from that direction when moving. base = TRUE // Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays diff --git a/maps/endeavour/endeavour-turbolifts.dm b/maps/endeavour/endeavour-turbolifts.dm index 94351b98e26a..c4c80b81d5a9 100644 --- a/maps/endeavour/endeavour-turbolifts.dm +++ b/maps/endeavour/endeavour-turbolifts.dm @@ -8,8 +8,8 @@ wall_type = null // Don't make walls areas_to_use = list( - /area/turbolift/t_ship/level1, - /area/turbolift/t_ship/level2, - /area/turbolift/t_ship/level3, - /area/turbolift/t_ship/level4 + /area/turbolift/e_ship/level1, + /area/turbolift/e_ship/level2, + /area/turbolift/e_ship/level3, + /area/turbolift/e_ship/level4 ) diff --git a/maps/endeavour/endeavour.dm b/maps/endeavour/endeavour.dm index 576d2c23f649..7dc84ec970fb 100644 --- a/maps/endeavour/endeavour.dm +++ b/maps/endeavour/endeavour.dm @@ -159,7 +159,6 @@ traits = list( ZTRAIT_STATION, ZTRAIT_FACILITY_SAFETY, - ZTRAIT_LEGACY_BELTER_DOCK, ) base_turf = /turf/simulated/open link_below = /datum/map_level/endeavour/ship/deck_three @@ -175,6 +174,7 @@ traits = list( ZTRAIT_STATION, ZTRAIT_FACILITY_SAFETY, + ZTRAIT_LEGACY_BELTER_DOCK, ) base_turf = /turf/simulated/open link_below = /datum/map_level/endeavour/ship/deck_four diff --git a/maps/endeavour/engines/rust.dmm b/maps/endeavour/engines/rust.dmm index 0e501ced74fa..71e31bc66d26 100644 --- a/maps/endeavour/engines/rust.dmm +++ b/maps/endeavour/engines/rust.dmm @@ -325,6 +325,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, /area/engineering/engine_room) +"dV" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "ev" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 @@ -408,6 +417,9 @@ /obj/machinery/door/airlock/hatch{ req_one_access = null }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "hP" = ( @@ -473,6 +485,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) +"km" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "kt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -603,6 +627,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) +"nl" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "nq" = ( /obj/machinery/air_alarm{ dir = 1; @@ -666,6 +699,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "qB" = ( @@ -701,6 +740,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "sc" = ( @@ -787,6 +832,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) +"vS" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "vV" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -806,12 +860,37 @@ }, /turf/simulated/floor, /area/engineering/engine_room) +"wo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"wJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "wL" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 1 }, /turf/simulated/floor/plating, /area/engineering/engine_room) +"wR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "xe" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -857,8 +936,11 @@ /area/engineering/engine_room) "At" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) @@ -866,6 +948,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "CA" = ( @@ -887,12 +972,71 @@ }, /turf/simulated/floor/reinforced, /area/engineering/engine_room) +"CW" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Dw" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"DB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"DF" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "EG" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, /turf/simulated/floor/plating, /area/engineering/engine_room) +"EH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"EM" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "Fk" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/deuterium, @@ -951,6 +1095,13 @@ /obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/engineering/engine_room) +"GE" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "GL" = ( /obj/machinery/light, /obj/machinery/door/firedoor, @@ -1021,6 +1172,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) +"JP" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "Kb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1051,14 +1211,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ll" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) @@ -1209,9 +1370,13 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "Qk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Qo" = ( @@ -1265,6 +1430,15 @@ "Sw" = ( /turf/simulated/floor, /area/engineering/engine_room) +"SH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "SQ" = ( /obj/machinery/air_alarm{ dir = 1; @@ -1334,6 +1508,18 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_room) +"VX" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"WF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) "XA" = ( /obj/structure/table/standard, /obj/random/powercell, @@ -1356,9 +1542,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Yd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1368,6 +1551,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ye" = ( @@ -1510,7 +1696,7 @@ Ye Ye Ye Ye -Ye +GE Ye aP "} @@ -1530,8 +1716,8 @@ ZF PT kW kW -kW -kW +nl +dV kW kW Hw @@ -1553,8 +1739,8 @@ FL Qo Qo Ll -Ye -Ye +wJ +DB Ye Ye "} @@ -1592,15 +1778,15 @@ dB aH dB dB -mF -Qv +km +JP Ye SQ jf NE kB Ye -Ye +GE "} (10,1,1) = {" pp @@ -1615,7 +1801,7 @@ aI Gq aw Yd -Qv +EM Ye UA jf @@ -1642,8 +1828,8 @@ Ye Ye jf VD -kB -Ye +wR +WF nq "} (12,1,1) = {" @@ -1664,8 +1850,8 @@ Ye tl jf VD -kB -Ye +EH +VX Th "} (13,1,1) = {" @@ -1794,32 +1980,32 @@ oV Qv cx Ye -kB -Ye +wR +WF Ye Ye jf "} (19,1,1) = {" -Ye -Ye -Ye -Ye +DF +DF +DF +DF Qk At gu -ue -Ye -Ye +Dw +CW +kW Ay -oV -Qv +SH +vS cx Ye -Kb -Ye -Ye +wo +VX Ye +xe jf "} (20,1,1) = {" diff --git a/maps/endeavour/levels/deck1.dmm b/maps/endeavour/levels/deck1.dmm index efee125fe14f..7c3e7dd14aca 100644 --- a/maps/endeavour/levels/deck1.dmm +++ b/maps/endeavour/levels/deck1.dmm @@ -53,6 +53,14 @@ }, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"acA" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "adZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 5 @@ -112,6 +120,18 @@ /obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/hallway/d1afthall) +"agQ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "agV" = ( /obj/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/outline/yellow, @@ -294,11 +314,8 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "apf" = ( /obj/effect/floor_decal/techfloor{ @@ -399,11 +416,17 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "atm" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -480,19 +503,16 @@ /area/hallway/secondary/docking_hallway) "axd" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 1 AMIDSHIPS SUPPORT" + RCon_tag = "AUX - DECK 1 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "axR" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -584,18 +604,6 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) -"aBS" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) "aCq" = ( /obj/structure/sign/warning/bomb_range{ name = "\improper LIVE ORDINANCE"; @@ -612,6 +620,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) +"aCy" = ( +/obj/structure/catwalk, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "aCQ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -644,36 +659,18 @@ "aEk" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/camera/network/civilian{ dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "aEK" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/structure/bookcase{ + name = "bookcase (Fiction)" }, -/obj/machinery/suit_storage_unit/exploration, -/turf/simulated/floor/tiled, -/area/space) +/obj/item/book/custom_library/fiction, +/turf/simulated/floor/wood, +/area/library) "aEU" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/endeavour/hallway/d1fwdmaint) @@ -741,6 +738,21 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) +"aGw" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "aGA" = ( /obj/structure/catwalk, /obj/structure/cable/cyan{ @@ -816,26 +828,17 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 5 }, -/obj/machinery/disposal, /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "aHF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/steeldecal/steel_decals8{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor{ - dir = 8 - }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1portamidhall) "aHN" = ( /obj/machinery/light{ dir = 8 @@ -898,12 +901,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "aJz" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/disposal, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aJQ" = ( @@ -1075,18 +1076,6 @@ /obj/machinery/light/flamp, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/lounge) -"aRe" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) "aRm" = ( /obj/structure/table/woodentable, /obj/machinery/photocopier/faxmachine{ @@ -1120,6 +1109,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "aSd" = ( @@ -1212,10 +1204,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bookcase{ - name = "bookcase (Reference)" + name = "bookcase (Non-Fiction)" }, -/obj/item/book/manual/engineering_particle_accelerator, -/obj/item/book/custom_library/reference, +/obj/item/book/custom_library/nonfiction, /turf/simulated/floor/wood, /area/library) "aVF" = ( @@ -1235,7 +1226,7 @@ /area/bridge) "aVW" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 1 AFT SUPPORT" + RCon_tag = "AUX - DECK 1 AFT" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) @@ -1321,6 +1312,10 @@ /area/endeavour/hallway/d1aftmaint) "aYh" = ( /obj/machinery/shipsensors, +/obj/machinery/light{ + dir = 8; + pixel_x = -10 + }, /turf/simulated/floor/plating, /area/shuttle/courser/general) "aYQ" = ( @@ -1333,12 +1328,21 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/orange{ + icon_state = "5-10" + }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "aZE" = ( /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "baf" = ( @@ -1349,6 +1353,27 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"bak" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "baZ" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -1357,9 +1382,6 @@ /turf/simulated/floor/carpet, /area/bridge/office) "bbP" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -1421,6 +1443,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/sign/deck/first{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "ber" = ( @@ -1650,7 +1675,7 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/ship_munition/disperser_charge/mining, /turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1aftmaint) +/area/exploration/courser_dock) "bog" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1715,23 +1740,25 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "bsq" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/newscaster{ + pixel_x = -27 + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = -27 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "bsZ" = ( /obj/structure/bookcase{ - name = "bookcase (Fiction)" + name = "bookcase (Reference)" }, -/obj/item/book/custom_library/fiction, -/obj/item/book/manual/the_humanized_mice, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/fission_engine, +/obj/item/book/manual/supermatter_engine, +/obj/item/book/manual/atmospipes, /turf/simulated/floor/wood, /area/library) "bul" = ( @@ -1783,7 +1810,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "bwE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -1816,9 +1843,18 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) -"bxs" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) +"bxh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/open, +/area/endeavour/exploration/hallway_fore) "bxv" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -1838,21 +1874,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) -"byY" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "bzz" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -1890,12 +1911,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "bAB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway2) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "bBw" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -1966,7 +1986,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "bFn" = ( /obj/machinery/newscaster{ @@ -2013,6 +2033,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "bHQ" = ( @@ -2036,13 +2059,19 @@ dir = 4 }, /obj/machinery/camera/network/command, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "bIn" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/library) "bIp" = ( /obj/structure/bed/chair/comfy/black{ @@ -2051,15 +2080,14 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bIw" = ( -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/bookcase{ - name = "bookcase (Religious)" +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, -/obj/item/book/custom_library/religious, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "bIB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -2114,9 +2142,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/wood, /area/hydroponics/garden) "bLC" = ( @@ -2157,10 +2182,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bookcase{ - name = "bookcase (Non-Fiction)" + name = "bookcase (Religious)" }, -/obj/item/book/manual/tesla_engine, -/obj/item/book/custom_library/nonfiction, +/obj/item/book/custom_library/religious, /turf/simulated/floor/wood, /area/library) "bNm" = ( @@ -2326,7 +2350,7 @@ /obj/structure/bed/chair/bay/comfy/black{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "bVE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2380,12 +2404,14 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "bWH" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/crew_quarters/coffee_shop) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "bWR" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -2448,6 +2474,9 @@ "caS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/flora/pottedplant/orientaltree, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/wood, /area/hydroponics/garden) "cbd" = ( @@ -2492,6 +2521,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "ceM" = ( @@ -2574,31 +2606,32 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"cgX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) "chb" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 27 - }, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/item/nullrod, +/turf/simulated/floor/lino, +/area/chapel/office) "chH" = ( /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 6 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "cib" = ( @@ -2707,7 +2740,7 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "cmM" = ( /obj/machinery/shipsensors, @@ -2853,6 +2886,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/lounge) +"cuR" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1portforhall) "cvc" = ( /obj/effect/floor_decal/corner/blue{ dir = 8 @@ -2918,15 +2957,6 @@ }, /turf/simulated/floor/tiled, /area/exploration) -"cxg" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "cxt" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -2939,9 +2969,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "cxE" = ( @@ -2952,9 +2979,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/orange{ - icon_state = "5-10" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "cxS" = ( @@ -2982,15 +3006,6 @@ }, /turf/simulated/floor/tiled, /area/exploration) -"czd" = ( -/obj/machinery/media/jukebox{ - icon_state = "superjuke-nopower"; - state_base = "superjuke"; - pixel_x = -30; - pixel_y = 33 - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1aftmaint) "czv" = ( /obj/machinery/camera/network/exploration{ dir = 1 @@ -3011,9 +3026,6 @@ dir = 4 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "czH" = ( @@ -3044,23 +3056,26 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "cBe" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portforhall) "cBI" = ( /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 }, -/obj/item/book/manual/legal/sop_vol2, -/obj/item/book/manual/legal/sop_vol1, +/obj/item/paper_bin, +/obj/item/folder/red, +/obj/item/folder/blue, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/bridge) "cBN" = ( @@ -3160,10 +3175,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "cGq" = ( /obj/structure/table/rack/shelf, @@ -3174,9 +3186,6 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"cGC" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "cGG" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/general) @@ -3205,15 +3214,13 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "cHX" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp/green, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/library) "cIt" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -3282,7 +3289,13 @@ icon_state = "2-8" }, /obj/machinery/camera/network/command, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "cKW" = ( /obj/structure/table/reinforced, @@ -3314,9 +3327,6 @@ "cMJ" = ( /turf/simulated/wall/r_wall/prepainted, /area/endeavour/surfacebase/tram) -"cMM" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1fwdhall) "cMQ" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector{ @@ -3335,9 +3345,6 @@ "cOe" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/fire_alarm/south_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -3387,15 +3394,6 @@ /obj/item/stool/padded, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) -"cPD" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hallway/secondary/docking_hallway) "cPS" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -3467,11 +3465,8 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "cSr" = ( /obj/machinery/light/small/emergency{ @@ -3561,7 +3556,13 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "cVc" = ( /obj/effect/floor_decal/borderfloorblack, @@ -3610,6 +3611,15 @@ "cWc" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/dock) +"cWg" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Library" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/library) "cXD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -3683,6 +3693,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/lawoffice) "cYO" = ( @@ -3805,7 +3818,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "dhw" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -3814,17 +3830,10 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 10 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, +/obj/machinery/light, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) -"dhZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) "dip" = ( /obj/structure/table/rack, /obj/item/tank/jetpack/oxygen, @@ -3871,17 +3880,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portamidhall) "dkm" = ( /obj/structure/table/rack/shelf/steel, /obj/item/stack/flag/red, @@ -3933,9 +3939,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/grass, /area/hydroponics/garden) "dnc" = ( @@ -3955,11 +3958,18 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "dos" = ( /obj/machinery/chem_master/condimaster, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "doC" = ( /turf/simulated/floor/tiled, @@ -4147,8 +4157,6 @@ /obj/machinery/camera/network/command, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/fire_alarm/north_mount, -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/bridge) "dvb" = ( @@ -4194,6 +4202,14 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/shuttle/civvie/general) +"dAp" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/beige/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dAq" = ( /turf/simulated/floor/tiled, /area/exploration/pilot_prep) @@ -4461,6 +4477,18 @@ /obj/vehicle_old/train/trolley, /turf/simulated/floor/plating, /area/maintenance/substation/dock) +"dKY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "dLH" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -4473,11 +4501,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "dMa" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "dMq" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -4518,6 +4543,9 @@ alpha = 255 }, /obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "dOB" = ( @@ -4585,10 +4613,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) -"dQH" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1fwdhall) "dQJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -4621,12 +4645,6 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "dSe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4636,13 +4654,26 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "dSB" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dTn" = ( /obj/machinery/door/blast/regular, /obj/machinery/atmospheric_field_generator/perma, @@ -4655,6 +4686,11 @@ }, /turf/simulated/floor/wood, /area/exploration/meeting) +"dTP" = ( +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/palebottlegreen, +/turf/simulated/floor/plating, +/area/crew_quarters/lounge/kitchen_freezer) "dUe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4777,6 +4813,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/wood, /area/hydroponics/garden) "eav" = ( @@ -4854,9 +4893,6 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) -"ecv" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "ecK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning{ @@ -4865,25 +4901,29 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "edF" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/glass_external/public{ - name = "Public EVA"; - req_one_access = null +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 1 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) +/area/bridge/hallway) "edR" = ( /obj/machinery/light{ dir = 8 @@ -4920,6 +4960,9 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "eeY" = ( @@ -4971,13 +5014,19 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "ejb" = ( /obj/structure/table/rack, @@ -5026,16 +5075,25 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/exploration) -"ekR" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp{ - pixel_y = 10 +"ekP" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/camera/network/civilian{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/lino, -/area/chapel/office) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) +"ekR" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/plating{ + initial_gas_mix = "TEMP=2.7" + }, +/area/endeavour/command/turrets) "elR" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/effect/paint/commandblue, @@ -5120,11 +5178,10 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/air_alarm/north_mount, -/obj/machinery/camera/network/civilian, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "eoP" = ( @@ -5135,12 +5192,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "eoY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -5233,7 +5284,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "esI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5277,7 +5328,8 @@ /area/endeavour/hallway/d1aftmaint) "etW" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Deck 1 Aft Grid" + RCon_tag = "Deck 1 Aft Grid"; + cur_coils = 2 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -5327,7 +5379,7 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1aftmaint) +/area/exploration/courser_dock) "evE" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5367,7 +5419,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "eyi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5493,6 +5545,16 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) +"eCS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 5 + }, +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled/dark, +/area/bridge/meeting_room) "eCW" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -5503,13 +5565,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/dock) "eDl" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1fwdhall) "eDy" = ( /obj/machinery/door/firedoor/glass, @@ -5559,8 +5615,8 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "eFE" = ( /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d1fwdmaint) @@ -5573,16 +5629,6 @@ }, /turf/simulated/floor/water/pool, /area/endeavour/surfacebase/sauna) -"eFI" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "eFW" = ( /turf/simulated/wall/r_wall/prepainted, /area/endeavour/hallway/d1afthall) @@ -5643,22 +5689,19 @@ /area/rnd/test_area) "eHI" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 4 + dir = 8 }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 5 + dir = 8 }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/station/stairs_four) +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "eIl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/railing{ @@ -5722,6 +5765,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"eMO" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "eNt" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -5743,7 +5790,13 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "eNI" = ( /obj/machinery/newscaster{ @@ -5768,10 +5821,7 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "eOe" = ( /obj/effect/floor_decal/borderfloorblack/corner{ @@ -5801,11 +5851,6 @@ /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/rnd/misc_lab) -"ePf" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1fwdhall) "ePo" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/machinery/atmospherics/portables_connector{ @@ -5855,6 +5900,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "eQc" = ( @@ -5935,7 +5986,7 @@ /obj/machinery/holoposter{ pixel_y = 32 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "eTc" = ( /obj/effect/floor_decal/techfloor/orange, @@ -5974,10 +6025,10 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "eUz" = ( +/obj/structure/catwalk, /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "eUJ" = ( @@ -5988,11 +6039,9 @@ "eUP" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 9 +/obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) @@ -6072,18 +6121,21 @@ /turf/simulated/floor/carpet, /area/endeavour/hallway/d1fwdmaint) "eWl" = ( -/obj/landmark/spawnpoint/job/pilot, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/space) +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "eWE" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/fuel_port{ @@ -6205,7 +6257,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "fbD" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 }, @@ -6271,6 +6322,12 @@ dir = 1 }, /obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "fdP" = ( @@ -6279,8 +6336,16 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "fef" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/steel, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "feg" = ( /obj/machinery/light, @@ -6325,9 +6390,6 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ffU" = ( @@ -6349,7 +6411,7 @@ /obj/structure/bed/chair/bay/comfy/black{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "fhC" = ( /obj/machinery/suit_cycler{ @@ -6371,14 +6433,20 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway2) "fix" = ( /obj/structure/table/marble, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, /obj/machinery/light, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "fjs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -6400,6 +6468,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "fjB" = ( @@ -6429,13 +6500,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/lawoffice) -"fkM" = ( -/obj/machinery/porta_turret/crescent{ - density = 1; - faction = "neutral" - }, -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/endeavour/command/turrets) "fkS" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -6501,11 +6565,11 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/effect/floor_decal/corner/navblue/border{ +/obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "fmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -6578,12 +6642,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"fnO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1fwdhall) "fnT" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6662,7 +6720,7 @@ dir = 1 }, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "fsb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6702,7 +6760,11 @@ icon_state = "0-8" }, /obj/machinery/power/apc/north_mount, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "fta" = ( /obj/structure/catwalk, @@ -6759,6 +6821,9 @@ pixel_x = -5; pixel_y = -1 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/lawoffice) "ftU" = ( @@ -6821,15 +6886,15 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "fvo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "fvr" = ( @@ -6845,9 +6910,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -6882,6 +6944,15 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) +"fyY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "fza" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -6971,26 +7042,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"fDi" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) -"fDn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "fDv" = ( /obj/machinery/mineral/equipment_vendor/survey, /obj/machinery/light{ @@ -7013,15 +7064,15 @@ /turf/simulated/floor/wood, /area/library) "fDY" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) "fEx" = ( @@ -7091,11 +7142,14 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "fIr" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/library) +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "fIt" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -7107,7 +7161,10 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "fIR" = ( /obj/structure/table/woodentable, @@ -7127,6 +7184,8 @@ icon_state = "1-2" }, /obj/map_helper/access_helper/airlock/station/science/toxins, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/rnd/misc_lab) "fJS" = ( @@ -7223,7 +7282,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "fMh" = ( /obj/structure/table/woodentable, @@ -7286,10 +7357,23 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) +"fND" = ( +/obj/structure/memorial{ + name = "NSV Endeavour's Builder's Plate"; + desc = "The Armstrong-Hawker Shipbuilding company would like to thank the following for the contributions to the design: Dáire van der Waals, M.D., Ph.D.; Ruminous Melro, B.S.E; Hammond McGuire Sr., M.S.E.. Their work was essential in the design and manufacture of this vessel, and those of her class in the years to follow." + }, +/turf/simulated/wall/prepainted, +/area/station/stairs_one) "fNJ" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) +"fNK" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "fOe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -7352,9 +7436,6 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) @@ -7456,21 +7537,6 @@ "fUM" = ( /turf/simulated/floor/wood, /area/exploration/meeting) -"fUU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 5 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "fVc" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7492,6 +7558,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/captain) +"fVP" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/tiled/steel, +/area/station/stairs_one) "fVU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7544,7 +7617,7 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/ship_munition/disperser_charge/mining, /turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1aftmaint) +/area/exploration/courser_dock) "fYf" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -7584,14 +7657,20 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "gag" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/item/radio/beacon, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/item/radio/beacon, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "gaj" = ( /obj/machinery/door/firedoor, @@ -7644,9 +7723,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) -"gbe" = ( -/turf/simulated/wall/prepainted/engineering/atmos, -/area/space) "gbt" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -7661,7 +7737,7 @@ /obj/machinery/recharger/wallcharger{ pixel_x = -22 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "gcd" = ( /obj/machinery/power/apc/south_mount, @@ -7692,12 +7768,18 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "geF" = ( /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/misc_lab) "geL" = ( @@ -7795,9 +7877,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) -"gis" = ( -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1fwdhall) "giv" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/closet/secure_closet/guncabinet/excursion, @@ -7808,8 +7887,20 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) +"giY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "gja" = ( /obj/structure/table/reinforced, /obj/item/stamp/denied, @@ -7823,6 +7914,12 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) "gjv" = ( @@ -8044,7 +8141,7 @@ dir = 4 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "gqq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8070,6 +8167,8 @@ dir = 1 }, /obj/structure/table/reinforced, +/obj/item/book/manual/legal/sop_vol2, +/obj/item/book/manual/legal/sop_vol1, /turf/simulated/floor/tiled/dark, /area/bridge) "gqZ" = ( @@ -8097,6 +8196,16 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"gtI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/tiled, +/area/endeavour/exploration/hallway_fore) "gud" = ( /obj/machinery/door/firedoor, /turf/simulated/wall/r_wall/prepainted/exploration, @@ -8171,7 +8280,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "gxB" = ( /turf/simulated/wall/r_wall/prepainted/exploration, @@ -8182,6 +8292,7 @@ }, /obj/structure/closet/firecloset, /obj/item/duct_tape_roll, +/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "gyv" = ( @@ -8223,16 +8334,6 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"gAn" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "gAA" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -8241,6 +8342,29 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) +"gBE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) +"gBF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "gBG" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/violet, @@ -8276,16 +8400,16 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "gDf" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/light{ +/obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "gDh" = ( /obj/machinery/door/airlock/voidcraft/vertical{ @@ -8326,10 +8450,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) -"gDL" = ( -/obj/structure/lattice, -/turf/space, -/area/endeavour/command/turrets) "gEb" = ( /obj/structure/bed/chair, /obj/landmark/spawnpoint/job/chaplain, @@ -8389,12 +8509,18 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/station/stairs_four) +/turf/simulated/floor/tiled/dark, +/area/station/stairs_one) "gIT" = ( /obj/structure/window/reinforced, /turf/simulated/open, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) +"gIW" = ( +/obj/structure/bookcase{ + name = "bookcase (Religious)" + }, +/turf/simulated/floor/wood, +/area/library) "gIY" = ( /obj/machinery/air_alarm/alarms_hidden{ dir = 4; @@ -8419,7 +8545,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "gJj" = ( /obj/effect/floor_decal/borderfloor{ @@ -8438,12 +8564,16 @@ /turf/simulated/wall/prepainted/command, /area/endeavour/hallway/d1fwdhall) "gJJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "gKk" = ( @@ -8452,6 +8582,10 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "gKK" = ( @@ -8479,6 +8613,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "gLE" = ( @@ -8533,13 +8673,22 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"gPm" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +"gOX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/vending/dinnerware, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) +"gPm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/black/full, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "gPM" = ( /obj/map_helper/airlock/door/ext_door, @@ -8590,22 +8739,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "gQU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/vending/wallmed1{ - pixel_x = 32 +/obj/structure/bookcase{ + name = "bookcase (Reference)" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1fwdhall) +/turf/simulated/floor/wood, +/area/library) "gRB" = ( /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -8667,16 +8805,9 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "gVv" = ( -/obj/structure/table/woodentable, -/obj/item/storage/fancy/crayons, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/storage/fancy/candle_box, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/lino, -/area/chapel/office) +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/wood, +/area/library) "gVE" = ( /obj/machinery/light{ dir = 4 @@ -8691,22 +8822,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) "gWh" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) -"gWC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1fwdhall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "gWI" = ( /obj/machinery/atmospherics/component/unary/heater{ dir = 1 @@ -8781,7 +8909,13 @@ /obj/item/storage/box/donkpockets, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/food/condiment/enzyme, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "hbb" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -8804,15 +8938,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "hbA" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/machinery/disposal, /turf/simulated/floor/wood, /area/hydroponics/garden) "hbF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera/network/civilian{ dir = 9 }, @@ -8829,29 +8958,20 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) -"hcC" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) "hcK" = ( /obj/machinery/camera/network/command{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/light{ +/obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "hdn" = ( /obj/effect/floor_decal/borderfloorblack/corner{ @@ -8860,9 +8980,6 @@ /obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "6-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "hdp" = ( @@ -8900,6 +9017,9 @@ dir = 1 }, /obj/machinery/door/airlock/glass, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "heD" = ( @@ -9006,9 +9126,7 @@ /turf/simulated/floor/plating, /area/endeavour/exploration/hallway_aft) "hgJ" = ( -/obj/machinery/door/airlock{ - name = "Unisex Showers" - }, +/obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor{ dir = 1 }, @@ -9024,6 +9142,8 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "hho" = ( @@ -9041,6 +9161,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "hhy" = ( @@ -9048,7 +9171,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = null }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway2) "hhY" = ( /obj/machinery/door/firedoor{ @@ -9057,6 +9180,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "hik" = ( @@ -9159,6 +9288,7 @@ /turf/simulated/floor/airless/ceiling, /area/endeavour/hallway/d1aftmaint) "hnl" = ( +/obj/effect/floor_decal/steeldecal/steel_decals2, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "hnz" = ( @@ -9199,7 +9329,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "hpL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9442,6 +9576,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) +"hAP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "hAV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -9450,17 +9601,10 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "hBB" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1fwdhall) "hCj" = ( /turf/simulated/wall/r_wall/prepainted/exploration, @@ -9476,6 +9620,8 @@ /obj/machinery/door/firedoor/glass{ dir = 8 }, +/obj/effect/paint/commandblue, +/obj/structure/wall_frame, /obj/structure/window/reinforced/polarized/full{ id = "hop_office2"; name = "HoP Office window" @@ -9507,16 +9653,9 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "hEF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/space) +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/grass, +/area/hydroponics/garden) "hFw" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/meeting) @@ -9564,14 +9703,14 @@ /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/clownoffice) "hIR" = ( -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/monodark, +/area/bridge) "hIY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/item/radio/beacon, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "hJE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9580,6 +9719,7 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/hydroponics/garden) "hJO" = ( @@ -9614,14 +9754,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "hJZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, /obj/structure/cable/orange{ - icon_state = "6-9" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portforhall) "hLu" = ( /obj/structure/lattice, /turf/simulated/open, @@ -9674,18 +9816,18 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "hOF" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/item/book/manual/atmospipes, -/obj/item/book/manual/rust_engine, -/obj/item/book/manual/supermatter_engine, -/obj/item/book/manual/tesla_engine, -/obj/item/book/manual/engineering_particle_accelerator, -/obj/item/book/manual/engineering_singularity_safety, -/obj/item/book/manual/fission_engine, -/turf/simulated/floor/wood, -/area/library) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1fwdhall) "hOH" = ( /obj/machinery/computer/borgupload, /obj/effect/floor_decal/corner/purple{ @@ -9725,6 +9867,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) +"hPu" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "hPQ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -9795,8 +9943,15 @@ /area/endeavour/hallway/d1fwdmaint) "hSi" = ( /obj/effect/floor_decal/spline/fancy, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) +"hSl" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "hSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -9839,10 +9994,13 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "hUE" = ( /obj/machinery/portable_atmospherics/canister/empty, @@ -9926,7 +10084,19 @@ /obj/machinery/vending/wallmed1{ pixel_x = 32 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "hWC" = ( /obj/structure/cable/green{ @@ -9956,24 +10126,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "hXa" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/structure/closet/secure_closet/pilot, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/storage/backpack/parachute, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "hXy" = ( /obj/effect/floor_decal/corner/purple{ dir = 9 @@ -10009,8 +10169,8 @@ "hYj" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, -/obj/structure/cable/orange{ - icon_state = "5-10" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 8 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) @@ -10034,9 +10194,6 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -10065,6 +10222,18 @@ }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) +"hZy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "iao" = ( /obj/structure/table/woodentable, /obj/machinery/bookbinder, @@ -10084,12 +10253,7 @@ /turf/simulated/floor/tiled, /area/exploration) "ibq" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, +/obj/effect/floor_decal/steeldecal/steel_decals_central4, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ibx" = ( @@ -10175,16 +10339,16 @@ "ieh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "ifc" = ( /obj/effect/floor_decal/industrial/warning, @@ -10214,7 +10378,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "ifH" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -10422,10 +10586,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ioL" = ( /obj/structure/bed/chair/bay/comfy/black{ @@ -10458,23 +10619,14 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/endeavour/hallway/d1fwdmaint) "ipW" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /obj/structure/cable/orange{ - icon_state = "6-8" + icon_state = "2-4" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1afthall) "iqj" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -10534,7 +10686,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "itm" = ( /obj/effect/floor_decal/borderfloorblack, @@ -10708,6 +10860,16 @@ }, /turf/simulated/floor/wood, /area/library) +"ixU" = ( +/obj/machinery/camera/network/exploration, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "iyv" = ( /obj/structure/window/reinforced{ dir = 8 @@ -10776,7 +10938,13 @@ dir = 1 }, /obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "iAU" = ( /obj/effect/floor_decal/borderfloorblack, @@ -10803,7 +10971,7 @@ /area/hallway/secondary/docking_hallway) "iBH" = ( /turf/simulated/wall/prepainted/command, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "iBS" = ( /obj/machinery/atmospherics/component/unary/engine{ dir = 4 @@ -10838,7 +11006,7 @@ /area/exploration/meeting) "iDg" = ( /turf/simulated/open, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "iDW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/flora/ausbushes/ywflowers, @@ -10899,6 +11067,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "iGx" = ( @@ -10949,8 +11120,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1portforhall) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "iKm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -10962,6 +11136,13 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"iKG" = ( +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, +/obj/item/book/manual/the_humanized_mice, +/turf/simulated/floor/wood, +/area/library) "iLb" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -11006,22 +11187,16 @@ /turf/simulated/floor/wood, /area/library) "iNb" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorblack/corner2{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ +/obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "iNf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11114,10 +11289,12 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "iRz" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "chapel" - }, /obj/effect/paint/palebottlegreen, +/obj/structure/window/reinforced/polarized/full{ + id = "chapel"; + name = "Chaplain's Office" + }, +/obj/structure/wall_frame, /turf/simulated/floor/plating, /area/chapel/office) "iRR" = ( @@ -11169,6 +11346,23 @@ /obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) +"iUW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) +"iVd" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "iVk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11188,9 +11382,6 @@ }, /turf/simulated/floor/wood, /area/lawoffice) -"iWc" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "iWy" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills, @@ -11210,6 +11401,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) +"iXl" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "iXB" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -11247,7 +11449,7 @@ icon_state = "4-8" }, /obj/machinery/fire_alarm/south_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "iYx" = ( /obj/item/clothing/mask/gas/sexyclown, @@ -11284,15 +11486,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) -"iZC" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "iZH" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 1 @@ -11434,35 +11627,25 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "jhz" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/beige/border, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "jhQ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/vending/dinnerware, +/obj/effect/floor_decal/corner/black{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/corner/black{ dir = 10 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/closet/secure_closet/pilot, -/obj/effect/floor_decal/industrial/outline, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/oxygen, -/obj/item/suit_cooling_unit, -/obj/item/storage/backpack/parachute, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/lounge/kitchen_freezer) "jie" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -11490,9 +11673,6 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -11554,20 +11734,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "jlB" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 9 - }, /obj/machinery/door/firedoor{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "jlM" = ( @@ -11577,6 +11754,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "jlN" = ( @@ -11768,7 +11948,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "jsu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11836,7 +12016,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "jtY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11906,6 +12086,13 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) +"jvO" = ( +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/lounge/kitchen_freezer) "jvT" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -11999,23 +12186,11 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "jzE" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 8 - }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/steeldecal/steel_decals2{ dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/station/stairs_four) +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway2) "jzT" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -12059,6 +12234,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "jBC" = ( @@ -12158,6 +12335,9 @@ dir = 4 }, /obj/item/radio/beacon, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "jGj" = ( @@ -12199,6 +12379,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "jGM" = ( @@ -12262,22 +12444,22 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "jJL" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "jJV" = ( /obj/machinery/fire_alarm/north_mount, @@ -12300,10 +12482,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "jLe" = ( @@ -12396,7 +12580,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "jOr" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12418,17 +12602,12 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "jPj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8; + pixel_x = -10 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/courser_dock) "jPH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12480,6 +12659,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"jQM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "jQW" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -12510,9 +12693,6 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "jTi" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, @@ -12562,15 +12742,34 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "jTS" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/paint/commandblue, +/obj/structure/wall_frame, /obj/structure/window/reinforced/polarized/full{ id = "library_study" }, -/obj/structure/wall_frame/prepainted, -/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/library/study) +"jTT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "jUy" = ( /obj/machinery/computer/rcon{ dir = 4 @@ -12654,14 +12853,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "jWV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/exploration/excursion_dock) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/palebottlegreen, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/hydroponics/garden) "jXa" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -12766,6 +12962,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "kaL" = ( @@ -12777,10 +12976,10 @@ dir = 4 }, /obj/structure/cable/orange{ - icon_state = "4-10" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1portforhall) "kaO" = ( /obj/effect/floor_decal/industrial/halfstair, /turf/simulated/floor/tiled/dark, @@ -12845,20 +13044,15 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "kdf" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "kdt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12883,6 +13077,9 @@ "kef" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "keD" = ( @@ -12909,12 +13106,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) -"kfj" = ( -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) "kfn" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -12958,6 +13149,15 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "khT" = ( @@ -13012,6 +13212,14 @@ /obj/effect/mist, /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) +"kiC" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "kiD" = ( /obj/structure/bed/chair/sofa/black{ dir = 1 @@ -13021,11 +13229,13 @@ "kiK" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "kiQ" = ( @@ -13039,7 +13249,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "kjq" = ( /obj/structure/bed/chair/sofa/black/right, @@ -13049,14 +13259,19 @@ /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/carpet/bcarpet, /area/library) -"kkD" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" +"klV" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1fwdmaint) "kmb" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -13123,7 +13338,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "kqJ" = ( /obj/structure/table/woodentable, @@ -13168,13 +13389,14 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "kuZ" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/dock) "kvb" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -13279,6 +13501,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"kAg" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_one) "kAA" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, @@ -13305,6 +13534,13 @@ "kBk" = ( /turf/simulated/floor/tiled/monowhite, /area/endeavour/hallway/d1fwdmaint) +"kBD" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/shoot{ + pixel_y = 12 + }, +/turf/simulated/floor/lino, +/area/chapel/office) "kBS" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -13349,13 +13585,17 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "kEh" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/orange{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portamidhall) "kEl" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -13367,6 +13607,24 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) +"kEq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "kEs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13542,10 +13800,7 @@ "kKH" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navgold/bordercorner, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "kLc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -13588,7 +13843,13 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "kMv" = ( /turf/simulated/wall/prepainted/civilian, @@ -13633,7 +13894,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "kNs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -13717,7 +13978,7 @@ "kPs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "1-8" }, /turf/simulated/floor/wood, /area/hydroponics/garden) @@ -13751,14 +14012,18 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) -"kPW" = ( -/obj/machinery/door/airlock{ - name = "Restroom" +"kQd" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "kQS" = ( /obj/structure/table/bench, @@ -13769,7 +14034,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1starboardafthall) "kRj" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -13809,18 +14074,6 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) -"kTG" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) "kTQ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -13838,7 +14091,10 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "kUz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -13924,19 +14180,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"kXL" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1fwdhall) "kXM" = ( /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) @@ -14004,7 +14247,7 @@ /obj/machinery/computer/ship/navigation{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "lbL" = ( /obj/machinery/fire_alarm/north_mount, @@ -14067,20 +14310,17 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "leE" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/light, -/obj/machinery/camera/network/civilian{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals1{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portforhall) "lgr" = ( /turf/simulated/floor/wood, /area/crew_quarters/mimeoffice) @@ -14090,12 +14330,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"lhl" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) "lhS" = ( /turf/simulated/wall/prepainted/civilian, /area/hallway/secondary/docking_hallway2) @@ -14152,23 +14386,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "llA" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 6 - }, /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/station/stairs_four) +/obj/machinery/vending/wallmed1{ + pixel_x = 32 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_one) "llV" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -14179,7 +14405,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "llY" = ( /obj/machinery/door/firedoor, @@ -14265,14 +14491,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "lou" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1fwdhall) "loQ" = ( /obj/structure/table/rack/shelf, @@ -14309,15 +14537,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"lqh" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "lqD" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -14416,12 +14635,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood, /area/lawoffice) -"lvj" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hallway/secondary/docking_hallway) "lwn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14469,7 +14682,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "lyX" = ( /obj/map_helper/access_helper/airlock/station/exploration/department, @@ -14560,7 +14773,7 @@ /area/endeavour/hallway/d1portamidhall) "lBc" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 1 AFT MAIN" + RCon_tag = "MAIN - DECK 1 AFT" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) @@ -14605,11 +14818,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "lDc" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/station/stairs_four) +/obj/structure/sign/deck/first, +/turf/simulated/wall/r_wall/prepainted, +/area/station/stairs_one) "lDo" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -14662,12 +14873,8 @@ /turf/simulated/floor/wood, /area/lawoffice) "lHm" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/obj/effect/floor_decal/borderfloorblack/corner2, -/obj/effect/floor_decal/corner/navblue/bordercorner2, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portforhall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d1starboardafthall) "lIc" = ( /obj/item/gun/energy/lasertag/red, /obj/structure/table/rack/shelf/steel, @@ -14722,16 +14929,13 @@ dir = 4; pixel_x = -28 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "lKS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -14801,6 +15005,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "lNr" = ( @@ -14828,6 +15035,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) +"lOm" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/station/stairs_one) "lOq" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -14863,17 +15076,13 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "lOX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hallway/secondary/docking_hallway) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "lPo" = ( /obj/structure/railing{ dir = 8 @@ -14885,14 +15094,6 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "lPB" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "lQq" = ( @@ -14977,7 +15178,7 @@ "lSz" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "lTA" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -14995,26 +15196,8 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) -"lUc" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) "lUh" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1fwdhall) @@ -15045,9 +15228,6 @@ "lVS" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/air_alarm/south_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -15060,7 +15240,13 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "lXo" = ( /obj/effect/floor_decal/spline/plain{ @@ -15138,6 +15324,9 @@ /area/chapel/main) "maZ" = ( /obj/structure/flora/pottedplant/stoutbush, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lawoffice) "mbU" = ( @@ -15257,7 +15446,7 @@ /area/endeavour/hallway/d1aftmaint) "meH" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 1 FORE SUPPORT" + RCon_tag = "AUX - DECK 1 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -15273,9 +15462,6 @@ /area/bridge) "mfn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "mfu" = ( @@ -15360,7 +15546,7 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 10 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "mic" = ( /obj/effect/floor_decal/chapel, @@ -15381,7 +15567,25 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "mjY" = ( /obj/structure/table/reinforced, @@ -15417,7 +15621,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "mlA" = ( /turf/simulated/floor/tiled/dark, @@ -15432,23 +15642,25 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "mmk" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central6, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1portforhall) +"mmC" = ( +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/machinery/fire_alarm/north_mount, +/obj/machinery/light{ + dir = 1 }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/machinery/suit_storage_unit/exploration, -/turf/simulated/floor/tiled, -/area/space) -"mmC" = ( /turf/simulated/floor/tiled/steel, -/area/chapel/main) +/area/endeavour/hallway/d1portamidhall) "mmN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15481,11 +15693,20 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "mnk" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "moK" = ( /obj/machinery/computer/security, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "mpL" = ( /obj/structure/table/bench/wooden, @@ -15532,6 +15753,15 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wood, /area/lawoffice) +"msQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "msS" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -15549,14 +15779,21 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "mth" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1fwdhall) "muD" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloor{ @@ -15568,7 +15805,10 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) "muT" = ( -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "muU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -15722,6 +15962,7 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "mAC" = ( @@ -15732,16 +15973,19 @@ dir = 1 }, /obj/machinery/air_alarm/north_mount, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "mBp" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "mBw" = ( /obj/structure/cable/green{ @@ -15754,7 +15998,16 @@ dir = 4 }, /obj/item/radio/beacon, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "mBH" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -15765,18 +16018,6 @@ }, /turf/simulated/floor/tiled, /area/exploration) -"mCT" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) "mDd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -15795,6 +16036,19 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) +"mEk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/obj/effect/floor_decal/corner/black{ + dir = 5 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/lounge/kitchen_freezer) "mER" = ( /obj/machinery/light/small{ dir = 4 @@ -15936,6 +16190,7 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "mJt" = ( @@ -15964,8 +16219,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1portforhall) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "mKU" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -16016,7 +16271,7 @@ dir = 4 }, /turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "mMT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -16049,6 +16304,13 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "mOK" = ( @@ -16120,9 +16382,6 @@ dir = 4 }, /obj/item/radio/beacon, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "mRF" = ( @@ -16315,6 +16574,12 @@ pixel_x = 32 }, /obj/machinery/holopad, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "mXO" = ( @@ -16486,8 +16751,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1portforhall) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "ngG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -16572,10 +16840,7 @@ /area/endeavour/hallway/d1starboardforhall) "nkN" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) @@ -16600,11 +16865,18 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "nlF" = ( -/obj/machinery/door/firedoor/glass{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/turf/simulated/wall/prepainted, -/area/hydroponics/garden) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1fwdhall) "nlI" = ( /obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/industrial/outline/yellow, @@ -16625,20 +16897,20 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "nnp" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "nnq" = ( /obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "nnH" = ( /obj/machinery/door/firedoor{ @@ -16647,12 +16919,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "nnP" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "noe" = ( /obj/machinery/computer/crew{ @@ -16735,16 +17014,28 @@ /obj/machinery/vending/wallmed1{ pixel_x = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "nqO" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "nrb" = ( /obj/machinery/door/airlock/voidcraft/vertical{ @@ -16775,8 +17066,14 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) +"nsi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "ntm" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -16787,6 +17084,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nty" = ( @@ -16826,9 +17126,6 @@ "nup" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -16878,7 +17175,7 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/air_alarm/south_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "nwm" = ( /obj/machinery/door/airlock/glass_external{ @@ -16916,7 +17213,7 @@ }, /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1starboardafthall) "nxf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16950,9 +17247,6 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "nyK" = ( @@ -17133,6 +17427,9 @@ pixel_y = 27 }, /obj/machinery/camera/network/civilian, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nHt" = ( @@ -17151,7 +17448,13 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "nHB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17257,12 +17560,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "nLZ" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "nMe" = ( @@ -17278,7 +17585,7 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "nMh" = ( /obj/structure/table/reinforced, @@ -17306,7 +17613,7 @@ "nNn" = ( /obj/structure/closet/crate, /obj/item/tool/crowbar, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "nNo" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -17369,6 +17676,15 @@ /obj/spawner/window/reinforced/full, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"nQJ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/courser_dock) "nQR" = ( /obj/machinery/air_alarm{ dir = 4; @@ -17377,6 +17693,18 @@ /obj/structure/reagent_dispensers/beerkeg/fakenuke, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) +"nRa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "nRP" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 @@ -17471,25 +17799,21 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"nUH" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +"nUI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) -"nUI" = ( -/obj/structure/bookcase{ - name = "bookcase (Religious)" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 }, -/obj/item/book/custom_library/religious, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "nVc" = ( /obj/structure/closet/secure_closet/captains, /obj/item/clothing/accessory/poncho/roles/cloak/captain, @@ -17527,7 +17851,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "nWj" = ( /obj/structure/cable/green{ @@ -17548,22 +17872,21 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) -"nXR" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "5-8" +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1starboardafthall) +"nXR" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "nXX" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -17608,7 +17931,7 @@ dir = 1 }, /turf/simulated/open, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "nYT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17659,11 +17982,12 @@ /turf/simulated/open, /area/rnd/misc_lab) "ocK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/wood, +/area/hydroponics/garden) "odj" = ( /obj/machinery/air_alarm{ frequency = 1441; @@ -17697,15 +18021,16 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "oeW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/wall_frame/prepainted, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/paint/commandblue, +/obj/structure/wall_frame, /obj/structure/window/reinforced/polarized/full{ id = "lawyer_blast"; - name = "Internal Aiffars window" + name = "Internal Affairs Office" }, -/obj/effect/paint_stripe/commandblue, -/turf/simulated/floor, +/turf/simulated/floor/plating, /area/lawoffice) "ofe" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -17744,10 +18069,7 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ofG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17797,7 +18119,7 @@ dir = 9 }, /obj/machinery/vending/fitness, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) "oiv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17880,6 +18202,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "ojQ" = ( @@ -17893,9 +18221,6 @@ /area/endeavour/hallway/d1portforhall) "okH" = ( /obj/machinery/power/apc/east_mount, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17903,21 +18228,9 @@ /area/maintenance/tool_storage) "okP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/hydroponics/garden) -"olk" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "olr" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17935,7 +18248,7 @@ /area/maintenance/substation/dock) "omT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "onf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18017,19 +18330,20 @@ /turf/simulated/floor/tiled, /area/exploration) "opz" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 9 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portforhall) "opC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18065,17 +18379,29 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, -/obj/structure/cable/green{ +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) +"orE" = ( +/obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/bridge/hallway) +/area/endeavour/hallway/d1starboardforhall) "osa" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/techfloor/grid, @@ -18282,15 +18608,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) -"oCc" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "oCT" = ( /obj/machinery/computer/shuttle_control/explore/civvie{ dir = 8 @@ -18301,7 +18618,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "oDs" = ( /obj/machinery/door/blast/regular{ @@ -18319,6 +18636,9 @@ "oDE" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "oDJ" = ( @@ -18384,6 +18704,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/dock) +"oHx" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/air_alarm/west_mount, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardafthall) "oHy" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -18415,7 +18748,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navgold/bordercorner2, /obj/machinery/air_alarm/south_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "oKo" = ( /obj/structure/closet/secure_closet/personal{ @@ -18497,28 +18830,35 @@ /area/exploration/meeting) "oNV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "oOx" = ( -/obj/structure/table/woodentable, -/obj/item/nullrod, -/obj/item/reagent_containers/food/drinks/bottle/holywater, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/vending/snack, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/lino, -/area/chapel/office) +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1fwdhall) "oOB" = ( /obj/effect/paint/commandblue, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1fwdhall) +"oPk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1starboardamidhall) "oPo" = ( /obj/machinery/door/airlock/voidcraft/vertical{ name = "cockpit hatch" @@ -18537,8 +18877,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/tiled/dark, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "oQY" = ( /obj/structure/barricade, /obj/machinery/door/airlock/maintenance/common, @@ -18561,10 +18902,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "oRQ" = ( /obj/effect/floor_decal/industrial/warning, @@ -18699,6 +19037,18 @@ /obj/structure/closet/athletic_mixed, /turf/simulated/floor/holofloor/tiled/dark, /area/crew_quarters/pool/changing_room) +"oXb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "oXj" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -18800,19 +19150,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway2) -"pbZ" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "pcv" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -18899,7 +19236,10 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "pfk" = ( /obj/effect/floor_decal/chapel, @@ -18950,6 +19290,9 @@ dir = 8; pixel_x = -24 }, +/obj/structure/cable/orange{ + icon_state = "1-10" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pfX" = ( @@ -18976,9 +19319,6 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "pgF" = ( @@ -19006,7 +19346,14 @@ /turf/simulated/floor/carpet/purcarpet, /area/bridge) "phc" = ( -/turf/simulated/wall/r_wall/prepainted, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 9 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "phl" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -19067,7 +19414,7 @@ dir = 8; name = "Library" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/library) "plx" = ( /obj/structure/bookcase/legal/combo, @@ -19086,9 +19433,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "plJ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled, -/area/space) +/obj/effect/floor_decal/steeldecal/steel_decals2, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "pmD" = ( /obj/item/flashlight/lantern, /obj/structure/table/standard, @@ -19121,17 +19468,19 @@ /area/endeavour/hallway/d1afthall) "pmP" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 + dir = 8 }, -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1portforhall) +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "pmV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, @@ -19206,6 +19555,9 @@ /obj/machinery/door/airlock/glass/exploration{ name = "Pathfinder's Office" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "poQ" = ( @@ -19258,7 +19610,7 @@ /area/exploration) "prQ" = ( /obj/machinery/computer/teleporter, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "prS" = ( /obj/machinery/newscaster{ @@ -19290,9 +19642,6 @@ "ptG" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/fire_alarm/south_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -19412,6 +19761,14 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) +"pyy" = ( +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1fwdhall) "pzo" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/crew_quarters/lounge) @@ -19464,12 +19821,23 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway) "pCl" = ( -/obj/landmark/spawnpoint/job/pilot, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "pDa" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19709,21 +20077,6 @@ /obj/machinery/floodlight, /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) -"pQR" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 9 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "pRd" = ( /obj/structure/catwalk, /obj/machinery/light{ @@ -19753,12 +20106,21 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "pSA" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) "pSS" = ( @@ -19792,7 +20154,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "pWq" = ( /obj/machinery/gateway/centerstation, @@ -19801,13 +20166,28 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"pWE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "pWN" = ( /obj/machinery/camera/network/outside, /turf/space, /area/hallway/secondary/docking_hallway) "pXa" = ( /obj/structure/bed/chair/bay/comfy/black, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "qbM" = ( /obj/machinery/door/morgue{ @@ -19816,18 +20196,21 @@ /turf/simulated/floor/wood, /area/crew_quarters/clownoffice) "qcd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor{ dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "qcV" = ( @@ -19879,10 +20262,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "qer" = ( @@ -19999,11 +20378,12 @@ /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/cockpit) "qii" = ( -/obj/structure/loot_pile/surface/medicine_cabinet{ - pixel_y = 24 +/obj/machinery/media/jukebox{ + icon_state = "superjuke-nopower"; + state_base = "superjuke" }, -/turf/simulated/floor/tiled/monowhite, -/area/endeavour/hallway/d1fwdmaint) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d1aftmaint) "qik" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -20079,8 +20459,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/tram) "qln" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "qlw" = ( /obj/machinery/door/blast/regular{ @@ -20133,7 +20518,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "qoX" = ( /obj/effect/floor_decal/industrial/warning{ @@ -20170,9 +20555,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "qrE" = ( @@ -20256,10 +20640,10 @@ /area/space) "quJ" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 5 + dir = 4 }, /obj/effect/floor_decal/corner/navblue/border{ - dir = 5 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 @@ -20267,7 +20651,6 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 5 }, -/obj/machinery/disposal, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "quY" = ( @@ -20303,7 +20686,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "qxF" = ( /obj/machinery/light/small{ @@ -20390,11 +20773,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "qBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -20414,16 +20794,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "qCb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "qCw" = ( /obj/machinery/door/airlock/voidcraft/vertical, @@ -20507,14 +20882,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) -"qFl" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) "qFo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -20571,18 +20938,18 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "qKj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "qKF" = ( /obj/machinery/conveyor{ @@ -20614,10 +20981,16 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-9" - }, /obj/machinery/computer/timeclock/premade/south, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "qLL" = ( @@ -20646,29 +21019,31 @@ /turf/simulated/floor/tiled/white, /area/exploration/medical) "qMR" = ( -/obj/effect/floor_decal/borderfloorblack{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) +"qNt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light{ - dir = 4; - use_power = 0 + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) -"qNt" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/hallway/secondary/docking_hallway) "qNJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20686,12 +21061,6 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -20708,10 +21077,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "qOo" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1portforhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "qOz" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -20782,20 +21149,11 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"qRx" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "qRD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "qRQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -20838,12 +21196,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "qUh" = ( -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/navblue/bordercorner, /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "qUr" = ( /obj/effect/floor_decal/spline/plain{ @@ -20979,11 +21340,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/clownoffice) "qZR" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" +/obj/structure/bed/chair/comfy/brown, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 27 }, -/obj/item/book/manual/evaguide, -/obj/item/book/custom_library/reference, /turf/simulated/floor/wood, /area/library) "qZT" = ( @@ -21038,6 +21398,13 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/hydroponics/garden) +"rci" = ( +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/lawoffice) "rcm" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/penguin_baby, @@ -21118,7 +21485,7 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "rfr" = ( /obj/effect/floor_decal/grass_edge{ @@ -21185,7 +21552,7 @@ icon_state = "4-8" }, /obj/machinery/air_alarm/south_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "rkb" = ( /obj/structure/table/reinforced, @@ -21284,7 +21651,10 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "rmZ" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -21342,7 +21712,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "roT" = ( -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "rpb" = ( /obj/structure/bed/double/padded, @@ -21544,7 +21914,7 @@ dir = 4 }, /obj/machinery/air_alarm/north_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "rAN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21595,23 +21965,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "rCw" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 10 - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/station/stairs_four) +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/turf/simulated/floor/lino, +/area/chapel/office) "rCE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21723,18 +22086,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"rGM" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) "rHo" = ( /obj/machinery/light{ dir = 1 @@ -21771,7 +22122,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "rJw" = ( /obj/effect/floor_decal/industrial/warning{ @@ -21817,6 +22174,10 @@ }, /turf/simulated/wall/r_wall/prepainted/exploration, /area/shuttle/excursion/cargo) +"rOU" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/grass, +/area/hydroponics/garden) "rPt" = ( /obj/machinery/light{ dir = 8; @@ -21916,13 +22277,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) -"rUF" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) "rUP" = ( /obj/machinery/gateway{ dir = 10 @@ -21973,6 +22327,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/holopad, /turf/simulated/floor/carpet/bcarpet, /area/library) "rWf" = ( @@ -22020,7 +22375,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "rZl" = ( /obj/effect/mist, @@ -22030,12 +22385,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/endeavour/surfacebase/sauna) -"rZH" = ( -/obj/structure/loot_pile/surface/medicine_cabinet{ - pixel_y = 24 - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d1fwdmaint) "sae" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -22088,12 +22437,22 @@ "sbG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/beige/bordercorner, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "scr" = ( /obj/machinery/fire_alarm/north_mount, @@ -22155,13 +22514,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"sfL" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/dock) "sfX" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -22232,21 +22584,17 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) "sjP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable/orange{ - icon_state = "6-9" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1portforhall) "sjU" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/endeavour/exploration/hallway_fore) @@ -22282,17 +22630,15 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "skF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "skI" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/effect/paint/commandblue, @@ -22367,6 +22713,15 @@ }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) +"sqc" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "sqd" = ( /obj/structure/railing{ dir = 4 @@ -22386,7 +22741,7 @@ /area/shuttle/courser/cockpit) "srV" = ( /turf/simulated/floor/plating, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "ssc" = ( /obj/machinery/light/small{ dir = 1 @@ -22580,7 +22935,6 @@ /area/exploration/explorer_prep) "sAo" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/tree/sif, /obj/structure/cable/orange{ icon_state = "4-8" }, @@ -22596,7 +22950,7 @@ /obj/machinery/camera/network/command{ dir = 9 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "sAT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -22613,9 +22967,6 @@ "sBk" = ( /obj/structure/flora/pottedplant/orientaltree, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/wood, /area/hydroponics/garden) "sBr" = ( @@ -22698,6 +23049,9 @@ /obj/effect/floor_decal/spline/fancy{ dir = 10 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "sEz" = ( @@ -22790,7 +23144,8 @@ dir = 5 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/full, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "sIK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22848,7 +23203,10 @@ /obj/structure/bed/chair/comfy/brown{ dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -37 + }, +/turf/simulated/floor/wood, /area/library) "sMI" = ( /obj/machinery/air_alarm{ @@ -22875,6 +23233,9 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, /obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "sPy" = ( @@ -22924,12 +23285,12 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "sQi" = ( @@ -22949,9 +23310,6 @@ /area/space) "sQy" = ( /obj/structure/catwalk, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "sQO" = ( @@ -22961,13 +23319,12 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/machinery/vending/coffee{ +/obj/machinery/camera/network/civilian{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "sQR" = ( /obj/machinery/ai_status_display{ @@ -22990,13 +23347,19 @@ dir = 8; pixel_x = -24 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "sSr" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -23076,16 +23439,15 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/clownoffice) -"sXH" = ( -/obj/structure/table/bench/wooden, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "sXI" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) @@ -23114,7 +23476,8 @@ /area/endeavour/hallway/d1portforhall) "sYy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "sZj" = ( /turf/simulated/wall/r_wall, @@ -23167,20 +23530,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/endeavour/hallway/d1portamidhall) -"taq" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "tat" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -23190,6 +23543,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"tby" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/lino, +/area/chapel/office) "tbI" = ( /obj/machinery/computer/ship/engines, /obj/machinery/turretid{ @@ -23226,9 +23587,6 @@ "tcd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "tdX" = ( @@ -23300,14 +23658,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1portforhall) "tfD" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway) "tfY" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -23347,10 +23702,13 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "thT" = ( -/obj/machinery/door/firedoor{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "thX" = ( /obj/structure/mirror{ @@ -23417,12 +23775,15 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = null }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/docking_hallway2) "tkI" = ( -/obj/machinery/bookbinder, -/turf/simulated/floor/wood, -/area/library) +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp{ + pixel_y = 10 + }, +/turf/simulated/floor/lino, +/area/chapel/office) "tkX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -23445,27 +23806,11 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "tmb" = ( -/obj/machinery/camera/network/exploration{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ +/obj/structure/bed/chair/bay/comfy/black{ dir = 4 }, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/monodark, +/area/bridge) "tmc" = ( /obj/machinery/light/small{ dir = 4 @@ -23524,18 +23869,18 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "tqm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "tqr" = ( @@ -23604,7 +23949,13 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "tsv" = ( -/turf/simulated/open, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_fore) "tsT" = ( /obj/structure/extinguisher_cabinet{ @@ -23617,19 +23968,19 @@ /turf/simulated/floor/wood, /area/library) "tsU" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/bordercorner{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "tsX" = ( /turf/simulated/floor/wood, @@ -23650,7 +24001,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "tui" = ( /obj/effect/floor_decal/spline/plain{ @@ -23694,6 +24045,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "tuJ" = ( @@ -23819,13 +24176,19 @@ name = "exploration turret"; uid = "exploration" }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cockpit) "twL" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "txk" = ( /obj/effect/paint/violet, @@ -23947,15 +24310,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) -"tCw" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) "tCz" = ( /obj/structure/bed/chair{ dir = 4 @@ -23980,7 +24334,7 @@ /area/endeavour/surfacebase/tram) "tCW" = ( /obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/tree/sif, +/obj/structure/flora/tree/jungle_small, /turf/simulated/floor/grass, /area/hydroponics/garden) "tCX" = ( @@ -23989,7 +24343,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "tDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24073,15 +24427,23 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "tHm" = ( /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) "tHB" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "tHJ" = ( /obj/structure/catwalk, @@ -24105,6 +24467,24 @@ /obj/item/tape_recorder, /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) +"tIO" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "tJq" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/steel_grid, @@ -24161,9 +24541,6 @@ req_one_access = null }, /obj/structure/catwalk, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "tLA" = ( @@ -24172,6 +24549,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "tLX" = ( @@ -24260,18 +24639,21 @@ /turf/simulated/floor/tiled, /area/exploration) "tOv" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "tOJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24313,7 +24695,7 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/sauna) "tQg" = ( -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "tQt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24503,7 +24885,13 @@ dir = 8; pixel_x = 30 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "uaP" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -24585,6 +24973,14 @@ }, /turf/simulated/wall/r_wall/prepainted/exploration, /area/shuttle/excursion/cargo) +"ucg" = ( +/obj/structure/bookcase{ + name = "bookcase (Reference)" + }, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/engineering_singularity_safety, +/turf/simulated/floor/wood, +/area/library) "ucz" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil, @@ -24614,9 +25010,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /obj/machinery/light{ dir = 8 }, @@ -24636,22 +25029,10 @@ /area/crew_quarters/lounge) "ueo" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/bordercorner2{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1portforhall) "ueu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24669,7 +25050,7 @@ /area/chapel/main) "ueA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "ueQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -24742,13 +25123,17 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "uhG" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/carpet/bcarpet, -/area/library) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1fwdhall) "uhT" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled, @@ -24771,26 +25156,11 @@ /turf/simulated/floor/plating, /area/maintenance/substation/dock) "ujK" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, /obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/fire_alarm/south_mount, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardamidhall) -"ujU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1afthall) "uke" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24803,6 +25173,15 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"ukf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1portforhall) "ukx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -24875,16 +25254,20 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "umU" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 5 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "uni" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24925,10 +25308,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"upe" = ( -/obj/structure/sign/deck/first, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/endeavour/hallway/d1fwdhall) "upy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24977,7 +25356,7 @@ dir = 1 }, /obj/machinery/air_alarm/north_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "uqY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25003,6 +25382,15 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "ush" = ( +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "usi" = ( @@ -25165,8 +25553,14 @@ icon_state = "4-8" }, /obj/machinery/light, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) +"uwY" = ( +/obj/machinery/camera/network/outside{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/misc_lab) "uxe" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -25253,10 +25647,7 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "uAa" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -25308,6 +25699,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) +"uBH" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_one) "uBN" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -25362,7 +25759,7 @@ /area/shuttle/civvie/general) "uGs" = ( /obj/machinery/tele_pad, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "uGt" = ( /obj/machinery/camera/network/command{ @@ -25372,22 +25769,18 @@ dir = 8; pixel_x = -24 }, -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/folder/red, -/obj/item/folder/blue, -/obj/item/pen, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/bridge) "uGL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1portforhall) "uGO" = ( /obj/machinery/atmospherics/pipe/tank/air, /obj/machinery/light{ @@ -25481,7 +25874,7 @@ dir = 8 }, /obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "uLN" = ( /obj/structure/sink{ @@ -25571,6 +25964,12 @@ /obj/landmark/spawnpoint/job/mime, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/mimeoffice) +"uQz" = ( +/obj/structure/cable/orange{ + icon_state = "5-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/civilian) "uQL" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -25613,13 +26012,20 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/shuttle/civvie/general) "uRN" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "uSH" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, @@ -25639,20 +26045,6 @@ "uTr" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1fwdmaint) -"uTG" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "uTX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -25660,11 +26052,11 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "uUa" = ( @@ -25681,9 +26073,6 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "uUz" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, /obj/item/radio/intercom{ pixel_y = -24 }, @@ -25695,10 +26084,6 @@ "uUK" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/surfacebase/tram) -"uUN" = ( -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, -/area/hallway/secondary/docking_hallway) "uUX" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -25756,7 +26141,8 @@ /area/maintenance/substation/command) "uWM" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Deck 1 Amidships Grid" + RCon_tag = "Deck 1 Amidships Grid"; + cur_coils = 2 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -25798,9 +26184,6 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 9 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/item/radio/intercom{ pixel_y = -28 }, @@ -25849,12 +26232,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vaR" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, @@ -25880,7 +26260,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "vca" = ( /obj/structure/closet/firecloset, @@ -25973,13 +26353,18 @@ /area/shuttle/courser/general) "vdF" = ( /turf/simulated/wall/r_wall/prepainted, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "vdU" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/air_alarm/east_mount, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "vdY" = ( /obj/structure/flora/pottedplant, @@ -26051,21 +26436,6 @@ "vgA" = ( /turf/simulated/open, /area/endeavour/hallway/d1fwdhall) -"vhm" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "vhJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -26076,13 +26446,10 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "viz" = ( /obj/machinery/fire_alarm/south_mount{ @@ -26104,12 +26471,6 @@ /obj/effect/floor_decal/corner/navgold/border{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "vjS" = ( @@ -26137,7 +26498,7 @@ dir = 8 }, /obj/machinery/air_alarm/west_mount, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vkr" = ( /obj/structure/cable/green{ @@ -26151,6 +26512,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"vkI" = ( +/obj/effect/floor_decal/grass_edge{ + dir = 4 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/hydroponics/garden) +"vlj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "vll" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26192,7 +26566,10 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) "vmH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -26225,7 +26602,7 @@ "voG" = ( /obj/structure/table/standard, /obj/item/hand_tele, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "voN" = ( /obj/structure/bed/chair/comfy/brown{ @@ -26328,22 +26705,29 @@ /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "vrC" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/obj/item/book/manual/chef_recipes, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/tiled/monodark, +/area/bridge) "vrN" = ( +/obj/machinery/light{ + dir = 8 + }, /obj/effect/floor_decal/borderfloorblack{ - dir = 6 + dir = 10 }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 6 +/obj/effect/floor_decal/corner/beige/border{ + dir = 10 }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardforhall) +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "vsG" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, @@ -26406,11 +26790,7 @@ /turf/simulated/floor/wood, /area/lawoffice) "vvP" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/full, /obj/structure/curtain/black, /turf/simulated/floor/wood, /area/library) @@ -26429,20 +26809,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "vwv" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portamidhall) "vwC" = ( /turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d1aftmaint) @@ -26459,6 +26830,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "vwK" = ( @@ -26518,6 +26893,13 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/grass, /area/hydroponics/garden) +"vzW" = ( +/obj/machinery/vending/cola, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1fwdhall) "vBg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -26539,6 +26921,7 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "vBt" = ( @@ -26581,7 +26964,7 @@ "vBK" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "vBM" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -26589,7 +26972,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vCO" = ( /obj/machinery/door/firedoor, @@ -26650,11 +27033,15 @@ }, /area/exploration) "vEj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bookcase{ + name = "bookcase (Reference)" }, -/turf/simulated/floor/tiled, -/area/space) +/obj/item/book/manual/evaguide, +/obj/item/book/custom_library/reference, +/obj/item/book/manual/tesla_engine, +/obj/item/book/manual/rust_engine, +/turf/simulated/floor/wood, +/area/library) "vEn" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -26783,7 +27170,7 @@ dir = 8; pixel_x = -24 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "vJp" = ( /obj/structure/table/reinforced, @@ -26893,7 +27280,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "vOo" = ( /obj/structure/sign/deck/first, @@ -26940,7 +27327,7 @@ "vRx" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "vSp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26959,17 +27346,12 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "vTi" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled/techfloor/grid, +/area/exploration/excursion_dock) "vTv" = ( /obj/landmark{ name = "carpspawn" @@ -27159,7 +27541,13 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "wbU" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -27172,14 +27560,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) -"wci" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1afthall) "weh" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -27208,7 +27590,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "wfu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -27224,10 +27606,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "wge" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "wgu" = ( @@ -27328,11 +27712,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/hydroponics/garden) -"wkc" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1fwdhall) "wkh" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/spline/plain{ @@ -27361,10 +27740,16 @@ /turf/simulated/floor/tiled, /area/endeavour/exploration/hallway_aft) "wkL" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardafthall) "wlk" = ( /obj/structure/closet/hydrant{ @@ -27396,7 +27781,7 @@ /area/endeavour/hallway/d1starboardafthall) "wmU" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 1 FORE MAIN" + RCon_tag = "MAIN - DECK 1 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -27445,9 +27830,6 @@ "woM" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/item/radio/intercom{ pixel_y = -28 }, @@ -27461,6 +27843,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "wpZ" = ( @@ -27582,13 +27967,14 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "wus" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1starboardafthall) "wuD" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -27614,7 +28000,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/bcarpet, +/obj/structure/bookcase{ + name = "bookcase (Fiction)" + }, +/turf/simulated/floor/wood, /area/library) "wwx" = ( /obj/structure/cable/green{ @@ -27687,20 +28076,33 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "wym" = ( /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/tram) "wyr" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/wall_frame/prepainted, -/obj/structure/grille, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/paint/commandblue, +/obj/structure/wall_frame, /obj/structure/window/reinforced/polarized/full{ id = "hop_office"; name = "HoP Office window" }, -/obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "wyP" = ( @@ -27739,17 +28141,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "wyY" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1fwdhall) "wzh" = ( /obj/structure/cable/green{ @@ -27827,7 +28223,7 @@ /obj/machinery/tele_projector{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/teleporter) "wBb" = ( /obj/effect/floor_decal/borderfloorblack, @@ -27895,26 +28291,29 @@ /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1starboardforhall) "wCn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "wCQ" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/effect/floor_decal/corner/navgold/border{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portforhall) "wDb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/structure/shuttle/engine/heater{ @@ -27930,18 +28329,18 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/endeavour/hallway/d1aftmaint) +/area/exploration/courser_dock) "wDH" = ( /obj/machinery/camera/network/command{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "wEG" = ( /obj/structure/table/marble, @@ -28009,12 +28408,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "wHY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -28060,34 +28455,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1aftmaint) "wNy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardafthall) -"wNI" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 27 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) +/area/endeavour/hallway/d1portforhall) "wOi" = ( -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/beige/border, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "wOo" = ( /turf/simulated/floor/tiled/dark, @@ -28113,7 +28491,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "wPe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28166,15 +28544,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"wRE" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/bordercorner{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "wRQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -28224,15 +28593,6 @@ "wTD" = ( /turf/simulated/floor/wood, /area/crew_quarters/lounge) -"wUc" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1fwdhall) "wUf" = ( /obj/machinery/door/airlock/glass/security{ id_tag = "Checkpoint"; @@ -28260,21 +28620,11 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1fwdhall) -"wUs" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navgold/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) "wUJ" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/chapel) @@ -28298,37 +28648,31 @@ /area/hallway/secondary/docking_hallway2) "wWq" = ( /turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_four) +/area/station/stairs_one) "wWR" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/disposal, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/tram) "wWT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable/orange{ - icon_state = "4-9" + icon_state = "2-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portforhall) "wXh" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d1fwdmaint) "wXu" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/station/stairs_one) "wYe" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloor{ @@ -28356,10 +28700,10 @@ /area/shuttle/excursion/general) "wZh" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/navgold/border{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 6 @@ -28367,11 +28711,8 @@ /obj/effect/floor_decal/corner/navgold/bordercorner2{ dir = 6 }, -/obj/machinery/vending/wallmed1{ - pixel_x = 32 - }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1portforhall) +/area/endeavour/hallway/d1starboardafthall) "wZQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -28466,7 +28807,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "xeT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28474,20 +28815,19 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardforhall) "xfa" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/space) +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/holofloor/tiled/dark, +/area/endeavour/hallway/d1fwdhall) "xfk" = ( /obj/effect/floor_decal/corner/blue/full, /obj/structure/window/reinforced, /obj/structure/table/reinforced, +/obj/item/book/manual/legal/sop_vol3, +/obj/item/book/manual/legal/sop_vol4, /turf/simulated/floor/tiled/dark, /area/bridge) "xfm" = ( @@ -28503,7 +28843,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "xft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28542,27 +28882,25 @@ /turf/simulated/wall/r_wall/prepainted/exploration, /area/maintenance/station/exploration) "xhP" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 13 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/lounge/kitchen_freezer) -"xhZ" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 5 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "xiw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28643,11 +28981,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) -"xnK" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardforhall) "xoh" = ( /obj/machinery/gateway{ dir = 9 @@ -28682,7 +29015,8 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "xpv" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -28721,6 +29055,9 @@ pixel_x = -5; pixel_y = -1 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "xpU" = ( @@ -28743,6 +29080,9 @@ /obj/map_helper/access_helper/airlock/station/engineering/department, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/maintenance/substation/dock) "xri" = ( @@ -28759,7 +29099,19 @@ /area/endeavour/hallway/d1fwdmaint) "xrx" = ( /obj/machinery/light, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/bridge/hallway) "xrL" = ( /turf/simulated/wall/r_wall/prepainted/command, @@ -28771,6 +29123,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "xtc" = ( @@ -28795,15 +29149,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "xtJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/door/firedoor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/library) "xtP" = ( /obj/machinery/computer/communications, /turf/simulated/floor/wood, @@ -28835,25 +29185,14 @@ /turf/simulated/floor/grass, /area/endeavour/exploration/hallway_aft) "xuK" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/structure/bed/chair/comfy/brown, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, -/obj/machinery/suit_storage_unit/exploration, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/library) "xuM" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, @@ -28895,7 +29234,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1afthall) "xvP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28994,6 +29333,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/docking_hallway) "xyG" = ( @@ -29049,6 +29394,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) +"xzM" = ( +/obj/structure/table/woodentable, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box{ + pixel_y = 2; + pixel_x = 2 + }, +/turf/simulated/floor/lino, +/area/chapel/office) "xzO" = ( /obj/structure/table/alien/blue{ desc = "Is this imported?"; @@ -29089,7 +29443,7 @@ pixel_y = 32 }, /obj/machinery/vending/cola, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d1afthall) "xBJ" = ( /obj/machinery/shipsensors, @@ -29117,7 +29471,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "xDl" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ @@ -29125,16 +29479,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) -"xEu" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portamidhall) "xEw" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -29149,6 +29493,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portforhall) "xEQ" = ( @@ -29213,11 +29560,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/clownoffice) "xHh" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d1portamidhall) "xHo" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/window/reinforced, @@ -29254,7 +29610,7 @@ /area/hydroponics/garden) "xJO" = ( /obj/effect/shuttle_landmark/endeavour/deck4/excursion_space, -/turf/space, +/turf/space/basic, /area/space) "xJZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7{ @@ -29280,17 +29636,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d1fwdmaint) "xKW" = ( +/obj/machinery/light{ + dir = 1 + }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled, +/area/hallway/secondary/docking_hallway) "xLn" = ( /obj/machinery/door/airlock/command{ name = "Head of Personnel"; @@ -29330,14 +29686,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"xOn" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navblue/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d1portforhall) "xON" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -29381,13 +29729,17 @@ /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) "xQm" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1portforhall) "xQD" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -29415,7 +29767,10 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 6 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1portamidhall) "xSm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29501,15 +29856,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "xVw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway2) "xWx" = ( @@ -29517,6 +29866,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 9 }, +/obj/machinery/light, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "xWL" = ( @@ -29532,21 +29882,31 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "xYV" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/sign/department/bridge{ pixel_x = 32 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/navgold/border, /obj/machinery/light{ dir = 4; use_power = 0 }, -/turf/simulated/floor/tiled/steel, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1fwdhall) "xZn" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/space) +"xZx" = ( +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "xZD" = ( /obj/item/flame/candle/candelabra/everburn, /obj/structure/table/woodentable, @@ -29575,11 +29935,14 @@ /obj/machinery/holoposter{ pixel_y = 32 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) "ybg" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 1 AMIDSHIPS MAIN" + RCon_tag = "MAIN - DECK 1 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) @@ -29610,9 +29973,6 @@ "ycC" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/air_alarm/south_mount, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -29630,11 +29990,22 @@ pixel_x = -28; pixel_y = -4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/bridge) "ydv" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/obj/effect/floor_decal/corner/black/full, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/lounge/kitchen_freezer) "ydy" = ( /obj/machinery/button/remote/blast_door{ @@ -29772,7 +30143,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1portforhall) "ygA" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -29829,9 +30200,6 @@ "ykX" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navgold/border, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d1starboardamidhall) @@ -31766,7 +32134,7 @@ jNg jNg jNg jNg -xJO +jNg jNg jNg jNg @@ -32477,8 +32845,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX dkX joA @@ -32487,10 +32855,10 @@ joA joA joA joA +nXR joA joA -joA -joA +nXR joA joA joA @@ -32671,8 +33039,8 @@ xRj xRj xRj xRj -usG -usY +xRj +xRj dkX dkX joA @@ -32865,8 +33233,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX dkX joA @@ -33095,8 +33463,8 @@ uUK uUK uUK cMJ -gDL -fOo +xRj +xRj xRj xRj xRj @@ -33289,8 +33657,8 @@ uUK uUK uUK cMJ -usG -fOo +xRj +xRj xRj xRj xRj @@ -33483,8 +33851,8 @@ uUK uUK onr cMJ -usY -usG +xRj +xRj xRj xRj xRj @@ -33677,7 +34045,7 @@ uUK uUK uUK cMJ -usG +xRj xRj xRj xRj @@ -33824,8 +34192,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX dkX dkX @@ -33840,7 +34208,7 @@ xRj dkX dkX joA -joA +hSl wwz joA bKZ @@ -34018,8 +34386,8 @@ xRj xRj xRj xRj -usG -usY +xRj +xRj dkX dkX dkX @@ -34212,8 +34580,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX dkX dkX @@ -35199,7 +35567,7 @@ feg euS joA joA -rvv +kdf bKZ bKZ bKZ @@ -35557,10 +35925,10 @@ xRj xRj xRj xRj -vEj -hIR -pCl -xHh +xRj +xRj +xRj +xRj xRj xRj xRj @@ -35587,7 +35955,7 @@ uXd euS spf joA -rvv +kdf bKZ wni aAL @@ -35751,10 +36119,10 @@ xRj xRj xRj xRj -eWl -xfa -hEF -xtJ +xRj +xRj +xRj +xRj xRj xRj xRj @@ -35941,14 +36309,14 @@ xRj xRj xRj xRj -jhQ -hXa -hXa -plJ -tmb -aEK -xuK -mmk +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj xRj xRj xRj @@ -36457,7 +36825,7 @@ xRj xRj xRj xRj -xRj +xJO xRj xRj xRj @@ -36756,7 +37124,7 @@ sXa xDl xDl rNe -joA +vTi joA sXa izk @@ -36791,7 +37159,7 @@ hkO dzM cKW yiH -tAk +pbi nei eiz sQl @@ -37183,8 +37551,8 @@ tAk nei tAk sQl -usG -fOo +xRj +xRj jNg jNg jNg @@ -37331,9 +37699,9 @@ jRq pcA hbS hgE -joA -joA -suA +nsi +jQM +bAB joA sHS joA @@ -37377,8 +37745,8 @@ tAk nei tAk sQl -usY -usG +xRj +xRj jNg jNg jNg @@ -37525,9 +37893,9 @@ jRq mFi lsW hCj -izQ -joA -jWV +ixU +eTR +eTR vLc qxW eTR @@ -37571,8 +37939,8 @@ tAk nei wBM sQl -usG -fOo +xRj +xRj jNg jNg jNg @@ -38750,6 +39118,7 @@ xST rhG tzn xRj +geQ xRj xRj xRj @@ -38767,7 +39136,6 @@ xRj xRj xRj xRj -geQ xRj xRj xRj @@ -38939,7 +39307,7 @@ ijU ijU gKK eoY -bAB +eTc mTa bew hoc @@ -39101,7 +39469,7 @@ dAK kHh kHh kHh -cGC +kHh xgP aBC vll @@ -39109,13 +39477,13 @@ jGP clV atm gdd -cxg +vll gXC vll tsf dvb esN -lOX +uke iZf kUp trw @@ -39123,7 +39491,7 @@ uaP iBm myN tsf -cPD +tsf wyW uaP tkc @@ -39132,7 +39500,7 @@ edR fbu hhy xHD -wVY +xVw fYz ijU ijU @@ -39289,15 +39657,15 @@ wim sti rlK usu -fDn +pFt kru pFt -fDn pFt pFt pFt pFt -fDn +pFt +pFt bMi hUM pFt @@ -39307,7 +39675,7 @@ pFt pFt pwe kWd -lvj +kWd cPS uke esN @@ -39317,13 +39685,13 @@ hGQ esN rgH esN -qNt +esN slW hGQ sZj gEI gEI -gEI +jzE ijU xHD xVw @@ -39485,20 +39853,20 @@ rlK tBJ iTz wqV -qRx +yfG sae pJd -qRx +yfG yfG gmx eUU psG fqB pJd -taq +wqV vts yfG -qRx +yfG vwD qMR xiw @@ -39523,8 +39891,8 @@ aIY gJJ fYz ijU -usG -fOo +xRj +xRj xRj xRj xRj @@ -39674,7 +40042,7 @@ jLe wWq wWq wWq -vdF +lDc iAO oiv fcG @@ -39694,10 +40062,10 @@ dZr dZr dZr dZr -dZr +fmb fsR -xyA -wBM +gWh +fhK fhK loX fhK @@ -39717,8 +40085,8 @@ aCx jkD fYz ijU -usY -usG +xRj +xRj xRj xRj xRj @@ -39868,11 +40236,11 @@ jLe wWq iDg iDg -dnA +lOm kHh pmO -cGC -dnA +kHh +fVP iDg iDg wWq @@ -39885,12 +40253,12 @@ vLU xNI xNI bzz -xNI dKp xNI dZr +fmb fsR -xyA +gWh fhK tAw iAm @@ -39911,8 +40279,8 @@ jmM oFd fYz ijU -usG -fOo +xRj +xRj xRj xRj xRj @@ -40066,7 +40434,7 @@ dnA ueA brQ xuO -dnA +lOm iDg iDg wWq @@ -40080,11 +40448,11 @@ xNI dnc xNI xNI -xNI oiL dZr +fmb fsR -xyA +gWh fhK tAw kPw @@ -40254,15 +40622,15 @@ aNK aNK fVV wWq -vRx wWq +wXu mMw cUW rAN gKk -wWq -wWq vRx +wXu +wWq wWq nCl dZr @@ -40274,15 +40642,15 @@ tLX xNI xNI xNI -xNI -rUF +dKp dZr +fmb fsR -xyA +gWh fhK sBI ebA -iAm +tfD fhC fhK nct @@ -40408,8 +40776,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj xgT ehq ehq @@ -40448,7 +40816,7 @@ oid kno kHh nHQ -cxg +wHF vll vll jYp @@ -40459,24 +40827,24 @@ vjB sQO fRf dhw -kAA -xET -xET -xET -xET -xET -xET -mUN +dZr +xNI +xNI +xNI +xNI +xNI +xNI +xNI xNI dnc -dKp dZr -lhl -xyA +xKW +fsR +gWh fhK ejb xGU -iAm +tfD ber fhK nct @@ -40536,55 +40904,62 @@ xRj xRj xRj xRj -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -"} -(56,1,1) = {" -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj -xRj +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +"} +(56,1,1) = {" +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj xRj xRj xRj @@ -40597,13 +40972,6 @@ xRj xRj xRj xRj -xRj -xRj -xRj -xRj -xRj -usG -fkM xgT ehq ehq @@ -40640,37 +41008,37 @@ jWs cqc xAO kHh -cGC kHh kHh kHh +plJ kHh kHh pmO kHh kHh kHh -aBr -kHh -jQW -dZr -xNI -xNI -xNI -xNI -vHP -xNI -sNR +nnP +ujK +lOX +kAA +xET +xET +xET +xET +kuZ +xET +mUN xNI vHP -kfj dZr +fmb fsR -xyA +gWh fhK eYG jvK -iAm +tfD bVS fhK nct @@ -40796,8 +41164,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj rTu rTu rTu @@ -40833,7 +41201,7 @@ cCy jWs cqc vnQ -cGC +kHh kHh rkY lEq @@ -40841,7 +41209,7 @@ rkY kHh rkY fVU -sXH +rkY kHh kHh aBr @@ -40858,9 +41226,9 @@ hvu cWc cWc cWc -dZr -uUN -xyA +skF +fsR +gWh fhK awW mfn @@ -41028,7 +41396,7 @@ sZB dKn jYp kHh -cGC +kHh rkY lEq rkY @@ -41040,7 +41408,7 @@ kHh kHh aBr kHh -nnP +fNK dZr xNI cWc @@ -41052,9 +41420,9 @@ sNR sUh rRP cWc -dZr +fmb fsR -xyA +gWh fhK jUN wHY @@ -41246,12 +41614,12 @@ saT xNI nYu cWc -dZr +qNt fsR -xyA +gWh +fhK fhK fhK -edF fhK fhK fhK @@ -41416,17 +41784,17 @@ idu cqc mAo owg -wci -kHh -kHh -kHh -cGC -kHh -cGC -kHh -kHh -kHh -aBr +ipW +ujK +ujK +ujK +ujK +ujK +ujK +hXa +ujK +ujK +hPu pmO dNj dZr @@ -41441,7 +41809,7 @@ olZ fre xrg nHB -nHB +gBF tLA fhK rGy @@ -41610,7 +41978,7 @@ eZR cqc rrh tBJ -cGC +aBr ceM oYx oYx @@ -41618,7 +41986,7 @@ smu oYx vEv vyI -cGC +kHh pnA oNV vpL @@ -41634,8 +42002,8 @@ sUh shj xuM cWc -dZr -fsR +umU +uRN xyA fhK pBk @@ -41816,7 +42184,7 @@ wyr wyr nxJ oHo -gWh +saW dZr xNI cWc @@ -41828,7 +42196,7 @@ cWc cjq cWc cWc -dZr +iFj iFj xyG fhK @@ -42192,7 +42560,7 @@ wim aNK phl fnJ -pQg +wNy piy mlA nuL @@ -42202,7 +42570,7 @@ nVG mlA rbV piy -xKW +axR nVE vIw dZr @@ -42384,9 +42752,9 @@ qTj gPV wLB npN -fmb +ojQ fnJ -tHB +wNy piy piy piy @@ -42396,7 +42764,7 @@ piy piy piy piy -vTi +axR oHo vIw dZr @@ -42580,7 +42948,7 @@ wim aNK ojQ fnJ -pQg +wNy piy tVb fCr @@ -42590,7 +42958,7 @@ hkm gkp uru piy -vTi +axR oHo riG dZr @@ -42774,7 +43142,7 @@ wim aNK pvA dkB -pQg +wNy piy vcl qzE @@ -42784,7 +43152,7 @@ nuL lrq mlA hDt -vTi +axR nVE iYr dJe @@ -42935,13 +43303,13 @@ usG sjU sjU tsv -tsv -opm -iJn -opm opm opm +iJn opm +gtI +bxh +bxh iJn khD qfI @@ -42968,7 +43336,7 @@ wim aNK uqH dth -tHB +wNy piy puC qrE @@ -43129,13 +43497,13 @@ usY sjU sjU bbP -fDY -oBL -tfh tfh +oBL tfh tfh tfh +fDY +fDY oBL mZn nPK @@ -43162,7 +43530,7 @@ wim aNK qXN dth -pQg +wNy piy dgm jxt @@ -43356,7 +43724,7 @@ aLP aNK bRG pDa -tHB +wNy piy piy piy @@ -43550,7 +43918,7 @@ wim aNK xdS dth -pQg +wNy piy mgg woe @@ -43560,9 +43928,9 @@ oNd vqA uLN piy -xKW +axR oHo -qFl +vIw dJe sja eYV @@ -43742,9 +44110,9 @@ gPV wim wim aNK -eFI +jie vmH -rVd +hJZ piy rcm raV @@ -43754,8 +44122,8 @@ bEg twp ftU piy -vTi -oHo +axR +nUI yiz dJe lkN @@ -43938,7 +44306,7 @@ wim aNK fFk dth -pQg +wNy piy piy piy @@ -43948,7 +44316,7 @@ piy piy piy piy -xKW +axR oHo vIw dJe @@ -44130,9 +44498,9 @@ gPV wim wim aNK -fmb +ojQ dth -tHB +wNy aNK jLe ciZ @@ -44142,7 +44510,7 @@ wim wim wim aNK -lUc +cHu oHo vIw dJe @@ -44288,8 +44656,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX bdl bdl @@ -44326,7 +44694,7 @@ aNK aNK vEN dth -pQg +wNy aNK wim wim @@ -44336,9 +44704,9 @@ jLe jLe jLe nzK -ocK +lPB oHo -qFl +vIw dJe dJe dJe @@ -44482,8 +44850,8 @@ xRj xRj xRj xRj -usG -usY +xRj +xRj dkX fGf bdl @@ -44520,7 +44888,7 @@ wim aNK trx jlN -xOn +xEy aNK aNK aNK @@ -44676,8 +45044,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj dkX bdl bdl @@ -44714,14 +45082,14 @@ wim ruI ojQ dth -hlO -jQG +xQm +asR oRw hUo jQG jQG -cgX tkX +eCR rlP uzH eNZ @@ -44739,7 +45107,7 @@ piW piW piW piW -sfL +piW piW qUT kov @@ -44884,7 +45252,7 @@ vGO oPo dVW dVW -awx +nQJ rmZ aGI mma @@ -44906,14 +45274,14 @@ gPV wim wim aNK -gAn +phl dth jpf -jpf -thT -jpf -jpf -jpf +oDE +wCQ +tHB +tHB +tHB nqN bNZ chH @@ -45103,7 +45471,7 @@ aNK nuG aSA ngG -oDE +wNy pEr pEr pEr @@ -45126,10 +45494,10 @@ dsD plx ayy plx -lLD +gQU eOl -lLD -nUI +jBQ +jBQ dsD uze uze @@ -45297,7 +45665,7 @@ aNK aNK vEN dth -tHB +wNy pEr rGD heq @@ -45306,7 +45674,7 @@ heq sxY pPL pEr -vTi +axR aFD doZ saW @@ -45466,16 +45834,16 @@ dVW upy dVW dVW -bdl +fGf bdl qoX uba fNJ aGI wim -kPR wim kPR +kPR wim wqg wim @@ -45491,7 +45859,7 @@ wim aNK bRG dth -pQg +wNy pEr kgt pEr @@ -45500,7 +45868,7 @@ pEr pEr pEr jod -xKW +axR rgW arM baf @@ -45511,13 +45879,13 @@ wyX lKS bgE dsD -kjF -jnZ -sLI +xuK +sfX +cHX eOl -kjF -jnZ -sLI +gVv +sfX +cHX dsD uze uze @@ -45667,7 +46035,7 @@ gvN lNE aGI vmX -czd +wim wim wim wim @@ -45685,7 +46053,7 @@ wim aNK fFk pDa -tHB +wNy pEr vBH etW @@ -45694,7 +46062,7 @@ wAt pPL pPL pEr -ipW +cHu vEK iuy saW @@ -45705,12 +46073,12 @@ jTS dub jTS dsD -kjF -jnZ -sLI +qZR +sfX +cHX eOl -kjF -jnZ +gVv +sfX sLI dsD wUJ @@ -45853,13 +46221,13 @@ gDh dVW dVW dVW -bdl +jPj bdl maq aGI sPS ntW -etS +aGI kPR wim wim @@ -45879,7 +46247,7 @@ eca aNK phl dth -pQg +wNy pEr vDR hWC @@ -45889,18 +46257,18 @@ aVW pPL lxO hnl -hJZ -skF +vEK +iuy saW dsD ikV jZL uMM ixM -eOl -iao eeY -tkI +iao +mJP +mJP eOl uSH ncX @@ -45923,7 +46291,7 @@ uVB wqi wqi oxc -uze +ckq pdu ucD usG @@ -46050,11 +46418,11 @@ bdl bdl bdl qjN -dkX +aGI bnR wDq -etS -wim +aGI +qii wim wim ibx @@ -46071,9 +46439,9 @@ wim jLe jLe dDB -fmb +ojQ dth -pQg +wNy pEr djQ lBc @@ -46084,8 +46452,8 @@ qfo pEr aFB wmH -sjP -gWh +jeN +saW vLq eOl eOl @@ -46093,12 +46461,12 @@ eOl feB tCG rLV -fDJ -fDJ +jCV +jCV fDJ fDJ hPn -eOl +mJP uVf dsD uze @@ -46244,10 +46612,10 @@ bdl bdl bdl bdl -dkX +aGI fXR evs -etS +aGI wim wim jLe @@ -46267,7 +46635,7 @@ efK npN ojQ dth -pQg +wNy pEr pEr pEr @@ -46277,8 +46645,8 @@ nQy pEr pEr pEr -xgB -iuy +jTT +cdv qLH dsD kCA @@ -46287,12 +46655,12 @@ sfX rRJ sfX wrh -eOl -eOl +mJP +mJP eOl eOl nJA -eOl +mJP ltO dsD uze @@ -46438,10 +46806,10 @@ bdl bdl bdl bdl -dkX -etS -etS -etS +aGI +aGI +aGI +aGI wim wim wim @@ -46461,7 +46829,7 @@ wim aNK uqH dth -tHB +wNy pEr cSr pPL @@ -46471,11 +46839,11 @@ eUz sQy sQy tLz -kdf -wNy +xgB +iuy lPB -dsD -uhG +cWg +mJP mJP mJP vIH @@ -46483,13 +46851,13 @@ vEe mJP mJP wAB -mJP +eOl eOl fDI tsT dsD dsD -uze +ckq uze uze syE @@ -46632,7 +47000,7 @@ bdl bdl bdl czv -dkX +aGI ayL ayL ayL @@ -46655,29 +47023,29 @@ wim aNK pKc vmH -rVd +hJZ pEr abZ kIs kIs wsZ -pPL +uQz pPL eGo pEr jkq -cdv -leE -dsD +iuy +lPB +xtJ wAB -jBQ mJP -hOF +mJP +mJP uvU jTs jTs rVX -jCV +fDJ fDJ fOe xoy @@ -46826,12 +47194,12 @@ bdl bdl bdl bdl -dkX +aGI xji meE iPk iSA -kPW +ayL wim gPV wim @@ -46849,7 +47217,7 @@ wim aNK sYx jlN -xOn +xEy pEr pEr pEr @@ -46868,10 +47236,10 @@ bMt kNK aVu ugs -kjF -jnZ -tfD +aEK mJP +iKm +eOl eOl eOl shJ @@ -47020,7 +47388,7 @@ bdl bdl bdl bdl -dkX +aGI iPk iPk iPk @@ -47043,32 +47411,32 @@ aFa aFa ylz dth -hlO -fDi -iZC +aGw +opz +cBe ntm pfO kQX eFu -eCR -asR -kTG +tkX +oHx +uzH iZH iuy -lVS -dsD +saW +vLq iKm -rxS +lLD rXg -qZR +rxS own -kjF -jnZ -sLI +rdf +mJP +mJP lCx -fIr -fIr -fIr +esl +esl +esl iEX cTj tMg @@ -47205,16 +47573,16 @@ fGf bdl bdl bdl -bdl +jPj dVW rGc dVW -bdl +jPj bdl bdl bdl qjN -dkX +aGI ulX idJ iSA @@ -47235,29 +47603,29 @@ kvQ nSH fLt mYH -fmb +ojQ nYt -dBE +sqc yfL -kiW +mmk kiW kiW mKR -kiW rYG rYG +bIw nVY vBM jeN cOe dsD jAq -qFN +gIW rXg -vrC +qFN own +iKG mJP -uau jNp dsD vvP @@ -47408,7 +47776,7 @@ bdl bdl bdl bdl -dkX +aGI bVV hUY nqx @@ -47429,29 +47797,29 @@ cpq piB tLv mYH -ojQ +leE fnJ -jpf +oDE eNB -ngd -ngd -ngd +uGL +uGL +ueo iKk ngf -wkL +vdU vdU nnH ojo voU -kEh +lVS dsD jDn esl tjy blT aej -kjF -cHX +mJP +mJP vaR dsD mJP @@ -47594,15 +47962,15 @@ bdl bdl bdl bdl +jPj bdl +jPj bdl bdl bdl bdl bdl -bdl -bdl -dkX +aGI ayL ayL ayL @@ -47623,29 +47991,29 @@ mMT mMT mMT mYH -fmb +ojQ fnJ -iWc -wWq -wWq +wNy vdF +wXu +lDc ngd nwU -ngd -vdF +eMO vdF +wXu vdF -vEK +wkL jeN -xhZ +saW dsD -scN -rdf +ucg +vEj bsZ mJP wvw -kjF -jnZ +scN +mJP uUz dsD kjF @@ -47819,21 +48187,21 @@ rzS aFa oxw fnJ -thT +qUh nYy iDg -oQJ -ngd -wPz +uBH ngd +vlj +qOo oQJ iDg gIT -uGL +tsU iuy -kEh -dsD -chb +saW +vLq +mJP mJP mJP mJP @@ -48011,27 +48379,27 @@ dGT aDo goT hOL -byY +eCz rvA qUh nYy iDg -lDc -mnk -vYT -jpf +kAg +ngd +wPz +qOo gGW iDg gIT tsU iuy -cBe +nup dsD iMY plx plx -lLD -bIw +scN +scN dsD eaJ mJP @@ -48208,18 +48576,18 @@ kOV cBN pmX eUP -vRx -wWq -wWq -nkN -vYT +vdF +wXu +vdF +cuR +wPz qOo -wWq -wWq -vRx -iNb +lDc +wXu +vdF +xgB iuy -kEh +baf wUJ oxc uze @@ -48399,21 +48767,21 @@ eaK gnc rBZ dCX -vhm +aSm fnJ fef -wWq -wWq -wWq +ukf +ukf +ukf nkN -vYT +thT wus -wWq -wWq -wWq -vEK +msQ +msQ +msQ +iNb iuy -xhZ +saW wUJ uze uze @@ -48595,19 +48963,19 @@ noo aFa ojQ fnJ -iWc -wWq -wWq -wWq +oDE +uGL +uGL +uGL quJ vYT wZh -wWq -wWq -wWq -dhZ +fyY +xZx +fyY +dKY iuy -nup +saW wUJ wUJ wUJ @@ -48787,34 +49155,34 @@ eaK eaK nPI aFa -olk +pvA dkB -lHm -wWq -wWq -wWq +wNy wki -tfv wki -wWq -wWq -wWq -ueo +wki +wki +tfv +lHm +lHm +lHm +lHm +xgB lLu hdn -hcC +mWz hjh -hcC +mWz vkl bIB -hcC +mWz mhW fkZ tQg lyH hjh -hcC -vJi +mWz +eWl bIB vkl llV @@ -48979,11 +49347,11 @@ ifX gmJ rbv svI -bWH +jKd mYH jie vmH -rVd +hJZ oxc uze uze @@ -48996,7 +49364,7 @@ oxc hYA dqz hlC -wWT +kPV jXs kPV kPV @@ -49012,11 +49380,11 @@ kPV kPV kPV pql -kPV +iUW sAT lSz wUJ -uze +ckq pdu ucD sQl @@ -49177,7 +49545,7 @@ jKd mYH ojQ pDa -tHB +wNy oxc dqm whp @@ -49193,19 +49561,19 @@ sCh kKH dMq xUN -tCw xUN xUN -tCw xUN +xUN +giY xCy -wCQ +xUN tWo xUN -tCw xUN xUN -aBS +xUN +xCy dJH mYF jJh @@ -49385,12 +49753,12 @@ grq oNH lMT aoR -jMU -urc -iRz +sDi iRz iRz urc +iRz +iRz urc sDi fkm @@ -49407,8 +49775,8 @@ eKd uze pdu ucD -usG -fOo +xRj +xRj xRj xRj xRj @@ -49563,7 +49931,7 @@ hVl aFa aFa aFa -uTG +jWP cPY sOS bjg @@ -49578,13 +49946,13 @@ iLD bjg gpc kCB -ujK -jMU -urc +ptG +sDi rWf nNo -ekR +tkI qLQ +qJO iRz uxn gRB @@ -49601,8 +49969,8 @@ sDi uze pdu ucD -usY -usG +xRj +xRj xRj xRj xRj @@ -49759,7 +50127,7 @@ fZy fBm hWM hAH -qcV +iVd bjg lkX uWM @@ -49773,12 +50141,12 @@ bjg hRp sCh ycC -jMU -urc +sDi dRp gEb mVc qzo +qJO iRz gRB kOk @@ -49795,8 +50163,8 @@ sDi nZR pdu ucD -usG -fOo +xRj +xRj xRj xRj xRj @@ -49936,7 +50304,7 @@ qTb aIM aIM aIM -aIM +uwY hub wim wim @@ -49945,13 +50313,13 @@ wim fZy peY sIl -ydv +gPm ydv gPm +jhQ fZy -fZy -uTG -cPY +xHh +nRa kef xRT bjg @@ -49964,15 +50332,15 @@ iLD iLD iLD jct -rGM +jLq sCh woM -jMU -urc +sDi mVP iFq -gVv +chb nkk +tby fLT xON rXx @@ -50132,20 +50500,20 @@ geF geF geF fJv -kov -kov +bWH +bWH tux wim fZy fsX gwz -muT -muT dMa +dMa +dMa +mEk fZy -fZy -itz -cPY +mmC +kEh qcV mYb bjg @@ -50160,13 +50528,13 @@ ojn bjg vDK sCh -xQm -jMU -urc +lSz +sDi nBa fXA qJO qJO +xzM iRz dFj urL @@ -50328,20 +50696,20 @@ hub hub wim wim -gPV +kQd wim fZy hpw sYy sYy nLW -muT +dMa har fZy enD -fjy -dSB -nlF +tOv +acA +mYb bjg bjg bjg @@ -50353,14 +50721,14 @@ bjg bjg bjg yaO -sCh +oPk nqO -jMU -urc +sDi xjh -oOx +rCw vpO xri +kBD iRz gRB jcv @@ -50522,14 +50890,14 @@ ejN wim wim wim -gPV +kQd wim fZy gdn -muT -muT +dMa +dMa xoZ -muT +dMa fix fZy nYq @@ -50549,7 +50917,7 @@ nAf aWO mho fvL -jMU +sDi urc urc urc @@ -50716,35 +51084,35 @@ wim aLP wim wim -gPV +kQd eca fZy +jvO muT muT -xhP muT muT dos fZy -wNI -ePX +eVQ +dkh rCo nAf jVj rEd vzu ofn -tCW +hEs sAo tCW tCW -tCW +hEs nAf -rGM +jLq kCB -opz +jJh jMU -sDi +aPj aPj aPj jmU @@ -50910,36 +51278,36 @@ wim wim wim wim -gPV +kQd aNK fZy fZy mWX fZy -fZy -fZy +dTP +dTP fZy fZy hYO ePX dhv -nAf +cIt caS dZF -dnu -dnu -dnu +ocK +ocK +ocK kPs bLa sBk dmO -cIt -vwv -dkh +nAf +jLq +sCh ibq -mmC eDy dKl +dKl uvm sfh tQt @@ -51090,8 +51458,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj hub cpA hjz @@ -51104,18 +51472,18 @@ maa maa maa kfn -fta +ekP svt cPf lTA sZv mrC -oCc -oCc +eRR +eRR eRR bWR -wRE -cPY +uvX +kEh mne nAf ofn @@ -51132,7 +51500,7 @@ jLq kCB ofq jMU -sDi +aPj aPj aPj erV @@ -51284,8 +51652,8 @@ xRj xRj xRj xRj -usG -usY +xRj +xRj hub skW aIM @@ -51294,11 +51662,11 @@ aIM kVc eeZ hub -maa +teS maa byt byt -viT +klV sZS jBa xrO @@ -51478,8 +51846,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj hub hUE aIM @@ -51516,9 +51884,9 @@ oFO bpS ukx nAf -rGM +jLq jwq -xQm +lSz oxc uze uze @@ -51697,7 +52065,7 @@ cEb cEb cEb jbl -cPY +kEh qcV nAf ofn @@ -51890,9 +52258,9 @@ cEY doC kNR cEb -nUH +nkQ jGf -qcV +aHF nAf kDz bdt @@ -51904,7 +52272,7 @@ bjw bNR dyH nAf -rGM +jLq dIS jTi jEB @@ -52085,7 +52453,7 @@ cEb cEb cEb hYO -cPY +kEh iAU nAf rbW @@ -52473,8 +52841,8 @@ cEb cEb cEb jWP -cPY -ecv +kEh +sZv ixz tTD tTD @@ -52682,7 +53050,7 @@ dtm nAf sEj kCB -xQm +lSz rCH xch dRe @@ -52861,7 +53229,7 @@ iQL yey cEb hPQ -cPY +kEh qcV nAf dfE @@ -52876,7 +53244,7 @@ vSI nAf jLq sCh -kkD +lSz oeW mGw tsX @@ -53054,7 +53422,7 @@ nCE iQL pyh cEb -xEu +aGl aRC xEw nAf @@ -53068,13 +53436,13 @@ izy okP tFC nAf -rGM +jLq sCh -xQm +lSz oeW iVV tsX -maZ +rci cYG ftM sQe @@ -53249,8 +53617,8 @@ nRR hZk cEb itz -cPY -dSB +kEh +qcV nAf nxI hsu @@ -53259,7 +53627,7 @@ mXd tTD bRC ofn -pgF +bNR cTV nAf aWO @@ -53269,7 +53637,7 @@ oeW noZ tsX tsX -maZ +tsX kEB oIm rCH @@ -53443,7 +53811,7 @@ dIE dIE dIE mAC -cPY +kEh qcV nAf czH @@ -53452,11 +53820,11 @@ gAi eYk tTD bRC -pgF bNR +hEF ctY nAf -rGM +jLq fvo qrz rXv @@ -53637,8 +54005,8 @@ rVI aMy dIE twz -cPY -dSB +kEh +qcV nAf xPV ikk @@ -53646,7 +54014,7 @@ dfS mXd tTD bRC -bNR +rOU pgF opC nAf @@ -53657,7 +54025,7 @@ oeW vuK tsX tsX -maZ +tsX kEB msB rCH @@ -53833,7 +54201,7 @@ dIE eVQ cdK pBW -nAf +jWV ecK ecK nFT @@ -53844,9 +54212,9 @@ hgn dnu wZQ nAf -rGM +jLq xHM -xQm +lSz oeW tui tsX @@ -54025,10 +54393,10 @@ xKz vyg dIE hYO -cPY +kEh qcV nAf -bNR +hEs bNR qgv iDW @@ -54040,7 +54408,7 @@ wnl nAf jLq qkG -xQm +lSz oeW luN tsX @@ -54049,7 +54417,7 @@ emV mRT nbm rCH -maa +teS abN xAC maa @@ -54218,8 +54586,8 @@ iQS rln tbQ dIE -lqh -cPY +hYO +kEh qcV nAf dAR @@ -54228,7 +54596,7 @@ ezT aAt qXp nZD -nZD +vkI ksB oWB nAf @@ -54413,8 +54781,8 @@ rln pGO dIE sQg -cPY -qcV +gBE +acA uTr uTr uTr @@ -54443,8 +54811,8 @@ xAC maa ris sQl -usY -usG +xRj +xRj xRj xRj xRj @@ -54606,8 +54974,8 @@ fmJ esr vdw dIE -uTG -cPY +hAP +kEh iAU uTr maa @@ -54622,7 +54990,7 @@ maa uTr gJc rCE -xQm +lSz uTr maa maa @@ -54637,8 +55005,8 @@ xAC kfn ris sQl -usG -fOo +xRj +xRj xRj xRj xRj @@ -54801,8 +55169,8 @@ kim gAb dIE hYO -cPY -ecv +kEh +sZv gED byt byt @@ -54816,7 +55184,7 @@ tjQ cfl nrF rCE -xQm +lSz uTr maa maa @@ -55009,8 +55377,8 @@ uTr uTr uTr eez -rCE -xQm +gOX +kiC uTr byt byt @@ -55178,18 +55546,18 @@ maa maa byt uTr -pQR -oCc +cPf +eRR sxX -oCc +eRR eRR npZ eRR -ujU +sxX eRR ovE uvX -cPY +kEh cQC ydG uTr @@ -55204,7 +55572,7 @@ eGI uAt nkw jGp -nXR +gAA uTr maa maa @@ -55382,9 +55750,9 @@ sZv sZv sZv bDI -ecv -cPY sZv +hZy +vwv mne uTr maa @@ -55394,7 +55762,7 @@ byt byt maa uTr -mCT +iXX ikY xeT cxE @@ -55566,12 +55934,12 @@ sIg byt maa uTr -fUU -wXu +xln gnm gnm gnm -pbZ +gnm +tCb gnm gnm gnm @@ -55772,8 +56140,8 @@ pcK pcK pcK nGa -dth -uRN +pWE +iXl aLV stV kiQ @@ -55782,8 +56150,8 @@ aLV aLV aLV aLV -wUs -kaL +uhY +fcc itm uTr uTr @@ -55950,7 +56318,7 @@ xRj ePJ ris ris -maa +teS byt qZT maa @@ -55966,7 +56334,7 @@ fRp ctD snQ ojQ -dth +oXb lJy aLV wAL @@ -55977,7 +56345,7 @@ kYE hff aLV uhY -jPj +bAu nwc uTr pbo @@ -56160,8 +56528,8 @@ rXC rXC snQ eCz -pDa -uRN +kaL +lJy aLV tzx lmB @@ -56171,8 +56539,8 @@ ghn meH aLV uhY -jPj -xnK +bAu +vsG uTr wqe aGj @@ -56335,8 +56703,8 @@ xRj xRj xRj xRj -usG -usY +xRj +xRj ris ris ris @@ -56354,7 +56722,7 @@ rXC rXC kRq jpf -pDa +kaL uwI aLV oZB @@ -56366,7 +56734,7 @@ uWI cvv uhY mRz -kuZ +prV uTr aGj nHX @@ -56529,8 +56897,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj jNg ris ris @@ -56548,7 +56916,7 @@ rXC fFn snQ aSm -dth +oXb lJy aLV txl @@ -56559,7 +56927,7 @@ ctS bBw aLV mTU -jPj +bAu cVc uTr uTr @@ -56741,8 +57109,8 @@ ucz rXC tuw snQ -fmb -mbU +ojQ +sjP flG gic gSE @@ -56919,13 +57287,13 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj ris maa byt oVo -rZH +maa maa qsz bpw @@ -56936,14 +57304,14 @@ rXC rkb snQ jie -vmH +wWT pVQ khS mnk mnk mnk mXH -ush +orE ush aZE gpx @@ -57113,13 +57481,13 @@ xRj xRj xRj xRj -usG -rnI +xRj +xRj ris kfn byt oVo -qii +kBk kBk buo bpw @@ -57132,17 +57500,17 @@ snQ ojQ dth lJy -gbe -gbe -gbe -gbe -gbe -gbe -gbe -gbe +aEU +aEU +aEU +aEU +aEU +aEU +aEU +aEU liZ bAu -xnK +vsG uTr uTr uTr @@ -57307,8 +57675,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj ris maa byt @@ -57519,7 +57887,7 @@ jrM mNB cBN kWj -umU +bOP aEU aEU rba @@ -57890,8 +58258,8 @@ xRj xRj xRj xRj -xRj -xRj +ekR +rnI ris uTr uTr @@ -57905,7 +58273,7 @@ uTr uTr uTr uTr -byY +eCz mbU hhr aLm @@ -57916,7 +58284,7 @@ eFE aEU eFE cXS -bxs +jux bAu itm uTr @@ -58085,7 +58453,7 @@ xRj xRj xRj xRj -xRj +ekR ris ris maa @@ -58279,7 +58647,7 @@ xRj xRj xRj xRj -vcB +jNg xrL xrL qJU @@ -58295,7 +58663,7 @@ uTr uTr rAx dth -uRN +lJy aEU aEU aEU @@ -58306,7 +58674,7 @@ aEU vBg koX fcc -xnK +vsG uTr maa kZn @@ -58500,7 +58868,7 @@ tuO uJk ikY tvd -vrN +xpv uTr uTr uTr @@ -58685,17 +59053,17 @@ uTr aUL jTR pQg -lUh +vzW lUh qyL vgA vgA -upe +qyL bdP lJv qJY uTr -maa +uTr maa bFR maa @@ -58872,14 +59240,14 @@ pgc xQD jbd qJU -byt +aCy kfn maa uTr nMe bwE rVd -lUh +oOx lUh qyL vgA @@ -59073,7 +59441,7 @@ uTr mJc nxf pQg -lUh +pyy lUh qyL vgA @@ -59264,10 +59632,10 @@ byt rDe maa uTr -tOv +vEN fnJ -tHB -lUh +pQg +xfa lUh qyL vgA @@ -59458,18 +59826,18 @@ byt uTr uTr uTr -pmP -aHF -mth +ojQ +fnJ +pQg lUh lUh tuO qyL qyL tuO -aRe +uJk bAu -xnK +vsG uTr maa kfn @@ -59638,14 +60006,14 @@ xRj xRj xRj xRj -usG -phc +xRj +skI phc -qln -jhz -wOi -wOi -fMf +mBp +gDf +mBp +pmP +agQ xrx blR byt @@ -59654,7 +60022,7 @@ kfn uTr ojQ xwO -tHB +pQg lUh lUh lUh @@ -59831,33 +60199,33 @@ xRj xRj xRj xRj -usG -usY -phc -phc +xRj +xRj +skI +eCS qln -wOi -wOi -wOi -fMf +qln +qln +qln +kEq wOi blR byt maa sIg uTr -vEN +ojQ fnJ hlO hgT -wUc +hOF wUh cvT mNK -mNK +nlF xem bAu -xnK +vsG uTr maa byt @@ -60026,7 +60394,7 @@ xRj xRj xRj xRj -usG +xRj kOQ cys cys @@ -60034,7 +60402,7 @@ cys cys blR mBw -wOi +dAp blR izR uTr @@ -60043,8 +60411,8 @@ uTr nuG khU vvR +mth iCg -gQU jKs bLW kiK @@ -60227,7 +60595,7 @@ kHE pDq ilb blR -fMf +pCl wOi blR byt @@ -60238,7 +60606,7 @@ uTr wWq wWq wWq -wWq +vRx vmD qcd jlB @@ -60432,11 +60800,11 @@ byt wWq iDg iDg -jzE -cMM -kXL -gis -rCw +uBH +eDl +uhG +eDl +oQJ iDg iDg wWq @@ -60452,8 +60820,8 @@ bHe nVc cYi vGJ -usG -fOo +xRj +xRj xRj xRj xRj @@ -60615,8 +60983,8 @@ qeP bkI ofG blR -fMf -xrx +edF +jhz jYs jYs jYs @@ -60627,10 +60995,10 @@ iBH iDg iDg llA -dQH +eDl lou -fnO -eHI +eDl +uBH iDg iDg wWq @@ -60646,8 +61014,8 @@ fNh ivS cYi vGJ -usY -usG +xRj +xRj xRj xRj xRj @@ -60820,10 +61188,10 @@ xkO iBH wWq wWq -vRx +wWq +eDl +uhG eDl -kXL -wkc vRx wWq wWq @@ -60840,8 +61208,8 @@ fJS lRe cYi vGJ -usG -fOo +xRj +xRj xRj xRj xRj @@ -61016,9 +61384,9 @@ srV vBK wWq wyY -gWC -ePf -wWq +uhG +eDl +fND srV srV wWq @@ -61210,7 +61578,7 @@ srV srV wWq hBB -gWC +uhG xYV wWq srV @@ -61387,12 +61755,12 @@ xRj ePJ kOQ kOQ -blv +kOQ wrQ blv iif -fMf -wOi +bak +dAp jYs jYs ctB @@ -61583,10 +61951,10 @@ xRj iif iif wCn -mBp +eHI gDf -fMf -wOi +tIO +fIr gDf wDH mBp @@ -61599,14 +61967,14 @@ hcK lKM gag jlu -gDf +dSB wDH bsq mBp mBp mBp mBp -gDf +vrN iif cYi cYi @@ -61780,17 +62148,17 @@ cKS hWg bFi wyg -ttX +ieh uaF kqq -ttX +ieh rJn wbz lWb -ttX +ieh nHx -ttX -ttX +ieh +xhP ttX mik ttX @@ -62003,8 +62371,8 @@ iPF hai vdY cYi -usY -usG +xRj +xRj xRj xRj xRj @@ -62197,8 +62565,8 @@ hai hai jAg cYi -usG -fOo +xRj +xRj xRj xRj xRj @@ -62381,7 +62749,7 @@ nKZ rQb hDD uHb -aVK +vrC tNT ubJ umn @@ -62561,8 +62929,8 @@ svq svq vYC qkB -ioL -evM +tmb +hIR tPq ueQ evM @@ -62575,7 +62943,7 @@ evM hFM wfz psb -evM +hIR xxd ubJ oxf @@ -63136,8 +63504,8 @@ xRj xRj jBC xRj -usG -rnI +xRj +xRj svq svq svq @@ -63330,8 +63698,8 @@ xRj xRj xRj xRj -fOo -usG +xRj +xRj xRj svq svq diff --git a/maps/endeavour/levels/deck2.dmm b/maps/endeavour/levels/deck2.dmm index ccf927e5f4dc..954951cc6d6f 100644 --- a/maps/endeavour/levels/deck2.dmm +++ b/maps/endeavour/levels/deck2.dmm @@ -1,15 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aao" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ +/obj/machinery/light, +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardafthall) "aaK" = ( /obj/structure/lattice, /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "aaU" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -43,6 +45,16 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"abW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "acc" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -121,6 +133,7 @@ /obj/machinery/camera/network/medbay{ network = list("Psychiatric") }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "aee" = ( @@ -131,6 +144,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "6-9" + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "aeS" = ( @@ -176,22 +192,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"afR" = ( -/obj/structure/table/reinforced, -/obj/machinery/holoplant{ - pixel_y = 12 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +"agL" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "agO" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/station/public_meeting_room) "agS" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/bed/roller, @@ -219,6 +228,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"ahN" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "aia" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -262,18 +281,11 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "aiO" = ( -/obj/machinery/camera/network/civilian, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super; - dir = 2; - pixel_x = 0; - pixel_y = 21 - }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/spline/plain{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "aja" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -281,6 +293,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) +"ajd" = ( +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ajj" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -297,6 +315,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "alY" = ( @@ -311,8 +332,11 @@ /area/medical/medbay4) "amq" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "amG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -357,6 +381,15 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"ana" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "anx" = ( /obj/machinery/computer/robotics{ dir = 4 @@ -373,6 +406,31 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) +"anF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) +"aoi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "apg" = ( /obj/machinery/artifact_scanpad, /obj/structure/window/reinforced{ @@ -397,8 +455,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/rnd/breakroom) "apQ" = ( @@ -426,6 +482,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "aqt" = ( @@ -462,6 +523,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "arw" = ( @@ -485,16 +548,13 @@ /area/rnd/storage) "arL" = ( /obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) -"arU" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/machinery/fire_alarm/north_mount, -/obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d2portamidhall) "arY" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -511,9 +571,9 @@ /obj/structure/table/carbon/reinforced, /obj/item/storage/box/treats, /obj/machinery/button/windowtint{ - id = "robotics1"; - pixel_x = -25; - pixel_y = -2 + id = "robotics-inner"; + pixel_x = -22; + pixel_y = 10 }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) @@ -539,13 +599,25 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"aua" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "auq" = ( /obj/machinery/door/firedoor/glass{ dir = 4 }, /obj/machinery/door/airlock/medical{ autoclose = 0; - frequency = 1379; + frequency = 1378; icon_state = "door_locked"; id_tag = "virology_airlock_east_exterior"; locked = 1; @@ -582,6 +654,22 @@ /obj/landmark/spawnpoint/job/cyborg, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) +"aws" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "aww" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -660,9 +748,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, @@ -689,17 +774,14 @@ /turf/simulated/floor/tiled, /area/medical/virology) "aAu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "aAw" = ( /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) @@ -728,9 +810,6 @@ dir = 8; pixel_x = -10 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) @@ -761,7 +840,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/space, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "aDi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -781,8 +860,18 @@ /turf/simulated/wall/prepainted/science, /area/assembly/robotics) "aDX" = ( -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) +"aEl" = ( +/obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -790,14 +879,17 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/rnd/research/researchdivision) "aEn" = ( -/obj/effect/floor_decal/borderfloor/corner{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "5-10" + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aEO" = ( @@ -835,6 +927,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"aFv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "aFA" = ( /obj/machinery/computer/diseasesplicer, /obj/effect/floor_decal/borderfloor{ @@ -868,12 +971,17 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aHb" = ( +"aGC" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"aHb" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -956,6 +1064,18 @@ name = "Station Intercom (General)"; pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "aJg" = ( @@ -975,23 +1095,15 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "aKq" = ( -/obj/structure/sign/department/operational{ - pixel_y = -29 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "aKy" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, /obj/machinery/light{ dir = 8; pixel_x = -10 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "aKR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1013,6 +1125,12 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "aLW" = ( @@ -1030,6 +1148,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"aNn" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "aNu" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/beige/border, @@ -1080,8 +1207,11 @@ "aPo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "aPI" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -1137,6 +1267,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "aRl" = ( @@ -1175,35 +1311,26 @@ /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) "aUb" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "aUo" = ( /obj/machinery/light/small, /obj/machinery/media/jukebox, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aUs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/camera/network/research{ - dir = 4; - network = list("Xenobiology") +/obj/effect/paint/purplegray, +/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "research-outer" }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/plating, +/area/rnd/reception_desk) "aUR" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/space) @@ -1214,8 +1341,20 @@ /turf/simulated/floor/reinforced, /area/rnd/testingroom) "aVd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) +"aVr" = ( +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "aVO" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/spline/fancy/wood, @@ -1233,17 +1372,35 @@ "aXm" = ( /obj/fiftyspawner/glass, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "aXF" = ( /obj/machinery/transhuman/resleever, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/medical/resleeving) "aYt" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) +"aYX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/vending/nifsoft_shop{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8; + pixel_x = -10 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2afthall) "aZa" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/electrical{ @@ -1279,7 +1436,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "aZZ" = ( /obj/machinery/air_alarm{ dir = 8; @@ -1293,15 +1450,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay4) -"ban" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - icon_state = "5-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +"baj" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "baT" = ( /obj/machinery/light{ dir = 4 @@ -1320,14 +1472,14 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "bbQ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/patient_wing) +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "bch" = ( /obj/structure/closet/secure_closet/medical2, /obj/machinery/fire_alarm/east_mount, @@ -1337,11 +1489,15 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "bcp" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/door/firedoor{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/deep/indoors, /area/endeavour/hallway/d1starboardamidhall) "bds" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -1368,6 +1524,14 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"beo" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "bfi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1376,6 +1540,18 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"bfx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "bfE" = ( /obj/machinery/camera/network/outside{ dir = 5 @@ -1433,15 +1609,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "bhg" = ( @@ -1480,15 +1649,10 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "bhT" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) +/obj/structure/window/reinforced, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "biu" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall/prepainted/medical, @@ -1554,6 +1718,21 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"bjk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/deck/second{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "bjp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1575,15 +1754,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/medbreak) "bjV" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2fwdmaint) +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "bks" = ( /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/wood, @@ -1616,6 +1800,20 @@ /obj/map_helper/access_helper/airlock/station/science/xenoarcheology, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"bkX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "blH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -1646,14 +1844,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "bmg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/wall/prepainted, +/area/crew_quarters/cafeteria) "bnr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -1697,6 +1889,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "bqS" = ( @@ -1734,6 +1929,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"bsO" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/landmark/spawnpoint/overflow/station, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "bsW" = ( /obj/machinery/cryopod/robot/door/gateway, /turf/simulated/floor/tiled/techfloor, @@ -1746,6 +1949,15 @@ "buE" = ( /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"buM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "bvp" = ( /obj/machinery/camera/network/medbay, /obj/effect/floor_decal/borderfloor{ @@ -1772,6 +1984,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "bxz" = ( @@ -1799,6 +2017,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"byX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "bzj" = ( /obj/structure/shuttle/engine/heater{ dir = 8 @@ -1808,6 +2037,18 @@ }, /turf/simulated/wall/r_wall/prepainted/medical, /area/shuttle/emt/cockpit) +"bzH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "bzR" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/steel_ridged, @@ -1818,6 +2059,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "bzV" = ( @@ -1887,6 +2130,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) +"bBg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "bBu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1894,6 +2149,14 @@ /obj/effect/floor_decal/borderfloorwhite, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"bBw" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "bBJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1923,6 +2186,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/workshop) +"bCK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "bCS" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -1953,6 +2228,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"bDt" = ( +/obj/spawner/window/low_wall/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/station/public_meeting_room) "bDG" = ( /obj/machinery/light{ dir = 8; @@ -1969,13 +2254,23 @@ /obj/structure/window/phoronreinforced, /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) +"bEj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "bEv" = ( /obj/machinery/door/firedoor/glass{ dir = 4 }, /obj/machinery/door/airlock/research{ id_tag = "researchdoor"; - name = "Robotics Lab" + name = "R&D Distribution Area" }, /obj/map_helper/access_helper/airlock/station/science/robotics, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2012,6 +2307,14 @@ /area/medical/patient_wing) "bFe" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "bFy" = ( @@ -2038,6 +2341,18 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) +"bFI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "bFP" = ( /obj/machinery/light{ dir = 4 @@ -2083,6 +2398,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 9 }, +/obj/machinery/air_alarm/west_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "bGy" = ( @@ -2122,26 +2438,14 @@ /turf/space, /area/space) "bHz" = ( -/obj/structure/curtain/open/shower, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/machinery/shower{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "bHA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2183,7 +2487,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "bIN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2191,7 +2495,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "bIW" = ( /obj/structure/sign/department/robo, @@ -2278,8 +2585,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "bKV" = ( /obj/structure/table/steel, /obj/machinery/recharger, @@ -2295,13 +2602,22 @@ /turf/simulated/floor/tiled, /area/medical/medbay4) "bLe" = ( -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/door/airlock/maintenance/common, -/obj/map_helper/access_helper/airlock/station/science/robotics, -/turf/simulated/floor/plating, -/area/rnd/hallway) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay Access"; + pixel_x = -32; + pixel_y = 27; + req_access = list(29,47); + req_one_access = list(47) + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "bMe" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2352,6 +2668,12 @@ /area/holodeck_control) "bNH" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "bNQ" = ( @@ -2377,17 +2699,18 @@ /turf/simulated/floor/grass, /area/medical/psych_ward) "bPx" = ( -/turf/simulated/wall/prepainted, -/area/rnd/research_restroom) +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery2) "bPE" = ( /obj/structure/closet/hydrant{ pixel_y = 32 }, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -2417,13 +2740,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "bQh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/vending/giftvendor, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2afthall) "bQj" = ( /obj/machinery/door/firedoor/glass, @@ -2478,16 +2799,27 @@ /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) "bSu" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/borderfloorblack{ + alpha = 255; dir = 5 }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "bSI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/endeavour/hallway/d1starboardamidhall) "bSL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2557,6 +2889,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"bVW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) +"bWn" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "bWr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -2617,6 +2965,11 @@ icon_state = "4-8" }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "bYa" = ( @@ -2632,20 +2985,23 @@ /area/medical/medbay4) "bYn" = ( /obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/bamboo, +/obj/machinery/photocopier/faxmachine{ + department = "Public Meeting Room" + }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "bYo" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "bYu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8; + light_range = 12 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/holodeck_control) "bYw" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor, @@ -2690,28 +3046,46 @@ /area/crew_quarters/medbreak) "bYT" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Deck 2 Aft Grid" + RCon_tag = "Deck 2 Aft Grid"; + cur_coils = 2 }, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) +"bZt" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"bZu" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "bZw" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "bZX" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/structure/cable/green{ + icon_state = "4-10" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardamidhall) "cac" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -2754,14 +3128,14 @@ }, /obj/machinery/door/airlock/glass/medical/polarized{ req_one_access = null; - name = "Operating Theatre 1"; - id_tint = "or1" + name = "Operating Theatre 2"; + id_tint = "or2" }, /obj/map_helper/electrochromatic_linker{ - id = "or1" + id = "or2" }, /turf/simulated/floor/tiled/white, -/area/medical/surgery) +/area/medical/surgeryprep) "cbh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2791,11 +3165,15 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) "ccB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/paint/babyblue, +/obj/structure/window/reinforced/polarized/full{ + id = "or1" }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/medical/surgeryprep) "ccN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2815,6 +3193,12 @@ /obj/map_helper/access_helper/airlock/station/science/toxins, /turf/simulated/floor/tiled, /area/maintenance/research) +"cda" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "cdg" = ( /obj/machinery/air_alarm{ dir = 4; @@ -2832,10 +3216,10 @@ /turf/simulated/wall/prepainted/medical, /area/medical/exam_room/exam_1) "ceq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /turf/simulated/floor/tiled, @@ -2889,6 +3273,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"cfw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "cfI" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloorwhite{ @@ -2922,7 +3318,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "cgs" = ( @@ -2957,6 +3357,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "cja" = ( @@ -2964,14 +3367,8 @@ /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) "cje" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "cjf" = ( /obj/machinery/door/firedoor/glass, @@ -3001,19 +3398,27 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) -"ckP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ +"cki" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2portamidhall) +"ckH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"ckP" = ( +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/station/public_meeting_room) "ckU" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled, @@ -3049,11 +3454,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "cmb" = ( -/obj/structure/cable{ - icon_state = "5-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d2fwdhall) "cmc" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled, @@ -3064,6 +3472,12 @@ pixel_x = -10 }, /obj/machinery/computer/timeclock/premade/north, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "cmy" = ( @@ -3097,10 +3511,22 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) +"cnu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/machinery/holoposter{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "cny" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "coh" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -3189,6 +3615,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) +"cqt" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/holodeck_control) "cqv" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -3249,7 +3682,31 @@ /area/rnd/xenobiology) "csb" = ( /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) +"cse" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"csf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "csx" = ( /obj/item/storage/excavation, /obj/item/pickaxe, @@ -3272,6 +3729,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"ctj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ctB" = ( /obj/structure/closet/secure_closet/scientist, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3287,8 +3756,16 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) +"cuE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "cuL" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -3308,29 +3785,29 @@ /turf/simulated/floor/tiled, /area/medical/virology_fore_access) "cva" = ( -/obj/structure/window/reinforced{ +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) +"cvh" = ( +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/curtain/open/shower/medical, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/medical/surgeryprep) -"cvh" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "cvB" = ( -/obj/structure/bed/chair, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "cvD" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3376,24 +3853,23 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "cwT" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) "cxk" = ( /obj/machinery/light{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -3433,11 +3909,9 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "cyw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/holopad, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) @@ -3465,6 +3939,18 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "czU" = ( @@ -3479,11 +3965,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "czX" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "cAb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -3502,36 +3991,57 @@ /obj/map_helper/access_helper/airlock/station/medical/morgue, /turf/simulated/floor/tiled/techfloor, /area/medical/resleeving) +"cAQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "cBb" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/research_restroom) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "cBK" = ( -/obj/machinery/light{ - dir = 1 +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d1starboardafthall) +"cCF" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) +"cCK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) +"cDA" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/machinery/power/apc/west_mount{ - pixel_x = 0; - pixel_y = 22; - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) -"cDA" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "cDC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3592,8 +4102,14 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "cFb" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/prepainted, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/structure/flora/pottedplant/unusual{ + pixel_y = 12 + }, +/turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) "cFh" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -3705,6 +4221,18 @@ "cHC" = ( /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) +"cIi" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "cIp" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -3735,6 +4263,18 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"cKS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "cLg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -3770,21 +4310,18 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "cMM" = ( -/obj/machinery/newscaster{ - pixel_y = -31 - }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "cMY" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -3801,12 +4338,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "cNK" = ( /obj/structure/disposalpipe/segment, @@ -3856,12 +4389,14 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "cOM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central6, /obj/machinery/camera/network/civilian{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "cOS" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, @@ -3878,17 +4413,12 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "cPx" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, /obj/machinery/light{ dir = 8; pixel_x = -10 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/table/rack/shelf, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "cQu" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -3901,20 +4431,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "cQB" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ +/obj/structure/catwalk, +/obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "cRF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3947,8 +4469,30 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) +"cSd" = ( +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) +"cSK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora/lab_atmos) "cSS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3977,6 +4521,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"cTm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "cTu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4019,19 +4575,15 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "cUl" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) -"cUN" = ( -/obj/effect/paint/babyblue, -/obj/structure/window/reinforced/polarized/full{ - id = "or2" - }, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/turf/simulated/floor/plating, -/area/medical/surgery2) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) +"cUN" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "cVq" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4109,7 +4661,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "cZK" = ( /obj/machinery/body_scanconsole, /turf/simulated/floor/tiled/white, @@ -4170,6 +4722,15 @@ /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych/psych_1) +"dde" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "ddn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -4227,6 +4788,13 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/holodeck_control) +"dfx" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) "dgC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4282,8 +4850,11 @@ /area/maintenance/research) "dhy" = ( /obj/machinery/fire_alarm/north_mount, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -4327,14 +4898,21 @@ /area/endeavour/hallway/d2aftmaint) "dkr" = ( /obj/machinery/light, -/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/holodeck_control) +"dkv" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/bed/chair/comfy/beige, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "dkw" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/testingroom) "dlc" = ( @@ -4365,11 +4943,9 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "dlw" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "dly" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -4378,12 +4954,9 @@ dir = 1 }, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "dlB" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, @@ -4407,7 +4980,19 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora/lab_atmos) "dni" = ( -/turf/simulated/wall/prepainted, +/obj/structure/cable{ + icon_state = "5-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/medical/virologymaint) "dnV" = ( /obj/machinery/air_alarm{ @@ -4416,20 +5001,23 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) -"dnZ" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "5-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"dnZ" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "doi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor/grid, @@ -4471,6 +5059,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) +"dpH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "dqm" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4564,13 +5167,26 @@ dir = 6 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) -"dub" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/area/tether/station/public_meeting_room) +"dtW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) +"dub" = ( +/obj/machinery/disposal{ + pixel_y = -2 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "duc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -4578,6 +5194,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "dug" = ( @@ -4644,6 +5263,19 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"dwZ" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "dxn" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -4689,7 +5321,7 @@ }, /obj/structure/barricade/cutout/lusty, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "dyM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4697,17 +5329,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "dyQ" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/flora/grass/event/full_grass2, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "dyS" = ( /obj/machinery/door/blast/regular, /obj/machinery/atmospheric_field_generator/perma, @@ -4731,11 +5367,22 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_b) "dzi" = ( -/obj/machinery/computer/timeclock/premade/south, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) +"dzq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "dzs" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "dzH" = ( @@ -4817,13 +5464,6 @@ }, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) -"dCq" = ( -/obj/machinery/camera/network/research{ - dir = 4; - network = list("Xenobiology") - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics/morgue) "dCW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 @@ -4846,6 +5486,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"dEb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "dEc" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ @@ -4871,9 +5523,15 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/storage) "dFg" = ( -/obj/structure/sign/deck/second, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/endeavour/hallway/d1starboardforhall) +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/flora/grass/event/grassy_bush1, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "dFm" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_one"; @@ -4896,6 +5554,16 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"dGt" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "dGL" = ( /obj/structure/cable/green, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -4912,6 +5580,9 @@ "dHc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "dHs" = ( @@ -4929,11 +5600,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "dIf" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/turf/simulated/floor/plating, +/area/medical/virologymaint) "dIx" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -4966,6 +5637,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"dIS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "dIV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4987,6 +5667,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"dJI" = ( +/obj/effect/floor_decal/carpet/blue, +/obj/effect/floor_decal/carpet/blue{ + dir = 4 + }, +/obj/effect/floor_decal/carpet/blue{ + dir = 6 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "dJW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5018,6 +5708,9 @@ /area/rnd/xenobiology/xenoflora) "dMg" = ( /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/airless/ceiling, /area/maintenance/research) "dMM" = ( @@ -5124,6 +5817,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"dOv" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "dPs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -5144,8 +5848,11 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dQe" = ( -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "dQf" = ( /obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood{ @@ -5198,6 +5905,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"dSt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "dSA" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -5222,16 +5938,26 @@ /area/assembly/robotics) "dSQ" = ( /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) +/obj/machinery/door/airlock/glass{ + name = "Long-Range Teleporter Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/departing) "dSY" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) +"dTv" = ( +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "dTF" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ @@ -5272,16 +5998,21 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "dUk" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "dUn" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, /mob/living/simple_mob/slime/xenobio/rainbow/kendrick, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "dUT" = ( /obj/machinery/door/firedoor, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "dUW" = ( @@ -5297,17 +6028,10 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "dVQ" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super; - dir = 2; - pixel_x = 0; - pixel_y = 21 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "dVV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5323,6 +6047,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"dWk" = ( +/obj/structure/bed/chair, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery) "dWP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5350,10 +6081,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"dXk" = ( +/obj/structure/flora/grass/event/leafy_bush2, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "dXL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -5416,12 +6156,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "dYX" = ( -/obj/structure/bed/chair, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 +/obj/machinery/atm{ + pixel_x = -32 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "dZd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5455,6 +6194,18 @@ /obj/structure/table/carbon/reinforced, /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) +"eah" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "eam" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -5514,11 +6265,20 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "eaK" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) +"ebF" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/stool/padded, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "ebI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5561,6 +6321,12 @@ }, /turf/simulated/wall/r_wall/prepainted/medical, /area/shuttle/emt/general) +"ecV" = ( +/obj/structure/cable/orange{ + icon_state = "6-9" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) "ecY" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -5610,15 +6376,13 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) "edP" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - icon_state = "5-10" +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/research) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "eew" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor{ @@ -5640,19 +6404,21 @@ /turf/simulated/wall/prepainted/medical, /area/medical/chemistry) "efb" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "efc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "eff" = ( @@ -5671,15 +6437,25 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "efr" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) +"efw" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "efL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -5706,11 +6482,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) "egu" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "egX" = ( /obj/structure/table/woodentable, /obj/machinery/light{ @@ -5771,7 +6550,7 @@ /obj/structure/lattice, /obj/structure/grille, /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "ein" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5790,6 +6569,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"eiI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) "eiO" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5822,10 +6610,10 @@ /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "ejr" = ( +/obj/structure/catwalk, /obj/structure/cable/orange{ - icon_state = "6-8" + icon_state = "4-8" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "ejt" = ( @@ -5841,8 +6629,10 @@ /area/medical/reception) "ejv" = ( /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ejy" = ( @@ -5893,9 +6683,11 @@ /turf/simulated/wall/prepainted, /area/maintenance/medbay/aft) "ekA" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/prepainted/science, -/area/rnd/hallway) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "ekC" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -5941,11 +6733,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) +"elT" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "eme" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5995,11 +6790,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) "eoT" = ( -/obj/machinery/light, -/obj/structure/sign/department/operational{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "epc" = ( /obj/machinery/atmospherics/portables_connector{ @@ -6042,6 +6833,8 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "eqL" = ( @@ -6073,8 +6866,22 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) +"esy" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d2portafthall) "etB" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, @@ -6090,6 +6897,16 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"eub" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ewY" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -6118,13 +6935,16 @@ /turf/simulated/floor/tiled/steel_ridged, /area/medical/medbay_emt_bay) "exl" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/vending/nifsoft_shop{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) +"exs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/substation/medical_science) "eyb" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_b) @@ -6163,14 +6983,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ezh" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/deep/indoors, /area/endeavour/hallway/d2portamidhall) "ezA" = ( /obj/effect/floor_decal/industrial/warning{ @@ -6182,10 +7010,10 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) "ezI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/holodeck_control) "ezO" = ( @@ -6228,23 +7056,27 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "eBA" = ( -/obj/machinery/holopad, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) +"eBL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) -"eBL" = ( -/obj/structure/table/woodentable, -/obj/item/paicard, +/obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 + dir = 8 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "eCw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -6281,9 +7113,17 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "eDX" = ( -/obj/machinery/floodlight, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2aftmaint) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "eEv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery) @@ -6318,16 +7158,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "eFl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/spawner/window/low_wall/reinforced/full, +/turf/simulated/floor/plating, +/area/crew_quarters/cafeteria) "eFy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6362,12 +7195,22 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled, /area/medical/resleeving) +"eHd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "eHm" = ( /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "eHQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "eHS" = ( @@ -6402,12 +7245,17 @@ /obj/structure/sign/department/virology{ pixel_y = -32 }, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super; - pixel_x = -21 +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -6423,10 +7271,16 @@ /area/assembly/robotics/surgery) "eJe" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 2 AMIDSHIPS SUPPORT" + RCon_tag = "AUX - DECK 2 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) +"eJz" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "eJO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6528,10 +7382,12 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "eOr" = ( @@ -6548,11 +7404,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"eOX" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "ePI" = ( /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "ePT" = ( @@ -6565,14 +7428,14 @@ /turf/simulated/floor/tiled, /area/medical/virology_aft_access) "eQq" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "eQr" = ( /obj/machinery/light/small{ dir = 1 @@ -6596,7 +7459,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "eRt" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -6613,9 +7476,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "eRK" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "eRP" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -6683,17 +7548,13 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "eUd" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-10" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "eUu" = ( /obj/machinery/camera/network/medbay, @@ -6714,9 +7575,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "eUy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6801,20 +7663,30 @@ /area/medical/medbay_primary_storage) "eXe" = ( /obj/machinery/light, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, +/obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "eXh" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) +"eXR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "eXW" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_two"; @@ -6836,6 +7708,15 @@ /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) +"eYj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "eYk" = ( /obj/machinery/light/small{ dir = 4 @@ -6899,9 +7780,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "eZJ" = ( -/obj/machinery/camera/network/civilian, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/endeavour/hallway/d2afthall) "eZS" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -6979,6 +7868,20 @@ /area/medical/psych_ward) "fcM" = ( /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) +"fcN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "fcX" = ( @@ -7045,6 +7948,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ffI" = ( @@ -7079,6 +7985,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"fhX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/flora/grass/event/sunny_bush1, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "fik" = ( /turf/simulated/floor/airless/ceiling, /area/space) @@ -7089,19 +8005,16 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "fiF" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "fiT" = ( -/obj/structure/cable/orange{ - icon_state = "6-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2aftmaint) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "fiX" = ( /obj/structure/bed/chair/sofa/beige/left{ dir = 8 @@ -7181,21 +8094,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"fmi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/machinery/disposal, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8; - light_range = 12 +"fmk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/research) "fmm" = ( /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) @@ -7213,6 +8120,18 @@ /obj/machinery/camera/network/research, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"fmL" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "fnt" = ( /obj/machinery/light{ dir = 4 @@ -7240,29 +8159,38 @@ "foz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "foJ" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "fpq" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "fpV" = ( -/obj/machinery/light, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass{ + name = "Long-Range Teleporter Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/teleporter/departing) "fqf" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -7290,13 +8218,15 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "fqP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) "frq" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ @@ -7387,10 +8317,16 @@ /obj/machinery/light, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) -"fuk" = ( -/obj/machinery/holopad, +"ftU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) +"fuk" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "fuU" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -7401,18 +8337,20 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "fvj" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) "fwo" = ( /obj/machinery/door/firedoor, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -7540,14 +8478,20 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "fBJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 5 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardafthall) "fBP" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -7558,6 +8502,8 @@ /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, /obj/map_helper/access_helper/airlock/station/science/department, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/hallway) "fCr" = ( @@ -7581,6 +8527,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "fCE" = ( @@ -7608,9 +8556,11 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologymaint) "fDK" = ( -/obj/structure/closet/emcloset, +/obj/machinery/fire_alarm/south_mount, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/endeavour/hallway/d1starboardforhall) "fDP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7636,11 +8586,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "fEp" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner_techfloor_grid{ dir = 1 }, -/turf/simulated/open, -/area/endeavour/station/stairs_three) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "fFG" = ( /obj/effect/floor_decal/carpet/blue{ icon_state = "blue2_edges"; @@ -7686,13 +8636,28 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/medical/medbay4) +"fHk" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "fHl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) "fIn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "fIp" = ( @@ -7748,11 +8713,22 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "fIE" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -7816,16 +8792,18 @@ "fKw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "fKA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "fKS" = ( @@ -7855,6 +8833,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "fLZ" = ( @@ -7878,6 +8858,29 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"fMl" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/water/deep/indoors, +/area/endeavour/hallway/d1starboardamidhall) +"fMy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) +"fMC" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "fNb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ @@ -7919,9 +8922,26 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/crew_quarters/heads/cmo) "fOr" = ( -/obj/machinery/door/firedoor, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super; + dir = 2; + pixel_x = 0; + pixel_y = 21 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/endeavour/hallway/d2fwdhall) "fOE" = ( /obj/machinery/light{ dir = 4 @@ -8060,11 +9080,11 @@ /turf/simulated/floor/tiled, /area/medical/virology_aft_access) "fRp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -8112,11 +9132,26 @@ /obj/machinery/station_map{ pixel_y = 32 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) +"fTn" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "fTE" = ( /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ @@ -8200,6 +9235,15 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "fVX" = ( @@ -8234,20 +9278,9 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "fWJ" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) "fWL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ @@ -8266,6 +9299,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"fWX" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "fXo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8306,10 +9348,33 @@ }, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) +"fZy" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/map_helper/access_helper/airlock/station/medical/surgery, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass/medical/polarized{ + req_one_access = null; + name = "Operating Theatre 1"; + id_tint = "or1" + }, +/obj/map_helper/electrochromatic_linker{ + id = "or1" + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgeryprep) "gao" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "gaA" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -8326,18 +9391,14 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "gbN" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/navgold/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d1starboardamidhall) "gbY" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8346,17 +9407,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gck" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/bed/chair/comfy/beige{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "gcM" = ( /obj/machinery/button/remote/blast_door{ id = "xenobio2"; @@ -8427,6 +9491,24 @@ "gfA" = ( /turf/simulated/floor/plating, /area/maintenance/fpmaint2) +"gfI" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) +"ggw" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ggD" = ( /obj/structure/table/standard, /obj/item/paper_bin{ @@ -8461,21 +9543,24 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "ghc" = ( +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) +"gii" = ( +/turf/simulated/floor/tiled, +/area/teleporter/departing) +"gij" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/power/apc/west_mount{ - pixel_x = 22; +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) -"gii" = ( -/turf/simulated/floor/tiled, -/area/teleporter/departing) +/area/endeavour/hallway/d1starboardafthall) "gir" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8484,6 +9569,8 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/research) "giU" = ( @@ -8495,6 +9582,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"gjd" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "gjp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8683,6 +9783,16 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/medbreak) +"gqL" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "gqW" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 @@ -8726,15 +9836,16 @@ /area/medical/exam_room/exam_2) "gsh" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "gso" = ( @@ -8746,6 +9857,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "gsB" = ( @@ -8767,6 +9881,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"gtd" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "gtH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /obj/machinery/air_alarm{ @@ -8785,10 +9912,10 @@ /turf/space, /area/space) "gtR" = ( +/obj/structure/catwalk, /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "1-8" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "gub" = ( @@ -8822,15 +9949,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) -"guR" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) "gvn" = ( /obj/structure/closet/secure_closet/medical2, /obj/item/clothing/suit/straight_jacket, @@ -8849,6 +9967,8 @@ /area/medical/medbay4) "gvw" = ( /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gwr" = ( @@ -8879,11 +9999,24 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/airless/ceiling, /area/endeavour/hallway/d2aftmaint) "gwT" = ( /turf/simulated/floor/tiled/white, /area/medical/chemistry) +"gxR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "gyu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -8931,6 +10064,10 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"gAf" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "gAn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8955,34 +10092,47 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) -"gBj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"gAW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) +"gBj" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "gBH" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/table/rack/shelf, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "gBJ" = ( /obj/structure/catwalk, @@ -9007,6 +10157,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"gCd" = ( +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) +"gCi" = ( +/obj/structure/window/reinforced, +/obj/machinery/vending/giftvendor, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "gCj" = ( /obj/machinery/shower{ dir = 8 @@ -9027,8 +10190,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "gDB" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9062,18 +10227,14 @@ /turf/simulated/floor/tiled, /area/medical/surgery2) "gEY" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "gFG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -9087,6 +10248,8 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "gGo" = ( @@ -9190,17 +10353,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/medical/surgeryprep) "gIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "gJm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9227,9 +10385,6 @@ dir = 8 }, /obj/machinery/power/apc/west_mount, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) @@ -9275,25 +10430,30 @@ pixel_y = -37 }, /obj/machinery/vending/coffee, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) -"gMk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"gLH" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) +"gMk" = ( +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "gMn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9318,6 +10478,19 @@ /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, /area/medical/chemistry) +"gMN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "gMR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9369,10 +10542,10 @@ dir = 10 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "gOV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9467,6 +10640,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"gRw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "gRW" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -9491,6 +10682,12 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "gSb" = ( @@ -9505,6 +10702,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "gSR" = ( @@ -9515,12 +10718,14 @@ /area/assembly/robotics/surgery) "gSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "gUD" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -9535,6 +10740,11 @@ /obj/map_helper/access_helper/airlock/station/medical/department, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) +"gUZ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "gVf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -9589,11 +10799,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "gXq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "gXK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/disposal, @@ -9622,20 +10835,14 @@ /turf/simulated/floor/plating, /area/medical/virologymaint) "gYH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-8" }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "gYU" = ( /obj/machinery/camera/network/outside{ dir = 8 @@ -9695,13 +10902,15 @@ /turf/simulated/floor/plating, /area/medical/medbay_primary_storage) "hbH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "hbZ" = ( @@ -9743,6 +10952,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "hdR" = ( @@ -9761,10 +10971,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"heB" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "heR" = ( /obj/machinery/fire_alarm/north_mount, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -9776,13 +10998,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/medical/virology_fore_access) -"hfW" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +"hfm" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) +"hfW" = ( /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "hfZ" = ( @@ -9837,11 +11078,22 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "hiV" = ( @@ -9856,26 +11108,37 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"hjA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "hjJ" = ( /obj/machinery/keycard_auth{ pixel_x = 28; pixel_y = -22 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) +"hjM" = ( +/obj/fiftyspawner/steel, +/turf/simulated/floor/plating, +/area/maintenance/medbay/aft) +"hjR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/rdoffice) -"hjM" = ( -/obj/fiftyspawner/steel, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/endeavour/hallway/d2afthall) "hjT" = ( /obj/machinery/air_alarm{ frequency = 1441; @@ -9891,6 +11154,17 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) +"hkf" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "hkx" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9940,6 +11214,15 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) +"hlu" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "hlv" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4; @@ -9951,10 +11234,15 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/testingroom) "hlC" = ( @@ -9964,6 +11252,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "hlM" = ( @@ -10139,20 +11433,36 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "hpi" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "5-10" + }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"hpB" = ( +"hpo" = ( /obj/structure/cable/orange{ - icon_state = "4-9" + icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, /turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) +"hpB" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "hpE" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -10203,9 +11513,24 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"hqy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "hqT" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/access_helper/airlock/station/science/robotics, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "hrJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10228,16 +11553,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) -"hsE" = ( -/obj/machinery/vending/cart, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +"hsu" = ( +/obj/machinery/light{ + dir = 4; + pixel_x = 10 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) +"hsE" = ( +/obj/map_helper/electrochromatic_linker{ + id = "robotics-outer" + }, +/turf/space/basic, +/area/space) "hui" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -10312,6 +11645,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"hvp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "hwg" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -10336,6 +11681,15 @@ /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/exam_room/exam_1) +"hxy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/comfy/beige, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "hxQ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/tiled, @@ -10351,7 +11705,10 @@ /obj/structure/sign/department/virology{ pixel_y = -32 }, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "hyM" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -10428,19 +11785,23 @@ /area/medical/morgue) "hBp" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 2 AMIDSHIPS MAIN" + RCon_tag = "MAIN - DECK 2 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) "hBs" = ( /turf/simulated/floor/tiled, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "hBA" = ( -/obj/machinery/door/firedoor{ +/obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2afthall) "hBM" = ( /obj/machinery/door/firedoor/glass, /obj/map_helper/access_helper/airlock/station/medical/department, @@ -10467,15 +11828,15 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_a) "hCz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/lapvend, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) "hCA" = ( /turf/simulated/wall/prepainted/science, /area/rnd/robotics/morgue) @@ -10485,9 +11846,19 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled, /area/medical/virology) +"hDn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "hDs" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/teleporter/departing) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "hDu" = ( /obj/machinery/light/small{ dir = 1 @@ -10625,12 +11996,29 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "hGi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) +"hGF" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) +"hGK" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "hHa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/rnd{ @@ -10701,6 +12089,11 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "hLb" = ( @@ -10710,9 +12103,13 @@ /turf/simulated/floor/tiled, /area/medical/virology) "hLz" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/plating, -/area/maintenance/research) +/obj/machinery/button/windowtint{ + id = "robotics-outer"; + pixel_x = -22; + pixel_y = 32 + }, +/turf/space/basic, +/area/space) "hLV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10726,7 +12123,7 @@ /area/medical/chemistry) "hMz" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 2 FORE MAIN" + RCon_tag = "MAIN - DECK 2 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -10813,7 +12210,15 @@ /area/rnd/xenobiology/xenoflora/lab_atmos) "hOG" = ( /turf/simulated/wall/prepainted/medical, -/area/hallway/station/docks) +/area/endeavour/hallway/d1starboardamidhall) +"hPe" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "hPg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/medical{ @@ -10844,7 +12249,7 @@ /area/rnd/xenobiology/xenoflora/lab_atmos) "hQy" = ( /obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = 32 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) @@ -10893,11 +12298,34 @@ /obj/structure/table/carbon/reinforced, /turf/simulated/floor/tiled/old_tile/purple, /area/assembly/robotics/surgery) +"hTl" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "hTw" = ( /obj/structure/cable/green{ icon_state = "5-10" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "hUa" = ( @@ -11038,19 +12466,12 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "ibJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/map_helper/access_helper/airlock/station/medical/department, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/medical{ - name = "Recovery Wing" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/surgeryprep) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ice" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -11070,10 +12491,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "icZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11137,11 +12558,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 4 }, /turf/simulated/floor/tiled, @@ -11150,24 +12567,33 @@ /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "iez" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) +"ieG" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/vending/weeb, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "ieR" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -11179,11 +12605,25 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "ifg" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d1starboardforhall) +"ifz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "ifA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -11196,6 +12636,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) +"ifB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "igd" = ( /turf/simulated/wall/prepainted/medical, /area/maintenance/substation/medical_science) @@ -11203,6 +12652,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/testingroom) "igr" = ( @@ -11221,17 +12676,12 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "igN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/flora/grass/event/purple_flowers1, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "iiq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11239,9 +12689,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp/green, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "iiB" = ( /obj/machinery/computer/diseasesplicer{ dir = 1 @@ -11281,11 +12732,10 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) "ijz" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "ijE" = ( /obj/machinery/disposal{ pixel_y = -2 @@ -11312,6 +12762,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "ikD" = ( @@ -11362,17 +12813,7 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_1) "ilh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood/corner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "iln" = ( /obj/machinery/holopad, @@ -11404,9 +12845,17 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "imb" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -11423,15 +12872,12 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "ion" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/component/binary/pump/high_power/on{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/plating, +/area/medical/virologymaint) "ioD" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11477,21 +12923,22 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ioT" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/machinery/light/small{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/landmark{ - name = "xeno_spawn"; - pixel_x = -1 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/vending/mre, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "ioV" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_d) @@ -11572,7 +13019,7 @@ dir = 1 }, /turf/simulated/open, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "itp" = ( /obj/structure/curtain/medical, /turf/simulated/floor/tiled, @@ -11604,9 +13051,20 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/medbay/aft) "iuJ" = ( -/obj/structure/grille, -/turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "ivj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/simulated/floor/tiled/techfloor, @@ -11627,9 +13085,14 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, +/obj/machinery/holopad, +/obj/machinery/holopad, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "ivK" = ( @@ -11659,6 +13122,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"ixI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "ixQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11716,6 +13190,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "iyW" = ( @@ -11825,9 +13301,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "iAs" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "iBd" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11855,7 +13331,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "iBU" = ( @@ -11867,7 +13348,7 @@ "iCr" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "iDd" = ( /obj/machinery/light/small{ dir = 1 @@ -11904,14 +13385,12 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "iFi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "iFv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11958,6 +13437,15 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "iHA" = ( @@ -11973,11 +13461,17 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "iHO" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardamidhall) "iIb" = ( /mob/living/simple_mob/animal/passive/cat/runtime, /obj/effect/floor_decal/borderfloor{ @@ -12009,6 +13503,12 @@ /obj/item/soap/nanotrasen, /turf/simulated/floor/tiled, /area/holodeck_control) +"iJi" = ( +/obj/structure/window/reinforced, +/obj/machinery/vending/snack, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "iJo" = ( /obj/structure/table/steel_reinforced, /obj/item/defib_kit/loaded{ @@ -12049,19 +13549,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) -"iKn" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled, -/area/holodeck_control) "iKN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "iKZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -12089,6 +13583,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) +"iNn" = ( +/obj/structure/cable/orange{ + icon_state = "2-9" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) "iNo" = ( /obj/spawner/window/low_wall/reinforced/full, /obj/machinery/door/blast/regular{ @@ -12101,8 +13601,27 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "iNI" = ( -/turf/simulated/floor/plating, -/area/endeavour/station/stairs_three) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) +"iNM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "iOv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -12207,10 +13726,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/structure/flora/grass/event/ferny_bush1, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "iST" = ( -/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/water/deep/indoors, +/area/endeavour/hallway/d1starboardamidhall) +"iSU" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "iTl" = ( @@ -12253,7 +13793,7 @@ pixel_x = -26 }, /turf/simulated/floor/tiled/steel_grid, -/area/space) +/area/endeavour/hallway/d2portafthall) "iUD" = ( /obj/structure/closet/secure_closet/RD, /obj/item/aicard, @@ -12326,7 +13866,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -12400,23 +13943,25 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"jak" = ( +/obj/machinery/computer/arcade/clawmachine, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "jam" = ( /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"jaG" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "jbC" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/obj/landmark/spawnpoint/overflow/station, -/turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/obj/item/stool/padded, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "jbQ" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 @@ -12431,6 +13976,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"jch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "jct" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12440,6 +13996,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) +"jcO" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "jdh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -12456,6 +14021,12 @@ /obj/effect/floor_decal/corner/beige/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "jdx" = ( @@ -12526,7 +14097,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "jhy" = ( /obj/machinery/camera/network/outside{ @@ -12569,15 +14140,16 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) -"jjG" = ( -/obj/machinery/light, -/obj/structure/cable/green{ +"jjo" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/cable/orange{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -12614,6 +14186,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "jlt" = ( @@ -12671,9 +14249,8 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d2aftmaint) "jnq" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -12739,6 +14316,12 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "jqy" = ( @@ -12827,6 +14410,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jsT" = ( @@ -12864,6 +14452,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "jue" = ( @@ -12873,7 +14470,7 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "juw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -12890,12 +14487,35 @@ "juF" = ( /turf/simulated/wall/prepainted/medical, /area/medical/reception) +"juM" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "jvv" = ( -/obj/machinery/camera/network/research{ - dir = 8; - network = list("Research","Toxins Test Area") +/obj/effect/floor_decal/carpet/blue{ + icon_state = "blue2_edges"; + dir = 8 + }, +/obj/effect/floor_decal/carpet/blue{ + icon_state = "blue2_edges"; + dir = 1 + }, +/obj/effect/floor_decal/carpet/blue{ + icon_state = "blue2_edges"; + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/computer/arcade/orion_trail/kobayashi, /turf/simulated/floor/carpet/sblucarpet, /area/rnd/hallway) "jvz" = ( @@ -12906,9 +14526,17 @@ /turf/simulated/floor/tiled/white, /area/holodeck_control) "jvO" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/prepainted/medical, -/area/crew_quarters/medical_restroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "jwd" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -12920,14 +14548,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/structure/flora/grass/event/leafy_bush1, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "jwV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"jxf" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "jxy" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/medical{ @@ -13022,10 +14659,13 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "jAz" = ( @@ -13154,11 +14794,14 @@ /turf/simulated/floor/tiled/white, /area/medical/morgue) "jER" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-10" }, -/turf/simulated/floor/tiled, -/area/endeavour/station/stairs_three) +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "jFD" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/effect/floor_decal/industrial/warning/dust/corner{ @@ -13180,7 +14823,10 @@ /obj/structure/cable{ icon_state = "5-8" }, -/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "jGo" = ( @@ -13193,6 +14839,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) +"jGq" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "jGK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13220,6 +14881,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"jHs" = ( +/obj/machinery/light, +/obj/structure/flora/grass/event/stalky_bush1, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "jHx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 6 @@ -13258,8 +14925,23 @@ "jKh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) +"jKw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super; + dir = 2; + pixel_x = 0; + pixel_y = 21 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "jKT" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/tiled/white, @@ -13305,7 +14987,7 @@ dir = 8 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "4-10" }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -13314,7 +14996,7 @@ /area/rnd/xenobiology) "jMN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "jNo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13337,13 +15019,25 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "jOk" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 21 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardafthall) +"jOJ" = ( +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "jPu" = ( /obj/machinery/power/port_gen/pacman/mrs{ anchored = 1 @@ -13420,14 +15114,16 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/breakroom) "jQR" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "jRs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13441,10 +15137,8 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "jRu" = ( -/obj/structure/sign/deck/third, -/obj/structure/sign/deck/second, /turf/simulated/wall/prepainted, -/area/endeavour/hallway/d2aftmaint) +/area/endeavour/hallway/d1starboardamidhall) "jRE" = ( /turf/space/basic, /area/endeavour/command/turrets) @@ -13488,6 +15182,18 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) +"jTr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "jTt" = ( /obj/structure/sink{ dir = 8; @@ -13515,24 +15221,12 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "jUZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "jVj" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/landmark/spawnpoint/overflow/station, -/turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/obj/machinery/computer/arcade, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "jVn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13588,6 +15282,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "jWy" = ( @@ -13595,17 +15294,33 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "jXi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "jYo" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -13628,11 +15343,22 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/shuttle/emt/general) "jZz" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) +"jZM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "jZP" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -13647,16 +15373,21 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "jZR" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "jZX" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "jZY" = ( /turf/simulated/wall/prepainted/medical, /area/crew_quarters/medbreak) @@ -13709,7 +15440,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "kdl" = ( -/turf/simulated/wall/prepainted/medical, +/obj/structure/sign/department/operational{ + pixel_y = -29 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardafthall) "kdL" = ( /obj/structure/table/glass, @@ -13725,14 +15463,23 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "keo" = ( -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 }, /turf/simulated/floor/plating, /area/medical/virologymaint) +"keB" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "keI" = ( /obj/machinery/light{ dir = 8; @@ -13755,6 +15502,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"kff" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "kfr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -13798,9 +15557,18 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "kfV" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "kgb" = ( @@ -13815,26 +15583,16 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_d) "kgB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/fire_alarm/north_mount, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) -"kgH" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/area/endeavour/hallway/d2portforhall) "kgX" = ( /obj/structure/bed/chair, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -13859,14 +15617,20 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) "khL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/rnd/research/researchdivision) "khV" = ( /obj/structure/bed/chair/office/light, /obj/landmark/spawnpoint/job/chief_medical_officer, @@ -13887,16 +15651,15 @@ /area/rnd/storage) "kiA" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "kjj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/holodeck_control) "kjr" = ( /obj/machinery/air_alarm{ frequency = 1441; @@ -13917,6 +15680,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"kjZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "kkr" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13963,6 +15737,12 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/assembly/robotics) +"klu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "klY" = ( /turf/simulated/wall/prepainted/medical, /area/medical/exam_room/exam_2) @@ -14061,12 +15841,20 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "kpO" = ( /obj/machinery/camera/network/civilian, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -14098,6 +15886,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) +"ksB" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "ksR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14145,12 +15942,23 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"kuq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "kuE" = ( /obj/machinery/door/firedoor{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -14197,6 +16005,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "kvH" = ( @@ -14241,6 +16052,11 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"kxI" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "kyn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14256,9 +16072,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"kyy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "kyR" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 2 AFT SUPPORT" + RCon_tag = "AUX - DECK 2 AFT" }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) @@ -14275,8 +16103,14 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -14309,15 +16143,24 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "kBU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) +"kBX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/orange{ + icon_state = "6-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "kCt" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) @@ -14343,6 +16186,10 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kDq" = ( +/obj/machinery/computer/arcade/orion_trail, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "kDA" = ( /obj/structure/bed/chair{ dir = 1 @@ -14381,8 +16228,14 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -14422,12 +16275,11 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "kHM" = ( -/obj/structure/bed/chair/comfy/beige, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "kHZ" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -14487,6 +16339,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "kKI" = ( @@ -14610,6 +16465,26 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"kOr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/west_mount{ + pixel_x = 0; + pixel_y = 22; + dir = 2 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "kOA" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Containment Pen"; @@ -14626,26 +16501,44 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "kOH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_techfloor_grid/full, +/obj/machinery/light{ + dir = 8; + pixel_x = -10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) +"kPG" = ( +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8; + pixel_x = -10 }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "kQH" = ( /obj/structure/morgue{ dir = 2 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) +"kQJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "kQP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14680,9 +16573,17 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "kSk" = ( -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) +"kTq" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "kTr" = ( /obj/machinery/computer/crew{ dir = 4 @@ -14703,20 +16604,36 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "kTB" = ( -/obj/structure/window/reinforced, -/turf/simulated/open, -/area/endeavour/station/stairs_three) -"kUg" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 4 }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) +"kUg" = ( /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "kUk" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "kUn" = ( @@ -14724,6 +16641,19 @@ /obj/effect/floor_decal/corner/lightorange/border, /turf/simulated/floor/tiled/white, /area/medical/chemistry) +"kUp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + icon_state = "6-9" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "kUs" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -14752,9 +16682,6 @@ }, /obj/structure/bed/chair/office/light, /obj/landmark/spawnpoint/job/research_director, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "kVh" = ( @@ -14799,6 +16726,21 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"kVB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "kVK" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -14822,19 +16764,22 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) -"kWR" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) +"kWR" = ( +/obj/structure/window/reinforced, +/obj/machinery/vending/cola, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "kXa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "kXu" = ( /obj/machinery/shower{ @@ -14844,15 +16789,20 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_a) "kXE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "kYs" = ( -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide, -/turf/simulated/floor/plating, -/area/medical/virologymaint) +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "kYG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -14881,7 +16831,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "kZg" = ( -/obj/item/radio/beacon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -14891,6 +16840,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "kZh" = ( @@ -14967,18 +16919,24 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) +"laM" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "laO" = ( -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "lbt" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -14998,6 +16956,18 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"lbX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "lcu" = ( /obj/structure/bed/chair, /turf/simulated/floor/wood/sif/indoors, @@ -15085,15 +17055,9 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "lfu" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery) "lfy" = ( /obj/structure/table/steel_reinforced, /obj/item/reagent_containers/spray/cleaner{ @@ -15124,8 +17088,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "liz" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15165,14 +17129,39 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "ljk" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "Robotics Lab" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"ljq" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "lkq" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/reinforced, /area/rnd/testingroom) +"lkA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "lkB" = ( /obj/machinery/photocopier, /turf/simulated/floor/wood, @@ -15185,28 +17174,31 @@ /turf/simulated/floor/plating, /area/medical/surgery_storage) "llq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorwhite{ +/obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue/border{ +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/medical/surgeryprep) +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "llr" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "lmG" = ( @@ -15235,6 +17227,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "log" = ( @@ -15265,11 +17259,8 @@ /area/medical/exam_room/exam_2) "loC" = ( /obj/structure/bed/chair/comfy/beige, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "loK" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -15309,8 +17300,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite/corner, -/obj/effect/floor_decal/corner/paleblue/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "lpx" = ( @@ -15342,20 +17331,23 @@ /turf/simulated/floor/plating, /area/maintenance/research) "lqw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) "lqJ" = ( -/obj/machinery/camera/network/civilian{ +/obj/structure/bed/chair/comfy/beige{ dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "lrJ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/voidcraft/vertical{ @@ -15429,6 +17421,28 @@ }, /turf/simulated/floor, /area/shuttle/emt/general) +"ltx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"ltM" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "lui" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -15451,11 +17465,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"luz" = ( +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "luA" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "luC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15523,7 +17544,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) @@ -15573,10 +17597,10 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "lzj" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "lzH" = ( /obj/machinery/power/apc/south_mount, @@ -15674,13 +17698,8 @@ /turf/simulated/floor/tiled, /area/medical/virology_fore_access) "lBS" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/research) +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "lCd" = ( /obj/machinery/door/blast/regular{ id = "xenobiovs2"; @@ -15725,6 +17744,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) +"lCS" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "lDf" = ( /obj/machinery/air_alarm{ dir = 8; @@ -15742,12 +17773,11 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "lEi" = ( @@ -15768,17 +17798,21 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) -"lFr" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) +"lFr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "lFS" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/air_alarm{ @@ -15816,8 +17850,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/holopad, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "lGG" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -15834,6 +17869,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"lHV" = ( +/turf/simulated/floor/glass/reinforced, +/area/endeavour/hallway/d1starboardamidhall) "lIe" = ( /obj/machinery/artifact_scanpad, /turf/simulated/floor/tiled/dark, @@ -15853,10 +17891,10 @@ /area/medical/psych_ward) "lJB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8 + dir = 9 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 8 + dir = 9 }, /obj/machinery/light{ dir = 8; @@ -15864,16 +17902,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"lJH" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/vending/weeb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "lJV" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2aftmaint) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "lKg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/holopad, @@ -15895,12 +17941,16 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "lKu" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "lKI" = ( @@ -15955,6 +18005,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/reception) +"lNE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"lNY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "lOB" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -15962,6 +18033,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "lPc" = ( @@ -16030,9 +18103,6 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/meter, /obj/effect/floor_decal/borderfloor/corner2{ dir = 9 @@ -16068,13 +18138,39 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"lTi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "lTq" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/holodeck_control) +"lTs" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "lTx" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Containment Pen"; @@ -16107,6 +18203,12 @@ "lVq" = ( /obj/machinery/camera/network/civilian, /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "lVD" = ( @@ -16217,8 +18319,11 @@ dir = 4; pixel_x = 10 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "mcM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16247,33 +18352,32 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "mcN" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/obj/map_helper/access_helper/airlock/station/medical/surgery, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass/medical/polarized{ - req_one_access = null; - name = "Operating Theatre 2"; - id_tint = "or2" +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/map_helper/electrochromatic_linker{ - id = "or2" +/obj/structure/bed/chair, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/surgery2) +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "mcO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-10" +/obj/machinery/computer/arcade/orion_trail, +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/carpet/bcarpet, /area/endeavour/hallway/d2afthall) +"mcW" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "mdc" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -16294,14 +18398,19 @@ /turf/simulated/floor/plating, /area/maintenance/research) "mdU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) +"mfl" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "mft" = ( /obj/structure/bed/chair/comfy/brown{ dir = 4 @@ -16317,6 +18426,12 @@ icon_state = "4-8" }, /obj/machinery/computer/timeclock/premade/north, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "mgH" = ( @@ -16357,12 +18472,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical) "mih" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "miA" = ( @@ -16377,11 +18494,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "mjW" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/turf/simulated/floor/tiled, +/obj/structure/flora/pottedplant/flower, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2afthall) "mkk" = ( /obj/structure/closet/wardrobe/chemistry_white, @@ -16415,18 +18532,19 @@ "mmt" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"mmy" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/landmark/spawnpoint/overflow/station, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "mmI" = ( /turf/simulated/wall/prepainted/medical, /area/maintenance/medbay/aft) -"mmM" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) "mmX" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -16455,15 +18573,9 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "mnH" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/landmark/spawnpoint/latejoin/station/gateway, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/obj/machinery/computer/arcade/clawmachine, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "mnP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16604,6 +18716,15 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/rnd/breakroom) +"mqU" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "mri" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -16680,6 +18801,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/medical/chemistry) +"mut" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "muS" = ( /obj/machinery/computer/shuttle_control/explore/emt{ dir = 8 @@ -16693,8 +18824,12 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) "mvm" = ( -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/structure/flora/grass/event/yellow_flowers1, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "mvx" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -16712,15 +18847,21 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology/xenoflora/lab_atmos) "mwF" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) +"mwO" = ( +/obj/machinery/holopad, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "mxu" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16737,10 +18878,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "mxz" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "mxO" = ( @@ -16775,13 +18918,11 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) "mzd" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/landmark/spawnpoint/latejoin/station/gateway, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "mzm" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/air_alarm{ @@ -16867,10 +19008,11 @@ /area/rnd/research_foyer) "mAv" = ( /obj/effect/paint/purplegray, -/obj/structure/window/reinforced/polarized/full{ - id = "robotics1" - }, /obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "robotics-outer" + }, /turf/simulated/floor/plating, /area/assembly/robotics) "mBc" = ( @@ -16887,13 +19029,23 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "mBm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) +"mCN" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "mDp" = ( /turf/space, /area/space) @@ -16907,15 +19059,19 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) -"mEc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +"mEn" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/rdoffice) +/area/endeavour/hallway/d1starboardafthall) "mEE" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -16992,13 +19148,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "mFT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "mGl" = ( @@ -17016,13 +19174,17 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_d) "mHk" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /obj/machinery/camera/network/research, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) +"mHM" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2afthall) "mHV" = ( /obj/machinery/door/airlock/maintenance/engi{ req_one_access = null @@ -17068,9 +19230,16 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "mIK" = ( -/obj/structure/flora/pottedplant/fern, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/area/endeavour/hallway/d1starboardafthall) "mIS" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -17129,7 +19298,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/vending/cola, +/obj/structure/closet/lasertag/blue, /turf/simulated/floor/tiled, /area/holodeck_control) "mKL" = ( @@ -17164,14 +19333,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "mLh" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "mMo" = ( /obj/structure/table/reinforced, @@ -17188,7 +19356,23 @@ /turf/simulated/floor/wood, /area/medical/medbay4) "mMN" = ( -/obj/machinery/camera/network/civilian, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/west_mount{ + pixel_x = 0; + pixel_y = 22; + dir = 2 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "mMS" = ( @@ -17202,15 +19386,20 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "mMY" = ( -/obj/machinery/vending/nifsoft_shop, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/open, +/area/rnd/research/researchdivision) "mNh" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/fpmaint2) @@ -17221,10 +19410,36 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/medical/virologymaint) +"mOb" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"mOd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8; + pixel_x = -10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "mOj" = ( /obj/structure/lattice, /turf/space, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "mOz" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -17233,12 +19448,11 @@ /turf/simulated/floor/tiled, /area/holodeck_control) "mOF" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "mPv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17246,8 +19460,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) +"mPY" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "mQh" = ( /obj/machinery/light{ dir = 1 @@ -17268,11 +19491,16 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "mQp" = ( -/obj/machinery/vending/coffee{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardamidhall) "mRk" = ( /obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -17280,6 +19508,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) +"mRr" = ( +/obj/machinery/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "mRv" = ( /obj/machinery/disposal, /obj/effect/floor_decal/spline/fancy/wood{ @@ -17288,11 +19528,21 @@ /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/wood, /area/rnd/breakroom) -"mSd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +"mRH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2fwdhall) +"mSd" = ( +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "mSe" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17303,32 +19553,36 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "mSK" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 21 +/obj/machinery/computer/timeclock/premade/south, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/endeavour/hallway/d2portforhall) "mTi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "mTD" = ( /obj/machinery/camera/network/civilian, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -17404,6 +19658,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "mWk" = ( @@ -17435,6 +19691,18 @@ /obj/machinery/camera/network/outside, /turf/space, /area/space) +"mXu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "mXR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17458,10 +19726,15 @@ /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora/lab_atmos) "mYS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "mYX" = ( @@ -17491,11 +19764,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "nah" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/research) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "nbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17509,6 +19785,18 @@ /obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) +"nbC" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "nbH" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled{ start_pressure = 9000 @@ -17569,11 +19857,18 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "ncC" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "ndm" = ( /obj/machinery/light_switch{ pixel_x = 25 @@ -17606,6 +19901,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) +"ndJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "ndN" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Virology Maintenance Access"; @@ -17647,6 +19955,31 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"neX" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) +"nfa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "nfD" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled, @@ -17680,7 +20013,6 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "ngB" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17690,12 +20022,14 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "ngD" = ( -/obj/structure/bed/chair/comfy/beige, -/turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/wall/prepainted, +/area/tether/station/public_meeting_room) "ngP" = ( /obj/effect/paint/babyblue, /obj/structure/window/reinforced/polarized/full{ @@ -17724,29 +20058,41 @@ /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/medbreak) "nhq" = ( -/obj/machinery/washing_machine, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "nhX" = ( -/obj/machinery/door/airlock{ - name = "Unit 1" +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/light{ + dir = 8; + pixel_x = -10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "nic" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) "njb" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "njB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -17770,18 +20116,16 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "nlb" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "nlx" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -17814,15 +20158,21 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) "nmB" = ( -/obj/structure/cable/orange{ - icon_state = "6-9" - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) +"nmJ" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgeryprep) "nmL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -17853,9 +20203,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "nok" = ( @@ -17873,6 +20220,13 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/steel_ridged, /area/medical/medbay_emt_bay) +"npm" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "npO" = ( /obj/machinery/camera/network/civilian, /obj/item/radio/intercom{ @@ -17896,28 +20250,40 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "nqG" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "nrD" = ( -/obj/machinery/camera/network/civilian, -/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "nrZ" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardafthall) "nsd" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/camera/network/research{ @@ -17941,11 +20307,29 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, /turf/simulated/floor/plating, /area/medical/virologymaint) "nuO" = ( -/obj/structure/cable/orange{ - icon_state = "4-6" +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -17978,6 +20362,14 @@ /area/medical/psych/psych_2) "nvq" = ( /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "nvB" = ( @@ -17990,6 +20382,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"nvG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) +"nvK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "nwe" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, @@ -17999,13 +20407,22 @@ "nwm" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 + dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/rnd/testingroom) +"nww" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "nwz" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -18069,15 +20486,32 @@ }, /turf/simulated/floor/tiled/monotile, /area/medical/surgery2) +"nyF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "nyR" = ( -/obj/structure/cable/orange{ - icon_state = "6-8" +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "nzx" = ( /turf/simulated/open, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "nzW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -18101,17 +20535,17 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) -"nAh" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) +"nAh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "nAr" = ( /obj/structure/cable/green{ @@ -18123,22 +20557,29 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "nAQ" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/bench/steel, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d2portamidhall) "nAR" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery2) "nBj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/map_helper/access_helper/airlock/station/medical/department, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/medical{ + name = "Recovery Wing" + }, /obj/structure/cable/green{ - icon_state = "2-5" + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/white, +/area/medical/medbay4) "nBm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18147,6 +20588,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "nBn" = ( @@ -18173,8 +20617,14 @@ /turf/simulated/floor/plating, /area/shuttle/emt/general) "nBC" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/water/deep/indoors, /area/endeavour/hallway/d2portamidhall) "nBJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/purple{ @@ -18182,6 +20632,37 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"nBU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"nBV" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"nCo" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "nCp" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(55); @@ -18189,6 +20670,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) +"nCR" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "nCS" = ( /obj/structure/table/standard, /obj/item/anobattery{ @@ -18239,10 +20727,20 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"nDt" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "nEU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -18250,6 +20748,12 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "nGf" = ( @@ -18267,6 +20771,27 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/hallway/station/docks) +"nGv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"nHj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "nHo" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, @@ -18275,18 +20800,18 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/photocopier/faxmachine{ department = "Research Director's Office" }, /obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -18317,15 +20842,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "nJk" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/plating, +/area/medical/virologymaint) "nJI" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, @@ -18337,13 +20858,54 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/medbay/aft) +"nKm" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "nKo" = ( -/obj/machinery/light{ +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) +"nKq" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/structure/table/bench/padded, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/rnd/hallway) "nKH" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -18360,9 +20922,6 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, @@ -18390,6 +20949,15 @@ /area/medical/reception) "nKY" = ( /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "nLb" = ( @@ -18425,13 +20993,8 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_2) "nMd" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "nMh" = ( /obj/machinery/requests_console{ @@ -18467,15 +21030,19 @@ /obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) +"nMK" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) "nMP" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) "nNg" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/bench/steel, +/turf/simulated/floor/glass/reinforced, /area/endeavour/hallway/d1starboardamidhall) "nNM" = ( /obj/machinery/camera/network/civilian{ @@ -18487,16 +21054,18 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "nNS" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) @@ -18590,16 +21159,10 @@ /area/rnd/breakroom) "nQX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 + dir = 6 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -18610,6 +21173,12 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "nRx" = ( @@ -18712,20 +21281,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "nWj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/borderfloorwhite/corner, +/obj/effect/floor_decal/corner/paleblue/bordercorner, +/turf/simulated/floor/tiled/white, +/area/medical/surgeryprep) "nWB" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -18775,17 +21334,17 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "nXl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/railing{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/door/firedoor{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/open, +/area/rnd/research/researchdivision) "nXm" = ( /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) @@ -18801,6 +21360,10 @@ /obj/structure/bed/chair/comfy/beige, /turf/simulated/floor/wood, /area/crew_quarters/medbreak) +"nYN" = ( +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) "nZC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18811,12 +21374,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"nZL" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) "oaJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18824,9 +21381,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "oaQ" = ( @@ -18839,14 +21394,13 @@ /turf/simulated/wall/prepainted, /area/endeavour/hallway/d2afthall) "obi" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "obu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -18870,14 +21424,16 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "ocd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, /area/holodeck_control) -"ocG" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/prepainted, -/area/endeavour/hallway/d2aftmaint) "ode" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -18908,15 +21464,17 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_a) "oeP" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/cable/green{ + icon_state = "5-10" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ - icon_state = "5-10" + icon_state = "8-10" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -18930,17 +21488,16 @@ /turf/simulated/floor/tiled/white, /area/holodeck_control) "ofU" = ( -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/mirror{ - pixel_y = 30 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "ogd" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -18949,11 +21506,14 @@ /turf/simulated/floor/plating, /area/maintenance/research) "ogg" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /obj/structure/cable/orange{ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2afthall) "ogl" = ( /obj/structure/closet/secure_closet/medical_wall/synth_anesthetics{ pixel_y = 32 @@ -18996,8 +21556,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "ojL" = ( /obj/structure/table/standard, /obj/item/storage/box/monkeycubes{ @@ -19015,12 +21578,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ojU" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 +/obj/machinery/button/windowtint{ + id = "robotics-inner"; + pixel_x = -22; + pixel_y = 24 }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) +/turf/space/basic, +/area/space) "ojY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19041,8 +21605,6 @@ /area/rnd/xenobiology/xenoflora) "okq" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "oks" = ( @@ -19111,6 +21673,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"okS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "okU" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/surgery, @@ -19150,12 +21721,15 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "omt" = ( -/obj/machinery/fire_alarm/north_mount{ - dir = 1; - pixel_y = -21 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/rnd/hallway) "omH" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -19194,11 +21768,16 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "ooD" = ( -/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/camera/network/civilian, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "ooU" = ( @@ -19243,6 +21822,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"ors" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "orZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techfloor, @@ -19268,9 +21851,29 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"ote" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "otC" = ( -/turf/simulated/wall/prepainted, -/area/endeavour/hallway/d2portforhall) +/obj/structure/table/woodentable, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/folder/yellow, +/obj/item/folder/white, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "otK" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -19353,19 +21956,22 @@ /area/rnd/robotics/morgue) "owo" = ( /obj/effect/paint/purplegray, -/obj/structure/window/reinforced/polarized/full{ - id = "rnd1" - }, /obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "research-inner" + }, /turf/simulated/floor/plating, /area/rnd/reception_desk) "owE" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "5-8" }, -/obj/structure/cable/orange{ - icon_state = "4-10" +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "owP" = ( @@ -19408,9 +22014,13 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "ozA" = ( -/obj/machinery/light, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d1starboardamidhall) "ozS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19469,8 +22079,22 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) +"oBL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "oCa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -19483,7 +22107,6 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "oCg" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19493,7 +22116,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) "oCO" = ( /obj/effect/floor_decal/borderfloor{ @@ -19531,6 +22154,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"oEp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "oEw" = ( /obj/machinery/light{ dir = 8; @@ -19565,8 +22193,15 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2afthall) "oFZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/wooden_reinforced, @@ -19579,6 +22214,12 @@ /obj/machinery/station_map{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "oGx" = ( @@ -19604,7 +22245,7 @@ }, /obj/machinery/door/airlock/research{ id_tag = "researchdoor"; - name = "Robotics Lab" + name = "R&D Distribution Area" }, /obj/map_helper/access_helper/airlock/station/science/robotics, /turf/simulated/floor/tiled, @@ -19661,6 +22302,10 @@ /obj/map_helper/access_helper/airlock/station/medical/department, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"oHz" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "oIm" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19728,6 +22373,15 @@ /obj/map_helper/access_helper/airlock/station/science/xenoarcheology, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) +"oJk" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "oJw" = ( /obj/machinery/door/firedoor/glass, /obj/spawner/window/low_wall/reinforced/full, @@ -19794,6 +22448,21 @@ /obj/item/clothing/glasses/science, /turf/simulated/floor/tiled/steel, /area/rnd/chemistry_lab) +"oKF" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "oLc" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -19858,6 +22527,14 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"oOa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "oOE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, @@ -19890,10 +22567,11 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, -/obj/structure/closet/lasertag/blue, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "oQz" = ( @@ -19903,11 +22581,35 @@ /area/medical/patient_a) "oQC" = ( /obj/machinery/media/jukebox, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) +"oQJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora/lab_atmos) +"oQM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "oRe" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/full, @@ -19929,15 +22631,22 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "oSi" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/cryopod/robot/door/gateway, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2aftmaint) +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "oSl" = ( /obj/structure/sign/greencross, /turf/simulated/wall/prepainted/medical, @@ -20004,6 +22713,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "oUK" = ( @@ -20024,8 +22739,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -20078,6 +22796,13 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) +"oXr" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/stool/padded, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "oXG" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20145,9 +22870,8 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "oYE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "oZp" = ( @@ -20184,12 +22908,14 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "oZA" = ( -/obj/structure/closet/lasertag/red, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atm{ + pixel_x = -32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/endeavour/hallway/d2fwdhall) "oZD" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -20259,17 +22985,12 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) "pay" = ( -/obj/machinery/door/firedoor/glass, -/obj/map_helper/access_helper/airlock/station/medical/department, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/door/airlock/glass/medical{ - name = "Recovery Wing" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -20279,8 +23000,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -20302,6 +23026,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "pbD" = ( @@ -20346,6 +23072,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "pdP" = ( @@ -20366,6 +23095,16 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) +"peI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) "peR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -20393,10 +23132,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "pfe" = ( /obj/structure/railing, @@ -20407,7 +23146,7 @@ dir = 8 }, /turf/simulated/open, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "pff" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -20422,15 +23161,29 @@ /turf/simulated/floor/wood, /area/medical/medbay4) "pfi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) +"pfz" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "pfB" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -20447,6 +23200,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology_fore_access) +"pfV" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "pgh" = ( /obj/machinery/sleeper{ dir = 4 @@ -20454,13 +23218,15 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "pgo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "pgD" = ( @@ -20547,18 +23313,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "pic" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) "pid" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -20613,6 +23372,11 @@ "pjz" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/surgeryprep) +"pjB" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "pky" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloor{ @@ -20635,6 +23399,15 @@ "pkD" = ( /turf/simulated/floor/plating, /area/endeavour/hallway/d2fwdmaint) +"pkG" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "pkK" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 4 @@ -20651,6 +23424,19 @@ /obj/machinery/power/terminal, /turf/simulated/floor, /area/shuttle/emt/general) +"plG" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery) +"plL" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "pmG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20824,6 +23610,14 @@ /obj/structure/closet/excavation, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"pqU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "pqY" = ( /obj/structure/table/glass, /obj/machinery/door/window/westleft{ @@ -20887,14 +23681,15 @@ /turf/simulated/floor/wood, /area/medical/oncall_room) "ptm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "ptn" = ( @@ -20940,12 +23735,28 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) +"pva" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "pvs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"pvG" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "pvZ" = ( /obj/structure/table/steel_reinforced, /obj/item/reagent_containers/glass/bottle/biomass{ @@ -21002,6 +23813,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "pyK" = ( @@ -21013,8 +23826,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass/research{ name = "Research Lounge"; req_one_access = null @@ -21026,6 +23837,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "pyW" = ( @@ -21052,8 +23869,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "pAX" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -21096,21 +23916,25 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "pBU" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) +"pBY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) -"pBY" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdmaint) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "pCc" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloorwhite{ @@ -21125,6 +23949,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"pCj" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "pCA" = ( /obj/machinery/disposal, /turf/simulated/floor/tiled/techfloor, @@ -21150,10 +23983,10 @@ /area/rnd/research/researchdivision) "pDc" = ( /obj/structure/cable/orange{ - icon_state = "8-9" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2afthall) "pDh" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -21173,6 +24006,19 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"pDv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "pDw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -21186,10 +24032,17 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "pDI" = ( -/obj/structure/table/woodentable, -/obj/item/flame/candle/candelabra/everburn, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/obj/machinery/cell_charger, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/structure/table/carbon/reinforced, +/obj/machinery/button/windowtint{ + id = "robotics-outer"; + pixel_x = 22; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/assembly/robotics) "pDO" = ( /turf/simulated/floor/tiled, /area/medical/surgeryprep) @@ -21224,15 +24077,9 @@ /turf/simulated/floor/wood, /area/medical/medbay4) "pFp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/holopad, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2portafthall) "pFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -21241,7 +24088,7 @@ dir = 10 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -21328,9 +24175,6 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, @@ -21355,7 +24199,7 @@ /area/medical/reception) "pIb" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 2 FORE SUPPORT" + RCon_tag = "AUX - DECK 2 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -21363,11 +24207,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "pIE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/structure/sign/department/operational{ + pixel_y = -30 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "pIM" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloor{ @@ -21381,12 +24229,36 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) +"pIY" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) +"pJr" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/research) "pJM" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) +"pKa" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/holodeck_control) "pKn" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/carbon_dioxide{ @@ -21418,6 +24290,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) +"pMh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "pMA" = ( /obj/item/defib_kit/jumper_kit, /obj/machinery/newscaster{ @@ -21515,7 +24396,7 @@ }, /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "pPO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21546,9 +24427,22 @@ "pQv" = ( /obj/machinery/camera/network/outside, /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "pQx" = ( -/obj/machinery/recharge_station, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8; + pixel_x = -10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "pQM" = ( @@ -21587,6 +24481,8 @@ /obj/structure/cable/green{ icon_state = "5-10" }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "pRH" = ( @@ -21597,6 +24493,20 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"pRM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "pRS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21615,6 +24525,13 @@ "pRW" = ( /turf/space/basic, /area/space) +"pSD" = ( +/obj/structure/flora/grass/event/sparse_grass2, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "pTw" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled/white, @@ -21669,11 +24586,15 @@ /turf/simulated/floor/tiled, /area/medical/medbay4) "pUB" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-10" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardamidhall) "pUI" = ( /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -21689,25 +24610,36 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "pUU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/rnd/hallway) "pVw" = ( /obj/structure/table/woodentable, /obj/machinery/light, /turf/simulated/floor/wood, /area/medical/medbay4) "pVB" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d2portafthall) "pVI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -21760,7 +24692,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/area/maintenance/medbay/aft) "pWI" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21847,7 +24779,7 @@ dir = 5 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "pXL" = ( /obj/machinery/computer/cryopod{ name = "asset retention console"; @@ -22018,6 +24950,8 @@ /area/medical/morgue) "qaO" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "qbE" = ( @@ -22049,6 +24983,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"qgi" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "qgo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22080,9 +25023,17 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/space) "qhk" = ( -/obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "qhH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22096,6 +25047,9 @@ /turf/simulated/floor/wood, /area/medical/oncall_room) "qhO" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "qhW" = ( @@ -22117,6 +25071,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"qiy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "qiH" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -22135,20 +25100,20 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) -"qjv" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/rnd/research/researchdivision) +"qjv" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "qjy" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -22159,18 +25124,14 @@ /turf/simulated/floor/tiled, /area/medical/virology_fore_access) "qjz" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d2portafthall) "qjW" = ( /obj/structure/table/standard, /obj/item/storage/box/gloves{ @@ -22214,7 +25175,13 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "qkF" = ( -/obj/structure/bed/chair/comfy/brown{ +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ dir = 4 }, /turf/simulated/floor/tiled, @@ -22256,7 +25223,7 @@ "qlS" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "qmn" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -22264,8 +25231,8 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) "qmF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22304,6 +25271,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "qnO" = ( @@ -22410,9 +25379,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/item/radio/beacon, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "qsP" = ( /obj/machinery/fire_alarm/east_mount, /obj/machinery/washing_machine, @@ -22420,6 +25396,9 @@ /area/crew_quarters/medical_restroom) "qtE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "qtF" = ( @@ -22445,6 +25424,12 @@ /obj/map_helper/access_helper/airlock/station/medical/department, /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) +"quL" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "qvd" = ( /obj/machinery/status_display{ pixel_y = 30 @@ -22563,6 +25548,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"qxt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "qyg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22572,11 +25568,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "qyo" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/obj/structure/table/reinforced, +/obj/structure/flora/pottedplant/unusual{ + pixel_y = 12 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "qys" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -22595,6 +25595,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"qyx" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "qyX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22622,6 +25640,11 @@ /obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) +"qzR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "qzS" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the CMO's office."; @@ -22701,18 +25724,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay4) -"qBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) "qCG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22720,8 +25731,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "qCZ" = ( @@ -22751,7 +25766,8 @@ name = "Virology Access Console"; tag_exterior_door = "virology_airlock_east_exterior"; tag_interior_door = "virology_airlock_east_interior"; - pixel_y = -24 + pixel_y = -24; + frequency = 1378 }, /turf/simulated/floor/tiled, /area/medical/virology_fore_access) @@ -22788,6 +25804,14 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/grass, /area/medical/psych_ward) +"qEo" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "qEp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22846,11 +25870,6 @@ }, /turf/simulated/floor/wood, /area/medical/medbay4) -"qFC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) "qFD" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/storage/belt/medical, @@ -22863,6 +25882,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "qGj" = ( @@ -22886,11 +25908,10 @@ /area/medical/patient_wing) "qGR" = ( /obj/structure/cable/orange{ - icon_state = "6-9" + icon_state = "1-2" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/endeavour/hallway/d2fwdmaint) +/area/endeavour/hallway/d2aftmaint) "qHA" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -22909,11 +25930,15 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "qIm" = ( -/obj/structure/railing{ +/obj/machinery/fire_alarm/east_mount, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/research) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "qIn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -22928,8 +25953,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -22943,7 +25966,7 @@ /area/medical/psych_ward) "qIz" = ( /turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "qIA" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -22952,18 +25975,8 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "qIV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d2portafthall) "qJz" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/sleeper) @@ -22974,6 +25987,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) +"qKa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "qKo" = ( /obj/structure/table/standard, /obj/item/storage/bag/xenobio{ @@ -23002,13 +26024,14 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "qKx" = ( -/obj/machinery/washing_machine, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/holoposter{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "qKA" = ( /obj/item/mmi, /obj/item/mmi, @@ -23094,12 +26117,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "qNR" = ( @@ -23212,6 +26235,18 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) +"qRh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "qSj" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -23227,12 +26262,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "qSn" = ( -/obj/machinery/fire_alarm/east_mount, -/obj/effect/floor_decal/carpet/blue{ - icon_state = "blue2_edges"; - dir = 1 - }, -/turf/simulated/floor/carpet/sblucarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/rnd/hallway) "qSo" = ( /obj/machinery/iv_drip, @@ -23254,6 +26286,9 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"qSD" = ( +/turf/simulated/floor/glass/reinforced, +/area/endeavour/hallway/d2portamidhall) "qTp" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -23273,14 +26308,26 @@ /obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) -"qUK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +"qTI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) +"qUK" = ( +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -23297,6 +26344,28 @@ /obj/structure/curtain/medical, /turf/simulated/floor/tiled, /area/medical/resleeving) +"qWa" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) +"qWY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "qXw" = ( /obj/item/radio/intercom{ dir = 1; @@ -23390,18 +26459,24 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_2) "qYt" = ( -/obj/structure/table/woodentable, -/obj/machinery/recharger, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-5" }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/turf/simulated/floor/tiled, +/area/rnd/hallway) "qYx" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "qYN" = ( @@ -23423,6 +26498,12 @@ /obj/landmark/spawnpoint/latejoin/station/cyborg, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"qZb" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "qZA" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, @@ -23511,6 +26592,16 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/machinery/button/windowtint{ + id = "research-outer"; + pixel_x = -22; + pixel_y = -32 + }, +/obj/machinery/button/windowtint{ + id = "research-inner"; + pixel_x = -22; + pixel_y = -23 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "rcb" = ( @@ -23563,12 +26654,11 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) "rdl" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "rdw" = ( @@ -23599,6 +26689,18 @@ /area/medical/virology_fore_access) "rdN" = ( /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "reb" = ( @@ -23705,11 +26807,29 @@ }, /obj/machinery/light, /obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "rgo" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) +"rgv" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) @@ -23843,6 +26963,21 @@ "rpj" = ( /turf/simulated/wall/prepainted, /area/maintenance/substation/research) +"rpD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "rpN" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -23885,6 +27020,9 @@ dir = 1 }, /obj/structure/table/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "rsI" = ( @@ -23930,24 +27068,29 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "rtj" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /obj/structure/cable/orange{ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/area/endeavour/hallway/d2portforhall) "rtM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2afthall) "rtP" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "rug" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -23977,12 +27120,28 @@ "rup" = ( /turf/simulated/wall/prepainted, /area/teleporter/departing) +"ruq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "rut" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"ruu" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "6-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "ruz" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 @@ -23990,15 +27149,24 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "ruD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) +"ruN" = ( +/obj/structure/catwalk, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) "rvs" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -24052,6 +27220,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"rxN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "rxP" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/green{ @@ -24085,13 +27265,17 @@ /turf/simulated/floor/tiled, /area/holodeck_control) "ryg" = ( -/obj/machinery/door/airlock{ - name = "Unit 2" +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/structure/window/reinforced, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) "ryl" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24099,8 +27283,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2fwdhall) +"rym" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "ryO" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -24154,12 +27347,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "rBK" = ( -/obj/machinery/power/apc/west_mount, +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d2portamidhall) +"rCE" = ( /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d2portforhall) "rDO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24197,8 +27394,8 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloorwhite/corner, +/obj/effect/floor_decal/corner/paleblue/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "rEu" = ( @@ -24214,7 +27411,7 @@ "rEw" = ( /obj/structure/grille, /turf/simulated/floor/airless/ceiling, -/area/space) +/area/tether/station/public_meeting_room) "rFa" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -24280,10 +27477,18 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "rIw" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "rJd" = ( @@ -24300,11 +27505,16 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "rKe" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d2portforhall) "rKz" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -24349,9 +27559,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, @@ -24460,14 +27667,15 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) "rNf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/teleporter/departing) +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "rNh" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -24626,32 +27834,38 @@ dir = 4 }, /obj/effect/paint/purplegray, -/obj/structure/window/reinforced/polarized/full{ - id = "robotics1" - }, /obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "robotics-inner" + }, /turf/simulated/floor/plating, /area/assembly/robotics) "rUa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "rUk" = ( -/obj/effect/floor_decal/industrial/warning/dust{ +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ dir = 1 }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d2aftmaint) "rUx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -24727,12 +27941,12 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_a) "rWV" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/holodeck_control) "rXl" = ( @@ -24742,6 +27956,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "rXr" = ( @@ -24861,16 +28077,27 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) -"scT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +"scP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/vending/fitness, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2fwdhall) +"scT" = ( +/obj/effect/paint/purplegray, +/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, +/obj/map_helper/electrochromatic_linker{ + id = "robotics-inner" + }, +/turf/simulated/floor/plating, +/area/assembly/robotics) "sdA" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -24884,11 +28111,6 @@ pixel_y = -31 }, /obj/machinery/light, -/obj/machinery/button/windowtint{ - id = "rnd1"; - pixel_x = -25; - pixel_y = -2 - }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "seE" = ( @@ -24923,8 +28145,11 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -25036,6 +28261,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/storage) +"slw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "sly" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -25049,7 +28286,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "slz" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -25059,8 +28295,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "slJ" = ( /obj/machinery/light_switch{ pixel_x = 25 @@ -25070,12 +28309,27 @@ /turf/simulated/floor/tiled/white, /area/holodeck_control) "slM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/light{ + dir = 4; + pixel_x = 10 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) +"sme" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d2portafthall) "smf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -25089,6 +28343,18 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay4) +"smh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "smA" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/air_alarm{ @@ -25166,6 +28432,11 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled, /area/rnd/storage) +"spp" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "sps" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -25228,20 +28499,19 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "sqA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "srL" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "srS" = ( /obj/structure/disposalpipe/segment, @@ -25255,6 +28525,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"stX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "sun" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/borgplushie, @@ -25280,6 +28559,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "suM" = ( @@ -25333,8 +28618,11 @@ "sxt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -25342,22 +28630,25 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay4) "syB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "szf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "szg" = ( /obj/machinery/iv_drip, /turf/simulated/floor/tiled, @@ -25366,12 +28657,29 @@ /obj/structure/catwalk, /turf/simulated/floor/airless/ceiling, /area/endeavour/hallway/d2aftmaint) +"szz" = ( +/obj/structure/window/reinforced, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "szC" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"szG" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "sAZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25382,7 +28690,7 @@ "sBd" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/prepainted, -/area/endeavour/station/stairs_three) +/area/station/stairs_two) "sBg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, @@ -25472,6 +28780,28 @@ /obj/item/stamp/cmo, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"sEs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) +"sFf" = ( +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "sFi" = ( /obj/machinery/air_alarm{ frequency = 1441; @@ -25515,6 +28845,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) +"sFQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) +"sFY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "sGF" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ @@ -25579,12 +28935,26 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "sIj" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/structure/window/reinforced, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) +"sIr" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) @@ -25605,10 +28975,16 @@ /obj/map_helper/access_helper/airlock/station/science/robotics, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"sKw" = ( -/obj/machinery/light{ - dir = 1 +"sKg" = ( +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"sKw" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; dir = 2; @@ -25618,6 +28994,12 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "sLb" = ( @@ -25676,9 +29058,9 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "sNK" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/tiled/dark, -/area/maintenance/medbay/aft) +/obj/machinery/computer/arcade/battle, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "sNN" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_c) @@ -25690,15 +29072,16 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "sNS" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/bed/chair/comfy/beige{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "sOh" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25729,6 +29112,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"sPz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "sQb" = ( /obj/machinery/air_alarm{ dir = 1; @@ -25762,6 +29157,15 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"sQu" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "sQI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -25798,6 +29202,15 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"sSl" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "sTi" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -25828,19 +29241,16 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "sUb" = ( -/obj/effect/floor_decal/carpet/blue{ - icon_state = "blue2_edges"; - dir = 8 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 }, -/obj/effect/floor_decal/carpet/blue{ - icon_state = "blue2_edges"; +/obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 1 }, -/obj/effect/floor_decal/carpet/blue{ - icon_state = "blue2_edges"; - dir = 9 +/obj/structure/cable/green{ + icon_state = "5-10" }, -/turf/simulated/floor/carpet/sblucarpet, +/turf/simulated/floor/tiled, /area/rnd/hallway) "sUg" = ( /obj/structure/cable/green{ @@ -25896,12 +29306,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"sVb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/research) "sVt" = ( /obj/machinery/smartfridge/drying_rack, /obj/machinery/camera/network/research{ @@ -25930,6 +29334,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "sWB" = ( @@ -25953,12 +29363,15 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "sXn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "sXx" = ( @@ -25997,13 +29410,26 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) -"sYJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +"sYu" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 6 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) +"sYJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "sYQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -26014,13 +29440,8 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "sZj" = ( -/obj/structure/closet/emcloset, -/obj/machinery/light{ - dir = 4; - pixel_x = 10 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "sZy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -26107,6 +29528,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "tdj" = ( @@ -26141,7 +29568,7 @@ "tem" = ( /obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "4-10" + icon_state = "4-8" }, /turf/simulated/floor/airless/ceiling, /area/maintenance/research) @@ -26149,14 +29576,26 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "teE" = ( /turf/simulated/floor/airless/ceiling, /area/maintenance/fpmaint2) +"teL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "teN" = ( /obj/structure/fitness/punchingbag, /turf/simulated/floor/plating, @@ -26185,6 +29624,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"tfp" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "tfP" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -26269,11 +29718,23 @@ /area/rnd/hallway) "thZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/steel, +/area/rnd/testingroom) +"tid" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/rnd/testingroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "tij" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -26307,10 +29768,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"tkO" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "tlU" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardamidhall) "tmA" = ( /obj/structure/closet/l3closet/scientist/double, /turf/simulated/floor/tiled, @@ -26330,9 +29804,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) "tnk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -26358,6 +29832,12 @@ /area/medical/sleeper) "tov" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "toD" = ( @@ -26401,8 +29881,11 @@ /area/medical/virology_aft_access) "tpN" = ( /obj/machinery/fire_alarm/north_mount, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) @@ -26432,14 +29915,10 @@ /turf/simulated/floor/wood/sif/indoors, /area/medical/reception) "tqA" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 - }, -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/structure/sign/deck/second, +/obj/structure/sign/deck/second, +/turf/simulated/wall/prepainted, +/area/station/stairs_two) "tqI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -26469,16 +29948,10 @@ "tqR" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "tqY" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "tra" = ( @@ -26493,8 +29966,14 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "trs" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -26525,6 +30004,18 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) +"tsk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "tso" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/structure/cable/green{ @@ -26554,13 +30045,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) -"tty" = ( -/obj/machinery/door/firedoor{ +"ttq" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/rnd/research/researchdivision) "ttB" = ( /obj/structure/sign/department/xenolab, /turf/simulated/wall/prepainted/science, @@ -26621,6 +30111,8 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "twz" = ( @@ -26659,6 +30151,15 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "txt" = ( @@ -26764,7 +30265,7 @@ /area/medical/resleeving) "tBb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled, /area/holodeck_control) @@ -26813,12 +30314,9 @@ /turf/simulated/floor/plating, /area/maintenance/research) "tCI" = ( -/obj/landmark/spawnpoint/latejoin/station/gateway, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery) "tDo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26889,6 +30387,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/research) +"tFZ" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "tGx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26925,6 +30435,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) +"tHT" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "tHW" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -26970,19 +30493,30 @@ /turf/simulated/floor/tiled, /area/medical/surgeryprep) "tJk" = ( -/obj/machinery/vending/cola, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) +"tJE" = ( +/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"tJE" = ( -/obj/machinery/fire_alarm/north_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) +"tJU" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "tKG" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -26996,16 +30530,33 @@ }, /turf/simulated/floor/reinforced, /area/rnd/testingroom) +"tLi" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "tLz" = ( /obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "R&D Distribution Area" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tLU" = ( @@ -27022,18 +30573,28 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "tMu" = ( -/obj/machinery/camera/network/civilian, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "tMG" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 4 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "tNe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27219,6 +30780,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) +"tRx" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "tRy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27267,6 +30835,14 @@ name = "Server Base" }, /area/rnd/rdoffice) +"tTP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "tUb" = ( /turf/simulated/wall/prepainted, /area/endeavour/hallway/d2fwdmaint) @@ -27288,6 +30864,8 @@ /area/endeavour/hallway/d1starboardforhall) "tUN" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "tVG" = ( @@ -27310,23 +30888,20 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "tVO" = ( -/obj/structure/cable/orange{ +/obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) -"tVU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/catwalk, +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2fwdmaint) +"tVU" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "tWJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -27344,12 +30919,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "tWY" = ( @@ -27362,6 +30935,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"tXO" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "tXS" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -27375,16 +30957,27 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "tYf" = ( -/obj/machinery/vending/fitness, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/rnd/research/researchdivision) +/area/endeavour/hallway/d2afthall) "tYH" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d2fwdmaint) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "tZm" = ( /obj/machinery/computer/crew{ dir = 8 @@ -27401,14 +30994,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/rnd/breakroom) -"uaf" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) "uam" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "uaG" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/surgery_storage) @@ -27464,6 +31053,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/station/docks) +"ueR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) "ufe" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -27520,10 +31124,8 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "ufJ" = ( -/obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "ufT" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -27549,6 +31151,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"ugT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "uhe" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virology_aft_access) @@ -27558,14 +31172,11 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) "uhx" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, /obj/machinery/door/firedoor{ dir = 1 }, -/obj/machinery/camera/network/research{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, /area/rnd/hallway) "uhO" = ( @@ -27604,17 +31215,23 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "ujc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "uje" = ( /obj/structure/table/rack, /obj/item/suit_cooling_unit, @@ -27649,6 +31266,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "ukc" = ( @@ -27697,6 +31320,10 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"ulr" = ( +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "umy" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -27714,18 +31341,18 @@ /obj/map_helper/access_helper/airlock/station/medical/department, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"unI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +"unJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/vending/coffee{ - dir = 4 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2portafthall) "unU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -27775,17 +31402,31 @@ /turf/simulated/floor/tiled, /area/medical/resleeving) "upS" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "urd" = ( -/obj/machinery/door/firedoor, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) +"uro" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2fwdhall) "urC" = ( @@ -27901,16 +31542,17 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyisolation) "uvr" = ( -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/obj/structure/flora/grass/event/sparse_grass1, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "uvF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "uvO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27934,13 +31576,35 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) -"uwL" = ( -/obj/structure/cable/orange{ +"uwG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) +"uwL" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "uwU" = ( @@ -27967,8 +31631,15 @@ /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "uxG" = ( -/turf/simulated/wall/prepainted/science, -/area/rnd/research_restroom) +/obj/effect/paint/babyblue, +/obj/structure/window/reinforced/polarized/full{ + id = "or2" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/medical/surgeryprep) "uyr" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -27994,6 +31665,15 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"uza" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "uzv" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled, @@ -28034,6 +31714,18 @@ /obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"uCp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "uCq" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -28092,6 +31784,18 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"uDV" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "uEl" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/morgue) @@ -28126,6 +31830,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"uFQ" = ( +/obj/structure/flora/pottedplant/large, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "uFV" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/industrial/outline/blue, @@ -28208,14 +31922,11 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "uJM" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable/orange{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "uKo" = ( /obj/item/suit_cooling_unit{ pixel_y = -5 @@ -28241,8 +31952,19 @@ /area/medical/medbay_emt_bay) "uKJ" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) +"uLi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "uLo" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora/lab_atmos) @@ -28260,16 +31982,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/medical/surgery2) +"uMl" = ( +/obj/structure/cable/orange{ + icon_state = "6-9" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "uMm" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/bench/wooden, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardamidhall) +"uMx" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d2portamidhall) "uMG" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/babyblue, @@ -28309,6 +32040,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"uOj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "uOw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28322,12 +32062,21 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "uOW" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "uPt" = ( @@ -28383,18 +32132,17 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "uPR" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardafthall) "uPS" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -28404,6 +32152,19 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/medical/patient_d) +"uQe" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/research) "uQD" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, @@ -28413,8 +32174,10 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "uQE" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d1starboardamidhall) "uQM" = ( /obj/structure/table/glass, @@ -28488,7 +32251,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "uSX" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "uTa" = ( @@ -28506,16 +32269,14 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) "uTM" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "uUl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -28525,13 +32286,21 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "uVj" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super; + pixel_x = -21 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, -/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/area/endeavour/hallway/d1starboardamidhall) "uVq" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -28552,6 +32321,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "uVS" = ( @@ -28580,6 +32352,12 @@ /area/medical/sleeper) "uWv" = ( /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "uWQ" = ( @@ -28599,10 +32377,16 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer) "uXO" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardforhall) "uXW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -28625,12 +32409,16 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "uZg" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "uZs" = ( @@ -28659,11 +32447,24 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) +"vbt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "vbA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28714,6 +32515,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/holodeck_control) "vcP" = ( @@ -28808,26 +32611,27 @@ /turf/simulated/wall/prepainted/science, /area/maintenance/research) "vgB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/endeavour/hallway/d2afthall) "vha" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/holodeck_control) "vhp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) "vhu" = ( /obj/machinery/door/blast/regular{ id = "xenobiovs6"; @@ -28846,6 +32650,12 @@ dir = 8; pixel_x = -10 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vjT" = ( @@ -28870,6 +32680,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"vkq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "vkz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28882,8 +32703,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"vkH" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "vmn" = ( -/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -28893,8 +32719,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "vmM" = ( /obj/machinery/r_n_d/server/core, /obj/structure/window/reinforced{ @@ -28922,6 +32750,19 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"vnb" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) +"vnZ" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/landmark/spawnpoint/overflow/station, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "voG" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28943,11 +32784,8 @@ /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/medbreak) "vpL" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "vpS" = ( /obj/machinery/atmospherics/component/unary/freezer{ icon_state = "freezer" @@ -28987,12 +32825,17 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "vqH" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -29000,6 +32843,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navgold/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vqV" = ( @@ -29050,6 +32895,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology_aft_access) +"vsM" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "vtg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29088,10 +32942,15 @@ }, /turf/simulated/floor/tiled/white, /area/holodeck_control) -"vuR" = ( -/obj/machinery/holopad, +"vuW" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d1starboardforhall) "vvh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -29145,14 +33004,11 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "vwz" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/map_helper/electrochromatic_linker{ + id = "robotics-inner" }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/turf/space/basic, +/area/space) "vwR" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_one_access = null @@ -29193,7 +33049,12 @@ /obj/structure/cable/green{ icon_state = "4-9" }, -/obj/effect/floor_decal/steeldecal/steel_decals_central7, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vAJ" = ( @@ -29269,15 +33130,15 @@ /area/rnd/hallway) "vEl" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vFg" = ( @@ -29302,6 +33163,15 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research_foyer_auxiliary) +"vFz" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "vFG" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29314,6 +33184,17 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) +"vFO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "vGe" = ( /turf/simulated/wall/prepainted/medical, /area/medical/resleeving) @@ -29379,6 +33260,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"vIP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "vIV" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled, @@ -29402,6 +33293,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "vKZ" = ( @@ -29410,9 +33304,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) +"vLb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "vLg" = ( /obj/machinery/camera/network/civilian, /obj/machinery/computer/timeclock/premade/north, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "vLj" = ( @@ -29434,6 +33339,15 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vLs" = ( @@ -29457,6 +33371,15 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"vMB" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portforhall) "vMN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29517,10 +33440,18 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery2) -"vPr" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +"vPR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/endeavour/hallway/d1starboardafthall) "vQu" = ( /obj/machinery/camera/network/research{ dir = 8; @@ -29528,6 +33459,14 @@ }, /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) +"vQx" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "vQL" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -29543,7 +33482,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29570,7 +33508,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "vRE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -29611,6 +33554,13 @@ dir = 4; pixel_x = 10 }, +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "vUK" = ( @@ -29624,15 +33574,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "vVP" = ( @@ -29645,9 +33595,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "vVV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) @@ -29684,6 +33636,14 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"vXa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portamidhall) "vXm" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable{ @@ -29743,6 +33703,16 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_d) +"vYG" = ( +/obj/effect/floor_decal/corner_techfloor_grid/full, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/hallway/d2afthall) "vYM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29768,12 +33738,14 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologymaint) "vYV" = ( -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "vYW" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled{ start_pressure = 9000 @@ -29795,20 +33767,12 @@ /turf/simulated/floor/tiled/techfloor, /area/assembly/robotics) "vZs" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "vZv" = ( /obj/machinery/light{ dir = 1 @@ -29886,17 +33850,11 @@ /turf/simulated/floor/plating, /area/medical/virologymaint) "wbG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d1starboardafthall) "wbK" = ( /obj/machinery/camera/network/research{ dir = 4; @@ -29999,20 +33957,19 @@ /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "wdQ" = ( -/obj/machinery/holopad, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/hallway/d2afthall) "wdT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -30027,20 +33984,34 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/emt/general) "weC" = ( -/obj/machinery/atm{ - pixel_x = -33 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "weJ" = ( -/obj/machinery/light{ +/obj/landmark/spawnpoint/overflow/station, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) +"weW" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "6-9" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardforhall) +/area/endeavour/hallway/d2portafthall) "wfk" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -30048,14 +34019,13 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/substation/medical_science) "wfo" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/mauve/bordercorner2, /obj/machinery/holopad, @@ -30099,6 +34069,14 @@ /obj/structure/closet/bombcloset, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"wgp" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "wgC" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light/small{ @@ -30107,16 +34085,23 @@ /turf/simulated/floor/tiled, /area/rnd/storage) "wgF" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/area/endeavour/hallway/d2portamidhall) "whs" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30180,6 +34165,18 @@ /obj/landmark/spawnpoint/job/paramedic, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"wil" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "wiC" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/structure/closet/crate/biohazard, @@ -30236,16 +34233,18 @@ "wlz" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virology) -"wlW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"wlM" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) +"wlW" = ( /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "wlZ" = ( @@ -30256,6 +34255,16 @@ /obj/structure/window/reinforced/tinted, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/medbay_primary_storage) +"wmp" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/landmark/spawnpoint/overflow/station, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "wmA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30263,6 +34272,12 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "wng" = ( @@ -30369,13 +34384,15 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "wpi" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, /area/rnd/research/researchdivision) "wpj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -30416,6 +34433,14 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay4) +"wpO" = ( +/obj/machinery/door/airlock/research{ + id_tag = "researchdoor"; + name = "Robotics Lab" + }, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "wqB" = ( /obj/machinery/camera/network/research, /obj/machinery/lathe/autolathe, @@ -30442,6 +34467,24 @@ /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled, /area/medical/virology_fore_access) +"wqT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2fwdhall) "wrp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -30499,6 +34542,18 @@ /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/medical/psych_ward) +"wtZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardafthall) "wub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -30522,6 +34577,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) "wum" = ( @@ -30536,9 +34597,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) -"wuz" = ( -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) "wuC" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -30624,21 +34682,11 @@ /turf/simulated/floor/tiled, /area/medical/virology) "wzv" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -28; - req_access = list() +/obj/structure/bed/chair{ + dir = 4 }, -/obj/landmark/spawnpoint/overflow/station, /turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/area/crew_quarters/cafeteria) "wzx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30646,17 +34694,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "wzN" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "wzP" = ( @@ -30681,6 +34736,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"wAx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/departing) "wAD" = ( /obj/machinery/door/airlock/glass/medical{ name = "Psych Reception"; @@ -30788,6 +34847,12 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/research) "wDV" = ( @@ -30803,6 +34868,18 @@ }, /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/medbreak) +"wEA" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-9" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "wFe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -30855,6 +34932,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"wHL" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "wIc" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -30871,6 +34955,19 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) +"wJc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/flora/grass/event/yellow_flowers1, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "wJr" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30889,17 +34986,14 @@ /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) "wJw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/chair{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) +/turf/simulated/floor/tiled/techfloor/grid, +/area/crew_quarters/cafeteria) "wJN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -30912,6 +35006,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/storage) +"wKp" = ( +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) "wKq" = ( /obj/machinery/camera/network/medbay, /obj/structure/bed/chair/wheelchair, @@ -30930,11 +35027,24 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "wKT" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portamidhall) +/area/endeavour/hallway/d1starboardforhall) +"wLf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "wLE" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 1; @@ -30978,10 +35088,10 @@ /area/rnd/hallway) "wMn" = ( /obj/structure/cable/orange{ - icon_state = "2-9" + icon_state = "1-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "wMp" = ( /turf/simulated/wall/prepainted, /area/holodeck_control) @@ -31025,6 +35135,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"wNP" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d2aftmaint) "wNW" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/bodybags, @@ -31063,6 +35182,18 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) +"wPl" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "wPt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31072,6 +35203,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"wPE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "wPU" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -31109,22 +35249,23 @@ }, /area/rnd/rdoffice) "wQj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/research) "wQo" = ( -/obj/effect/paint/babyblue, -/obj/structure/window/reinforced/polarized/full{ - id = "or1" - }, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/landmark/spawnpoint/overflow/station, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/medical/surgery) +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "wQp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -31196,10 +35337,18 @@ /obj/effect/paint/babyblue, /turf/simulated/floor/plating, /area/crew_quarters/medbreak) +"wSf" = ( +/obj/machinery/holopad, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "wSM" = ( /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology) "wTM" = ( +/obj/machinery/floodlight, /turf/simulated/floor/airless/ceiling, /area/endeavour/hallway/d2aftmaint) "wTS" = ( @@ -31209,12 +35358,15 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "wUq" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/deep/indoors, +/area/endeavour/hallway/d2portamidhall) "wUs" = ( /turf/simulated/floor/airless/ceiling, /area/maintenance/research) @@ -31231,15 +35383,16 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "wVd" = ( -/obj/machinery/power/apc/west_mount{ - pixel_x = 0; - pixel_y = 22; - dir = 2 +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/holoposter{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techfloor, /area/endeavour/hallway/d2afthall) "wVf" = ( /obj/structure/cable{ @@ -31305,6 +35458,15 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/tiled, /area/holodeck_control) +"wWS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardforhall) "wYa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 8 @@ -31383,6 +35545,15 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/chemistry) +"xbt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) "xbz" = ( /obj/structure/closet{ name = "spare clothes" @@ -31407,6 +35578,11 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/medical/resleeving) +"xbQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "xbW" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/paleblue/border{ @@ -31431,7 +35607,7 @@ name = "Research Hall Shutters" }, /turf/simulated/floor/tiled, -/area/space) +/area/endeavour/hallway/d2portafthall) "xcx" = ( /obj/structure/closet/secure_closet/medical2, /obj/effect/floor_decal/corner/paleblue{ @@ -31440,12 +35616,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "xcG" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portforhall) +/area/endeavour/hallway/d1starboardforhall) "xda" = ( /turf/simulated/floor/plating, /area/maintenance/substation/medical) @@ -31479,6 +35654,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "xec" = ( @@ -31654,11 +35835,11 @@ /area/medical/virology) "xki" = ( /obj/structure/table/woodentable, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/structure/flora/pottedplant/bamboo{ + pixel_y = 12 }, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "xkX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31677,6 +35858,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"xlX" = ( +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d2afthall) "xmK" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -31760,14 +35945,11 @@ /turf/simulated/floor/plating, /area/maintenance/research) "xoj" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardafthall) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "xow" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -31791,13 +35973,10 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "xpI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, +/obj/map_helper/access_helper/airlock/station/science/robotics, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/rnd/research/researchdivision) "xpX" = ( /obj/machinery/camera/network/outside, /turf/simulated/floor/airless/ceiling, @@ -31806,6 +35985,11 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portforhall) "xqg" = ( @@ -31841,6 +36025,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology_aft_access) +"xry" = ( +/obj/structure/flora/grass/event/lavender_grass1, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/grass/indoors, +/area/tether/station/public_meeting_room) "xrB" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -31906,8 +36095,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2fwdhall) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "xtD" = ( /obj/structure/railing{ dir = 1 @@ -31930,6 +36120,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "xuu" = ( @@ -31995,21 +36191,9 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/breakroom) "xwp" = ( -/obj/machinery/door/airlock/research{ - name = "Research Bathroom" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/map_helper/access_helper/airlock/station/science/robotics, -/turf/simulated/floor/tiled, -/area/rnd/research_restroom) +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/dark, +/area/rnd/research/researchdivision) "xxn" = ( /obj/structure/window/reinforced/tinted{ dir = 1 @@ -32021,13 +36205,17 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/oncall_room) "xyo" = ( -/obj/item/radio/intercom{ +/obj/machinery/camera/network/research{ dir = 8; - pixel_x = -28; - req_access = list() + network = list("Research","Toxins Test Area") }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics/morgue) +/obj/machinery/computer/arcade/orion_trail/kobayashi, +/obj/effect/floor_decal/carpet/blue{ + icon_state = "blue2_edges"; + dir = 1 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/rnd/hallway) "xyH" = ( /obj/machinery/disposal, /obj/item/barrier_tape_segment/engineering, @@ -32037,11 +36225,26 @@ /obj/machinery/station_map{ pixel_y = 32 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardafthall) +"xzW" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/public_meeting_room) +"xAr" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "xAI" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -32107,26 +36310,47 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "xDa" = ( -/obj/machinery/camera/network/civilian, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "xDb" = ( /obj/machinery/door/firedoor, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "xDm" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"xDp" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portafthall) "xDH" = ( @@ -32136,12 +36360,9 @@ /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) "xDZ" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/rnd/research/researchdivision) +/obj/effect/floor_decal/carpet/blue, +/turf/simulated/floor/carpet/bcarpet, +/area/endeavour/hallway/d2afthall) "xEp" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 @@ -32179,11 +36400,27 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"xFs" = ( -/obj/structure/cable{ - icon_state = "1-2" +"xEX" = ( +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2fwdhall) +"xFn" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 1 }, /turf/simulated/floor/tiled, +/area/endeavour/hallway/d1starboardamidhall) +"xFs" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) "xFH" = ( /turf/simulated/wall/r_wall/prepainted/medical, @@ -32199,13 +36436,14 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "xFX" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d2portafthall) +/area/endeavour/hallway/d2portamidhall) "xGc" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -32214,14 +36452,9 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "xGm" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/station/stairs_three) +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/station/stairs_two) "xGB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 @@ -32269,9 +36502,9 @@ }, /obj/machinery/door/airlock/medical{ autoclose = 0; - frequency = 1379; + frequency = 1378; icon_state = "door_locked"; - id_tag = "virology_airlock_east_east_interior"; + id_tag = "virology_airlock_east_interior"; locked = 1; name = "Virology Interior Airlock"; req_one_access = null @@ -32295,32 +36528,17 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "xHD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/obj/map_helper/access_helper/airlock/station/science/robotics, -/turf/simulated/floor/tiled, -/area/rnd/research_restroom) +/turf/simulated/wall/prepainted/science, +/area/maintenance/medbay/aft) "xIf" = ( /turf/simulated/floor/plating, /area/maintenance/research) "xIg" = ( -/obj/machinery/computer/guestpass{ - dir = 4; - pixel_x = -28 - }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted, /area/endeavour/hallway/d2fwdhall) "xIj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -32328,7 +36546,10 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab/containment_one) "xID" = ( -/obj/machinery/vending/giftvendor, +/obj/structure/closet/lasertag/red, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/holodeck_control) "xIG" = ( @@ -32413,8 +36634,19 @@ /obj/structure/cable/green{ icon_state = "6-8" }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /obj/structure/cable/green{ - icon_state = "5-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) @@ -32466,12 +36698,12 @@ /turf/simulated/floor/tiled, /area/medical/virology) "xMa" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/disposal{ + pixel_y = -2 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) +/turf/simulated/floor/wood, +/area/tether/station/public_meeting_room) "xMp" = ( /obj/machinery/vitals_monitor, /obj/machinery/light{ @@ -32507,7 +36739,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-5" }, /obj/machinery/door/airlock/multi_tile/glass/medical{ name = "Mental Health" @@ -32588,8 +36820,29 @@ }, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_2) +"xQA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portafthall) +"xQM" = ( +/obj/structure/bed/chair, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery2) "xQT" = ( -/obj/machinery/fire_alarm/north_mount, +/obj/structure/flora/pottedplant/large, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) "xQV" = ( @@ -32603,6 +36856,12 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2portamidhall) "xRM" = ( @@ -32627,27 +36886,17 @@ /turf/simulated/floor/grass, /area/medical/psych_ward) "xSl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 1 }, -/obj/landmark/spawnpoint/latejoin/station/gateway, -/obj/effect/floor_decal/techfloor/orange{ +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/teleporter/departing) +/area/endeavour/hallway/d2afthall) "xUb" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass{ - name = "Long-Range Teleporter Access" - }, -/turf/simulated/floor/tiled, -/area/teleporter/departing) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "xUp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -32696,7 +36945,7 @@ "xWm" = ( /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, -/area/endeavour/hallway/d2fwdhall) +/area/tether/station/public_meeting_room) "xXp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -32706,6 +36955,15 @@ name = "Server Base" }, /area/rnd/rdoffice) +"xXG" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2portamidhall) "xYq" = ( /obj/structure/table/steel_reinforced, /obj/item/defib_kit/loaded, @@ -32765,33 +37023,57 @@ /turf/simulated/floor/carpet/purcarpet, /area/rnd/breakroom) "yah" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d1starboardamidhall) +/area/endeavour/hallway/d1starboardforhall) "ybi" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/maintenance/research) "ybk" = ( -/obj/machinery/door/airlock{ - name = "Research Shower" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/research_restroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d2afthall) "ybr" = ( /obj/machinery/computer/timeclock/premade/south, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardforhall) +"ybL" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/research) "ybY" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -32813,27 +37095,24 @@ /turf/simulated/floor/plating, /area/medical/medbay4) "ydt" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d2portamidhall) +"ydL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "ydY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"yez" = ( -/obj/machinery/computer/timeclock/premade/south, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d2afthall) "yeA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -32844,17 +37123,17 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) "yeN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /turf/simulated/floor/tiled/white, /area/holodeck_control) "yfn" = ( @@ -32908,9 +37187,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/reception_desk) "ygE" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d1starboardamidhall) @@ -32920,6 +37201,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"yhx" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/cafeteria) "yhE" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/dark, @@ -32931,15 +37224,18 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "9-10" - }, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/endeavour/hallway/d2aftmaint) "yhO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) "yhR" = ( @@ -32980,7 +37276,22 @@ /area/medical/resleeving) "yiM" = ( /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/station/stairs_two) +"ykr" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d2afthall) @@ -33013,6 +37324,11 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/medical/patient_c) +"yly" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d2portafthall) "ymb" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/unary/outlet_injector{ @@ -37383,7 +41699,7 @@ bzY bzY bzY bzY -lBS +tFT piJ qpq qpq @@ -38938,11 +43254,11 @@ xIf qpq pTU qpq -qpq -qpq -qpq -qpq -qpq +rup +rup +rup +rup +rup pNX nvb qYr @@ -39132,11 +43448,11 @@ xIf qpq pTU qpq -qpq -qpq -qpq -qpq -qpq +rup +mmy +oSi +bsO +dzi pNX pNX pNX @@ -39326,17 +43642,17 @@ xIf qpq pTU qpq -qpq -qpq -qpq -qpq -qpq -ejI -pQx -pQx +rup +wmp +weJ +wQo +nvG +fpV pQx +ykr +mOd nqG -pQx +pvG gJS goZ aNu @@ -39520,17 +43836,17 @@ huY huY pTU qpq -qpq -qpq -qpq -qpq -qpq -ejI -eHm -eHm -eHm +rup +iFi +bsW +tVU +gii +fWa eHm +klu eHm +cKS +kxI epJ gOV kBS @@ -39713,18 +44029,18 @@ xRM xvK huY pTU -iec -iec -iec -iec -iec -iec +qpq +rup +wmp +tSj +agL +wAx dSQ -eHm -eHm -eHm -eHm -eHm +nIk +ibJ +nIk +kvq +kxI epJ gOV kBS @@ -39908,17 +44224,17 @@ eUQ huY pTU qpq -qpq -qpq -qpq -qpq -qpq -ejI -eHm -qtE -bmg -qFO -eHm +rup +iFi +bsW +vnZ +pXL +rup +fIE +rtM +vsM +ybk +kxI gJS awE kBS @@ -40102,17 +44418,17 @@ aSW huY mQh qpq -qpq -qpq -qpq -qpq -qpq -ejI -fIE -eHm -pdM -eHm -eHm +rup +rup +rup +rup +rup +rup +oaU +oaU +qWY +jZM +kxI epJ gOV kBS @@ -40297,16 +44613,16 @@ huY pTU qpq qpq -qpq -qpq -qpq -qpq -ejI -eHm -eHm -pdM -eHm -fpV +tvV +oaU +kDq +oXr +xDZ +dYX +gAf +buM +ybk +fiT gJS gOV kBS @@ -40489,18 +44805,18 @@ uQX rsU huY pTU -rup -hDs -rup -rup -rup -hDs -rup -eHm -eHm +qpq +qpq +tvV +oaU +mcO +jbC +xDZ +jUZ +gAf +buM pdM -eHm -eHm +kxI epJ qCZ kBS @@ -40683,18 +44999,18 @@ lja aSW huY pTU -rup -wzv -jVj -jVj +qpq +qpq +tvV +oaU jVj jbC -rup -eHm -eHm +xDZ +jUZ +oaU +tYf pdM -eHm -eHm +kxI yde gOV ahK @@ -40877,18 +45193,18 @@ dsT pXQ huY pTU -rup -bsW -tSj -bsW -tSj -bsW -rup -eHm -eHm +qpq +qpq +tvV +oaU +sNK +jbC +xDZ +dlw +oaU +buM pdM -eHm -eHm +kxI tQp oJx eZl @@ -41071,18 +45387,18 @@ jCw rpN huY pTU -rup -tCI -mzd -xSl -mnH -tCI -rup -twY -eHm +qpq +qpq +tvV +oaU +jak +jbC +xDZ +jUZ +gAf +qWa sXn yhO -nBj xNy kRS jPF @@ -41265,18 +45581,18 @@ bfi uiz huY pTU -rup -gii -gii -rNf -gii -pXL -rup -eHm -eHm -pdM +qpq +qpq +tvV +oaU +mnH +ebF +dJI +jUZ +gAf +fTn +eYj pQY -eHm aHb iRW kGz @@ -41458,19 +45774,19 @@ uSa uSa uSa huY -bhT -rup -rup -xUb -fWa -xUb -rup -rup -fIE -eHm +pTU +ejI +ejI +oaU +oaU +oaU +oaU +xlX +jUZ +oaU +twY oeP -eHm -qhk +kxI tQp cbw cPe @@ -41481,9 +45797,9 @@ nAR nAR nAR nAR +rfd wbV qYq -cva gIR rfd nbZ @@ -41645,38 +45961,38 @@ upp xdh nMp pnt -uxG -ccB -dQe -ryg -mOF -uxG -eHm -jjG -oaU -mjW -eHm +xHD +qpq +qpq +qpq +qpq +qpq +qpq +pTU +ejI +mHM +aYX bQh -eHm +hBA mjW -oaU -eHm +jUZ +jUZ +gAf hTw -kvq -eHm -gJS +bVW +kxI mmI mmI mmI nAR +nAR rUX tWY nyz aLf arw -cUN +uxG aqP -xKC axP kUs rfd @@ -41839,38 +46155,38 @@ upp pKn cpB wtw -xwp -jUZ -tMG -uxG -uxG -uxG -eHm +xHD +iec +iec +iec +iec +iec +iec erm fqP -cRX -cRX +kSk +kSk wdQ mTi -mTi pfi -mcO +pfi +pfi +jER kfV xIj -eHm -gJS +kxI +mmI iuo cJg -sNK +bPx wQc gEz fjy uLE fwC lar -cUN +uxG ufB -xKC vOA nYd rfd @@ -42033,37 +46349,37 @@ wSM uuo rMY rAk -uxG +xHD +iec +xHD +xHD +xHD +xHD +xHD +xHD +xHD eQq -dQe -nhX -ioT -uxG -eHm -eHm kXa -eHm -qtE rUa -qFO -eHm kXa +kXa +kXa +kXa +oaU +tYf eHm -qtE -fBJ -eHm -gJS +kxI +mmI wBY uhO -sNK +bPx wQc vIV mGl tVG wpb nxI -mcN -ssq +caz ssq ldf gmW @@ -42227,38 +46543,38 @@ voG bXb fOE pad -uxG -ofU -dQe -uxG -uxG -uxG -fIE -eHm -oaU -eHm -eHm +xHD +iec +xHD +nHj +kPG +vgB +vgB +vgB +vgB +vgB +vgB kZg +eBA +eBA +eBA +eBA +eBA +pkG eHm -kSk -oaU -eHm -eHm -eHm -fpV -gJS +kxI +mmI goI xCP -cvB +xQM wQc bwC flr vOD xYq rQF -cUN +uxG yhR -xKC dIJ kMm rfd @@ -42421,42 +46737,42 @@ wSM qpQ qpQ qpQ -uxG -nhq -dQe -ybk -bHz -uxG -twY -eHm -oaU -twY -eHm -hJq -fpV -oaU -oaU -oaU -tov -tov -tov +xHD +iec +xHD +uLi +ajd +pDc +pDc +pDc +pDc +pDc +qtE +qsB +qFO +pDc +pDc +pDc +pDc +pDc +pDc +vQx mmI pwV goI -mIK -eEv +lfu eEv eEv eEv eEv eEv eEv +rfd oDK -xKC bGi kfA pay -hUR +nBj hUR aaU mqc @@ -42611,46 +46927,46 @@ ttB jPA ixo bhD -kCt -hqT +wSM +qpq dyL aXm -uxG -qKx -dQe -uxG -cBb -uxG -eHm -fpV -oaU -kSk -eHm +qpq +iec +xHD +ctj +ogg +neX +ggw +ggw +ggw +ggw +ljq hJq -eHm -oaU -tvV -oaU -eHm -eHm -eHm +tkO +jcO +jcO +jcO +jcO +neX +neX +jjo mmI goI sgW -dYX +dWk sFu szg joq ygh rfH dzg -wQo +ccB ufB -xKC loU +nWj pFA -ibJ -dAa +nPr dAa dAa dAa @@ -42805,46 +47121,46 @@ upp oGF bEv oGF -kCt +wSM hjM -hqT +qpq aXm -uxG -uxG +qpq +iec xHD -uxG cBb -bPx -oaU -qIz +wHL +cBb qIz +xGm +xGm qIz -eHm +fcM hJq -eHm +fiT qIz +xGm +xGm qIz -sBd -eHm -eHm -eHm +aKq +aKq +nCR mmI nJM uhO -sNK +tCI sFu qMX fON ugB dZN nDs -caz -ssq +fZy ssq rDP +nmJ qwz pjz -pjz snu aRl aRl @@ -42995,46 +47311,46 @@ iXx bxz nMd aKy -guR +cje cym dNQ twU kCt hjM pfe -hqT -dKQ -mIF -mIF -ufJ -hgr -eZJ -hBA +iec +iec +iec +xHD +mSd +uJM +mSd +nYN hBs cny -qIz -fcM +xGm +uLi jpl -eHm -qIz +kxI +xGm iCr hBs -iFi -qFO -eHm +nYN +efr +wbG +tJU mmI bAe uhO -sNK +tCI sFu eMi rcb qtU jyt lfy -wQo +ccB yhR -xKC olB pDO pDO @@ -43187,48 +47503,48 @@ iXx iXx iXx bxz -qYt -pDI -ljk +jZz +ilh +cje sTt nZC uUl kCt pWE itd -hqT -dKQ -dlw -mIF -mIF -hgr -pIz -hBA +xHD +xHD +xHD +xHD +mSd +uJM +mSd +wKp hBs cny -qIz -jOk -hJq -eHm -qIz +xGm +uLi +dtW +hjA +xGm iCr hBs -wbG -eHm -eHm +wKp +bHz +eoT +tJU mmI bAe nPi -egu +plG eEv vIj pYD tKG sXA okU -wQo +ccB iFY -xKC oEN aCR ffh @@ -43381,39 +47697,39 @@ lkq aUW lUe bxz -mmM -vwz +jZz +jZz cje oCO jVn bOa kCt -qsB -cDA -hqT -dKQ -aUb -pIE -mIF -dKQ -pIz -pIz +pTU +iec +xHD +esy +xbt +vbt +mSd +wSf +mSd sBd +xGm +xGm qIz +ltM +gMN +eZJ qIz -eHm -hJq -eHm -qIz -qIz -qIz -vZs -jPR -eoT +xGm +xGm +sBd +bHz +jaG +pIE mmI mJc mmI -mmI eEv eEv eEv @@ -43421,8 +47737,8 @@ eEv eEv eEv eEv +rfd oDK -xKC tNZ pDO tIT @@ -43433,7 +47749,7 @@ iYh sDS jfJ bfS -bbQ +ehA aHW nLb pNT @@ -43577,33 +47893,34 @@ iXx bxz nTZ nTZ -xDZ +cje oCO kyn bGM rRe eRd +iec hqT -hqT -bLe -wJw -rtM -mIF -mSd +qjz pIz -hBA -fEp +ulr +mSd +uJM +mSd +wKp nzx -jER -qtE +nzx +xGm +sPz bdW -qFO -jER +fcN +xGm nzx -kTB -aAu -jPR -jPR +nzx +wKp +bHz +eoT +tJU poq gaO rRb @@ -43611,7 +47928,6 @@ dbq dbq dbq dbq -dbq qfF sly dbq @@ -43776,32 +48092,32 @@ oCO jVn bOa kCt -hqT +qpq pJM -hqT -dKQ -gIV -iKN -mIF -dKQ -pIz -hBA -fEp +xHD +qjz +keB +nBV +mSd +uJM +mSd +fvj nzx -jER -eHm -hJq -eHm -jER nzx -kTB -aAu +xGm +hjR +kQJ +kxI +xGm +nzx +nzx +fvj hoX -oFP +mzd +mqU uor pWI mtG -llq qED qED uFP @@ -43973,24 +48289,24 @@ kCt kCt kCt kCt -dKQ +jXi gMk -dKQ kCt cja -pIz -uKJ +uJM +oHz +qIV +oaU oaU oaU -cFb mMN llr -eHm -cFb +kxI +oaU oaU oaU cBK -gSa +cDA aKq kdl igd @@ -44150,7 +48466,7 @@ xIf ppB xIf dgT -sVb +uQe xIf xIf ppB @@ -44159,7 +48475,7 @@ xIf uPt cNs jZz -foJ +cje sTt xFT uUl @@ -44167,26 +48483,26 @@ oQC cPx gBH gBH -lfu -kOH -kgH +ilh +ilh gLF kCt -pIz -pIz -oaU -tvV +jGq +hPe +yly oaU wVd -nWj -eHm -oaU -tvV +kOH +uLi +hJq +kxI +nhX +vYG oaU pBU nuO -dzi -kdl +cuE +hpo oMl eqi hKr @@ -44346,46 +48662,46 @@ neh tCF wDR gir -bzY -bzY -bzY -bzY -ttm +fmk +fmk +fmk +fmk +pJr wpi -nZL -jZR +bzH +tJk oCO jVn bOa lzj -uaf -afR -uaf -wuz ilh -jZR -tYf +ilh +ilh +ilh +ilh +xwp kCt -qyo -pIz -oaU -tvV +unJ +gUZ +cva oaU -eHm +cFb +gLH +uLi qLp -eHm -oaU -tvV +kxI +cvB +qyo oaU -pBU -rtj -wMn +mIK +imb +oEp ejv gGf wfk twx -cxJ -cxJ +exs +eiI cxJ cxJ aja @@ -44546,7 +48862,7 @@ nTZ nTZ nTZ wPU -kfO +tid kfO aWr jVn @@ -44555,33 +48871,33 @@ bSu efb efb efb -nZL -gYH -kCt +jZR +jZR kCt kCt -pIz -uKJ -oaU -oaU -oaU -tov -qIV -tov -oaU +unJ +vFz +sme oaU +tMG +kTB +uLi +hJq +kxI +xSl +llq oaU -pBU -rtj -jPR +kOr +jOk jPR +elT oMl wBt pQN rYh fIn -fIn -fIn +cxJ +cxJ mBm igd mmI @@ -44728,7 +49044,7 @@ wVB aPk tzb tzb -xPg +gRw bRN aPk tzb @@ -44738,7 +49054,7 @@ tzb wae tzb xPg -bRN +aws iYO qiK xhf @@ -44754,21 +49070,21 @@ bgJ tLz ioP jtH -pIz -pIz -pIz -sIj -bNH -eHm +pFp +vFz +tov +vgB +vgB +bWn iki +mCN +cRX cRX -vYV -efr oFP -tVU +gSa dXL hdr -jPR +elT oMl vXm qlw @@ -44922,7 +49238,7 @@ koS pCN cqO cqO -heh +khL sJr vkn cqO @@ -44932,7 +49248,7 @@ cqO cqO cqO heh -sJr +dOv jxJ cqO cqO @@ -44945,24 +49261,24 @@ cqO cqO cqO tkE -ojU -rIw -vgB -eaK -pIz -pIz -pIz -bNH -eHm -nlb -eHm -dUk -jPR -jPR -xoj +dOv +cIi +dyM +keB +wLf +eub +ggw +ggw +ljq +hJq +tkO +jcO +jcO +szG +sSl nEU pwN -jPR +elT oMl oMl oMl @@ -45113,10 +49429,10 @@ vgs vgs vgs uba -vgs ieR -vgs -vgs +kCt +wpO +ljk ffI cGO gZv @@ -45142,18 +49458,18 @@ whu whu mgw nBm -bNH -oaU -oaU -oaU -oaU -tov -qIV -tov -oaU -oaU -oaU -oaU +hGK +bmg +mcN +gIV +heB +ufJ +qhk +ufJ +aUb +gIV +rNf +bmg kuE nwT fIx @@ -45303,14 +49619,14 @@ pRW pRW uPt xIf -vgs xIf xIf -ppB xIf -neh xIf xIf +kCt +lBS +stX ffI inF xCX @@ -45337,20 +49653,20 @@ whu xui dyM iyN -oaU -cUl -uVj -mQp -eHm -hJq -eHm -vpL -ion -bZX -oaU -cxk +wJw +fEp +xUb +laM +nhq +nfa +qgi +dQe +xUb +xoj +sIj +cMY phe -jPR +elT cOC ijd wDr @@ -45497,17 +49813,17 @@ pRW pRW uPt xIf -vgs -vgs xIf xIf -neh -neh xIf xIf +kCt +kCt +lBS +qKa ffI tPV -mEc +xCX nHz rsx duc @@ -45527,23 +49843,23 @@ gub irM irM xAI -owo +aUs pyT lyl -pIz -oaU -arU -eHm -eHm -eHm -ujc -nIk -pVB -gao -gao -oaU -imb -tnk +ckH +iKN +xUb +wzv +wzv +jZX +bmg +yhx +wzv +wzv +xUb +bhT +cMY +dzq hfW nKL xEp @@ -45691,17 +50007,17 @@ jRE qBd uPt xIf -ppB -vgs -vgs -xIf -neh xIf xIf xIf +kCt +kCt +lBS +lBS +aEl ffI sWB -jXi +xCX kUS xHh ahE @@ -45723,20 +50039,20 @@ irM iUs xcd xdW -gbY -pIz -oaU -ijz -vpL -vpL -eHm -hJq -eHm -iHO -iHO -yez -oaU -rtj +ltx +xQA +hlu +xUb +uam +uam +fMy +eFl +vYV +uam +uam +xUb +szz +cMY ceq cgo azx @@ -45885,14 +50201,14 @@ qBd lmG uPt xIf -qIm -qIm -vgs -vgs -neh xIf xIf xIf +kCt +tsk +kuq +kuq +cAQ ffI qnn hjJ @@ -45915,23 +50231,23 @@ iaO lKg eEO kMH -owo +aUs rIw vKw eaK -oaU -mMN -gao -qFC +wJw +xUb +uam +uam gXq eFl -eHm -eHm +vYV uam -eHm -oaU -ivz -pFp +uam +xUb +sIj +jTr +tnk bXX cOC lZl @@ -46078,24 +50394,24 @@ pRW jRE qBd uPt -neh xIf -hLz -vgs -vgs -lBS -uPt -ffI -ffI +xIf +xIf +xIf +xpI +nww +bbQ +lqw +hCz ffI ffI -oWr ffI ffI ffI ffI ffI ffI +oWr nUG pCA mmt @@ -46109,24 +50425,24 @@ irM irM irM fTE -owo -pyT -dyM -pIz -oaU -eHm -eHm -gao +aUs +weW +nGv +gUZ +iKN +xUb +dUk +dUk jZX -hJq -eHm -vpL -vpL -vpL -oaU -tpN +bmg +lNY +dUk +dUk +xUb +bhT +lTi qmF -wuj +mdU jkz ngz iGC @@ -46272,24 +50588,24 @@ pRW pRW pRW uPt -neh -nah -nah xIf -ppB -neh xIf +xIf +xIf +kCt +okS +lBS +lBS +lBS +lBS +lBS +lBS +lBS ffI wQh xXp gRW nbe -ffI -ffI -fmi -aUs -unI -scT nUG iKm joM @@ -46305,22 +50621,22 @@ czU vXA whu dnV -dyM -omt -oaU -yiM -xMa -xMa -yiM -cQB -tty -pic -xMa -cMM -oaU -cxk -qmF -wuj +bFI +gUZ +hlu +hDs +xUb +laM +gYH +ujc +aAu +dQe +xUb +cUN +szz +gxR +fBJ +mdU cOC lcu iGC @@ -46466,24 +50782,24 @@ pRW pRW pRW uPt -neh -neh -neh -neh -neh -neh xIf +xIf +xIf +xIf +kCt +lCS +ttq +lBS +lBS +kTq +qZb +lBS +ors ffI tTu mEE vmM pmG -ffI -ffI -mMY -mIF -mIF -xpI nUG ijZ hwR @@ -46500,21 +50816,21 @@ whu fsC ujP nBm -bNH -oaU -rUk -iHO -iHO -eHm +hGK +bmg +juM +lJH +vZs +ufJ bJZ -eHm -iHO -iHO -tqA -oaU -imb -tnk -mdU +ufJ +vZs +npm +ioT +bmg +mEn +abW +egu cOC lcu iGC @@ -46660,25 +50976,25 @@ pRW pRW pRW uPt -vgs -vgs -vgs -vgs -vgs +xIf +xIf +xIf +xIf +kCt +dIS +kuq +kuq +kuq +ruq +ydL +lBS lBS -vgs ffI oks orZ sIX jsK ffI -ffI -tJk -vuR -vPr -nQX -sCm lJB sCm hla @@ -46694,12 +51010,12 @@ lCA rQf czJ gbY -pIz -dub -eHm -eHm +vFz +jxf +eRK +eRK +eRK eRK -eHm slz aPo aPo @@ -46708,7 +51024,7 @@ aPo gSU sxt foz -wuj +mdU cOC lcu iGC @@ -46857,25 +51173,25 @@ uPt xIf xIf xIf -ppB -xIf -neh xIf +kCt +kCt +kCt +kCt +cda +lBS +mMY +nXl +lBS ffI vWo eYr aKR lDf ffI -ffI -hsE -mIF -hpi -nXl -lqw -sag -sag -sag +bqS +nQX +qYt sag sag sag @@ -46890,19 +51206,19 @@ gWU uVE yfS obi -cRX -cRX -cRX -cRX +mOF +mOF +mOF +mOF lGE -cRX -cRX -cRX -cRX +mOF +mOF +mOF +mOF obi fpq oGY -wuj +mdU cOC lcu iGC @@ -47055,23 +51371,23 @@ yfn yfn yfn gBJ +kCt +lBS +lBS +lBS +lBS +lBS ffI ffI ffI ffI ffI ffI -ffI -hCz -gzA +bqS aEn -qxs -mIF -mIF -mIF -mIF mIF mIF +xnC rmq jor rzi @@ -47081,17 +51397,17 @@ uWQ mAp rQf hiw -xFX -eaK -nJk -eHm -eHm +dyM +keB +hsu +qKx +mPY mcL pAc -nzY +cnu slM ojq -ojq +cnu nzY jQR oWl @@ -47255,28 +51571,28 @@ jQJ jQJ jQJ jQJ -gKn -gKn -gKn -bqS -qxs -mIF +jQJ +jQJ +jQJ +foJ +sCm +sCm sUb -fFG -fFG -fFG -fFG +nah +mIF +mIF +iRy aDx aDx mTQ aDx rTV -mAv +scT aDx bIW bNH -nBm -bNH +sIr +mOb oDd oDd oDd @@ -47453,13 +51769,13 @@ lLM mRv gKn bqS -qxs -mIF +nQX +hpi qSn jvv -ipa -oya -vCk +fFG +fFG +fFG aDx mFr vZg @@ -47468,9 +51784,9 @@ anx aIH eOr mAv -pIz -dyM -pIz +qjz +ltx +eOX oDd cHC fOF @@ -47482,7 +51798,7 @@ cHC fOF cHC oDd -rtj +vIP gAn wuj pHO @@ -47619,7 +51935,7 @@ mDp mDp mDp pRW -pRW +hsE pRW pRW pRW @@ -47649,11 +51965,11 @@ gKn lAr jMc uhx -hCA -hCA -hCA -hCA -hCA +qIm +xyo +ipa +oya +vCk aDx lPA vZg @@ -47662,9 +51978,9 @@ vZg rmN dwr mAv -xDm -vKw -eaK +cse +ciZ +wgp oDd cHC cHC @@ -47676,7 +51992,7 @@ cHC cHC cHC bHC -rtj +cMY rul qnz rLu @@ -47844,10 +52160,10 @@ thW uIW vDl hCA -kQH -xyo -dCq -eAh +hCA +hCA +hCA +hCA aDx pgV vZg @@ -47856,9 +52172,9 @@ pqF vZg dSG mAv -pIz -dyM -pIz +kff +nGv +gUZ oDd wnU cHC @@ -47870,8 +52186,8 @@ cHC cHC cHC oDd -rtj -gAn +nbC +cTm hKM cOC qYk @@ -48009,7 +52325,7 @@ mDp pRW pRW pRW -pRW +hLz pRW pRW pRW @@ -48036,12 +52352,12 @@ aVO gKn bqS qxs -iRy +wdf hCA kQH ajj uEl -fJj +eAh aDx nTO vZg @@ -48051,7 +52367,7 @@ vZg pHp nBn tJE -dyM +bFI gvw oDd cHC @@ -48064,9 +52380,9 @@ cHC cHC cHC oDd -rtj -gAn -wuj +cMY +kyy +nrZ jkz ebW ehP @@ -48205,7 +52521,7 @@ pRW pRW pRW pRW -pRW +ojU pRW pRW pRW @@ -48235,16 +52551,16 @@ hCA kQH ije ilx -ovX +fJj aDx ejy vZg bTa vZg bfX -xiO +pDI mAv -pIz +qjz gbY uKJ oDd @@ -48258,7 +52574,7 @@ cHC cHC cHC oDd -imb +vPR gkX pgo chv @@ -48400,7 +52716,7 @@ pRW pRW pRW pRW -pRW +vwz pRW pRW qBd @@ -48429,7 +52745,7 @@ hCA jPQ cbF amG -uEl +ovX aDx wqB vZg @@ -48439,10 +52755,10 @@ vZg xiO aDx lVq -dyM -pIz -bHC -cHC +rpD +lTs +tfp +wMn cHC qgo cHC @@ -48453,8 +52769,8 @@ cHC cHC oDd mTD -gAn -wuj +wtZ +mdU efa eUu jlY @@ -48632,11 +52948,11 @@ mWk vZg qvv aDx -pIz +qjz dyM uKJ oDd -cHC +ePI eEE tzi eEE @@ -48646,9 +52962,9 @@ eEE eEE cHC oDd -rtj -gAn -jsQ +csf +bBg +aao jqy mKe xbs @@ -48827,10 +53143,10 @@ qYS jsc aDx eXh -dyM -pIz +qRh +ckH oDd -cHC +ePI eEE uFa bYT @@ -48841,8 +53157,8 @@ eEE cHC oDd cxk -gAn -wuj +anF +mdU jqy leM woF @@ -49020,11 +53336,11 @@ sWT hfZ gBW gVf -pIz -dyM -pIz +bLe +ltx +xQA oDd -cHC +ePI eEE mIs xsd @@ -49035,8 +53351,8 @@ eEE cHC oDd xzf -gbN -wuj +gAn +mdU jqy oRe xbs @@ -49218,7 +53534,7 @@ xDm ciZ eaK oDd -cHC +ePI eEE fPm iPG @@ -49230,7 +53546,7 @@ cHC oDd tpN ixQ -wuj +mdU chv pWZ jlY @@ -49408,11 +53724,11 @@ fhj oOO pCH jkG -pIz -dyM -pIz +rxN +nGv +gUZ oDd -cHC +ePI eEE eEE eEE @@ -49423,8 +53739,8 @@ eEE cHC oDd ivz -gAn -wuj +cTm +nyF wOP jZY jZY @@ -49602,22 +53918,22 @@ bPH hNv xAO aDx -pIz -dyM -pIz +dpH +bFI +gUZ oDd -cHC -cHC -cHC -cHC -cHC -sAZ +mfl +qGR +qGR +qGR +qGR +hqy gtR aBx -ePI +qQK tqR cMY -gAn +kyy jsQ jZY nYo @@ -49775,7 +54091,7 @@ dKQ bqS mIF mIF -mIF +nQX fRp pXr pXr @@ -49796,14 +54112,14 @@ aDx aDx aDx bIW -bNH -nBm -bNH -oDd +xDp +pVB +lFr oDd wnU cHC cHC +cHC mFI xOF cHC @@ -49964,12 +54280,12 @@ dNv uow xIf xIf -xnR +tHT fBT -rGZ -gzA -eiO -gzA +aFv +vFO +pRM +nKq iPf gzA eiO @@ -49990,10 +54306,10 @@ gKZ qog aPb dbo -tlU +mXu efc -fLZ -fLZ +ftU +oDd oDd mAe kEQ @@ -50004,8 +54320,8 @@ cHC cHC cHC oDd -imb -gkX +uPR +gij mdU jZY wvW @@ -50158,7 +54474,7 @@ fqJ uow xIf xIf -xnR +pfz oLT oLT oLT @@ -50185,8 +54501,8 @@ qog xec dbo vLl -hlC -bpS +bfx +oOa jne oDd oDd @@ -50352,7 +54668,7 @@ rfs uow xIf xIf -xnR +pfz oLT fPa wQp @@ -50379,18 +54695,18 @@ qog ogL dbo iGJ -fLZ -jGK -fLZ +eHd +sFQ +dde bxp -fLZ +dde viQ xRk wmA -xFs -tEs +fmL +fmL oUf -tEs +fmL lKu tep kJo @@ -50546,7 +54862,7 @@ dEU uow xIf xIf -xnR +pfz oLT dNU wvb @@ -50573,23 +54889,23 @@ qog aPb dbo nKY -fLZ -jGK -fLZ -bxp -fLZ -fLZ +uMx +uCp +xFX +wPl +xFX +xFX sVZ eqA -jWn oSb -ghc +oSb +oSb oSb uZg -ban +iSU ngB -kdT -jvO +ixI +uCH pEq uCH uCH @@ -50735,12 +55051,12 @@ qBd lmG uPt xIf -xnR +hfm xIf uPt xIf xIf -xnR +pfz oLT pBG ppE @@ -50767,22 +55083,22 @@ qog vbI dbo jue -fLZ -eBA -fLZ -qIz -qIz +dnZ +mLh qIz -sVZ -fLZ -fLZ +xGm +xGm qIz +smh +ftU +dub qIz +xGm +xGm qIz -owE -wCF -iez -jWy +srL +eUd +gao uCH rHV hiV @@ -50929,12 +55245,12 @@ jRE qBd uPt xIf -cET -yfn -tFT -yfn -yfn -ogd +dwZ +wQj +ybL +wQj +wQj +tLi oLT oLT oLT @@ -50960,22 +55276,22 @@ qog vKZ vbI dbo -nFY -fLZ -jGK -qbE +cUl +dnZ +mLh +nYN hBs cny -qIz +xGm qYx -fLZ -fLZ -qIz +ftU +uMm +xGm iCr hBs -fvj -dzs -qPf +nYN +srL +eUd jhl uCH kuF @@ -51155,22 +55471,22 @@ dbo dbo dbo ekA -fLZ -jGK -qbE +dnZ +mLh +wKp hBs cny -qIz -lFr -fLZ -fLZ -qIz +xGm +smh +fuk +uMm +xGm iCr hBs -fvj -wCF -qPf -cmb +wKp +srL +eUd +uQE uCH sLb fIJ @@ -51342,28 +55658,28 @@ sCm hkV xHi sCm -sCm rYW dKQ gHf pps rYW dKQ -qbE +vpL +mwO mLh -qbE -qIz -qIz +sBd +xGm +xGm qIz uOW -dIf +fuk fiF qIz -qIz -qIz -uwL -uQE -eUd +xGm +xGm +tqA +srL +peI uQE uCH qRe @@ -51536,28 +55852,28 @@ sag ozS wsg sag -sag -uMm +omt cYH knT lev nkb lGn jKh +vXa fKw -qbE -fEp +wKp nzx -jER -sVZ -fLZ -fLZ -jER nzx -kTB -fvj -wCF -qpl +xGm +smh +fuk +exl +xGm +nzx +nzx +wKp +srL +eUd hyb gHG gHG @@ -51730,25 +56046,25 @@ gzA gzA iPf gzA -eiO -cij +pUU dKQ sGF rbx cij dKQ -mYS +ghc +ydt uvF tnb -fEp nzx -jER -ydt -pUB -fLZ -jER nzx -kTB +xGm +iNM +tFZ +kYs +xGm +nzx +nzx fvj srL dly @@ -51930,23 +56246,23 @@ vez vez vez vez -dKQ -rdN -jGK -kUk -ocG +xFs +tTP +lJV +rBK oDd oDd oDd -kYR +rUk +oDd +oDd oDd oDd oDd jRu -yeL icI peU -wCF +uQE rpe lEi gaA @@ -52127,19 +56443,19 @@ cmn mPv gSJ wzx -fLZ -oDd -oDd +pjB oDd -iyy -sMF +cHC +cHC +cQB +cHC +fOF +cHC cHC oDd -oDd -oDd -tVO -uOw -jWy +iHO +jvO +owE dni vYN vYN @@ -52317,25 +56633,25 @@ wJN osH wNE vez -fLZ +uza jGK -fuk -fLZ -fLZ -oDd -oDd +eJz +ftU +ijz oDd -lJV +cHC +cHC +qgo +cHC +cHC cHC cHC oDd -oDd -oDd -tVO -uOw -kdT +mQp +bZX +pUB +vYN vYN -kYs keo wbt mpP @@ -52511,26 +56827,26 @@ dsi hmb blH tij -fLZ +uza jGK -fLZ -kUk -oDd -oDd +bBw +nvK oDd oDd +cHC +cHC qgo cHC cHC -oDd -oDd +cHC +cHC oDd yeL -cwT -kdT +uOw +rdl vYN nuw -kzb +nJk gYD mNp kzb @@ -52707,11 +57023,11 @@ mxS fxa lEm nAr -kUk +ksB oDd oDd -cHC fOF +cHC chD gjw chD @@ -52720,10 +57036,10 @@ chD chD oDd ygE -kBU +oQM rdl vYN -aia +ion vYN wYa ndN @@ -52899,9 +57215,9 @@ eQu wPt thh tij -fLZ -wum -fLZ +uza +uwG +edP oDd cHC cHC @@ -52914,10 +57230,10 @@ mKc xda oDd heR -vEl +pDv lnT vYN -kzb +dIf vYN hmG cgs @@ -53093,9 +57409,9 @@ eQu liR jBH vez -fLZ -wum -fLZ +mXu +wil +edP oDd cHC cHC @@ -53109,7 +57425,7 @@ eJe oDd gAz vEl -kdT +rdl vYN kzb vYN @@ -53287,12 +57603,12 @@ eQu mFL cYX tij -fLZ -wum -fLZ -bHC -cHC -cHC +cCK +slw +fHk +tfp +qGR +wMn cHC chD mia @@ -53301,9 +57617,9 @@ chD qli qnh oDd -exl +tlU ptm -pUU +rdl vYN kzb vYN @@ -53481,12 +57797,12 @@ eQu bFz rvs tij -fLZ -qNj -fLZ +ugT +pfV +qiy oDd cHC -cHC +ePI cHC chD chD @@ -53496,8 +57812,8 @@ ioN bwt oDd kDU -uOw -jWy +aGC +mRr vYN kzb vYN @@ -53677,21 +57993,21 @@ ufm tij mYS hbH -fBE +kjZ oDd cHC -cHC -cHC -cHC -cHC -cHC -fOF -sAZ -oSi +mfl +qGR +qGR +qGR +qGR +wNP +hqy +gtR oDd ygE kBU -rdl +byX vYN aia vYN @@ -53869,22 +58185,22 @@ aCZ jnq sjz sjz -fLZ -wum +uza +ifz kUk oDd oDd oDd oDd cHC -cHC +oDd cHC cHC sAZ -oSi +qQK oDd yeL -uOw +nBU aqd vYN aia @@ -54064,21 +58380,21 @@ dmF mYG uLo nFY -qjz -fLZ +wum +edP oDd cHC cHC cHC cHC -cHC +oDd cHC cHC sAZ -oSi +qQK oDd bPE -fWJ +uOw lDm vYN kzb @@ -54257,23 +58573,23 @@ wNs sFK epc uLo -uXO +dGt vRa -uXO +cki oDd wnU cHC cHC cHC -cHC -cHC -cHC +oDd +oDd +oDd sAZ -oSi +qQK oDd -tVO -uOw -kdT +xFn +ueR +qxt vYN aia vYN @@ -54451,23 +58767,23 @@ wNs hlv oSw uLo -rdN +aVr qNj -fLZ +edP oDd scN cHC cHC cHC -cHC +oDd cHC cHC sAZ -oSi +qQK oDd vbg uOw -kdT +rdl vYN kzb vYN @@ -54645,7 +58961,7 @@ wNs rFW mvx uGR -fLZ +uza vUL jWn lbt @@ -54653,13 +58969,13 @@ mDv dkb qQK cHC -cHC +oDd cHC cHC sAZ -fiT +qQK oDd -dnZ +yeL uOw lnT vYN @@ -54839,9 +59155,9 @@ wNs otK oBg uGR -vLl -wum -fLZ +mYS +gjd +edP oDd cHC qQK @@ -54855,7 +59171,7 @@ kEQ yhI pbh vRD -kdT +rdl vYN aia vYN @@ -55033,9 +59349,9 @@ wNs otK xvN uGR -fLZ -wum -kUk +uza +syB +ksB oDd cHC oDd @@ -55047,7 +59363,7 @@ oDd oDd oDd oDd -tVO +ygE uOw jWy vYN @@ -55227,8 +59543,8 @@ wNs otK jUa uLo -fLZ -wum +uza +bCK arL oDd oDd @@ -55241,7 +59557,7 @@ cHC fOF nqw oDd -tVO +ygE xUp eJO oMP @@ -55417,14 +59733,14 @@ iMe rOJ hNW iui -wNs +cSK cQu bYw uLo -tlU +uza syB -fLZ -fBE +hTl +wPE oDd wTM cHC @@ -55435,7 +59751,7 @@ uCq uCq xgg oDd -tVO +ygE kJE kdT vCs @@ -55611,14 +59927,14 @@ iAr rKz ktj qLs -wNs +oQJ iei eew uLo -fLZ +mxz suL bpS -fLZ +ftU oDd gwF cHC @@ -55629,9 +59945,9 @@ uCq cHC mqw oDd -tVO +ygE kJE -kdT +rdl vCs vCs vCs @@ -55815,7 +60131,7 @@ ffk ezg oDd oDd -wTM +uAu cHC qQK cHC @@ -55823,9 +60139,9 @@ cHC cHC nMC oDd -tVO +ygE kJE -kdT +rdl vCs pwh bAO @@ -56005,21 +60321,21 @@ wUs wUs tcy xKb -fLZ +kBX hlC -bpS +wgF oDd oDd -wTM +szh qQK cHC cHC cHC qBi oDd -tVO +ygE kJE -kdT +rdl vCs vCs vCs @@ -56197,23 +60513,23 @@ brk kQU wUs dMg -edP -fLZ +ttm +oBL vAB -fLZ +uMl iBv -fLZ +wPE bHC szh -qQK -qQK -qQK -cHC +oDd +oDd +oDd +oDd uSX oDd -tVO +ygE kJE -kdT +lnT vCs emy bAO @@ -56394,20 +60710,20 @@ tem tcy tcy ooD -fLZ -xnN -fLZ +qbE +kUp +quL oDd -uAu -cHC -cHC -qQK -cHC -eDX oDd -tVO -uOw -lnT +oDd +pCj +jOJ +oDd +oDd +oDd +uwL +bSI +sKg fOZ fOZ rdA @@ -56589,20 +60905,20 @@ xIf tcy wzN fLZ -nrZ -kUk -oDd -oDd -oDd -oDd -bHC -oDd -oDd -oDd +xnN +wEA +eDX +dde +dde +dde +lNE +lNE +uVj +bjV nyR pFq uvP -wCF +lNE eIV guJ uNt @@ -56782,18 +61098,18 @@ ogd xIf tcy lay +nCo +qTI +fBE fLZ -xnN fLZ -bxp -fLZ -viQ fLZ fLZ wCF -rBK -gEY -oSb +wCF +wCF +wCF +wCF hpB elh wZf @@ -56976,20 +61292,20 @@ fwV wMp wMp wMp -mxz -efc +nFY +xnN kiA -bxp -fLZ nAQ nAQ -fLZ -qkF -qkF +nAQ +qSD +lHV +nNg +nNg nNg wCF -tVO -uPR +wCF +qpl vqS bFe guJ @@ -57170,19 +61486,19 @@ ako jTt vuG wMp -vLl +qyx +jGK cyw -fBE -bxp -fLZ -nBC +ezh +wUq nBC -fuk -iST +qSD +lHV iST +fMl bcp -aYt -aao +dzs +wCF ruD upS hOG @@ -57363,23 +61679,23 @@ bNt lgi slJ yeN -fwV -fLZ -xnN -fLZ -bxp -fLZ -wKT -wKT -fLZ -rKe -rKe +ocd +vLb +xbQ +eJz +nAQ +nAQ +nAQ +qSD +lHV +nNg +nNg nNg wCF -tVO +bZt qpl rXl -mbs +fOZ bmb hDv hDv @@ -57558,22 +61874,22 @@ hxV wMp wMp wMp +rdN +ifB +xXG fLZ -xnN -fLZ -bxp fLZ fLZ fLZ -ezh +wCF onD -yah -lKu tEs -tep +tEs +tEs +hDn tWO fLw -mbs +fOZ oFh oku weg @@ -57752,22 +62068,22 @@ eUS jvz den wMp -bSI -aDX -bSI -tUb -tUb -tUb -tUb -tUb -bjV -tUb -tUb -tUb -bYu -qUK -kjj -mbs +uza +jGK +bBw +rgo +xFX +xFX +ndJ +pMh +ote +pMh +qkF +pMh +gbN +qPf +ozA +fOZ oFh oku qww @@ -57935,10 +62251,10 @@ xVe xIf neh ieR -ocd -vRE -khL nnJ +nnJ +bpa +kjj wMp wMp wMp @@ -57946,21 +62262,21 @@ yeA wMp wMp wMp +efw +rKe tMu -gJm -aVd tUb -pkD -pkD -pkD -nMP +tUb +tUb +tUb +tUb jGe -pkD -hlS +tUb +tUb tUb xDa -ttn -oBJ +aDX +aYt mbs hzW oku @@ -58140,9 +62456,9 @@ ako fbI twz wMp -fVs +eah gJm -aVd +rtj tUb pkD pkD @@ -58150,9 +62466,9 @@ nMP hor nMP pkD -pkD +hlS tUb -ogg +qUK ttn mWa mbs @@ -58324,8 +62640,8 @@ xIf neh tcy ryc -frJ -bpa +cqt +vRE nnJ wMp wMp @@ -58334,9 +62650,9 @@ mVt wMp wMp wMp -aVd +nKo dqm -aVd +rtj tUb iDd nMP @@ -58346,7 +62662,7 @@ pkD pkD pkD tUb -ogg +yah ttn oBJ mbs @@ -58525,12 +62841,12 @@ lOB pbm oQx ieT -oZA +ieT ieT bzU cue wlW -tUN +rtj tUb nMP hor @@ -58541,8 +62857,8 @@ pkD pkD tUb sgw -ttn -oBJ +iez +uXO mbs oFh oku @@ -58722,8 +63038,8 @@ jRK jRK jRK wMp -aVd -ksR +oKF +sEs nvq tUb lZR @@ -58735,7 +63051,7 @@ pkD pkD tUb dhy -ttn +eXR ybr mbs xnE @@ -58916,9 +63232,9 @@ jRK jRK mzX wMp -aVd -ksR -aVd +tXO +dEb +uDV tUb wVf rpj @@ -59123,7 +63439,7 @@ pUI pUI tUb kpO -ttn +oJk oBJ mbs sgy @@ -59304,9 +63620,9 @@ jRK jRK jRK mai -aVd -ksR -tUN +aoi +gAW +rtj tUb lwk tEk @@ -59316,8 +63632,8 @@ pIb pUI pUI tUb -ogg -ttn +aua +wWS oBJ mbs hog @@ -59498,9 +63814,9 @@ jRK jRK jRK wMp -aVd -ksR -aVd +fVs +mut +rtj tUb wdp hMz @@ -59510,7 +63826,7 @@ lnk pUI cFB tUb -ogg +vVV ioD mWa mbs @@ -59692,9 +64008,9 @@ jRK jRK jRK mai -aVd +tXO ksR -aVd +rtj tUb rpj rpj @@ -59704,7 +64020,7 @@ fIK rpj pUI tUb -ogg +vVV sNd nRt aPI @@ -59898,7 +64214,7 @@ jGa rpj pUI gyu -ogg +vVV fYZ eHQ reX @@ -60082,7 +64398,7 @@ jRK mai oGt ksR -tUN +rtj tUb pkD pkD @@ -60276,7 +64592,7 @@ jRK wMp uWv ksR -aVd +ruu tUb fNy pkD @@ -60286,9 +64602,9 @@ jGa pkD hlS tUb -uJM +tcX bgF -vWh +oYE mbs sRh bYo @@ -60468,15 +64784,15 @@ jRK jRK jRK mai -aVd +tXO lSb -cue +rCE aee ejD cTu cTu cfh -jGa +ejr pkD pkD tUb @@ -60662,11 +64978,11 @@ mai pMH wMp wMp -aVd +kVB gJm -aVd +nDt tUb -pkD +ecV pkD pkD jyg @@ -60847,30 +65163,30 @@ xIf xIf tcy wMp -tHz -tHz -wQj -tHz +nnJ +nnJ +nnJ +nnJ okq ezI tHz -tHz -vdg -aVd -gJm +bYu +pKa aVd +qzR +nDt tUb iDd -pkD -pkD -jyg +iNn +nMK +tVO +ruN nMP -qGR tUb tUb sgw uhS -ozA +xcG iro iro iro @@ -61042,17 +65358,17 @@ xIf xIf tcy wMp -iKn +wMp xID mKr nnJ wCh -nKo +frJ wWO wMp aJe gJm -aVd +nDt tUb pkD pkD @@ -61064,7 +65380,7 @@ nmB aQB kUg cmT -vWh +oYE iro hlS pkD @@ -61246,7 +65562,7 @@ eYK eYK vLg gJm -aVd +nDt tUb pkD pkD @@ -61255,8 +65571,8 @@ pkD pkD pkD tUb -weJ -ogg +tcX +vWh bgF bZw iro @@ -61438,9 +65754,9 @@ gfA teE eYK eYK -aVd +tXO gJm -aVd +tUN tUb ifg ifg @@ -61450,9 +65766,9 @@ ifg ifg ifg jpu -pDc -bgF vWh +bgF +oYE iro pkD pkD @@ -61631,22 +65947,22 @@ gfA gfA eYK eYK -xcG -aVd +uOj +vMB gJm -aVd +nDt tUb ifg bge mna mna bge -ifg xQT -vWh +vuW +gfI vWh bgF -vWh +fDK iro pkD pkD @@ -61824,23 +66140,23 @@ sHP sHP sHP qcN -aVd -aVd +uOj +vMB pjb -hln -aVd +jch +sYu tUb ifg mna tPG tPG -dFg -tcX -vWh -vWh +mna +bjk vWh -bgF vWh +tUG +bEj +oYE biu pkD pkD @@ -62018,10 +66334,10 @@ gfA gfA gfA mNh -fVs +aLB pjb hln -aVd +nDt tUb tUb ifg @@ -62029,12 +66345,12 @@ mna tPG tPG nPa +gfI vWh vWh vWh -tUG fKA -oYE +xcG iro iDd pkD @@ -62212,10 +66528,10 @@ gfA gfA gfA eYK -fOr -qjv -fOr -otC +eah +gHJ +spp +sYu tUb pkD ifg @@ -62223,12 +66539,12 @@ mna tPG tPG nPa -vWh +cwT vWh vWh vWh pXE -vWh +ana cTz pkD pkD @@ -62406,11 +66722,11 @@ gfA gfA gfA mNh -aLB +tXO gHJ -aVd +nDt +tUb tUb -pkD pkD ifg mna @@ -62420,9 +66736,9 @@ mna tcX vWh vWh -vWh +fWJ oaJ -vWh +vnb cTz pkD pkD @@ -62600,23 +66916,23 @@ gfA gfA gfA mNh -uWv -gHJ -nvq +kgB +lkA +mSK +tUb +tUb tUb -pkD -pkD ifg bge mna mna bge -ifg +wKT vUI -vWh -vWh +uFQ +cwT bgF -vWh +oYE iro pkD pkD @@ -62794,23 +67110,23 @@ gfA gfA gfA mNh -cvh +nNS sYJ -kXE -tUb -pkD -pkD -tUb -tUb -tUb -tUb -tUb -tUb -ifg -vWh -vWh -bgF -ozA +tRx +xIg +pIY +xEX +xIg +xIg +xIg +xIg +xIg +xIg +xIg +xIg +hkf +bkX +plL iro pkD pkD @@ -62988,23 +67304,23 @@ hDu gfA gfA mNh -uvr -gHJ -aVd +cSd +gzw +aNn +rgv +dSt +dSt +sFY +dSt +oZA +cmb +gtd +cmb +mRH tYH -nMP -nMP -nMP -nMP -nMP -pkD -hlS -pkD -tUb -ifg -aiO -kgB -arr +nrD +lbX +fCt iro pkD pkD @@ -63182,23 +67498,23 @@ mNh mNh gfA mNh -aVd -gHJ -tUN -tUb -iDd -pkD -pkD -pkD -nMP -pkD -pkD -pkD -pkD -tUb -tcX -bgF -vWh +uro +gzw +fMC +gqL +sQu +sQu +sQu +sQu +qhO +teL +teL +teL +teL +cCF +hGF +lbX +qaO iro pkD pkD @@ -63376,23 +67692,23 @@ pRW mNh gfA mNh +scP +hvp +pqU +qIz +xGm +xGm +qIz +ckP +ckP +ckP +qIz +xGm +xGm +qIz fOr -qjv -fOr -tUb -tUb -tUb -tUb -tUb -tYH -tUb -tUb -tUb -tUb -tUb -dUT -kJL -dUT +wqT +qEo iro pkD pkD @@ -63570,23 +67886,23 @@ pRW mNh gfA mNh -aVd -gHJ -aVd -ncC -mvm -iAs -tUb +pic +vhp +pic +dfx +hBs +cny +xGm amq iRZ kWk -tUb -pBY -mvm -ncC -vWh -ckP -vWh +xGm +iCr +hBs +dfx +pic +oCg +pic iro pkD qUP @@ -63764,23 +68080,23 @@ gCJ mNh gfA mNh -fVs -gHJ -aVd -ncC -mvm -iAs -tUb -mvm -jwS -mvm -tUb -pBY +bbD +vhp +pic +yiM +hBs +cny +xGm mvm -ncC -vWh -igN -vWh +dyQ +uvr +xGm +iCr +hBs +yiM +pic +oCg +pic iro pkD iro @@ -63958,23 +68274,23 @@ pRW mNh mNh mNh -aLB +luA vhp -tUN -qIz -qIz -qIz +pic +sBd +xGm +xGm qIz -mvm +dFg jwS -mvm -qIz +jHs qIz -qIz -qIz -tcX -igN -vWh +xGm +xGm +sBd +pic +oCg +pic iro iro iro @@ -64152,23 +68468,23 @@ pRW pRW pRW dot -qhO -gzw -qhO -qIz +pic +vhp +pic +wKp nzx nzx -jER -qhO -gzw -qhO -jER +xGm +igN +fhX +xry +xGm nzx nzx -qIz -qhO -qBR -qhO +wKp +pic +oCg +pic iTE lmG qBd @@ -64346,23 +68662,23 @@ pRW pRW pRW dot -qhO +jMN nAh -qhO -qIz +bIw +wKp nzx nzx xGm -qhO -gzw -qhO +pSD +wJc +dXk xGm nzx nzx -qIz +wKp jMN ryl -kWR +bIw iTE qBd qBd @@ -64539,25 +68855,25 @@ pRW pRW pRW pRW -iTE +agO dVQ gCY -kWR -qIz -sBd -qIz -qIz -bbD -gzw -qaO -qIz -qIz -sBd -qIz -bbD +szf +ngD +ckP +ckP +ngD +ckP +bDt +ckP +ngD +ckP +ckP +ngD +dVQ vmn -qhO -iTE +dVQ +agO jRE jRE pRW @@ -64733,25 +69049,25 @@ pRW pRW pRW gCJ -iTE -rgo -gzw -qhO -qIz -iNI -iNI -qIz -nrD -gzw -qhO -qIz -iNI -iNI -qIz -luA -oCg -fCt -iTE +agO +luz +pBY +bZu +urd +gCi +pva +mcW +dTv +eBL +qjv +mcW +otC +ahN +beo +vkH +iuJ +fWX +agO qBd jRE pRW @@ -64927,25 +69243,25 @@ pRW pRW pRW pRW -iTE +agO uTM hGi -qhO -qIz -iNI -iNI -qIz -mSK +xWm +laO +kWR +weC +sZj +dkv sIh -szf -qIz -iNI +gck +sZj +gCd iNI -qIz -qhO -qBR -qaO -iTE +baj +xAr +ncC +eXe +agO lmG qBd pRW @@ -65121,25 +69437,25 @@ pRW pRW jRE qBd -iTE -rgo -gck -qaO -qIz -qIz -qIz -qIz -urd +agO +czX +hGi +xWm +laO +iJi +cMM +sZj +loC iiq lqJ -qIz -qIz -qIz -qIz -bbD -qBR -qhO -iTE +sZj +xMa +ieG +baj +xAr +cfw +xWm +agO qBd jRE pRW @@ -65315,24 +69631,24 @@ pRW pRW qBd lmG -iTE -rgo -sNS -qhO -qhO -xIg -mwF -weC -qhO -gzw -qhO -qhO -wgF +agO +xAr +hGi +xWm +aiO +ryg +xAr +sZj +loC njb -qhO -qhO -qBR -qhO +lqJ +sZj +xWm +nKm +xzW +rym +cfw +xWm rtP pRW pRW @@ -65509,24 +69825,24 @@ pRW pRW jRE qBd -iTE -czX +agO +xAr gOT +nlb +ofU +ofU +vkq phu -phu -phu -nNS -phu -phu +hxy xtv +sNS phu -phu -phu -nNS -phu -phu +nlb +ofU +ofU +vkq lgy -qhO +xWm rtP mDp pRW @@ -65703,25 +70019,25 @@ pRW pRW pRW pRW -iTE -fDK -sZj -qhO -wUq +agO +jKw +gEY +kHM +mwF cOM -laO -qhO -jMN +kHM +wlM +dkv eUx -bIw -qhO -wUq -njb -qhO -qhO -fDK -wUq -iTE +gck +iAs +kHM +sFf +mwF +kHM +kHM +dsY +agO lIp pRW pRW @@ -65897,25 +70213,25 @@ pRW pRW pRW gCJ -iTE +agO rtP rtP rtP -iTE -iTE -iTE +agO +agO +agO iev loC xki -agO +aZV eXe -iTE -iTE -iTE +agO +agO +agO rtP rtP rtP -iTE +agO qBd jRE pRW @@ -66091,25 +70407,25 @@ pRW pRW pRW pRW -iTE +agO csb aaK csb aaK csb -iTE +agO cZD -ngD +loC bYn aZV xWm -iTE +agO csb csb csb csb csb -iTE +agO lmG qBd pRW @@ -66291,13 +70607,13 @@ aaK csb aaK csb -iTE +agO pXJ kHM -eBL -dyQ +kHM +kHM dsY -iTE +agO pQv csb csb @@ -66482,16 +70798,16 @@ pRW mDp rEw aDe -iuJ +rEw ehX -iuJ -iTE +rEw +agO rtP rtP rtP rtP rtP -iTE +agO ehX ehX ehX @@ -66873,13 +71189,13 @@ jRE qBd jRE mDp -iuJ +rEw csb csb csb csb csb -iuJ +rEw pRW jRE qBd @@ -67068,11 +71384,11 @@ pRW pRW pRW pRW -iuJ -iuJ -iuJ -iuJ -iuJ +rEw +rEw +rEw +rEw +rEw pRW pRW pRW diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 49b47df96091..b9ce5d1db424 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -49,6 +49,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/janitor) "ach" = ( @@ -64,19 +65,33 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"acN" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "acT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/small, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "adf" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/hallwayaux) +"adB" = ( +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area_hallway) "adH" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "adX" = ( @@ -88,12 +103,28 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"adZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "aea" = ( /obj/structure/cable/green{ icon_state = "1-8" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"aec" = ( +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "agG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -125,6 +156,10 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/cargo) +"ahk" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "ahq" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -158,14 +193,12 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "aiO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/stairs/spawner/south{ + dir = 1; + pixel_y = -32 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/area/endeavour/station/stairs_three) "aiW" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -197,16 +230,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"akN" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "alc" = ( /obj/structure/table/woodentable, /obj/structure/cable/green{ @@ -226,9 +249,8 @@ /turf/simulated/wall/r_wall/prepainted, /area/endeavour/hallway/d3fwdmaint) "alR" = ( -/obj/structure/cryofeed, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 +/obj/machinery/cryopod{ + dir = 4 }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -318,6 +340,11 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"aqY" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "ars" = ( /obj/structure/cable/orange{ icon_state = "1-8" @@ -377,20 +404,13 @@ dir = 1; pixel_y = -28 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) -"auL" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) "auM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -398,8 +418,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) @@ -415,30 +438,40 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_3) "avK" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3fwdhall) +/area/endeavour/hallway/d3portforhall) "avW" = ( -/obj/structure/sign/directions/cargo{ - dir = 1; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/directions/cryo{ - dir = 4; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/sign/directions/engineering{ - dir = 4; - pixel_y = 38 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/structure/cable{ +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) -"awA" = ( +/area/endeavour/hallway/d3starboardforhall) +"awm" = ( +/obj/machinery/door/airlock{ + id_tag = "dorm3"; + name = "Dorm 3" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -448,11 +481,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) +"awA" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "awN" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -462,17 +501,25 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "axk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "aya" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/wood, @@ -480,6 +527,13 @@ "ayc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "ayg" = ( @@ -546,6 +600,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/lobby) +"aAA" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "aAM" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/ears/earmuffs, @@ -594,6 +661,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "aCO" = ( @@ -635,6 +705,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"aDU" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "aFg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -644,6 +721,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"aFF" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "aFS" = ( /obj/machinery/light, /obj/structure/cable/green{ @@ -664,6 +750,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/button/remote/blast_door{ + id = "armorylight"; + name = "Light Armory Access"; + pixel_x = -6; + pixel_y = 25; + req_access = list(3) + }, /turf/simulated/floor/tiled/dark, /area/security/armoury) "aGx" = ( @@ -758,16 +851,23 @@ /turf/simulated/floor/tiled, /area/security/lobby) "aII" = ( -/obj/structure/stairs/spawner/south, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/station/stairs_two) +/area/endeavour/hallway/d3portforhall) "aIZ" = ( /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/delivery) "aKg" = ( -/obj/structure/sink{ - pixel_y = 22 - }, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d3fwdhall) "aKj" = ( @@ -818,6 +918,20 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"aMa" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) +"aMk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "aMs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -829,6 +943,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "aMQ" = ( @@ -854,6 +971,15 @@ /obj/map_helper/access_helper/airlock/station/service/botany, /turf/simulated/floor/plating, /area/hydroponics) +"aND" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "aNV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -878,6 +1004,16 @@ /obj/spawner/window/low_wall/borosillicate/reinforced/full, /turf/simulated/floor, /area/security/hanger) +"aOg" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "aOs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/light{ @@ -904,27 +1040,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "aPr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "5-8" +/obj/structure/cable/orange{ + icon_state = "1-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/area/endeavour/hallway/d3starboardamidhall) "aPN" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3fwdmaint) +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_2) "aPW" = ( /obj/machinery/vending/mre, /turf/simulated/floor/wood, @@ -972,7 +1095,7 @@ dir = 8 }, /obj/structure/cable/green{ - icon_state = "2-9" + icon_state = "1-2" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -986,15 +1109,20 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "aUT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "aVb" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1017,7 +1145,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/fire_alarm/north_mount, +/obj/structure/bed/chair/comfy/beige{ + dir = 8 + }, +/obj/item/radio/intercom/north_mount, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "aVI" = ( @@ -1039,9 +1170,21 @@ "aVW" = ( /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) +"aWe" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "aWf" = ( /obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "aWJ" = ( /obj/structure/cable/green{ @@ -1056,6 +1199,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aWP" = ( @@ -1127,6 +1273,21 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"aZH" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "aZS" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -1269,6 +1430,18 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"bep" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "bfj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1296,13 +1469,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"bfD" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "bfE" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "bfY" = ( /obj/effect/paint/darkred, /obj/machinery/light{ @@ -1321,7 +1503,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) @@ -1372,6 +1554,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "bhh" = ( @@ -1478,6 +1663,10 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "blB" = ( @@ -1589,11 +1778,27 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "boM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "bpe" = ( @@ -1619,6 +1824,12 @@ pixel_y = 32 }, /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "bqs" = ( @@ -1628,6 +1839,9 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/disposal, /obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/up{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "brs" = ( @@ -1655,20 +1869,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "bsL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atm{ + pixel_y = 30 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "bsV" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -1743,8 +1954,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) +"buM" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) +"buX" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "bvs" = ( /obj/machinery/air_alarm{ dir = 4; @@ -1776,8 +2006,19 @@ }, /turf/simulated/floor/tiled, /area/security/range) +"bwN" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "bxI" = ( /obj/machinery/computer/timeclock/premade/south, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "bxW" = ( @@ -1792,6 +2033,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"byF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "byM" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1817,14 +2064,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "bzp" = ( /obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/orange{ - icon_state = "1-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -1850,6 +2097,28 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"bAI" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) +"bBc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "bBF" = ( /obj/effect/shuttle_landmark/endeavour/deck2/port, /turf/space, @@ -1897,6 +2166,13 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/brig) +"bDG" = ( +/obj/structure/stairs/spawner/south{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "bDV" = ( /obj/machinery/door/window/eastleft{ dir = 8 @@ -1938,14 +2214,12 @@ /turf/simulated/floor/tiled, /area/security/lobby) "bGz" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/obj/structure/flora/grass/event/sparse_grass1, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "bGJ" = ( /obj/structure/bed/chair/sofa/right, /obj/structure/window/basic{ @@ -1967,6 +2241,21 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) +"bIs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "bJy" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/access_helper/airlock/station/engineering/department, @@ -2019,6 +2308,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "bLw" = ( @@ -2089,7 +2381,7 @@ "bOW" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) @@ -2185,6 +2477,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "bUa" = ( @@ -2219,6 +2514,12 @@ "bUz" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "bUI" = ( @@ -2245,8 +2546,24 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) +"bVc" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Crew Quarters" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "bVC" = ( /obj/structure/table/rack/shelf/steel, /obj/item/tank/emergency/oxygen/double, @@ -2267,6 +2584,12 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "bWd" = ( @@ -2286,7 +2609,7 @@ /area/prison/cell_block) "bWK" = ( /turf/simulated/wall/prepainted, -/area/station/stairs_two) +/area/endeavour/station/stairs_three) "bXD" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/curtain/black, @@ -2307,6 +2630,12 @@ /turf/simulated/floor/tiled, /area/hydroponics) "bYm" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "bYP" = ( @@ -2333,17 +2662,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "bZv" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/orange{ + icon_state = "4-9" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "bZQ" = ( /obj/structure/bed/chair{ dir = 1 @@ -2364,7 +2687,7 @@ dir = 4 }, /obj/machinery/light, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "cce" = ( /obj/machinery/door/airlock/glass/security/polarized, @@ -2468,11 +2791,11 @@ /turf/simulated/floor/lino, /area/security/detectives_office) "che" = ( -/obj/structure/plasticflaps, /obj/machinery/conveyor{ tag = "mailroom"; id = "DLBelt" }, +/obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/quartermaster/delivery) "chh" = ( @@ -2521,6 +2844,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/maintenance/cargo/mining) +"cmi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo/mining) "cmw" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/beastybrown, @@ -2557,6 +2887,9 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "com" = ( @@ -2566,6 +2899,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "cop" = ( @@ -2592,14 +2931,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_11) "cpz" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "crj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2614,8 +2952,7 @@ /area/crew_quarters/sleep/Dorm_8) "crM" = ( /obj/machinery/light_switch{ - pixel_x = -9; - pixel_y = 30 + pixel_x = -30 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) @@ -2651,6 +2988,18 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "ctE" = ( @@ -2672,6 +3021,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"cua" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "cuC" = ( /obj/structure/table/woodentable, /obj/machinery/computer/ship/navigation/telescreen{ @@ -2679,7 +3037,7 @@ }, /obj/item/instrument/trumpet, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "cuJ" = ( /turf/simulated/floor/plating, /area/maintenance/starboardsolar) @@ -2761,11 +3119,8 @@ /turf/simulated/floor/tiled/white, /area/endeavour/hallway/d3fwdhall) "cBe" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/structure/cable/green{ - icon_state = "2-5" + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -2798,13 +3153,32 @@ /obj/item/pen, /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) +"cCr" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = -4 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm4"; + name = "Room 4 Lock"; + pixel_x = 26; + pixel_y = 7; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "cCJ" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "cCM" = ( @@ -2904,12 +3278,12 @@ "cGF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "cGU" = ( @@ -3030,6 +3404,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "cKR" = ( @@ -3074,12 +3451,24 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"cMd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +"cMK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "cMT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3173,8 +3562,19 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) +"cQG" = ( +/obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "cRj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -3189,6 +3589,15 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) +"cSd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "cSt" = ( /obj/machinery/holopad, /obj/machinery/camera/network/security{ @@ -3199,6 +3608,10 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"cSR" = ( +/obj/machinery/light/small, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "cTe" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super @@ -3229,7 +3642,7 @@ /obj/structure/closet/secure_closet/freezer/kitchen, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) @@ -3240,11 +3653,23 @@ /obj/machinery/appliance/cooker/fryer, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"cUM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "cUO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -3259,20 +3684,22 @@ /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/simulated/floor/plating, /area/security/warden) -"cWa" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +"cVy" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3aftmaint) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "cWp" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/plain{ @@ -3305,6 +3732,21 @@ /obj/item/storage/belt/utility, /turf/simulated/floor/tiled, /area/hydroponics) +"cXR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "cYs" = ( /obj/structure/closet/gmcloset{ name = "formal wardrobe" @@ -3322,6 +3764,12 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "cYG" = ( @@ -3400,10 +3848,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "dbw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled, -/area/maintenance/dormitory) +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d3fwdhall) "dbK" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor{ @@ -3414,8 +3866,27 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"dbR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "dcn" = ( /turf/simulated/wall/prepainted/civilian, /area/endeavour/surfacebase/bar_backroom) @@ -3456,12 +3927,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "ddk" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "dds" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -3496,9 +3966,17 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "deG" = ( @@ -3513,8 +3991,21 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) +"deT" = ( +/obj/structure/flora/pottedplant/large, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "dfi" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -3529,6 +4020,12 @@ /obj/machinery/atm{ pixel_y = 30 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "dfG" = ( @@ -3574,7 +4071,7 @@ /obj/machinery/holopad, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) @@ -3596,6 +4093,19 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) +"dhq" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "dhG" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -3625,12 +4135,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/wood, /area/crew_quarters/bar) "dia" = ( @@ -3644,6 +4152,27 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"diH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "diV" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 @@ -3656,6 +4185,12 @@ }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) +"dkj" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "dky" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3678,6 +4213,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) +"dlG" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/wood/sif, +/area/maintenance/dormitory) "dlI" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_8) @@ -3700,6 +4242,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) +"dmh" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) +"dmA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "dmR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3719,9 +4281,8 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "dns" = ( @@ -3730,6 +4291,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "dnz" = ( @@ -3756,9 +4324,31 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"dqc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dqd" = ( /turf/simulated/floor/tiled/dark, /area/security/range) +"dqu" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "dqN" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 32; @@ -3792,7 +4382,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "dsm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3824,6 +4414,26 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) +"duv" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/reddouble, +/turf/simulated/floor/carpet/gaycarpet, +/area/crew_quarters/sleep/Dorm_9) +"dwE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "dwU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3834,10 +4444,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "dym" = ( @@ -3861,7 +4473,36 @@ "dyX" = ( /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) +"dzp" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) @@ -3890,7 +4531,7 @@ "dzx" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/window/basic{ dir = 1 @@ -3965,6 +4606,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"dER" = ( +/obj/structure/flora/pottedplant/large, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "dFz" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/plating, @@ -3980,7 +4631,7 @@ }, /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "0-6" + icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -3991,8 +4642,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "dGe" = ( /obj/structure/window/reinforced/tinted{ dir = 1 @@ -4017,6 +4668,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_11) +"dGV" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "dHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4027,6 +4684,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "dHJ" = ( @@ -4055,6 +4715,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dIB" = ( @@ -4070,7 +4733,7 @@ /area/security/hallway) "dIC" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 3 AFT SUPPORT" + RCon_tag = "AUX - DECK 3 AFT" }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) @@ -4099,6 +4762,16 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"dJV" = ( +/obj/machinery/light{ + dir = 1; + pixel_y = 20 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "dJX" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -4140,6 +4813,15 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) +"dMA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "dME" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4148,6 +4830,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "dMY" = ( @@ -4297,6 +4982,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "dPF" = ( @@ -4336,6 +5024,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dSm" = ( @@ -4351,8 +5045,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "dSJ" = ( /obj/structure/table/marble, /obj/item/storage/box/donkpockets, @@ -4380,6 +5074,22 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"dTT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 5 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "dUd" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -4427,6 +5137,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"dVv" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 6 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "dVD" = ( /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_3) @@ -4547,6 +5273,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"dYL" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm2"; + name = "Room 2 Lock"; + pixel_x = -26; + pixel_y = 7; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "dZb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -4592,6 +5335,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"ecr" = ( +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "ecv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4617,6 +5372,15 @@ /obj/machinery/light, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"edb" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "edk" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled, @@ -4653,20 +5417,17 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "efw" = ( -/obj/item/radio/intercom{ - pixel_y = -24 - }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, -/obj/structure/flora/pottedplant/drooping, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/disposal, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "efy" = ( @@ -4676,12 +5437,24 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"efB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "efY" = ( -/obj/machinery/light{ +/obj/machinery/light_construct{ dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "egp" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -4698,6 +5471,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/janitor) "ehd" = ( @@ -4747,12 +5521,9 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "eiY" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "eja" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4761,12 +5532,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ejd" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/cryopod/robot, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "ejk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4785,7 +5559,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) @@ -4806,6 +5580,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "emZ" = ( @@ -4863,14 +5640,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"enc" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "enu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "enJ" = ( @@ -4879,16 +5655,6 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) -"enZ" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "eoc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4899,6 +5665,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "eoB" = ( @@ -4908,8 +5678,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "4-10" + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -4939,14 +5712,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "eqa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3portforhall) "eqm" = ( /obj/machinery/light_switch{ pixel_x = -9; @@ -4980,7 +5748,13 @@ pixel_y = 30 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) @@ -5010,12 +5784,38 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"esx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "esA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/area/endeavour/hallway/d3starboardforhall) "esB" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/blue, @@ -5028,7 +5828,7 @@ pixel_y = 7 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "etd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5052,6 +5852,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "etR" = ( @@ -5067,7 +5869,7 @@ /obj/effect/floor_decal/borderfloor, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, @@ -5101,10 +5903,15 @@ "evc" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) +"evi" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/browndouble, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_2) "evn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5142,7 +5949,7 @@ name = "Station Intercom (General)"; pixel_y = 21 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "ewu" = ( /turf/simulated/wall/r_wall/prepainted, @@ -5152,15 +5959,47 @@ dir = 1; pixel_y = 20 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) +"ewW" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "exc" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) +"exf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "eyh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5200,6 +6039,14 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "eyV" = ( @@ -5256,6 +6103,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "eBh" = ( @@ -5279,6 +6129,8 @@ /area/crew_quarters/recreation_area) "eBi" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "eBl" = ( @@ -5381,7 +6233,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/armoury) @@ -5391,7 +6243,7 @@ "eCk" = ( /obj/structure/sign/deck/third, /turf/simulated/wall/prepainted, -/area/station/stairs_two) +/area/endeavour/station/stairs_three) "eCE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5438,6 +6290,11 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/security/brig) +"eDM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "eDS" = ( /obj/machinery/light{ dir = 1 @@ -5495,6 +6352,13 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"eGm" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/west_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "eGx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -5522,7 +6386,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) @@ -5586,7 +6450,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/security/nuke_storage) @@ -5717,6 +6581,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "eMX" = ( @@ -5725,6 +6592,21 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"eNl" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"eNA" = ( +/obj/structure/undies_wardrobe, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "eNB" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/beastybrown, @@ -5738,6 +6620,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) +"eNK" = ( +/obj/structure/closet/secure_closet/brig, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled/techmaint, +/area/security/brig) "ePn" = ( /obj/machinery/status_display/supply_display{ pixel_y = 32 @@ -5751,7 +6638,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) @@ -5761,7 +6648,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -5776,6 +6663,26 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"eRz" = ( +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 6 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "eSt" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -5787,21 +6694,22 @@ /turf/simulated/floor/tiled, /area/security/lobby) "eSJ" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/map_helper/access_helper/airlock/station/maintenance, -/obj/machinery/door/airlock/maintenance/engi{ - req_one_access = null - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3starboardhall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "eTr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "eTs" = ( @@ -5819,20 +6727,31 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "eTx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-6" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) "eTJ" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "eUA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "eVd" = ( @@ -5874,16 +6793,26 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "eWb" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/obj/structure/bed/double/padded, -/obj/random/bedsheet/double, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "eWe" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -5894,6 +6823,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/uxstorage) +"eWz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "eWW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5975,7 +6912,7 @@ /area/security/hallway) "eZu" = ( /obj/structure/cable/orange{ - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) @@ -5989,23 +6926,34 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/quartermaster/foyer) "eZW" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d3portforhall) "faa" = ( -/obj/structure/cryofeed{ - dir = 2 - }, /obj/machinery/status_display/supply_display{ pixel_y = 32 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) +/obj/structure/flora/grass/event/sparse_grass2, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) +"fbB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "fbD" = ( /obj/structure/musician/piano, /obj/effect/floor_decal/spline/plain{ @@ -6017,6 +6965,12 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fcE" = ( @@ -6058,17 +7012,16 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/interrogation) -"fdH" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "fek" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) @@ -6084,20 +7037,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"ffb" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/machinery/cryopod/robot, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "ffn" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/plain{ @@ -6110,6 +7049,10 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "ffP" = ( @@ -6174,13 +7117,42 @@ "fil" = ( /turf/simulated/floor/tiled, /area/quartermaster/warehouse) -"fiG" = ( -/obj/structure/cable{ - icon_state = "4-8" +"fip" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) +"fiy" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) +"fiz" = ( +/obj/structure/flora/ausbushes/fernybush, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) +"fiG" = ( /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "fiO" = ( @@ -6188,8 +7160,19 @@ id = "cafesign1"; pixel_y = 38 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) +"fiP" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "fiR" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -6215,6 +7198,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "fjp" = ( @@ -6243,6 +7229,7 @@ "fjB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "fjY" = ( @@ -6254,15 +7241,13 @@ /area/endeavour/hallway/d3fwdhall) "fko" = ( /obj/structure/table/reinforced, -/obj/item/binoculars, -/obj/item/stack/flag/green, -/obj/item/stack/flag/yellow, -/obj/item/stack/flag/red, -/obj/item/binoculars{ - pixel_y = 6 - }, -/turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/refinery) +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "fkv" = ( /obj/machinery/newscaster{ pixel_x = -28 @@ -6349,12 +7334,33 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) +"fnv" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "fnF" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/prison/cell_block) +"fop" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "foG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6374,28 +7380,48 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "fpx" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/status_display/supply_display{ + pixel_y = -32 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fpB" = ( -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/table/woodentable, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 27 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"fqc" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portamidhall) "fqM" = ( /obj/structure/bookcase/legal/combo, /obj/item/book/manual/security_space_law, @@ -6405,6 +7431,9 @@ /obj/item/book/manual/legal/cr_vol2, /obj/item/book/manual/legal/cr_vol4, /obj/item/book/manual/legal/cr_vol5, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/lino, /area/security/detectives_office) "fqT" = ( @@ -6419,15 +7448,19 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "fub" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fva" = ( @@ -6449,6 +7482,13 @@ /obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) +"fvQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "fxG" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6458,7 +7498,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -6556,10 +7596,13 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"fDp" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +"fDf" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/maintenance/dormitory) +/area/endeavour/hallway/d3portforhall) "fDt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6576,6 +7619,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "fDw" = ( @@ -6583,9 +7627,6 @@ /turf/space/basic, /area/space) "fEj" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -6596,8 +7637,10 @@ pixel_y = -6; req_access = list(3) }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = 6 }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) @@ -6625,10 +7668,18 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/hydroponics) +"fFB" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "fFD" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -6647,6 +7698,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"fHS" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "fIm" = ( /turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d3aftmaint) @@ -6698,6 +7755,13 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"fLd" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d3fwdhall) "fLu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -6956,9 +8020,6 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "fNN" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ @@ -7065,6 +8126,18 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"fQA" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "fRe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7095,12 +8168,21 @@ /turf/simulated/floor/tiled, /area/security/brig) "fSo" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/machinery/door/airlock{ + id_tag = "dorm2"; + name = "Dorm 2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "fSr" = ( /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ @@ -7119,9 +8201,8 @@ dir = 1; pixel_y = -28 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "fSG" = ( @@ -7150,6 +8231,16 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"fTU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "fUc" = ( /obj/structure/bed/chair/sofa, /obj/machinery/light{ @@ -7166,6 +8257,18 @@ }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"fUU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "fVn" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -7211,6 +8314,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/bar) "fWO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 10 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3afthall) "fWX" = ( @@ -7261,11 +8376,8 @@ /turf/simulated/floor/plating, /area/security/hanger) "fYq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -7316,7 +8428,6 @@ "gbe" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/cable/green, /turf/simulated/floor/plating, /area/security/armoury) "gbs" = ( @@ -7348,12 +8459,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"gcW" = ( -/obj/machinery/cryopod{ - dir = 2 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) "gdH" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -7375,9 +8480,17 @@ /turf/simulated/floor/tiled, /area/security/brig) "gdI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "gdU" = ( @@ -7424,6 +8537,18 @@ /obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/security/lobby) +"gfp" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) +"gfx" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "ggB" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/curtain/open/bed{ @@ -7431,8 +8556,31 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"ghh" = ( +/obj/machinery/door/airlock{ + id_tag = "dorm10"; + name = "Dorm 1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) +"ghO" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "ghV" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/up{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "gic" = ( @@ -7456,6 +8604,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "giv" = ( @@ -7594,6 +8745,15 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"goK" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "goX" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/freezer, @@ -7640,7 +8800,7 @@ /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -7697,6 +8857,23 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"grA" = ( +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "gtD" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable/orange{ @@ -7739,6 +8916,19 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/office) +"gug" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "gum" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7748,17 +8938,17 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "guu" = ( -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "guN" = ( /obj/structure/table/marble, /obj/item/hand_labeler, @@ -7790,14 +8980,27 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) +"gxY" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "gxZ" = ( /obj/machinery/light_switch{ pixel_x = -25 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"gyJ" = ( +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d3afthall) "gAa" = ( /obj/structure/cable/green, /obj/effect/paint/darkred, @@ -7805,12 +9008,12 @@ /turf/simulated/floor/plating, /area/prison/cell_block) "gBm" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "gBU" = ( @@ -7824,6 +9027,14 @@ dir = 1; pixel_y = -28 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "gCh" = ( @@ -7831,7 +9042,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "gCO" = ( @@ -7840,6 +9050,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"gCV" = ( +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "gCW" = ( /obj/machinery/shipsensors, /turf/simulated/floor/airless, @@ -7870,6 +9086,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "gEK" = ( @@ -7879,6 +9098,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"gFf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "gFi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -7900,6 +9131,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"gFU" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "gGm" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) @@ -7931,6 +9171,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gJI" = ( @@ -7944,7 +9187,7 @@ }, /obj/map_helper/access_helper/airlock/station/supply/maintenance, /turf/simulated/floor/plating, -/area/endeavour/hallway/d3porthall) +/area/maintenance/substation/security) "gKi" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -7969,7 +9212,7 @@ /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) @@ -8011,6 +9254,17 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"gMk" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "gMF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -8053,11 +9307,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "gOa" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_1) "gOb" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel, @@ -8076,6 +9327,12 @@ "gQq" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "gQF" = ( @@ -8100,7 +9357,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) @@ -8165,6 +9422,10 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gSN" = ( @@ -8189,6 +9450,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"gTr" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "gVa" = ( /obj/machinery/holopad/ship, /turf/simulated/floor/wood, @@ -8214,6 +9484,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "gWa" = ( @@ -8227,8 +9500,19 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) +"gWd" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "gXm" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8238,9 +9522,9 @@ /area/quartermaster/warehouse) "gXN" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -8302,6 +9586,8 @@ /area/maintenance/starboardsolar) "hbD" = ( /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "hbK" = ( @@ -8325,6 +9611,11 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"hbS" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "hcD" = ( /obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced{ @@ -8359,6 +9650,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "hcH" = ( @@ -8379,10 +9671,31 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) +"hdh" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo/mining) +"hdY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "heb" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable{ @@ -8428,7 +9741,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "hij" = ( /obj/machinery/light{ @@ -8462,7 +9775,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -8476,21 +9789,26 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"hky" = ( -/obj/structure/cryofeed{ - dir = 2 +"hkm" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/tiled, +/area/endeavour/surfacebase/mining_main/refinery) +"hky" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "hkE" = ( /obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, @@ -8500,6 +9818,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"hkN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "hkY" = ( /obj/structure/sign/directions/evac{ dir = 4 @@ -8532,6 +9858,21 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"hmk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "hmF" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -8631,6 +9972,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "hrV" = ( @@ -8646,6 +9990,13 @@ "hsr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "hsu" = ( @@ -8670,10 +10021,16 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "hte" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "htn" = ( @@ -8693,8 +10050,20 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Deck 3 Aft Grid" }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"huq" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "hus" = ( /obj/machinery/conveyor{ dir = 8; @@ -8702,6 +10071,24 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"huy" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) +"huM" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "hvc" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -8714,7 +10101,7 @@ "hvh" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/sign/warning/caution{ pixel_x = -32 @@ -8887,6 +10274,26 @@ /obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) +"hDH" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "hEc" = ( /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) @@ -8920,6 +10327,12 @@ }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"hGu" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, +/area/endeavour/hallway/d3fwdmaint) "hHe" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 1 @@ -8939,9 +10352,15 @@ /turf/simulated/wall/prepainted/security, /area/prison/cell_block) "hHQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable/orange{ - icon_state = "1-4" + icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "hHX" = ( @@ -8952,6 +10371,12 @@ /area/crew_quarters/sleep/Dorm_6) "hIB" = ( /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "hIR" = ( @@ -8976,6 +10401,7 @@ req_one_access = list() }, /obj/map_helper/access_helper/airlock/station/supply/cargo_bay, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "hJR" = ( @@ -9019,11 +10445,20 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "hLo" = ( -/obj/structure/cable/orange{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "hLt" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/cable/green{ @@ -9035,6 +10470,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"hLN" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "hMc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9068,6 +10514,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_11) +"hNe" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "hNE" = ( /obj/structure/table/steel, /obj/structure/window/reinforced{ @@ -9084,10 +10536,9 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "hOq" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) @@ -9225,7 +10676,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 + dir = 5 }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) @@ -9252,9 +10703,17 @@ /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) +"hXA" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "hXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "hXW" = ( @@ -9318,17 +10777,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/item/radio/beacon, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "hYY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "hZI" = ( /obj/machinery/light, /obj/structure/table/woodentable, @@ -9364,8 +10826,16 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -9376,9 +10846,15 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "ibp" = ( @@ -9418,9 +10894,11 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "ifc" = ( @@ -9495,6 +10973,27 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"ihZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "iil" = ( /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 8 @@ -9526,9 +11025,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /turf/simulated/floor/plating, /area/security/warden) "ikN" = ( @@ -9552,21 +11048,15 @@ /area/space) "ili" = ( /obj/machinery/disposal, +/obj/structure/disposalpipe/up, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ilD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/machinery/door/airlock/glass/civilian{ + name = "Crew Cryo Bay" }, -/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/dormitory) +/area/crew_quarters/sleep/cryo) "imb" = ( /obj/machinery/door/blast/regular/open{ dir = 2; @@ -9635,9 +11125,8 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "inx" = ( -/obj/structure/window/reinforced, -/turf/simulated/open, -/area/station/stairs_two) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d3starboardafthall) "inA" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/space) @@ -9661,6 +11150,11 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "ipU" = ( @@ -9788,6 +11282,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/vacant/vacant_shop) +"iuv" = ( +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "iva" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9837,13 +11335,16 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /turf/simulated/floor/plating, /area/security/warden) "iyq" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "iyz" = ( @@ -9870,10 +11371,6 @@ /obj/effect/floor_decal/corner/red{ dir = 8 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "iAq" = ( @@ -9893,7 +11390,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) @@ -9956,13 +11453,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"iEv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "iEz" = ( /obj/effect/floor_decal/corner/red{ dir = 9 }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) @@ -10028,11 +11532,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "iHD" = ( -/obj/structure/cable/orange{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) +/area/endeavour/hallway/d3starboardforhall) "iHU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -10043,12 +11554,17 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "iIq" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -10061,13 +11577,40 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) -"iIU" = ( -/obj/structure/cable/green{ +"iIt" = ( +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) +"iIC" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) +"iIN" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) +"iIU" = ( /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "iJh" = ( @@ -10115,6 +11658,18 @@ /area/quartermaster/office) "iKe" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "iKB" = ( @@ -10135,6 +11690,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) +"iLr" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "iNn" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/plain{ @@ -10213,6 +11772,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"iRh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "iRB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10222,6 +11791,15 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"iSj" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "iSy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10239,6 +11817,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "iTp" = ( @@ -10272,6 +11853,13 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"iVR" = ( +/obj/structure/stairs/spawner/north{ + dir = 2; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/endeavour/station/stairs_three) "iVS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10305,14 +11893,9 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "iXB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/station/stairs_three) "iXY" = ( /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) @@ -10352,18 +11935,36 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/machinery/mech_recharger, /obj/vehicle/sealed/mecha/combat/fighter/baron/sec/loaded, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) +"iYU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "iZa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"jag" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/conveyor{ + tag = "mailroom"; + id = "DLBelt" + }, +/obj/structure/plasticflaps, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "jaT" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, @@ -10374,6 +11975,12 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"jbc" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "jbw" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10401,6 +12008,17 @@ /obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"jbI" = ( +/obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "jbL" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -10415,14 +12033,11 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "jdI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/camera/network/civilian{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) +/area/security/nuke_storage) "jeb" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -10514,6 +12129,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "jhI" = ( @@ -10538,11 +12157,14 @@ pixel_y = 32 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "jhZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/apc/south_mount, /obj/structure/closet/crate, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "jic" = ( @@ -10569,6 +12191,12 @@ dir = 1; pixel_y = 20 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "jjl" = ( @@ -10634,9 +12262,17 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "jlq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/computer/cryopod{ + pixel_y = -32 + }, +/obj/machinery/computer/cryopod/robot{ + pixel_x = 32 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -10648,6 +12284,9 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/security/hallwayaux) "jlU" = ( @@ -10672,27 +12311,43 @@ /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled, /area/security/hanger) +"jmB" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "jmJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "jmL" = ( -/obj/structure/cryofeed{ - dir = 2 - }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) -"jmQ" = ( -/obj/structure/cable{ +/obj/structure/cable/orange{ icon_state = "4-8" }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"jmQ" = ( /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "jmX" = ( @@ -10706,8 +12361,24 @@ /obj/effect/floor_decal/corner/red/full, /obj/effect/floor_decal/industrial/outline/red, /obj/item/storage/box/flashbangs, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"jng" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "jon" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/beastybrown, @@ -10732,6 +12403,13 @@ }, /turf/simulated/floor, /area/quartermaster/warehouse) +"jpX" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "jqq" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -10776,6 +12454,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"jtk" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/quartermaster/foyer) "jtn" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/wood, @@ -10794,7 +12478,7 @@ /area/crew_quarters/bar) "jua" = ( /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "juy" = ( /obj/landmark/spawnpoint/job/quartermaster, /turf/simulated/floor/carpet/sblucarpet, @@ -10810,6 +12494,9 @@ cell_type = /obj/item/cell/super }, /obj/fiftyspawner/steel, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) "juL" = ( @@ -10834,6 +12521,29 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/lino, /area/security/detectives_office) +"jvH" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"jwr" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/surfacebase/mining_main/storage) "jwQ" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -10889,6 +12599,18 @@ /obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) +"jzp" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/surfacebase/mining_main/storage) "jzG" = ( /obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled/techfloor, @@ -10917,6 +12639,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "jAH" = ( @@ -10974,12 +12699,22 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"jDv" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "jDL" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/cable/green, -/turf/simulated/floor/plating, -/area/security/warden) +/obj/machinery/button/remote/blast_door{ + id = "armoryriot"; + name = "Emergency Armory Access"; + pixel_x = 25; + pixel_y = -6; + req_access = list(3) + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "jDO" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -10995,6 +12730,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "jEn" = ( @@ -11024,6 +12760,15 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "jGe" = ( @@ -11053,7 +12798,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -11078,12 +12832,23 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"jIi" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"jIr" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "dorm1"; + name = "Room 1 Lock"; + pixel_x = -26; + pixel_y = -7; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "jJA" = ( /obj/machinery/camera/network/command{ dir = 4 @@ -11099,16 +12864,6 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"jJU" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) "jKE" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -11128,6 +12883,8 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "jKX" = ( @@ -11137,6 +12894,15 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) +"jLq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "jLr" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/bar) @@ -11202,8 +12968,11 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) @@ -11214,28 +12983,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "jNA" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hos) -"jNV" = ( -/obj/effect/paint/darkred, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/security/warden) -"jOn" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "jON" = ( /turf/simulated/floor/tiled, /area/quartermaster/office) @@ -11292,8 +13048,11 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) @@ -11361,7 +13120,28 @@ pixel_y = -24 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) +"jVt" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "jWp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11375,6 +13155,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jWI" = ( @@ -11385,6 +13171,21 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_11) +"jXM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "jYr" = ( /obj/machinery/shield_diffuser, /turf/simulated/floor/airless/ceiling, @@ -11407,6 +13208,12 @@ pixel_y = -24 }, /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "jZR" = ( @@ -11466,6 +13273,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"kcl" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "kcI" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -11524,6 +13340,9 @@ /obj/machinery/reagentgrinder, /turf/simulated/floor/tiled, /area/hydroponics) +"kdZ" = ( +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_4) "keU" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, @@ -11556,6 +13375,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"kfA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "kfD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11566,13 +13394,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "kfH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "kfS" = ( @@ -11587,6 +13421,24 @@ "kgM" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/bar/lower) +"khP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "khT" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -11598,7 +13450,7 @@ dir = 4 }, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "kio" = ( /obj/machinery/light_switch{ dir = 8; @@ -11612,21 +13464,19 @@ "kiu" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/breakroom) -"kiY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" +"kiR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/turf/simulated/floor/tiled/monotile, +/area/security/lobby) +"kiY" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "kjU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -11679,6 +13529,18 @@ /obj/machinery/station_map{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "knk" = ( @@ -11753,6 +13615,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"krn" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/sleep/Dorm_2) "ksT" = ( /obj/machinery/disposal, /obj/effect/floor_decal/industrial/warning/full, @@ -11780,11 +13648,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "kui" = ( -/obj/structure/cryofeed{ - dir = 2 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "kur" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11795,11 +13662,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "kuG" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, /obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -11837,6 +13702,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/delivery) +"kwF" = ( +/obj/structure/stairs/spawner/north{ + dir = 2; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "kxv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11844,6 +13716,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "kxI" = ( @@ -11854,12 +13729,39 @@ /obj/structure/ore_box, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"kyv" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "kyF" = ( /obj/structure/closet/secure_closet/freezer/fridge{ anchored = 1 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) +"kyI" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "kyL" = ( /obj/structure/table/reinforced, /obj/item/forensics/sample_kit/powder, @@ -11878,9 +13780,8 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kBD" = ( @@ -11890,6 +13791,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kBH" = ( @@ -11929,6 +13834,21 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kCG" = ( @@ -11966,7 +13886,13 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "kDc" = ( -/obj/machinery/disposal, +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kDu" = ( @@ -11974,6 +13900,12 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kDv" = ( @@ -11995,9 +13927,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12008,31 +13937,43 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "kEi" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "kEF" = ( /obj/machinery/light{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "kGS" = ( -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 7 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "kHr" = ( /obj/structure/toilet{ dir = 8 @@ -12081,6 +14022,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "kKh" = ( @@ -12112,19 +14055,40 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "kKQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/civilian{ + name = "Crew Cryo Bay" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "kKU" = ( /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "kLg" = ( @@ -12162,6 +14126,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kNj" = ( @@ -12184,7 +14154,7 @@ /obj/structure/bed/double/padded, /obj/random/bedsheet/double, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "kOw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12199,18 +14169,6 @@ /obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/plating, /area/security/hanger) -"kPQ" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "kPR" = ( /obj/effect/paint/darkred, /obj/structure/cable/green{ @@ -12233,6 +14191,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kRb" = ( @@ -12256,6 +14218,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "kRn" = ( @@ -12320,7 +14285,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -12337,6 +14302,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kTd" = ( @@ -12357,12 +14325,18 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "kTN" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "kUb" = ( @@ -12465,6 +14439,7 @@ dir = 4 }, /obj/item/radio/beacon/anchored, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "kZj" = ( @@ -12475,7 +14450,7 @@ icon_state = "0-4" }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "kZu" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/wood, @@ -12486,6 +14461,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"kZH" = ( +/obj/structure/disposalpipe/sortjunction/wildcard/flipped{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "lag" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, @@ -12510,6 +14491,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"lbT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "lca" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12564,9 +14554,11 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "leL" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "lfc" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence, @@ -12596,14 +14588,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "lfS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "lgj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12629,6 +14618,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"lgM" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "lgT" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -12639,6 +14638,19 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) +"lhb" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "lhi" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, @@ -12652,11 +14664,24 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) +"lif" = ( +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "lin" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "liu" = ( @@ -12677,7 +14702,7 @@ "ljb" = ( /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /obj/machinery/computer/security/telescreen{ pixel_x = 32 @@ -12688,14 +14713,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "ljl" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/obj/machinery/camera/network/civilian{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "lkP" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -12703,11 +14732,13 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) "llM" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3fwdmaint) "lmr" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -12768,6 +14799,11 @@ /obj/structure/fitness/weightlifter, /turf/simulated/floor/carpet/bcarpet, /area/security/breakroom) +"lou" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "lpl" = ( /obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super @@ -12815,6 +14851,11 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"lqZ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "lrZ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -12889,6 +14930,18 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"luz" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "luP" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -12912,6 +14965,14 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "lwk" = ( @@ -12924,14 +14985,20 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "lwm" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3fwdhall) +/area/endeavour/hallway/d3starboardamidhall) "lwA" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -13049,6 +15116,13 @@ "lAm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "lAo" = ( @@ -13085,6 +15159,12 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "lCU" = ( @@ -13116,6 +15196,30 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"lDx" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portamidhall) +"lDC" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) "lDD" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -13126,10 +15230,6 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, /obj/effect/floor_decal/industrial/outline/red, /obj/structure/table/rack/shelf/steel, /obj/item/ammo_magazine/a5_7mm/five_seven/ap, @@ -13194,6 +15294,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "lIl" = ( @@ -13217,24 +15320,47 @@ /obj/machinery/fitness/punching_bag/clown, /turf/simulated/floor/tiled/dark, /area/security/brig) +"lIR" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "lIV" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdhall) "lIW" = ( /obj/machinery/light, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "lJp" = ( /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "lJu" = ( @@ -13246,7 +15372,7 @@ /area/crew_quarters/bar) "lJE" = ( /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -13258,12 +15384,11 @@ dir = 1 }, /obj/machinery/power/apc/north_mount, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/table/reinforced, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "lKA" = ( @@ -13291,7 +15416,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -13357,14 +15482,14 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "lOF" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /obj/map_helper/access_helper/airlock/station/maintenance, /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/endeavour/hallway/d3starboardhall) +/area/maintenance/substation/security) "lPz" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/range) @@ -13375,26 +15500,24 @@ /turf/simulated/floor/tiled, /area/security/hanger) "lPV" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) -"lPZ" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/machinery/light, +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "lQq" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "lQs" = ( @@ -13416,7 +15539,6 @@ pixel_y = 32 }, /obj/machinery/conveyor_switch/oneway{ - convdir = -1; tag = "mailroom"; id = "DLBelt" }, @@ -13434,7 +15556,7 @@ /area/endeavour/hallway/d3portforhall) "lSK" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 3 AMIDSHIPS MAIN" + RCon_tag = "MAIN - DECK 3 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -13456,14 +15578,20 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "lTW" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/station_map{ - pixel_y = 32 +/obj/machinery/fire_alarm/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "lTX" = ( /obj/effect/floor_decal/borderfloor{ @@ -13479,6 +15607,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "lUd" = ( @@ -13552,6 +15683,12 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/security/brig) +"lWb" = ( +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/lattice, +/obj/structure/disposalpipe/down, +/turf/simulated/open, +/area/endeavour/hallway/d3aftmaint) "lWQ" = ( /obj/machinery/computer/arcade/orion_trail, /obj/effect/floor_decal/spline/fancy/wood{ @@ -13670,8 +15807,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) +"mab" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "mbt" = ( /obj/structure/undies_wardrobe, /obj/machinery/light{ @@ -13683,6 +15844,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/landmark/spawnpoint/job/cargo_technician, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "mbJ" = ( @@ -13747,6 +15909,10 @@ /obj/map_helper/access_helper/airlock/station/supply/cargo_bay, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) +"mfm" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/vacant/vacant_shop) "mfr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13804,6 +15970,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/quartermaster/foyer) "mhY" = ( @@ -13822,6 +15989,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"miu" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/wood, +/area/endeavour/hallway/d3fwdhall) "miB" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -13870,13 +16041,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"mkK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "mkN" = ( /obj/item/stool/padded, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/structure/cable/green{ - icon_state = "2-9" + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -13966,7 +16150,7 @@ /area/hydroponics) "mmq" = ( /turf/simulated/open, -/area/station/stairs_two) +/area/endeavour/station/stairs_three) "mms" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14029,6 +16213,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "mpt" = ( @@ -14068,6 +16255,8 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "mqK" = ( @@ -14128,15 +16317,14 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "msv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ +/obj/structure/cable/orange{ icon_state = "1-2" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "msG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14179,9 +16367,26 @@ "muW" = ( /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"mvQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) +"mwk" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "mwA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "mwM" = ( @@ -14218,7 +16423,13 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) @@ -14268,10 +16479,21 @@ /area/security/brig) "mBj" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 3 FORE MAIN" + RCon_tag = "MAIN - DECK 3 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"mBA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "mBQ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/item/stool/padded, @@ -14335,16 +16557,17 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "mHr" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "mHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14371,7 +16594,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "mIk" = ( /obj/structure/cable/green{ @@ -14381,6 +16607,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "mIP" = ( @@ -14388,14 +16617,11 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "mJs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/turf/simulated/floor/wood, +/area/endeavour/hallway/d3fwdhall) "mJv" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled, @@ -14415,17 +16641,50 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "mKP" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "mKS" = ( /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"mLa" = ( +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) +"mLk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "mLl" = ( -/turf/simulated/shuttle/wall/voidcraft/green, -/area/shuttle/mining_ship/general) +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "mLm" = ( /turf/simulated/floor/plating, /area/maintenance/cargo/mining) @@ -14433,6 +16692,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "mMk" = ( @@ -14484,7 +16745,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "mQs" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -14531,6 +16792,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "mTI" = ( @@ -14569,6 +16833,18 @@ "mVn" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/bar/catwalk) +"mVA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "mWi" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -14576,9 +16852,11 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "mWw" = ( @@ -14614,6 +16892,18 @@ /obj/machinery/atm{ pixel_y = 30 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "mWO" = ( @@ -14645,6 +16935,17 @@ /obj/item/ammo_magazine/a9mm/top_mount, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"mXi" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "mXn" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -14660,6 +16961,17 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"mXV" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "mYK" = ( /obj/machinery/shower{ dir = 8 @@ -14735,6 +17047,8 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "nab" = ( @@ -14808,6 +17122,20 @@ /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) +"ndp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "nds" = ( /obj/machinery/camera/network/security{ dir = 4 @@ -14862,14 +17190,26 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "nfT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "nhj" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, @@ -14904,6 +17244,13 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"nif" = ( +/obj/structure/undies_wardrobe, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "niA" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -14922,13 +17269,11 @@ /area/crew_quarters/recreation_area_hallway) "njC" = ( /obj/structure/closet/firecloset, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "njT" = ( /obj/structure/table/marble, @@ -14981,7 +17326,6 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/dark, /area/janitor) "nkT" = ( @@ -14992,7 +17336,9 @@ dir = 4 }, /obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposalpipe/up{ + dir = 8 + }, /turf/simulated/floor/wood, /area/quartermaster/foyer) "nmv" = ( @@ -15014,8 +17360,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "nnV" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/machinery/cryopod/robot, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -15045,7 +17392,14 @@ "noQ" = ( /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 + }, +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -15107,16 +17461,7 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"npW" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) "nqm" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -15124,7 +17469,7 @@ dir = 4 }, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "nqs" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/toolbox/emergency, @@ -15180,6 +17525,16 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"nue" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "nuP" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -15192,6 +17547,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "nvw" = ( @@ -15229,12 +17585,12 @@ /turf/simulated/floor/wood, /area/security/breakroom) "nxo" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "nxz" = ( @@ -15250,6 +17606,21 @@ "nyi" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) +"nyw" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "nyW" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -15279,10 +17650,16 @@ /obj/structure/closet/crate/large, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"nAJ" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "nAS" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Vacant Shop" @@ -15314,7 +17691,7 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /turf/simulated/floor/tiled, /area/hydroponics) @@ -15342,7 +17719,6 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "nCY" = ( -/obj/machinery/disposal/deliveryChute, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -15350,7 +17726,7 @@ tag = "mailroom"; id = "DLBelt" }, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/disposaloutlet, /turf/simulated/floor/plating, /area/quartermaster/delivery) "nCZ" = ( @@ -15366,11 +17742,28 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"nDt" = ( -/obj/structure/cable{ - icon_state = "4-8" +"nDp" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 }, +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) +"nDt" = ( /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "nDz" = ( @@ -15388,6 +17781,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"nEe" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3fwdmaint) "nFa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -15401,10 +17798,13 @@ pixel_y = 32 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "nFM" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) @@ -15489,6 +17889,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "nKC" = ( @@ -15498,8 +17900,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3starboardafthall) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "nKI" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/briefcase/inflatable, @@ -15533,7 +17938,13 @@ /obj/machinery/atm{ pixel_y = 30 }, -/obj/machinery/light{ +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, /turf/simulated/floor/tiled, @@ -15566,6 +17977,18 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/lobby) +"nMU" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "nNj" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green, @@ -15602,15 +18025,20 @@ /turf/simulated/floor/tiled/techfloor, /area/hydroponics) "nOV" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "nPi" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security{ @@ -15642,6 +18070,15 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_3) +"nPo" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "nPU" = ( /obj/item/radio/intercom{ dir = 1; @@ -15656,6 +18093,21 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) +"nQm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "nQE" = ( /obj/machinery/vending/boozeomat, /obj/structure/table/marble, @@ -15663,6 +18115,15 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"nRf" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "nRo" = ( /obj/map_helper/airlock/door/simple, /obj/machinery/door/firedoor{ @@ -15679,10 +18140,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/security/breakroom) "nRx" = ( -/obj/structure/toilet{ - pixel_y = 10 +/obj/structure/adherent_bath, +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "nRV" = ( /obj/structure/sink{ @@ -15749,6 +18212,14 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"nTi" = ( +/obj/structure/disposalpipe/tagger/partial{ + name = "partial tagger - Sorting Office"; + sort_tag = "Sorting Office"; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "nTj" = ( /obj/structure/table/marble, /obj/item/storage/box/donkpockets, @@ -15766,6 +18237,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "nTY" = ( @@ -15773,6 +18247,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "nUf" = ( @@ -15817,12 +18294,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "nUU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "nVo" = ( @@ -15868,6 +18351,17 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) +"nWz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/west_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "nWU" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -15895,6 +18389,12 @@ /area/crew_quarters/sleep/Dorm_3) "nYH" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "nYR" = ( @@ -16051,18 +18551,41 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"ode" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "odI" = ( -/obj/structure/cable/orange{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "odS" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 }, /turf/simulated/floor/grass, /area/security/brig) +"odY" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "oez" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16076,7 +18599,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "oeT" = ( /obj/machinery/cryopod{ @@ -16094,11 +18617,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) @@ -16112,7 +18638,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "ogC" = ( /obj/machinery/door/firedoor/glass{ @@ -16133,7 +18659,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "ohc" = ( /obj/machinery/door/airlock/engineering{ name = "Solars"; @@ -16175,6 +18701,18 @@ /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"ojU" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "oki" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -16186,8 +18724,11 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -16199,6 +18740,11 @@ }, /turf/simulated/floor/plating, /area/hydroponics) +"okZ" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "olx" = ( /obj/structure/table/woodentable, /obj/machinery/computer/skills{ @@ -16271,7 +18817,13 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "oot" = ( /obj/machinery/vending/hydronutrients, @@ -16306,7 +18858,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -16326,13 +18878,25 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"oqi" = ( -/obj/machinery/cryopod, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 +"opZ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"oqi" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -16369,10 +18933,23 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/machinery/disposal, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"osL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "oth" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16406,6 +18983,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "oux" = ( @@ -16422,6 +19002,15 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"ova" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "ovb" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -16448,11 +19037,14 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "owv" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "owH" = ( /obj/machinery/shower{ dir = 4 @@ -16468,9 +19060,15 @@ dir = 1; pixel_y = -28 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "oxm" = ( @@ -16499,8 +19097,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) +"oxI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "oxV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16514,6 +19129,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "oyj" = ( @@ -16552,7 +19170,7 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "oyU" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -16578,6 +19196,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "oAk" = ( @@ -16598,6 +19219,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "oBE" = ( @@ -16655,7 +19280,7 @@ }, /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -16691,6 +19316,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/tiled, /area/security/brig) "oEx" = ( @@ -16740,6 +19366,12 @@ }, /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) +"oFw" = ( +/obj/structure/cable/orange{ + icon_state = "1-10" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "oFD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -16765,6 +19397,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "oGi" = ( @@ -16808,6 +19443,18 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"oIu" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "oIv" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -16831,12 +19478,21 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"oIW" = ( +/obj/structure/cable/orange{ + icon_state = "6-9" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "oJb" = ( /obj/effect/floor_decal/corner/red{ dir = 5 }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"oKo" = ( +/turf/simulated/floor/wood/sif, +/area/maintenance/dormitory) "oKt" = ( /obj/structure/bed/chair{ dir = 8 @@ -16876,6 +19532,11 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "oNw" = ( @@ -16937,6 +19598,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/tiled, /area/security/hanger) "oOo" = ( @@ -16955,6 +19617,10 @@ /obj/map_helper/access_helper/airlock/station/security/brig, /turf/simulated/floor/tiled/dark, /area/security/brig) +"oOy" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "oOI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass/mining{ @@ -16989,14 +19655,11 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/endeavour/hallway/d3starboardforhall) "oRt" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_2) +/turf/simulated/floor/plating, +/area/maintenance/dormitory) "oRw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17038,6 +19701,10 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"oTx" = ( +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "oUr" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Solar Farm Input"; @@ -17060,6 +19727,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "oVK" = ( @@ -17101,31 +19769,39 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/break_room) "oWG" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Crew Cryo Bay" + name = "Crew Quarters" }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "oWL" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled, /area/security/hanger) -"oXu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"oXi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/area/quartermaster/foyer) +"oXu" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "oXV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17134,6 +19810,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "oYh" = ( @@ -17184,6 +19861,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "pae" = ( @@ -17201,10 +19881,11 @@ /turf/simulated/floor/tiled, /area/security/hanger) "paM" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/light{ +/obj/effect/floor_decal/corner/navgold/border{ dir = 1 }, /turf/simulated/floor/tiled, @@ -17290,7 +19971,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) @@ -17337,6 +20018,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/hallway) "pfu" = ( @@ -17464,6 +20148,12 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "piX" = ( @@ -17472,6 +20162,12 @@ id = "barsign1"; pixel_y = 24 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "pjE" = ( @@ -17486,8 +20182,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) +"pjJ" = ( +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "pkc" = ( /obj/structure/bed/chair/sofa/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -17524,6 +20234,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"pkQ" = ( +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "pkT" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/security/detectives_office) @@ -17559,14 +20273,17 @@ /turf/simulated/floor/tiled, /area/hydroponics) "plT" = ( -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 }, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "plV" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -17661,6 +20378,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -17668,9 +20389,8 @@ /area/endeavour/hallway/d3afthall) "poW" = ( /obj/machinery/light, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pqk" = ( @@ -17713,15 +20433,22 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "prg" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "prj" = ( @@ -17750,11 +20477,14 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "psK" = ( /obj/machinery/light, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3afthall) "ptR" = ( /obj/structure/cable/green{ @@ -17785,6 +20515,9 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "puP" = ( @@ -17944,6 +20677,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "pBw" = ( @@ -18006,6 +20742,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) "pEk" = ( @@ -18022,8 +20759,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) "pEt" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "pFD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18087,6 +20836,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "pHB" = ( @@ -18111,9 +20864,17 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "pJa" = ( @@ -18123,12 +20884,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "pJd" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -37 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/cargo) "pJe" = ( /obj/structure/table/bench/padded, /obj/landmark/spawnpoint/job/shaft_miner, @@ -18165,6 +20928,16 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"pNH" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "pNN" = ( /obj/machinery/light, /obj/effect/floor_decal/corner/black/full{ @@ -18263,6 +21036,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pQh" = ( @@ -18283,6 +21059,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "pQP" = ( @@ -18294,6 +21073,16 @@ "pRW" = ( /turf/space/basic, /area/space) +"pSd" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) "pSx" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic, @@ -18324,6 +21113,9 @@ /area/janitor) "pTj" = ( /obj/item/stool/padded, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "pTt" = ( @@ -18344,7 +21136,7 @@ /area/security/breakroom) "pUh" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 3 FORE SUPPORT" + RCon_tag = "AUX - DECK 3 FORE" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) @@ -18372,8 +21164,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-5" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -18384,6 +21177,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "pWD" = ( @@ -18398,6 +21195,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "pXn" = ( @@ -18409,10 +21212,25 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) +"pXE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "pYf" = ( /obj/structure/sign/double/barsign{ pixel_y = 30 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "pYt" = ( @@ -18446,6 +21264,13 @@ dir = 4; use_power = 0 }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qaT" = ( @@ -18458,6 +21283,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "qaZ" = ( @@ -18509,8 +21337,39 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) +"qck" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "qcn" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -18551,15 +21410,23 @@ "qcx" = ( /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) +"qcJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "qcL" = ( /obj/structure/table/glass, /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, -/obj/machinery/light{ - dir = 8; - pixel_x = -10 - }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "qdk" = ( @@ -18585,7 +21452,7 @@ dir = 1 }, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "qdy" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -18611,6 +21478,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "qeD" = ( @@ -18620,7 +21491,7 @@ /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -18638,6 +21509,9 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Deck 3 Amidships Grid" }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/security) "qgg" = ( @@ -18645,7 +21519,7 @@ pixel_x = -24 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "qhs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18659,6 +21533,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "qhu" = ( @@ -18714,6 +21591,12 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/wood, /area/security/breakroom) +"qkV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "qlg" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) @@ -18741,6 +21624,14 @@ "qmQ" = ( /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) +"qmV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "qmY" = ( /obj/machinery/status_display/supply_display{ pixel_y = 32 @@ -18762,7 +21653,7 @@ /obj/structure/closet/wardrobe, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -18771,10 +21662,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "qnp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18835,6 +21724,20 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"qoA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "qoU" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -18909,9 +21812,11 @@ /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "qqC" = ( @@ -18933,6 +21838,18 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "qrV" = ( @@ -18943,6 +21860,8 @@ dir = 1 }, /obj/machinery/computer/timeclock/premade/south, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "qsL" = ( @@ -18996,6 +21915,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/supply/cargo_bay, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "qvz" = ( @@ -19021,13 +21941,16 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "qvK" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) +/area/endeavour/hallway/d3starboardforhall) "qvY" = ( /obj/machinery/light, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "qwg" = ( @@ -19035,6 +21958,18 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "qwK" = ( @@ -19053,9 +21988,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "qxb" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = -10 +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) +"qxm" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) @@ -19072,10 +22016,12 @@ /turf/simulated/floor/grass, /area/security/brig) "qyd" = ( -/obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "qyf" = ( @@ -19176,20 +22122,15 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) -"qCe" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/junction{ dir = 8 }, /turf/simulated/floor/tiled, -/area/station/stairs_two) +/area/endeavour/hallway/d3portamidhall) +"qCe" = ( +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3starboardafthall) "qCl" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/bcarpet, @@ -19248,6 +22189,13 @@ "qDH" = ( /turf/simulated/wall/r_wall, /area/space) +"qDS" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "qEf" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_2) @@ -19269,7 +22217,31 @@ "qHe" = ( /turf/simulated/wall/prepainted/security, /area/security/hallway) +"qHk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) +"qHq" = ( +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "qHr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "qHy" = ( @@ -19279,17 +22251,8 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "qHz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/turf/simulated/floor/carpet/gaycarpet, +/area/crew_quarters/sleep/Dorm_9) "qHG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19312,6 +22275,15 @@ /obj/machinery/vending/fitness, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) +"qIr" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "qIx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19344,14 +22316,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) "qJx" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) @@ -19390,10 +22366,6 @@ "qLB" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/plating, /area/security/warden) "qLH" = ( @@ -19412,21 +22384,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "qMq" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-4" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "qMv" = ( @@ -19474,12 +22451,6 @@ /obj/effect/floor_decal/corner/blue/border, /turf/simulated/floor/tiled, /area/quartermaster/office) -"qNg" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/open, -/area/station/stairs_two) "qNE" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -19603,7 +22574,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "qVm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19653,9 +22624,30 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"qZx" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "qZS" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/station/stairs_two) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "qZW" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -19667,6 +22659,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "qZZ" = ( @@ -19685,6 +22678,14 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"ras" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "raR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/freezer, @@ -19712,6 +22713,12 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "rcD" = ( @@ -19782,6 +22789,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "rfg" = ( @@ -19795,6 +22805,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"rfq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/vacant/vacant_shop) "rfW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -19869,6 +22886,9 @@ pixel_y = -32 }, /obj/effect/floor_decal/industrial/outline/red, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "rks" = ( @@ -19908,9 +22928,12 @@ /turf/simulated/floor/airless, /area/space) "rlJ" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass{ + desc = "A room dedicated for the repairs and recharging of adherent."; + name = "Adherent Maintenance" + }, +/turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "rmb" = ( /obj/effect/floor_decal/borderfloor{ @@ -19979,9 +23002,8 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "rpK" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/wood, +/area/maintenance/dormitory) "rqI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20006,6 +23028,21 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"rqN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "rra" = ( /obj/vehicle/sealed/mecha/combat/fighter/cludge{ dir = 4 @@ -20022,6 +23059,9 @@ pixel_y = -31 }, /obj/machinery/disposal, +/obj/structure/disposalpipe/up{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "rsv" = ( @@ -20112,8 +23152,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) +"rtp" = ( +/obj/structure/undies_wardrobe, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "rtF" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -20134,14 +23182,23 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ruf" = ( /obj/machinery/atm{ pixel_y = 30 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) @@ -20150,17 +23207,14 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) -"rva" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) "rvC" = ( /obj/structure/table/standard, /obj/item/coin/silver, @@ -20252,6 +23306,26 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"ryu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "rza" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -20268,9 +23342,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "rzc" = ( @@ -20349,12 +23425,32 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"rDl" = ( +"rCX" = ( /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3aftmaint) +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"rDj" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) +"rDl" = ( +/obj/structure/cryofeed{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "rDV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -20379,9 +23475,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-9" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "rEk" = ( @@ -20394,6 +23489,18 @@ /obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/security/hanger) +"rEE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "rER" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -20408,9 +23515,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "6-9" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "rFP" = ( @@ -20440,12 +23544,30 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/structure/flora/pottedplant/small{ + pixel_y = 12 + }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "rIA" = ( /obj/structure/table/rack, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) +"rIN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "rJC" = ( /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -20511,9 +23633,10 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "rOz" = ( @@ -20548,6 +23671,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "rOR" = ( @@ -20555,6 +23681,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "rOW" = ( @@ -20570,6 +23699,23 @@ "rPE" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/maintenance/bar/catwalk) +"rPF" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "rPU" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -20602,8 +23748,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "rQK" = ( -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/Dorm_1) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "rQZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20625,26 +23774,32 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "rSu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/chair/comfy/brown{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + pixel_x = 26; + pixel_y = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/button/remote/airlock{ + id = "dorm3"; + name = "Room 3 Lock"; + pixel_x = 26; + pixel_y = -7; + specialfunctions = 4 }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) +"rTm" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-2" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portamidhall) -"rTm" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/power/apc/north_mount, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) @@ -20669,9 +23824,19 @@ /turf/simulated/floor/tiled/white, /area/security/warden) "rUc" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "rUz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20683,11 +23848,13 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "rUS" = ( -/obj/structure/cable/green{ +/obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3fwdhall) +/area/endeavour/hallway/d3starboardamidhall) "rVy" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_6) @@ -20710,6 +23877,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/security/nuke_storage) "rXa" = ( @@ -20726,7 +23896,7 @@ /area/maintenance/substation/cargo) "rXl" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "DECK 3 AFT MAIN" + RCon_tag = "MAIN - DECK 3 AFT" }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) @@ -20736,6 +23906,15 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) +"rYq" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "rYD" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -20753,6 +23932,11 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "rZv" = ( @@ -20782,7 +23966,7 @@ /obj/effect/paint/darkred, /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/security/warden) @@ -20807,6 +23991,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "saK" = ( @@ -20827,8 +24017,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/cable/orange{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -20870,16 +24060,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"scV" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "scZ" = ( /turf/simulated/wall/prepainted/cargo, /area/endeavour/surfacebase/mining_main/storage) "see" = ( /obj/machinery/computer/timeclock/premade/south, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "seB" = ( @@ -20935,6 +24139,7 @@ /obj/structure/table/steel, /obj/item/clothing/gloves/black, /obj/item/clothing/glasses/welding, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/security/lobby) "shF" = ( @@ -20976,15 +24181,26 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "sid" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /obj/structure/cable/orange{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3starboardamidhall) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "sih" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "siu" = ( @@ -21119,9 +24335,19 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "snj" = ( -/obj/structure/cable/orange{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "snw" = ( @@ -21153,6 +24379,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = 6 + }, /turf/simulated/floor/tiled/dark, /area/security/tactical) "spd" = ( @@ -21162,6 +24393,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "sqf" = ( @@ -21216,10 +24453,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"srB" = ( +/obj/structure/cable/orange{ + icon_state = "5-10" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "srX" = ( /obj/machinery/camera/network/civilian{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "ssY" = ( @@ -21241,6 +24490,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"stl" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "stW" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -21249,11 +24507,21 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "suh" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = "dorm4"; + name = "Dorm 4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) "suB" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -21272,15 +24540,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"svB" = ( -/obj/machinery/cryopod{ - dir = 2 - }, -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) "svY" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/corner/red{ @@ -21415,8 +24674,11 @@ /area/endeavour/hallway/d3fwdmaint) "swv" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) @@ -21424,7 +24686,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "swT" = ( @@ -21435,9 +24696,11 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "sxc" = ( @@ -21466,10 +24729,28 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"sxT" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "syD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "syH" = ( @@ -21499,6 +24780,13 @@ }, /turf/simulated/floor/wood, /area/quartermaster/foyer) +"sAp" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "sAz" = ( /obj/structure/window/basic{ dir = 1 @@ -21513,19 +24801,25 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sAQ" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/light_construct{ + dir = 1 + }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "sBa" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "sBr" = ( @@ -21545,6 +24839,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "sDc" = ( @@ -21628,15 +24925,21 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_3) "sFQ" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "sFX" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "sFZ" = ( @@ -21702,6 +25005,9 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/security/hallwayaux) "sJu" = ( @@ -21718,6 +25024,24 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) +"sJA" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) +"sJL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "sKL" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled/steel/airless, @@ -21808,6 +25132,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "sQS" = ( @@ -21863,6 +25188,12 @@ /turf/simulated/floor/tiled, /area/security/lobby) "sTd" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "sTn" = ( @@ -21885,6 +25216,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"sUQ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "sUU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -21900,6 +25237,22 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"sWa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "sWb" = ( /obj/machinery/door/window/brigdoor/westright{ dir = 4; @@ -21925,6 +25278,9 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "sWg" = ( @@ -21976,6 +25332,18 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "sYp" = ( @@ -22038,6 +25406,15 @@ /obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"sZQ" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "taa" = ( /obj/machinery/door/window/brigdoor/southleft{ dir = 4; @@ -22085,6 +25462,9 @@ icon_state = "1-4" }, /obj/machinery/disposal, +/obj/structure/disposalpipe/up{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "tbK" = ( @@ -22127,6 +25507,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "tdk" = ( @@ -22142,7 +25525,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tdG" = ( -/turf/simulated/shuttle/wall/voidcraft/no_join, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "teq" = ( /obj/structure/cable/green{ @@ -22193,6 +25576,11 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "tib" = ( @@ -22310,15 +25698,20 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "tos" = ( /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "tox" = ( @@ -22348,6 +25741,17 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled, /area/security/lobby) +"tpm" = ( +/obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "tpp" = ( /obj/structure/cable{ icon_state = "1-4" @@ -22355,9 +25759,21 @@ /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"tpP" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "tqq" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -22378,6 +25794,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"trg" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/navblue/bordercorner, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "trE" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -22429,8 +25853,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "tvF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) @@ -22440,6 +25870,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "twA" = ( @@ -22466,7 +25899,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) @@ -22492,6 +25925,12 @@ /area/endeavour/surfacebase/mining_main/refinery) "txu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "txv" = ( @@ -22514,6 +25953,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"tzm" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "tzN" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -22528,6 +25973,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/janitor) "tAt" = ( @@ -22549,6 +25995,9 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "tBn" = ( @@ -22559,6 +26008,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "tBY" = ( @@ -22574,6 +26024,18 @@ dir = 4; pixel_y = 38 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "tCj" = ( @@ -22583,11 +26045,9 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "tDb" = ( -/obj/structure/flora/pottedplant/smelly, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "tDe" = ( /obj/structure/table/rack/steel, @@ -22621,6 +26081,22 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"tEi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255; + dir = 10 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "tEt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22665,34 +26141,22 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "tGB" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3fwdmaint) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "tGS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/radio/beacon, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "tHm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "tHq" = ( /obj/machinery/lathe/autolathe, /obj/effect/floor_decal/borderfloor, @@ -22739,6 +26203,26 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"tIj" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "tIo" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -22751,17 +26235,16 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "tIr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light{ + dir = 4; + use_power = 0 }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "0-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "tJl" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22772,6 +26255,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "tJB" = ( @@ -22833,12 +26319,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "tMF" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) +"tMK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "tMP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22862,9 +26363,8 @@ /area/crew_quarters/showers) "tNY" = ( /obj/machinery/computer/timeclock/premade/south, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "tOa" = ( @@ -22965,13 +26465,15 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled, /area/security/range) -"tTV" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-4" +"tTS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "tUi" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -22979,6 +26481,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "tUt" = ( @@ -23009,6 +26517,12 @@ }, /turf/space/basic, /area/space) +"tUR" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/crew_quarters/sleep/Dorm_9) "tVi" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -23027,10 +26541,13 @@ /turf/simulated/floor/tiled, /area/security/hanger) "tVr" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/camera/network/civilian, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "tVw" = ( @@ -23050,6 +26567,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/wood, /area/quartermaster/foyer) "tWm" = ( @@ -23067,6 +26587,16 @@ /obj/structure/sign/deck/third, /turf/simulated/wall/prepainted, /area/crew_quarters/fitness) +"tXh" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) +"tXo" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d3afthall) "tXt" = ( /obj/machinery/fire_alarm/north_mount, /obj/landmark{ @@ -23074,6 +26604,19 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"tXY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/endeavour/hallway/d3afthall) "tYv" = ( /obj/structure/closet/walllocker{ pixel_y = 32 @@ -23090,8 +26633,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardafthall) +/turf/simulated/floor/tiled/dark, +/area/endeavour/station/stairs_three) "tZq" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -23106,6 +26649,15 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"tZy" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "tZY" = ( /obj/machinery/computer/security{ dir = 4 @@ -23115,6 +26667,27 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"uam" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "uaL" = ( /obj/structure/table/marble, /obj/machinery/reagentgrinder, @@ -23147,6 +26720,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "ubN" = ( @@ -23206,12 +26783,20 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "ufL" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"ufN" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "ufX" = ( /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -23222,6 +26807,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "ugs" = ( @@ -23268,6 +26859,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"ugT" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "uhj" = ( /obj/effect/decal/mecha_wreckage/cludge{ dir = 1 @@ -23297,6 +26898,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "uhE" = ( @@ -23307,11 +26911,10 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) "uhW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/obj/structure/bed/double, +/obj/item/bedsheet/purpledouble, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_1) "uih" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23333,6 +26936,14 @@ }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"uiz" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "uiJ" = ( /obj/machinery/door/firedoor, /obj/item/folder/white, @@ -23381,7 +26992,7 @@ /obj/machinery/air_alarm/north_mount, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -23397,6 +27008,21 @@ "ujF" = ( /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"ujU" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "ukb" = ( /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) @@ -23405,7 +27031,7 @@ icon_state = "1-4" }, /obj/structure/cable/green{ - icon_state = "4-10" + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) @@ -23482,6 +27108,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "uny" = ( @@ -23500,12 +27129,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "uod" = ( @@ -23515,6 +27147,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "uoi" = ( @@ -23539,6 +27174,7 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "upw" = ( @@ -23552,6 +27188,15 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/breakroom) +"upV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "uqf" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -23565,9 +27210,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "url" = ( -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/map_helper/access_helper/airlock/station/engineering/department, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "urn" = ( /obj/machinery/vending/loadout/overwear, /turf/simulated/floor/tiled/dark, @@ -23625,18 +27277,29 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) -"ute" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) +"ute" = ( /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -23664,6 +27327,12 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "uwc" = ( @@ -23684,12 +27353,20 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "uwo" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "uwI" = ( @@ -23704,13 +27381,10 @@ /area/crew_quarters/sleep/Dorm_4) "uwR" = ( /obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-9" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/area/endeavour/hallway/d3afthall) "uxf" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/lobby) @@ -23743,6 +27417,14 @@ /obj/landmark/spawnpoint/job/security_officer, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"uyt" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "uyN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23766,7 +27448,7 @@ "uzm" = ( /obj/machinery/light{ dir = 4; - pixel_x = 10 + use_power = 0 }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -23780,6 +27462,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "uAl" = ( @@ -23821,6 +27504,12 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"uAU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "uBK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23830,6 +27519,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "uBN" = ( @@ -23846,7 +27538,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -23881,6 +27573,18 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"uGC" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "uGI" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -23953,7 +27657,10 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "uJk" = ( /obj/machinery/door/blast/regular{ @@ -23986,6 +27693,21 @@ /obj/machinery/holopad, /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/fitness) +"uJM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) "uKk" = ( /obj/structure/table/reinforced, /obj/item/pen{ @@ -24011,15 +27733,14 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/refinery) "uKP" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -25 - }, /obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "uKW" = ( @@ -24050,6 +27771,21 @@ }, /turf/simulated/floor/tiled, /area/security/nuke_storage) +"uMe" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "uMi" = ( /obj/structure/closet/secure_closet/hos2, /obj/item/storage/box/firingpins, @@ -24058,16 +27794,26 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) +"uMp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "uMs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light, +/turf/simulated/wall/prepainted, +/area/endeavour/station/stairs_three) +"uMD" = ( +/obj/structure/table/bench/steel, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/navgold/border{ + dir = 5 }, -/obj/machinery/light, /turf/simulated/floor/tiled, -/area/station/stairs_two) +/area/endeavour/hallway/d3starboardforhall) "uMF" = ( /obj/item/radio/intercom{ dir = 1; @@ -24101,12 +27847,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "uOI" = ( /turf/simulated/floor/tiled, /area/security/nuke_storage) "uOQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "uOU" = ( @@ -24117,6 +27872,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "uPB" = ( @@ -24161,14 +27922,24 @@ }, /obj/machinery/door/airlock/maintenance, /obj/map_helper/access_helper/airlock/station/engineering/department, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3aftmaint) "uSv" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/recreation_area_hallway) +"uSz" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/navblue/bordercorner2, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "uSC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24215,9 +27986,9 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/uxstorage) "uUx" = ( -/obj/machinery/computer/cryopod/robot{ - pixel_x = -31; - pixel_y = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -24236,6 +28007,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"uVe" = ( +/obj/structure/flora/grass/event/sparse_grass1, +/obj/machinery/status_display/supply_display{ + pixel_y = -32 + }, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) +"uVO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "uVT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24357,6 +28144,9 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Deck 3 Fore Grid" }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "uZq" = ( @@ -24366,6 +28156,12 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "uZE" = ( @@ -24375,10 +28171,16 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) -"uZY" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/space, -/area/space) +"uZQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "vaf" = ( /obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, @@ -24406,6 +28208,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hydroponics) +"vcz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "vcO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24440,6 +28251,10 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "vfa" = ( @@ -24457,12 +28272,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable/green, /obj/machinery/power/apc/south_mount, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "vfO" = ( /obj/structure/closet/crate/bin{ @@ -24470,6 +28282,14 @@ }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) +"vgb" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Crew Quarters" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "vge" = ( /obj/machinery/air_alarm{ dir = 4; @@ -24505,6 +28325,21 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"vhK" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "vhQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -24519,7 +28354,7 @@ "vig" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/machinery/requests_console{ announcementConsole = 1; @@ -24538,6 +28373,9 @@ dir = 4 }, /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "viP" = ( @@ -24592,7 +28430,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) @@ -24626,8 +28464,20 @@ /turf/simulated/floor/plating, /area/security/lobby) "vkT" = ( -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/Dorm_2) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "vkZ" = ( /obj/effect/floor_decal/corner_oldtile/white/diagonal, /obj/machinery/recipe_lookup/drinks{ @@ -24636,6 +28486,13 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"vlu" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/grass/event/sparse_grass2, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "vlK" = ( /obj/effect/paint/darkred, /obj/structure/cable/green{ @@ -24710,6 +28567,25 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"voc" = ( +/obj/machinery/camera/network/civilian, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "vom" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -24789,13 +28665,10 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "vpW" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) "vqa" = ( /obj/structure/table/steel, @@ -24956,6 +28829,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "vwK" = ( @@ -25053,11 +28929,26 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "vyW" = ( -/obj/structure/cable/green{ +/obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) +"vzm" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/area/endeavour/hallway/d3portforhall) "vzs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25074,7 +28965,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/dark, /area/security/hallway) @@ -25214,10 +29105,11 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "vCA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/water/deep/indoors, +/area/crew_quarters/sleep/bedrooms) "vCC" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -25268,8 +29160,23 @@ dir = 5 }, /obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/dark, /area/security/hallwayaux) +"vEl" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardforhall) "vEs" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -25 @@ -25277,6 +29184,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "vEy" = ( @@ -25366,6 +29278,12 @@ /obj/machinery/chem_master, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) +"vGH" = ( +/obj/structure/toilet{ + pixel_y = 10 + }, +/turf/simulated/floor/tiled/white, +/area/endeavour/hallway/d3fwdmaint) "vGJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25481,20 +29399,15 @@ /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "vLn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/endeavour/hallway/d3afthall) +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/security/hallway) "vLD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -25509,11 +29422,19 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) +"vMk" = ( +/obj/structure/disposalpipe/tagger{ + dir = 1; + name = "package tagger - Trash"; + sort_tag = "Trash" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "vMl" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -25544,11 +29465,20 @@ "vMr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, +/obj/item/binoculars, +/obj/item/stack/flag/red, +/obj/item/binoculars{ + pixel_y = 6 + }, +/obj/item/binoculars{ + pixel_y = 6 + }, +/obj/item/binoculars{ + pixel_y = 6 + }, +/obj/item/stack/flag/yellow, +/obj/item/stack/flag/green, /obj/structure/table/reinforced, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "vNb" = ( @@ -25652,8 +29582,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) +"vQh" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + alpha = 255 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2, +/turf/simulated/floor/tiled/monotile, +/area/endeavour/hallway/d3afthall) +"vQB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) +"vRj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "vRl" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) @@ -25666,12 +29630,21 @@ "vRH" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/station/stairs_three) +"vRK" = ( +/obj/structure/disposalpipe/sortjunction{ + name = "Trash"; + sortType = "Trash"; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "vSl" = ( -/turf/simulated/shuttle/wall/voidcraft/green, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/belter) "vSw" = ( /obj/structure/cable/green{ @@ -25743,12 +29716,11 @@ /turf/simulated/floor/tiled, /area/security/lobby) "vVx" = ( -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/power/apc/north_mount, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/turf/simulated/wall/prepainted, +/area/endeavour/hallway/d3fwdmaint) "vVA" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/endeavour/surfacebase/mining_main/uxstorage) @@ -25770,11 +29742,11 @@ /turf/simulated/floor, /area/security/brig) "vWK" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3afthall) +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "vWL" = ( /obj/structure/bed/chair{ dir = 1 @@ -25797,9 +29769,11 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/structure/cable/orange{ +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "vXj" = ( @@ -25837,14 +29811,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "vYG" = ( -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardamidhall) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) "vYO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25867,11 +29840,13 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "way" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 32 +/obj/landmark/spawnpoint/latejoin/station/cyborg, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8; + light_range = 12 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) @@ -25890,6 +29865,27 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) +"wbj" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "wbn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25898,6 +29894,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "wbu" = ( @@ -25925,6 +29924,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"wcT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/vacant/vacant_shop) "wcX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25952,6 +29957,19 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"wex" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "wez" = ( /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/monotile, @@ -25960,20 +29978,34 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/cargo/mining) "wgN" = ( -/obj/structure/disposaloutlet{ - dir = 1 - }, /obj/structure/disposalpipe/trunk, /obj/machinery/conveyor{ tag = "mailroom"; id = "DLBelt" }, -/obj/item/barrier_tape_segment/engineering, +/obj/machinery/disposal/deliveryChute{ + dir = 1 + }, /turf/simulated/floor/plating, /area/quartermaster/delivery) +"wiJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "wiS" = ( /obj/structure/table/reinforced, /obj/item/cell/high{ @@ -26002,6 +30034,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/janitor) "wkh" = ( @@ -26011,6 +30044,10 @@ "wki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "wku" = ( @@ -26029,7 +30066,6 @@ /area/vacant/vacant_shop) "wkI" = ( /obj/item/storage/box/nifsofts_mining, -/obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -26042,6 +30078,7 @@ /obj/item/suit_cooling_unit, /obj/item/suit_cooling_unit, /obj/item/duct_tape_roll, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "wkY" = ( @@ -26117,7 +30154,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/machinery/vending/fitness, +/obj/machinery/vending/coffee, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "wnA" = ( @@ -26130,6 +30167,18 @@ /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /turf/simulated/floor/plating, /area/security/detectives_office) +"woH" = ( +/obj/structure/undies_wardrobe, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) +"woK" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portamidhall) "wpe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26153,16 +30202,16 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "wqF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "1-10" + icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "8-10" + icon_state = "1-8" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -26170,6 +30219,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "wri" = ( @@ -26191,9 +30242,6 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "wrz" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26201,7 +30249,7 @@ dir = 4 }, /turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/sleep/Dorm_2) +/area/maintenance/dormitory) "wrS" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, @@ -26222,15 +30270,14 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "wsI" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/cryofeed{ + dir = 4 }, -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable/orange{ - icon_state = "1-2" +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d3aftmaint) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "wsY" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/plain{ @@ -26273,6 +30320,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "wvC" = ( @@ -26296,7 +30346,7 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "wwf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -26321,6 +30371,10 @@ /obj/item/tape_recorder, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) +"wwH" = ( +/obj/machinery/air_alarm/east_mount, +/turf/simulated/floor/tiled, +/area/security/hanger) "wwX" = ( /obj/machinery/media/jukebox, /obj/machinery/air_alarm{ @@ -26383,6 +30437,7 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/supply/cargo_bay, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "wAQ" = ( @@ -26396,6 +30451,23 @@ /obj/machinery/scale, /turf/simulated/floor/wood, /area/crew_quarters/fitness) +"wBG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardafthall) +"wCE" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "wCJ" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -26486,6 +30558,21 @@ "wFK" = ( /turf/simulated/wall/prepainted, /area/maintenance/starboardsolar) +"wFN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "wGd" = ( /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) @@ -26505,9 +30592,12 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "wGC" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "wHm" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/reagent_containers/glass/cooler_bottle, @@ -26555,6 +30645,11 @@ /obj/map_helper/access_helper/airlock/station/external_airlock, /turf/simulated/floor/plating, /area/quartermaster/warehouse) +"wIA" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/bluedouble, +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_4) "wIT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -26563,6 +30658,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"wJO" = ( +/obj/structure/table/woodentable, +/obj/item/storage/box/donkpockets, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "wKM" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -26686,18 +30789,42 @@ /obj/map_helper/access_helper/airlock/station/external_airlock, /turf/simulated/floor/plating, /area/quartermaster/warehouse) +"wQI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "wQJ" = ( /obj/machinery/atm{ pixel_y = 30 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "wQS" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) @@ -26712,6 +30839,12 @@ "wTk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "wTp" = ( @@ -26720,6 +30853,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) +"wTs" = ( +/obj/structure/sign/electricshock{ + pixel_y = -32 + }, +/turf/simulated/floor/crystal, +/area/endeavour/hallway/d3fwdhall) "wUZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26795,11 +30934,14 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wXO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/Dorm_2) +/obj/effect/floor_decal/corner/navblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "wYr" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -26870,10 +31012,7 @@ /area/security/hallway) "wZw" = ( /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) @@ -26897,6 +31036,9 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "xao" = ( @@ -26996,9 +31138,22 @@ /obj/item/gun/ballistic/shotgun/doublebarrel, /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) +"xfd" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "5-6" + }, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "xfl" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "DECK 3 AMIDSHIPS SUPPORT" + RCon_tag = "AUX - DECK 3 AMIDSHIPS" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -27023,6 +31178,15 @@ }, /turf/space/basic, /area/space) +"xgn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "xgH" = ( /obj/structure/window/basic{ dir = 8 @@ -27125,12 +31289,16 @@ "xlf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "xlg" = ( /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/office) @@ -27156,7 +31324,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, @@ -27206,6 +31374,21 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "xqo" = ( @@ -27236,19 +31419,20 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "xtt" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 +/obj/structure/cryofeed{ + dir = 4 }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 +/obj/machinery/light{ + dir = 8; + light_range = 12 }, -/obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "xtw" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/machinery/air_alarm/west_mount, /turf/simulated/floor/wood, /area/vacant/vacant_shop) "xtI" = ( @@ -27256,8 +31440,20 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) +"xus" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/blue, +/area/crew_quarters/sleep/Dorm_4) "xut" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27301,6 +31497,14 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"xwi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "xwr" = ( /turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) @@ -27329,6 +31533,12 @@ dir = 4; pixel_y = 38 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "xxy" = ( @@ -27343,6 +31553,18 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_7) +"xyc" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardamidhall) "xyl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -27365,6 +31587,18 @@ }, /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/fitness) +"xys" = ( +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -28 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3starboardafthall) "xyD" = ( /obj/machinery/appliance/cooker/oven, /obj/effect/floor_decal/corner_oldtile/white/diagonal, @@ -27377,8 +31611,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 1 }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) @@ -27394,6 +31631,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/office) "xyL" = ( @@ -27419,6 +31657,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/storage) "xzh" = ( @@ -27449,6 +31690,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"xBR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "xBX" = ( /mob/living/simple_mob/animal/goat{ desc = "Ah, it's Pete. They're not known for their pleasant disposition and now they're gonna eat all your plants."; @@ -27463,6 +31710,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"xCO" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/structure/disposalpipe/up{ + dir = 4 + }, +/obj/structure/plasticflaps, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "xCV" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -27508,6 +31765,9 @@ "xDr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/foyer) "xDs" = ( @@ -27546,13 +31806,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) -"xGk" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Cryo" +"xGw" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/bedrooms) "xGU" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -27583,11 +31842,38 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "xIi" = ( +/obj/machinery/cryopod{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"xIo" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/sleep/Dorm_1) +"xIv" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navblue/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"xID" = ( +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/bedrooms) "xIP" = ( /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"xJv" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/lower) "xJx" = ( /obj/structure/closet/hydrant{ pixel_y = 30 @@ -27642,6 +31928,9 @@ /obj/machinery/camera/network/cargo{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "xMc" = ( @@ -27649,11 +31938,25 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/surfacebase/mining_main/refinery) "xMu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "xMC" = ( @@ -27669,6 +31972,12 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "xMW" = ( @@ -27725,26 +32034,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /obj/machinery/light_switch{ dir = 4; pixel_x = -24 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "xPB" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/station/stairs_two) +/obj/spawner/window/low_wall/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/station/stairs_three) "xPF" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -27759,6 +32064,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xQu" = ( @@ -27845,14 +32151,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "xTl" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-8" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3starboardforhall) +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "xTD" = ( /obj/machinery/camera/network/security, /turf/simulated/floor/tiled, @@ -27869,6 +32173,24 @@ }, /turf/simulated/floor/plating, /area/security/security_lockerroom) +"xVA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) +"xWe" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/endeavour/station/stairs_three) "xWx" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 @@ -27905,6 +32227,24 @@ "xXg" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/vacant/vacant_shop) +"xXk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3starboardamidhall) "xXl" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/voidcraft{ @@ -27914,6 +32254,20 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"xXF" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/navgold/bordercorner2{ + dir = 9 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3afthall) "xXJ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, @@ -27938,6 +32292,14 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"xYu" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/navgold/border, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3fwdhall) "xYM" = ( /turf/simulated/floor/tiled/steel, /area/quartermaster/delivery) @@ -27988,6 +32350,24 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) +"ybd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) "ybF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28055,6 +32435,12 @@ /obj/machinery/station_map{ pixel_y = 32 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ygO" = ( @@ -28089,12 +32475,23 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/navgold/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "yil" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "yiF" = ( /obj/machinery/flasher/portable, /obj/machinery/light, @@ -28137,7 +32534,7 @@ }, /obj/machinery/light{ dir = 8; - pixel_x = -10 + light_range = 12 }, /turf/simulated/floor/tiled/techfloor, /area/security/lobby) @@ -28251,10 +32648,10 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) +/area/maintenance/dormitory) "ymj" = ( /turf/simulated/floor/tiled, -/area/station/stairs_two) +/area/endeavour/station/stairs_three) (1,1,1) = {" mDp @@ -32647,7 +37044,7 @@ evH evH vCx qYF -bQZ +rcG evH evH evH @@ -34001,7 +38398,7 @@ liu rKm cVu qLB -jDL +qLB jYQ jYQ jYQ @@ -34193,7 +38590,7 @@ vlK dAT bgj vBk -jNV +sak tiR vFk tZY @@ -34347,14 +38744,14 @@ xEe xEe xEe xEe -xEe -xEe -xEe -xEe -xEe -xEe -xEe -xEe +hkN +eWz +eWz +eWz +eWz +eWz +eWz +eWz mSQ mTI cop @@ -34387,7 +38784,7 @@ ovb dPF dfG voq -jNV +sak oJb xbA vDS @@ -34541,7 +38938,7 @@ kbt uzm kbt kbt -kbt +bwN kbt kbt uzm @@ -34551,7 +38948,7 @@ kbt kbt uzm gCh -jGZ +szl dhY ffu iwU @@ -34735,7 +39132,7 @@ uGk uGk uGk uGk -cHy +cXR uGk aMQ aMQ @@ -34747,7 +39144,7 @@ aMQ uGk kwl kEf -szl +xBR vAZ dJX dJX @@ -34929,7 +39326,7 @@ iaP qLS qLS qLS -qLS +tXh qLS aMQ aMQ @@ -34941,7 +39338,7 @@ aMQ uGk uPC fgL -szl +xBR oki lMS sOD @@ -34956,7 +39353,7 @@ xHf xRB uGk xTc -xTc +eNK cZb xTc osg @@ -35120,10 +39517,10 @@ rxD kbt kbt iaP -qLS -qLS -qLS -qLS +sAp +dmA +dmA +dGV qLS aMQ nUf @@ -35136,14 +39533,14 @@ uGk lWQ qvz pUX -msv -msv -msv -eTx +sci +sci +sci +sci sci sci fjB -eDt +dqc szl oki lMS @@ -35329,7 +39726,7 @@ eoc oUv pDX wqF -szl +bax pTj pTj pTj @@ -35519,7 +39916,7 @@ rTq rkO gjE asX -qHr +byF pir pir cBR @@ -35713,7 +40110,7 @@ aMQ aMQ xbH xbH -qoU +tIj pir sNC kCb @@ -35725,8 +40122,8 @@ mup hEe pir pYf -tJl -eCh +cMK +vcz hkY kSn kSn @@ -35902,12 +40299,12 @@ qup qLS qLS mVn -xZH -xZH -xZH +lif +lif +lif kgM xZH -xZH +leL pir pir hYD @@ -35918,7 +40315,7 @@ olG dTh eVd pir -eCh +iSj tJl gCd fIm @@ -35937,7 +40334,7 @@ lPF tgJ nws pTu -rCI +nfT wLx fJN dNF @@ -36096,12 +40493,12 @@ rEk qLS qLS mVn -xZH -xZH -xZH +lif +lif +lif kgM xZH -xZH +leL pir qnE tRb @@ -36290,12 +40687,12 @@ rEk qLS qLS mVn -xZH -xZH -xZH +lif +lif +lif kgM xZH -xZH +leL pir pFM dIR @@ -36306,7 +40703,7 @@ wMW dia hCa lgT -eCh +iSj gWa jZc fIm @@ -36484,12 +40881,12 @@ rEk qLS qLS mVn -xZH -xZH -xZH +lif +lif +lif kgM fSt -xZH +leL pir ksT eCE @@ -36500,7 +40897,7 @@ nTj mup hCa lgT -eCh +iSj ozn etj glG @@ -36678,12 +41075,12 @@ rEk mVn mVn mVn -xZH -xZH -xZH +lif +xCO +lif kgM xZH -xZH +leL pir igX pYC @@ -36870,14 +41267,14 @@ rEk rEk rEk qLS -mVn -xZH -xZH -xZH -xZH +qLS +kgM +lif +qDS +aDU kgM xZH -xZH +leL pir opV lmD @@ -36888,9 +41285,9 @@ wMW mup hCa lgT -eCh +iSj qaT -eCh +kGS wWK vwK gHM @@ -36915,7 +41312,7 @@ cNr vqf hPf gPk -wau +jDL gpB fJN fJN @@ -37064,14 +41461,14 @@ qLS qLS qLS qLS -mVn -xZH -xZH -xZH -xZH +qLS +kgM +kgM +kgM +lgM kgM xZH -xZH +leL pir nhj cHX @@ -37082,9 +41479,9 @@ fKI fKI bER xDp -eCh +fbB eBf -eCh +kGS okS prq jQE @@ -37239,11 +41636,11 @@ pRW pRW wuh iXY -mLl +tdG sKL sKL sKL -mLl +tdG iXY iXY iXY @@ -37258,14 +41655,14 @@ qLS qLS qLS qLS -mVn +qLS kgM xZH xZH -xZH +uAU kgM xZH -xZH +leL uvj mup pYC @@ -37278,7 +41675,7 @@ nCe noi eCh qaT -eCh +kGS mqs prq mnr @@ -37301,9 +41698,9 @@ pDe urB iEz etd -fEj +nyW iAo -iEz +fEj jmX pDe pDe @@ -37433,11 +41830,11 @@ pRW tUu wuh gmZ -mLl +tdG jAa qAH uWE -mLl +tdG iXY iXY iXY @@ -37456,10 +41853,10 @@ qLS kgM xZH xZH -xZH +uAU kgM xZH -xZH +leL pir pir tMP @@ -37472,7 +41869,7 @@ pir pir xqn jWp -eCh +xXF wWK buf mnr @@ -37627,11 +42024,11 @@ pRW pRW wuh iXY -mLl +tdG ubg lwX gpG -mLl +tdG iXY iXY iXY @@ -37650,10 +42047,10 @@ mVn kgM xZH xZH -xZH +uAU kgM xZH -xZH +leL pir cUi apJ @@ -37821,11 +42218,11 @@ pRW pRW wuh iXY -mLl +tdG ygR muW jhZ -mLl +tdG iXY iXY iXY @@ -37844,10 +42241,10 @@ mVn fSt xZH xZH -xZH -qoU -xZH -xZH +buX +hDH +iIN +vRK pir goX sEE @@ -37860,7 +42257,7 @@ wEv pir bqn kfD -bYm +vQh wWK cXP jKE @@ -38014,12 +42411,12 @@ pRW pRW pRW wuh -iXY +mLl mne ceU tpp kxI -mLl +tdG iXY iXY iXY @@ -38041,7 +42438,7 @@ xZH xZH kgM xZH -xZH +leL pir sRJ xMC @@ -38052,9 +42449,9 @@ aVW aVW lxd pir -ooh -vLn -ooh +lTW +kfD +enc glG nOt gHM @@ -38208,12 +42605,12 @@ pRW jGe jYr wuh -iXY -mLl +ufN +tdG gOb iRB jeT -mLl +tdG iXY iXY iXY @@ -38402,12 +42799,12 @@ pRW jYr aKn wuh -iXY -mLl +ufN +tdG sHr ifT eIe -mLl +tdG iXY iXY iXY @@ -38440,9 +42837,9 @@ pir pir pir rYo -eCh +iSj rfb -eCh +kGS glG onq nBM @@ -38459,7 +42856,7 @@ heG kSn kSn evH -rCI +nfT wLx wCM wCM @@ -38596,12 +42993,12 @@ pRW jGe jYr wuh -iXY -mLl +ufN +tdG cmR ifT eIe -mLl +tdG iXY iXY vSl @@ -38623,11 +43020,11 @@ xZH xZH kgM xbH -xZH -kLR -xZH -xZH -xZH +buX +oOy +oOy +oOy +xJv kLR kLR pmy @@ -38635,8 +43032,8 @@ pmy pmy pmy ooh -vLn -ooh +jVt +buM glG glG glG @@ -38790,12 +43187,12 @@ pRW pRW pRW wuh -iXY -mLl -mLl +ufN +tdG +tdG eum ofW -mLl +tdG iXY iXY vSl @@ -38818,30 +43215,30 @@ kgM kgM xbH xZH -xbH xZH xZH xZH -qoU -ymj +buX +lIR +hXA vRH -ymj -aII -qZS -lTW -dME +bDG +qHq +pkQ +tXo +tXY hjP -qZS -wGC -ymj +pkQ +qHq +kwF xPB axk qZW -msG -msG -msG -msG -msG +dMA +dMA +dMA +dMA +dqu msG lnp kSn @@ -38984,12 +43381,12 @@ pRW pRW pRW wuh -gmZ -mLl +dJV +tdG kRn bgM tMa -mLl +tdG iXY iXY vSl @@ -39017,25 +43414,25 @@ pYt pYt pYt pYt -ymj -ymj -ymj -aII -qZS -aWf +xWe +xPB +bDG +qHq +qHq +gyJ mIg -eCh -qZS -wGC -ymj -qCe -ymj +gyJ +qHq +qHq +kwF +xPB +hLo syH bUP kSn kSn kSn -kSn +uMp kSn cxF kSn @@ -39178,12 +43575,12 @@ pRW pRW tUu wuh -iXY -mLl +ufN +tdG tdG xJx cRB -mLl +tdG iXY iXY vSl @@ -39211,18 +43608,18 @@ vFW vFW eJd hMG -ymj -ymj -eCk -bWK +xWe bWK -url +xPB +xPB +eCk +aWf mIg -eCh -bWK -bWK +gyJ eCk -qCe +xPB +xPB +bWK usr tib lEY @@ -39372,202 +43769,202 @@ pRW pRW pRW wuh -iXY -gCW -buL -qSx -drT -mLl -iXY -iXY -vSl -hRx -qIH -hpq -vSl -iXY -rxD -aGE -mLm -mLm -mLm -hwP -hwP -mLm -mLm -lMH -lMH -lMH -lMH -pYt -sKV -pSY -tON -rpc -pYt -ymj -ymj -qNg -mmq -ymj -eCh -mIg -eCh -ymj -mmq -inx -qCe -ymj -lEY -kSn -kSn -vsu -gtD -gLw -gLw -boj -vqE -bYP -qVZ -gmw -lUk -wZv -wZv -uEp -wZv -mKK -mKK -rZv -jrY -mKK -vzP -rQZ -fBD -srx -kbw -mAl -mAl -wXu -fYk -lPz -lPz -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -"} -(59,1,1) = {" -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -pRW -pRW -pRW -pRW -wuh +ufN +gCW +buL +qSx +drT +tdG iXY iXY +vSl +hRx +qIH +hpq +vSl +iXY +rxD +aGE +mLm +mLm +mLm +hwP +hwP +mLm +mLm +lMH +lMH +lMH +lMH +pYt +sKV +pSY +tON +rpc +pYt +xWe +xPB +mmq +mmq +qHq +gyJ +mIg +gyJ +qHq +mmq +mmq +xPB +hLo +lEY +kSn +kSn +vsu +gtD +gLw +gLw +boj +vqE +bYP +qVZ +gmw +lUk +wZv +wZv +uEp +wZv +mKK +mKK +rZv +jrY +mKK +vzP +rQZ +fBD +srx +kbw +mAl +mAl +wXu +fYk +lPz +lPz +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp +"} +(59,1,1) = {" +mDp +mDp +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp +pRW +pRW +pRW +pRW +wuh +ufN +iXY rAq rAq rAq @@ -39594,26 +43991,26 @@ gic qBI lMH pYt -muK +iEv egL wjT acd tzN aUT -iXB -qNg +xPB mmq -ymj -iyq -dME +mmq +aec +tXo +tXY hjP -ymj +aec mmq -inx -qCe +mmq +xPB hLo uQr -mpA +vWK mpA vhc ars @@ -39629,7 +44026,7 @@ qAq qAq qAq qAq -qAq +mkK qAq box peG @@ -39760,14 +44157,14 @@ mDp mDp mDp wuh -iXY -iXY -iXY -iXY -iXY +fip +nmv +nmv +nmv +nmv xMb -iXY -iXY +nmv +rOn vSl aKK qIH @@ -39795,19 +44192,19 @@ pYt pYt kEi uMs -bWK -bWK +xPB +xPB bWK ewr byU psK bWK +xPB +xPB bWK -bWK -qCe odI lEY -lEY +url lEY qqC vjc @@ -39961,7 +44358,7 @@ wuh wuh wuh gmZ -iXY +ufN vSl ufL qIH @@ -39985,18 +44382,18 @@ pYt oIv muK pYt -eCh +fnv tMx boM -jdI -wTk +mLk +mLk +mLk jGq wTk -wTk prg -wTk +cua +ayc ayc -eqa ayc qJx xMu @@ -40007,7 +44404,7 @@ heb qjv iil pNn -vqE +lWb aQM gLw qVZ @@ -40155,7 +44552,7 @@ jrK ePB oWf nmv -rOn +rYq vSl vSl vSl @@ -40179,23 +44576,23 @@ pYt ePn dpX pYt -eCh +fQA pQK tvF -eCh -eCh -eCh -eCh -eCh +uwR +uwR +uwR +uwR +uwR saW -eCh -eCh -eCh -eCh -uPx -rva +uwR +uwR +uwR +uwR +uwR +msv poi -hHQ +huy pkT pkT pkT @@ -40216,7 +44613,7 @@ vvH pxU wEW vnn -wUZ +diH vBk evH pTu @@ -40373,23 +44770,23 @@ pYt aAV hVe pYt -eCh +iSj fub -hYY -lPV -lPV -lPV -ljl -lPV -owv +hHQ bYm +pSd bYm -srX +ecr bYm -eZW -vWK -pQK -iHD +jDv +bfD +bfD +srX +mvQ +bfD +uPx +gFf +kGS keU ajk oux @@ -40569,7 +44966,7 @@ pYt pYt uvI vvX -uvI +hYY syH syH syH @@ -40762,7 +45159,7 @@ hkI gVq lMH wQJ -xiG +rqN ipH syH bVC @@ -40776,7 +45173,7 @@ kSn kSn syH eqO -wuH +bIs qMq reV fJn @@ -40932,7 +45329,7 @@ qcx ejk jtn wuh -iXY +fko iXY iXY iXY @@ -40956,8 +45353,8 @@ ukb lUi lMH eww -xiG -fPA +rqN +cpz syH eGj vFB @@ -40969,9 +45366,9 @@ kSn kSn kSn syH -pAC +pXE vPs -snj +dmh oSF uqf qMv @@ -40997,7 +45394,7 @@ vBk evH pTu rEv -tVk +wwH cPE aNZ bfY @@ -41126,7 +45523,7 @@ qcx ejk qIo wuh -iXY +wCE iXY ehr wuh @@ -41149,9 +45546,9 @@ bhC mlz xgS lMH -sXK -xiG -fPA +cVy +rqN +cpz syH nKI kuK @@ -41163,9 +45560,9 @@ kSn kSn kSn syH -kIU +awA wuH -snj +pAC cce uBN mEG @@ -41343,23 +45740,23 @@ guN ukb bLw hkE -sTd -xiG -fPA +vhK +rqN +lPV +syH syH syH syH syH syH -kSn kSn kSn kSn kSn syH -kIU +awA wuH -snj +aWe keU bnZ bnZ @@ -41531,29 +45928,29 @@ mLm hwP lMH skT -ukb -ukb -ukb -ukb +rfq +mfm +mfm +mfm uzP dbK gxU gum -qvY +fDf +uiz +aMa +aMa +aMa +aQM syH kSn kSn kSn kSn -kSn -kSn -kSn -kSn -kSn syH kEF wuH -snj +qmV woj dfI bnZ @@ -41712,7 +46109,7 @@ oYC ldo gLK etR -leL +nNn uJr juy feq @@ -41725,7 +46122,7 @@ mLm mLm lMH nqP -ukb +wcT ukb ukb ukb @@ -41733,21 +46130,21 @@ iwp lMH qwg gLQ -eyy +aAA syH kSn kSn kSn -kSn -kSn +nTi +fiy kSn kSn kSn kSn syH -kIU +awA vPs -snj +qmV fnF hHh pwE @@ -41901,7 +46298,7 @@ bPg ldo ldo ldo -uKF +hkm ldo ldo ldo @@ -41927,21 +46324,21 @@ fUR hkE txu lRP -syD +sid syH kSn -kSn -kSn -kSn -kSn +fvQ +vMk +tzm +syH kSn kSn kSn kSn syH -kIU +awA wuH -snj +hdY vIs fWX rFP @@ -42095,8 +46492,8 @@ ldo ldo vsY lCC -uKF -fko +hkm +ldo lQq hOq gNj @@ -42121,21 +46518,21 @@ lMH lMH eww xiG -fPA +cpz syH kSn -kSn -kSn -kSn -kSn +kZH +aMa +jpX +syH kSn kSn kSn kSn syH -jmQ +tpm wuH -snj +qmV vIs rFP sWJ @@ -42304,21 +46701,21 @@ ffW ffW ffW ffW -mLm +cmi nCY che dOT hvh dOT -dOT +jag wgN eyn -txu -lRP -syD -syH +mXi +ndp +sid syH syH +uZQ syH syH syH @@ -42327,9 +46724,9 @@ syH kSn kSn syH -ddk +fTU deJ -uwo +mBA vIs rFP rFP @@ -42350,7 +46747,7 @@ qkg xGU nME qqF -rCI +nfT vBk dBi pDN @@ -42498,7 +46895,7 @@ xlg noW fgj ffW -mLm +hdh pwn pwn lRx @@ -42508,11 +46905,11 @@ aaY pwn pwn rcz -xiG -fPA +rqN +avK syH kSn -kSn +uMp kSn kSn kSn @@ -42523,7 +46920,7 @@ kSn syH jRB wuH -snj +qmV vIs rFP rFP @@ -42692,7 +47089,7 @@ pzs noW fgj ffW -mLm +hdh pwn twA xYM @@ -42702,11 +47099,11 @@ xYM pdF pwn uZv -xiG -fPA -syH -kSn -kSn +esx +fDf +uiz +aMa +jpX kSn kSn kSn @@ -42717,7 +47114,7 @@ kSn syH wQS wuH -snj +dmh hHh vIs sZO @@ -42886,7 +47283,7 @@ noW noW wxK ffW -mLm +hdh eNB jPe gGm @@ -42897,7 +47294,7 @@ ays iDE tBY xiG -qvY +jbI syH kSn kSn @@ -42909,14 +47306,14 @@ syH kSn kSn syH -lfS +ojU wuH -snj +pAC suB rNH rNH rNH -rNH +kiR rNH pwu kps @@ -43091,7 +47488,7 @@ gLZ jLP eja vCG -fPA +cpz syH kSn kSn @@ -43103,7 +47500,7 @@ syH kSn kSn syH -pAC +dwE dHD nxo nWU @@ -43283,9 +47680,9 @@ aIZ aIZ aIZ iDE -fPA +ujU xiG -eyy +hLN syH kSn kSn @@ -43293,12 +47690,12 @@ cvA diG diG diG -eiK +xfd diG diG eiK wZw -rsR +dbR snj qqF qqF @@ -43479,21 +47876,21 @@ kwo pwn jiN xiG -fPA +avK syH kSn kSn vDg kSn kSn -kSn +srB syH -kSn +oIW kSn syH -pAC +uJM rsR -snj +dmh qqF auQ yjg @@ -43670,24 +48067,24 @@ gal gal gal gal -gal -fPA -aPr -fPA +oXi +sZQ +xiG +vzm coi -kSn -kSn -vDg -kSn -kSn +mpA +mpA +xgn +mpA +oFw kSn syH kSn -kSn +bZv syH kfH rsR -snj +pAC wkY chh eem @@ -43841,7 +48238,7 @@ oNw vxE scZ rmb -sEz +jzp sEz shF uhv @@ -43867,7 +48264,7 @@ fva fva ukf emK -fPA +bAI syH kSn syH @@ -43877,7 +48274,7 @@ syH syH syH kSn -kSn +guu syH xyI rsR @@ -44035,7 +48432,7 @@ fil fil scZ scZ -gnO +jwr gnO scZ scZ @@ -44054,14 +48451,14 @@ xDr mhO lAm lAm -nfT +pZg lAm lAm -nfT +pZg pZg dns xlf -fPA +cpz syH kSn syH @@ -44071,9 +48468,9 @@ rXe ujj rXe syH -kSn +guu syH -tUi +qZx kTk uKP qqF @@ -44244,7 +48641,7 @@ eZz tBN veW kPT -tBn +jtk rBG rBG rBG @@ -44255,7 +48652,7 @@ rBG rBG pWF aCi -uvI +hYY syH kSn syH @@ -44265,11 +48662,11 @@ iPK dYs dIC syH -kSn +guu syH -eqO +bsL kRc -qMq +kIU qqF rxf chh @@ -44438,7 +48835,7 @@ bSQ tBn wnA wnA -tBn +jtk rBG fju fju @@ -44448,8 +48845,8 @@ fju fju rBG kMk -emK -fPA +bBc +avK syH kSn syH @@ -44459,11 +48856,11 @@ rXe bip ecO syH -kSn +guu syH -kIU +oIu kRc -owS +xys qqF nMx shz @@ -44653,9 +49050,9 @@ rXe taZ aZS syH -kSn +guu syH -kIU +aZH rsR tos qqF @@ -44678,7 +49075,7 @@ bml eDo bml wsz -wFj +ihZ vBk iyK qkL @@ -44837,21 +49234,21 @@ fju rBG xtI eTr -rZg +uSz syH vPk lRc drQ -drQ +pJd drQ pJa eZu -kSn -kSn -syH +mpA +ars +kui enu wbn -uwo +mBA qHe wHm nds @@ -45009,7 +49406,7 @@ tbK xEJ xEJ sFX -qek +qIr qek qLx xTf @@ -45029,21 +49426,21 @@ fju fju fju rBG -sTd +uGC viu -sTd -syH -kSn -kSn -kSn -kSn -kSn -kSn -cWa -kSn -kSn -syH -kIU +ras +cGV +cGV +cGV +cGV +cGV +cGV +cGV +cGV +cGV +cGV +cGV +sJL rsR qqr qHe @@ -45204,7 +49601,7 @@ dTQ fil fil fil -fil +mwk xkg lqE sXC @@ -45224,22 +49621,22 @@ rBG rBG rBG sTd -emK +bBc ipH -syH -bUP -kSn -kSn -kSn -kSn -kSn -rDl -mpA -mpA +cGV wsI +xtt +rDl +rDl +xtt +rDl +rDl +way +ejd +cGV rTm unJ -auL +hdY qHe alB pGi @@ -45418,22 +49815,22 @@ fju fju rBG sTd -emK +bBc bxI -syH -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -syH +cGV +alR +xIi +xIi +xIi +xIi +xIi +xIi +goa +nnV +cGV jmQ rsR -snj +qmV qHe alB uvl @@ -45614,18 +50011,18 @@ dlI txu eTr rZg -syH -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -syH -ddk +cGV +wGC +oqi +wWr +wWr +wWr +wWr +kuG +goa +nnV +cGV +mXV wbn uwo qHe @@ -45806,19 +50203,19 @@ xhD xvZ dlI jMM -emK +bBc fpx -syH -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -kSn -syH +cGV +mKP +plT +ugT +uUx +ugT +mHr +yil +tHm +jlq +cGV jRB eMM cGF @@ -46001,25 +50398,25 @@ sWi dlI uvI aCi -uvI -syH -syH -syH -syH -syH -syH -coi -syH -syH -syH -syH -tUi +hYY +cGV +cGV +cGV +cGV +ilD +tMF +kKQ +cGV +cGV +cGV +cGV +qZx kTk -uKP +pEt qHe uny uny -uny +vLn uny uny uny @@ -46033,7 +50430,7 @@ uny wbu gZq uny -uny +vLn hjV mpy uny @@ -46194,22 +50591,22 @@ bno kaW dlI wQJ -emK -sTd -fPA -fPA -fPA -qxb -pnV -pnV -pnV +bBc +vyW +huq +huq +ljl +sxT pnV -plT -jJU +grA +nOV +ryu +khP +oxI +oxI gdI -guu ute -snj +qmV qHe qHe qHe @@ -46388,29 +50785,29 @@ crj qwY dlI sTd -emK -sTd -fPA -fPA -fPA -fPA -pnV -dSy -kKU +bBc +trg +wXO +wXO +wXO +wXO +hNe +aFF +fUU kKU kKU kKU kKU +wBG +dbR lwh -rsR -snj orP -tOV -tOV -tOV -tOV -tOV -tOV +oKo +dlG +oKo +dlG +oKo +oKo orP tOV tOV @@ -46582,29 +50979,29 @@ gTq dlI dlI sTd -emK -fPA -qvY -bWK -bWK +bBc +cpz +eZW +xPB +xPB bWK -nKD +owv dFI nKD bWK -bWK -bWK -pnV -pAC +xPB +xPB +inx +aOg rsR -snj +pAC npi -tOV -tOV -tOV -tOV -tOV -tOV +oKo +oKo +oKo +oKo +oKo +oKo eqK tOV tOV @@ -46776,29 +51173,29 @@ pkW wAQ vaf sTd -emK -fPA -fPA -ymj -aII -qZS -pnV -pAC -pnV -qZS -wGC -ymj -pnV -pAC +bBc +cQG +eqa +bDG +qHq +pkQ +qHq +qkV +rQK +pkQ +qHq +kwF +qCe +pXE rsR -snj +pAC npi -tOV -tOV -tOV -tOV -tOV -tOV +oKo +oKo +oKo +oKo +oKo +oKo eqK tOV tOV @@ -46971,19 +51368,19 @@ rks vaf sTd oxG -fPA -fPA -ymj -aII -qZS -pnV -pAC -pnV -qZS -wGC -ymj -pnV -pAC +cpz +eqa +bDG +qHq +qHq +qHq +qkV +rQK +qHq +qHq +kwF +qCe +pXE rsR owS phK @@ -47164,22 +51561,22 @@ mkn jHr vaf sTd -emK -fPA -fPA +bBc +cpz +eZW +xPB +xPB eCk -bWK -bWK -pnV -pAC -pnV -bWK -bWK +lfS +qkV +rQK eCk -pnV -pAC +xPB +xPB +inx +ojU rsR -snj +qmV wHz cTU aQy @@ -47359,21 +51756,21 @@ jHr vaf txu eTr -syD -fPA -qNg +sid +eqa mmq -ymj -pnV -pAC -pnV -ymj mmq -inx -pnV -pAC +qHq +qHq +qkV +rQK +qHq +mmq +mmq +qCe +pXE rsR -snj +qmV wHz aya gos @@ -47552,22 +51949,22 @@ mkn jHr pwq sXK -emK -fPA -fPA -qNg +bBc +cpz +eqa mmq -ymj +mmq +aec dSy tYX -pnV -ymj +rQK +aec mmq -inx -pnV -pAC +mmq +qCe +pXE aMs -snj +qmV phK bNb gos @@ -47752,16 +52149,16 @@ mMr bWK bWK bWK -pAC -pnV -pnV +qkV +iuv +tIr bWK bWK bWK -mMr -mLw +mhY +odY fjn -qrB +mLw wHz xdO gos @@ -47939,9 +52336,9 @@ lin nvp mwA sQO -uOQ +woK pAU -gDD +xIv mMr lTw lTw @@ -47952,10 +52349,10 @@ mhY mhY mhY ufX -mMr +mhY tVr fjn -qrB +mLw tWr aXy gos @@ -48135,7 +52532,7 @@ pPi jiy eUA nTO -thA +rPF mMr lTw lTw @@ -48146,10 +52543,10 @@ mhY qeD ufX ufX -mMr +mhY fiG fjn -qrB +mLw wHz cYG gvA @@ -48329,7 +52726,7 @@ iPO jiy fpw pAU -gDD +jmL hFn lTw lTw @@ -48341,9 +52738,9 @@ uiN xfl ufX inX -mLw +fGL qhs -gBm +xVA nnI bSi kDv @@ -48521,9 +52918,9 @@ rVy mti pPi jiy -cYu +tMK pAU -gDD +pNH mMr lTw lTw @@ -48534,10 +52931,10 @@ mhY jkU nuP swT -mMr +mhY +wQI +hmk mLw -fjn -qrB wHz snw koi @@ -48728,10 +53125,10 @@ mhY bCC stW mhY -mMr +mhY +osL +hmk mLw -fjn -qrB wHz hjz bRI @@ -48909,7 +53306,7 @@ stc xut hgm jiy -gDD +tMK pAU oNu mMr @@ -48924,8 +53321,8 @@ dXR gNi lOF fYq -bsL -bzp +fjn +mLw hqP hqP hqP @@ -49103,23 +53500,23 @@ rVy mti pPi jiy -ctz +luz pAU -gDD -mMr +xIv mMr mMr mMr +mhY gJI -mMr -mMr -eSJ -mMr -mMr -mMr -mLw -fjn +mhY +mhY +bCC +mhY +mhY +mhY qrB +fjn +mLw hqP irT owH @@ -49299,21 +53696,21 @@ dky jiy sBa oxV -gDD -gDD -gDD +rCX +tZy +tZy fek +tEi gDD -gDD -gDD +opZ qca xPF -yhH +xXk hdd yhH nUU gig -qrB +iIt hqP tNF mCI @@ -49491,23 +53888,23 @@ daO nJE qNM jiy -gDD +tMK pAU -gDD -gDD -gDD -gDD -gDD -gDD -gDD -fGL -fGL -fGL -fGL -fGL -mLw +nRf +ddk +ddk +ddk +ddk +ddk +ddk +bzp +bzp +bzp +bzp +bzp +aPr fjn -qrB +eSJ hqP puw mYK @@ -49687,21 +54084,21 @@ mGq jiy spd pAU -gDD -gDD -gDD -gDD -gDD -gDD -gDD -fGL -fGL -fGL -fGL -fGL -mLw +eNl +eWb +eWb +dhq +eWb +eWb +eWb +iRh +tTS +wex +tTS +tTS +gTr fjn -qrB +mLw hqP seV ohV @@ -49889,7 +54286,7 @@ orP orP orP orP -ejd +orP orP orP orP @@ -50075,7 +54472,7 @@ dld jiy dfD pAU -gDD +xIv orP tOV tOV @@ -50089,7 +54486,7 @@ tOV orP ruf fjn -sid +wqJ vnQ nzc xDj @@ -50271,17 +54668,17 @@ uOQ pAU iIc orP -cGV -cGV -cGV -cGV -xGk -cGV +tOV +tOV +tOV +tOV +tOV +tOV tOV tOV tOV orP -wqJ +nDt fjn aup vnQ @@ -50463,19 +54860,19 @@ rBG rBG uOQ pAU -gDD +xIv orP -kPQ -kPQ -ffb -xtt -uUx -cGV +tOV +tOV +tOV +tOV +tOV +tOV tOV tOV tOV orP -wqJ +lDC fjn ieG vnQ @@ -50659,12 +55056,12 @@ exc nTO thA orP -lPZ -lPZ -goa -goa -xIi -cGV +tOV +tOV +tOV +tOV +tOV +tOV tOV tOV tOV @@ -50851,19 +55248,19 @@ fju rBG uOQ pAU -gDD -orP -fdH -wWr -xIi -xIi -xIi -cGV -tOV -tOV -tOV -orP -wqJ +xIv +daO +daO +daO +daO +daO +ekH +ekH +ekH +ekH +ekH +ekH +eTx fjn deC vnQ @@ -51045,19 +55442,19 @@ fju rBG uOQ pAU -gDD -tMF -jmL -gcW -wWr -xIi -wWr -cGV -npW -tOV -tOV -orP -wqJ +xIv +daO +wIA +xus +tpP +hbS +ekH +aqY +kyI +tUR +duv +ekH +xyc fjn vMf vLD @@ -51237,20 +55634,20 @@ vRl fju fju rBG -uOQ +lDx pAU -gDD -tMF -kui -gcW -wWr -xIi -oqi -cGV -tOV -tOV -tOV -orP +goK +daO +kdZ +kdZ +lbT +wJO +ekH +mLa +jLq +qHz +qHz +ekH nDt fjn see @@ -51431,20 +55828,20 @@ vRl fju fju rBG -eUA +fqc nTO thA -cGV -tTV -xIi -xIi -enZ -alR -cGV -tOV -tOV -tOV -orP +daO +oTx +woH +jng +rSu +ekH +cCr +efB +nif +iLr +ekH swv okL pIT @@ -51627,21 +56024,21 @@ fju rBG fpw pAU -gDD -cGV -way -mKP -nnV -cGV -cGV -cGV -orP -tOV -tOV -orP -vYG -uod -uwR +rUc +daO +daO +daO +awm +daO +ekH +ekH +suh +ekH +ekH +ekH +osL +lwm +gBm xAk xQL lxA @@ -51820,21 +56217,21 @@ fju fju rBG cYu -kiY -esA +ybd +jvH oWG -jOn -cMd -jlq -kKQ -nOV -tHm -ejd -tOV -tOV -orP -bZv -oXu +aND +eGm +rIN +xwi +gug +nWz +bep +ode +gWd +vgb +eDM +fFB gXN rxl hRv @@ -51845,7 +56242,7 @@ hcE hCy iBG iFu -iBG +edb iBG vFE wVa @@ -52015,21 +56412,21 @@ fju rBG xxb pAU -gDD -rpK -xIi -jIi -kuG -cGV -dbw -qnW -orP -tOV -tOV -orP -avW +jmL +sJA +sJA +sJA +sJA +sJA +xGw +dkj +sJA +sJA +sJA +sJA +fGL uod -qrB +rEE ekH ekH ekH @@ -52207,23 +56604,23 @@ vRl fju fju rBG -gDD +tMK pAU -iIc -cGV +lhb +xID hky -gcW -pJd -cGV -fDp -qnW -pCQ -tOV -tOV -orP -fiG +nAJ +nAJ +nAJ +nAJ +nAJ +nAJ +nAJ +hky +xID +wbj uod -qrB +mLw ekH pEk hTJ @@ -52401,23 +56798,23 @@ vRl rBG qdW rBG -gDD +nyw pAU -gDD -cGV +goK +xID faa -gcW -wWr -cGV +cSR +xID sFQ -qnW -pCQ -tOV -tOV -orP +ghO +cSR +xID +fiz +uVe +xID tVr uod -qrB +mLw ekH jUf imX @@ -52597,21 +56994,21 @@ ukT dcx len rOC -gDD -cGV -kui -gcW -wWr -cGV -yil -ilD -pCQ -tOV -tOV -orP -mLw +rUc +xID +vCA +gfp +vCA +vCA +bGz +vlu +vCA +vCA +vCA +xID +mab uod -qrB +mLw ekH vBq imX @@ -52785,26 +57182,26 @@ rWA uOI uOI uOI -uOI +jdI uOI uOI jDP -qvK -rSu -qvK -cGV -kui -gcW -wWr -cGV -svs -qnW -pCQ -tOV -tOV -orP -bGz -qHz +uMe +pAU +fHS +bVc +oXu +oXu +oXu +oXu +kcl +nPo +oXu +oXu +oXu +bVc +fYq +uod lIW ekH aBl @@ -52983,22 +57380,22 @@ xXg xXg xXg tgl -gDD -pAU -llM -cGV -kui -svB -akN -cGV -tOV -qnW -pCQ -tOV -tOV -orP -mLw -uod +ctz +ybd +sUQ +huM +kfA +huM +wFN +uVO +qoA +vRj +jXM +iYU +uyt +ode +rUS +fFB swZ gSN gSN @@ -53180,18 +57577,18 @@ itv gDD pAU blu -cGV -cGV -cGV -cGV -cGV -orP -mHr -pCQ -orP -orP -orP -mLw +qEf +qEf +qEf +ghh +qEf +qEf +cJC +fSo +cJC +cJC +cJC +qrB uod cCJ gSN @@ -53372,19 +57769,19 @@ qxA bPs tgl iKe -mIk +aII syD -fPA -fPA -fPA -qxb -fPA -fPA -aiO -wGd -wGd +qEf +ahk +rtp +cUM +jIr +qEf +dYL +qcJ +eNA eiY -wGd +cJC hte nTY jmJ @@ -53567,21 +57964,21 @@ lxI tgl rcz ofc -vCA -vCA -vCA -vCA -vCA -vCA -vCA -mJs -wGd -wGd -wGd -wGd -adH -aiO +okZ +qEf +aPN +aPN +cSd +vYG +qEf +gCV +upV +gOa +gOa +cJC sih +adZ +adH gSN kWJ nab @@ -53760,21 +58157,21 @@ qxA tle tgl fiO -xiG -fPA -fPA -fPA -fPA -fPA -fPA -fSo -wGd -wGd -gOa -uhW +rqN +okZ +qEf +evi +krn +qxb +lou +qEf +gfx +xTl +xIo uhW -tqq -aiO +cJC +sih +adZ vWW gSN rhG @@ -53953,22 +58350,22 @@ uXI qxA qnx tgl -fPA -xiG +qxm +rqN nKw mMr mMr -pku mMr mMr mMr mMr mMr -aPN mMr mMr -hIB -aiO +mMr +mMr +voc +nQm iaj gSN gSN @@ -54148,8 +58545,8 @@ qxA kfo tgl bWa -gLQ -eyy +qHk +rDj mMr lTw lTw @@ -54159,10 +58556,10 @@ hQd hQd hQd nFM -lTw -mMr -wGd -aiO +hQd +llM +tqq +qck cBe laD iAO @@ -54342,8 +58739,8 @@ kSc lsx tgl rub -xiG -fPA +rqN +okZ mMr lTw lTw @@ -54355,15 +58752,15 @@ xwr xwr mMr mMr -lJp +uam eoB -sih +wGd mfy vIe ibp rjJ vIe -vIe +adB vIe mti vIe @@ -54536,9 +58933,9 @@ qxA xZp tgl mWG -xiG -fPA -mMr +rqN +okZ +vVx lTw lTw xwr @@ -54551,7 +58948,7 @@ mMr mMr nLT pQa -sih +gxY xdM xdM xdM @@ -54743,8 +59140,8 @@ iFN pUh hvr mMr -vVx -awA +sih +pQa kAe xdM cTe @@ -54924,11 +59321,11 @@ eek rMh bEx fPA -xiG +rqN hbD mMr lTw -lTw +nEe xwr ujB mBj @@ -55117,11 +59514,11 @@ eek eek rMh tgl -rcz -xiG +kyv +rqN jFV mMr -lTw +mMr lTw xwr xwr @@ -55506,19 +59903,19 @@ gSf gSf mMr ygj -xiG +rqN gSH -qEf -qEf -qEf -qEf -qEf -cJC -cJC -cJC -cJC -cJC -cJC +orP +orP +orP +orP +orP +orP +orP +orP +orP +orP +orP klp pQa mqC @@ -55699,23 +60096,23 @@ lTw lTw lTw mMr -fPA -xiG -fPA -qEf -rUc -vkT +pjJ +sWa +iIC +orP +kiY +tOV qgg -cpz -cJC +rpK +orP bfE ogR -rQK +tOV kZj -cJC +orP hIB -tIr -wGd +eoB +tGB xdM xdM tHI @@ -55896,19 +60293,19 @@ mMr bUz mIk syD -qEf -vkT +orP +tOV nqm oRt -eWb -cJC +kOc +orP nFD khT qdl kOc -cJC +orP gQq -nTY +iHD rEi xdM vYX @@ -56087,23 +60484,23 @@ mMr gRf mMr mMr -fPA -xiG -fPA -qEf +qxm +rqN +okZ +orP efY wrz jua -vkT -cJC +tOV +orP sAQ mQi -rQK +tOV jVe -cJC -wGd -aiO -vyW +orP +gFU +eoB +tGB xdM nLm oMi @@ -56281,22 +60678,22 @@ lTw lTw lTw mMr -fPA -xiG +qxm +rqN qvY -qEf +orP jhS -wXO +tOV esO cuC -cJC +orP ymh -pEt -kGS -rQK -cJC -wGd -aiO +rpK +esO +tOV +orP +gFU +eoB poW xdM xdM @@ -56475,23 +60872,23 @@ lTw lTw lTw mMr -suh -xiG -suh -qEf -qEf +qxm +rqN +gMk +orP +orP oyR -qEf -qEf -cJC +orP +orP +orP wvZ -cJC -cJC -cJC -cJC -paM -aiO -xTl +orP +orP +orP +orP +lJp +eoB +tGB mMr lTw lTw @@ -56669,12 +61066,12 @@ alQ lTw lTw mMr -fPA +qxm tAU uIa qcn ecv -tGB +ecv ecv ecv ecv @@ -56683,9 +61080,9 @@ mMr mMr mMr mMr -wGd -aiO -vyW +paM +avW +qvK mMr lTw rOW @@ -56863,8 +61260,8 @@ alQ lTw lTw mMr -fPA -xiG +vkT +rqN eyy mMr mMr @@ -56875,11 +61272,11 @@ dNB dNB oQU kDc -eiY -wGd -wGd -aiO -vyW +nDp +deT +acN +eoB +tGB mMr lTw enJ @@ -57058,7 +61455,7 @@ lTw lTw gRf fPA -xiG +rqN fPA pku lTw @@ -57068,12 +61465,12 @@ dNB ikk ikk cPX +exf wGd wGd wGd -wGd -aiO -vyW +eoB +tGB bDg lTw alQ @@ -57251,9 +61648,9 @@ alQ lTw lTw mMr -fPA -xiG -fPA +ujU +rqN +scV mMr lTw lTw @@ -57266,8 +61663,8 @@ wGd wGd wGd wGd -aiO -vyW +eoB +tGB mMr lTw lTw @@ -57445,9 +61842,9 @@ alQ lUd lTw mMr -fPA -xiG -fPA +qxm +rqN +okZ mMr lTw lTw @@ -57640,8 +62037,8 @@ alQ lTw mMr rub -xiG -fPA +rqN +okZ mMr lTw lTw @@ -57650,12 +62047,12 @@ dNB ikk ikk dNB -wGd +vEl wGd wGd wGd com -vyW +wGd pku lTw lTw @@ -57833,9 +62230,9 @@ pRW alQ lTw mMr -fPA -xiG -fPA +nMU +rqN +okZ mMr mMr pku @@ -57844,12 +62241,12 @@ oQU dNB dNB oQU -wGd +uMD noQ -wGd -wGd +dER +jmB com -vyW +gxY mMr lTw lTw @@ -58027,9 +62424,9 @@ tUu alQ lTw mMr -fPA -xiG -fPA +pjJ +sWa +iIC mMr lTw lTw @@ -58041,9 +62438,9 @@ mMr mMr mMr mMr -wGd -com -vyW +paM +esA +jbc mMr lTw lTw @@ -58221,7 +62618,7 @@ pRW alQ alQ mMr -kuM +ova gEz jKI mMr @@ -58237,7 +62634,7 @@ lTw mMr nYH kDu -lwm +xYu alQ lTw lTw @@ -58415,9 +62812,9 @@ jGe jYr alQ mMr -kuM +ova uMR -kuM +lqZ mMr lTw lTw @@ -58431,7 +62828,7 @@ lTw mMr piH ugo -rUS +fiP alQ lTw lTw @@ -58609,7 +63006,7 @@ jYr aKn alQ alQ -nYH +nue lHF ufC mMr @@ -58623,9 +63020,9 @@ mMr mMr mMr mMr -kuM +wiJ ugo -rUS +fiP alQ lTw lTw @@ -58803,23 +63200,23 @@ jGe jYr alQ mMr -kuM +ova dHX dSg -dSg -dSg +fop +fop mxC -dSg +fop xMQ pab -dSg -mxC -dSg -dSg -dSg -dSg +vQB +dzp +vQB +vQB +vQB +mVA auM -avK +fiP alQ lTw lTw @@ -58997,9 +63394,9 @@ pRW nhl lTw alQ -kuM +ova kBD -bUW +aMk bUW bUW bUW @@ -59011,9 +63408,9 @@ hsr hsr hsr hsr -hsr +qZS jNw -kuM +fiP alQ lTw lTw @@ -59191,23 +63588,23 @@ pRW nhl lTw bsV +ova kuM -kuM -eBi -bWK -bWK -bWK -bWK -oeN -rUS -hhJ +lqZ bWK +iXB +iXB bWK +uIG +tGS +caA bWK +iXB +iXB bWK -piH -kuM +stl kuM +fiP alQ lTw lTw @@ -59385,23 +63782,23 @@ pRW pRW mDp bsV +ova kuM -kuM -kuM -ymj +lqZ +iXB +aiO ymj -aII -qZS -uIG -rUS +pkQ +oeN +tGS hhJ -qZS -wGC -ymj +pkQ ymj +iVR +iXB +stl kuM -kuM -kuM +fiP alQ lTw alQ @@ -59579,23 +63976,23 @@ pRW pRW pRW bsV +ova kuM -kuM -kuM -ymj +lqZ +iXB +aiO ymj -aII -qZS +qHq oeN -rUS +tGS hhJ -qZS -wGC +qHq ymj -ymj -kuM -kuM +iVR +iXB +stl kuM +fiP bsV bsV qJM @@ -59773,23 +64170,23 @@ pRW pRW pRW bsV +ova kuM -kuM -kuM -eCk -bWK +eBi bWK -qZS +iXB +iXB +eCk oeN -rUS -caA -qZS -bWK -bWK +tGS +hhJ eCk +iXB +iXB +bWK +piH kuM -kuM -kuM +ewW bsV pRW pRW @@ -59967,23 +64364,23 @@ pRW pRW pRW bsV -kuM +ova kuM jKI -bWK +iXB mmq mmq -ymj +qHq oeN -rUS +tGS hhJ -ymj +qHq mmq mmq -bWK -kuM -kuM +iXB +stl kuM +fiP bsV pRW pRW @@ -60163,21 +64560,21 @@ pRW bsV dyX kuM -dyX -bWK +eRz +iXB mmq mmq -ymj +aec oeN -rUS +tGS hhJ -ymj +aec mmq mmq -bWK -dyX +iXB +dTT kuM -dyX +dVv bsV pRW pRW @@ -60369,9 +64766,9 @@ bWK bWK bWK bWK -tfs +lIV rlJ -tfs +lIV qJM pRW pRW @@ -60561,7 +64958,7 @@ dHM vYO efw tfs -ajx +nRx qcL ajx xIP @@ -60937,7 +65334,7 @@ pRW jYr aKn alQ -mMr +jbL mMr mMr mMr @@ -60946,7 +65343,7 @@ mMr oGe bCj npe -bCj +lVx eaJ lIV jrE @@ -61131,11 +65528,11 @@ pRW jGe jYr alQ -jbL -lTw +alQ mMr -nRx +vGH dyV +aKg tfs fpB acT @@ -61326,21 +65723,21 @@ pRW pRW alQ alQ -lTw mMr -aKg +hGu +dyV kXm tfs aVe siv -tGS -siv +npe +lVx eaJ lIV pSV iZa ulp -xIP +wTs qJM qJM pRW @@ -61720,9 +66117,9 @@ qJM qJM tfs hWt +mJs lVx -lVx -lVx +miu qyd tfs qJM @@ -61914,9 +66311,9 @@ mDp bsV bsV njC +dbw bCj -bCj -bCj +fLd tDb bsV bsV @@ -62105,7 +66502,7 @@ mDp mDp mDp mDp -uZY +bsV bsV bsV qCo @@ -62113,7 +66510,7 @@ rHk qRU bsV bsV -uZY +bsV mDp mDp mDp @@ -62300,13 +66697,13 @@ mDp mDp mDp mDp -uZY bsV bsV bsV bsV bsV -uZY +bsV +bsV mDp mDp mDp @@ -62495,11 +66892,11 @@ mDp mDp mDp mDp -uZY -uZY -uZY -uZY -uZY +bsV +bsV +bsV +bsV +bsV mDp mDp mDp diff --git a/maps/endeavour/levels/deck4.dmm b/maps/endeavour/levels/deck4.dmm index 3b22dc12ffbc..b4ad0e8c8be1 100644 --- a/maps/endeavour/levels/deck4.dmm +++ b/maps/endeavour/levels/deck4.dmm @@ -23,14 +23,18 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "aca" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "acg" = ( @@ -71,6 +75,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) "agu" = ( @@ -107,9 +114,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/eva) "agP" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4fwdhall) "ahp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -216,6 +230,17 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) +"anp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portamidhall) "anJ" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -260,6 +285,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) +"arQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/button/remote/blast_door{ + id = "hangar_maint"; + name = "Hangar Maintenance Shutter Control"; + req_one_access = list(29,47); + pixel_y = 28; + pixel_x = 7 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/button/remote/blast_door{ + id = "hangar_lockdown"; + name = "Hangar Lockdown Control"; + pixel_x = -7; + pixel_y = 28; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "asr" = ( /obj/machinery/portable_atmospherics/canister/phoron/engine_setup, /obj/effect/floor_decal/industrial/outline{ @@ -348,7 +393,19 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "avq" = ( -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) "avD" = ( /obj/machinery/computer/ship/helm{ @@ -387,6 +444,15 @@ /obj/item/storage/briefcase/inflatable, /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) +"axg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4fwdhall) "axj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -506,15 +572,13 @@ /turf/simulated/floor/plating, /area/maintenance/substation/engineering) "aCh" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightorange/border{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4fwdhall) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "aDe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -537,6 +601,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "aEm" = ( @@ -689,7 +756,7 @@ "aOz" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardhall) +/area/endeavour/station/stairs_four) "aOG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -702,6 +769,17 @@ }, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/starboardnacelle) +"aPf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "aQf" = ( /turf/simulated/wall/prepainted/engineering, /area/endeavour/hallway/d4starboardamidhall) @@ -892,13 +970,20 @@ dir = 1 }, /obj/machinery/power/breakerbox/activated{ - RCon_tag = "ENGINEERING SUPPORT" + RCon_tag = "AUX - ENGINEERING" }, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"bdO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 10 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/starboardnacelle) "bec" = ( /obj/effect/floor_decal/corner/lightorange/diagonal, /obj/structure/cable/green{ @@ -962,7 +1047,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "bjb" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -1013,15 +1098,30 @@ /turf/simulated/floor/tiled/white, /area/engineering/shield_gen) "bmK" = ( -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d4porthall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portamidhall) "bmP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "bne" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -1120,6 +1220,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "bua" = ( @@ -1135,6 +1238,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardhall) "buV" = ( @@ -1148,7 +1254,7 @@ /area/engineering/atmos/workshop) "bwK" = ( /turf/simulated/wall/prepainted, -/area/station/stairs_one) +/area/endeavour/station/stairs_four) "bxh" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -1454,12 +1560,12 @@ /area/endeavour/hallway/d4starboardhall) "bPr" = ( /obj/structure/bed/chair/bay/comfy, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/corner/navgold/full{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "bQm" = ( @@ -1500,11 +1606,13 @@ /turf/simulated/floor/tiled/steel, /area/tcommsat/computer) "bQX" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4fwdhall) +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "bRD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1535,6 +1643,20 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) +"bTf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/access_helper/airlock/station/hangar, +/obj/machinery/door/airlock/glass/research{ + name = "Hangar Repair Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "bUB" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -1633,6 +1755,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"bZM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "caF" = ( /obj/structure/sign/department/eng{ pixel_y = -32 @@ -1660,6 +1794,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "cgT" = ( @@ -1740,14 +1880,29 @@ pixel_x = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/glass/research{ + name = "Hangar Repair Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/map_helper/access_helper/airlock/station/hangar, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4fwdhall) +/area/rnd/robotics/smallcraft) "ckx" = ( /obj/structure/cable/green{ icon_state = "1-4" }, /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) +"ckU" = ( +/obj/machinery/shield_diffuser, +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 9 + }, +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/starboardnacelle) "cnf" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/floor_decal/spline/fancy{ @@ -1979,12 +2134,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) -"cxU" = ( -/obj/machinery/turretid/lethal{ - pixel_y = 33 - }, -/turf/simulated/wall/r_wall/prepainted/command, -/area/endeavour/command/turrets) "cyd" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorblack{ @@ -2007,11 +2156,18 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "cAc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4fwdhall) +/area/rnd/robotics/smallcraft) "cAe" = ( /obj/machinery/holopad, /obj/structure/cable{ @@ -2035,6 +2191,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "cBS" = ( @@ -2084,6 +2244,12 @@ /obj/item/circuitboard/machine/lathe/autolathe, /turf/simulated/floor, /area/storage/tech) +"cGj" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "cGm" = ( /obj/machinery/light{ dir = 4; @@ -2106,6 +2272,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) +"cGG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/wall/r_wall/prepainted, +/area/rnd/robotics/smallcraft) "cGP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2133,6 +2304,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "cIU" = ( @@ -2431,17 +2606,24 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dhN" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/light, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4fwdhall) "djL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "dkm" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2627,7 +2809,7 @@ dir = 4 }, /turf/space, -/area/engineering/portnacelle) +/area/engineering/starboardnacelle) "dvY" = ( /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) @@ -2732,6 +2914,12 @@ /obj/machinery/recharge_station, /turf/simulated/floor/wood, /area/engineering/break_room) +"dDz" = ( +/obj/machinery/computer/rdconsole/robotics{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "dEd" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -2870,6 +3058,14 @@ /obj/item/multitool, /turf/simulated/floor, /area/storage/tech) +"dQV" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "dRg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -2897,6 +3093,9 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "dSj" = ( @@ -2916,6 +3115,14 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) +"dSP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "dUf" = ( /obj/item/modular_computer/console/preset/engineering, /obj/effect/floor_decal/borderfloorblack{ @@ -3125,6 +3332,18 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"ekV" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardforhall) "elg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -3154,6 +3373,9 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "elF" = ( @@ -3221,6 +3443,11 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/tech) +"epH" = ( +/obj/machinery/shield_diffuser, +/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/starboardnacelle) "eqo" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -3332,20 +3559,14 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "exJ" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightorange/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4fwdhall) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "eyl" = ( -/obj/machinery/button/windowtint{ - id = "bridge_interior"; - pixel_y = -26 - }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/corner/navgold{ dir = 9 @@ -3436,14 +3657,7 @@ "eDQ" = ( /obj/structure/sign/warning/caution, /turf/simulated/wall/r_wall/prepainted, -/area/endeavour/hallway/d4portforhall) -"eEz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/endeavour/command/turrets) +/area/endeavour/hallway/d4fwdhall) "eEF" = ( /obj/machinery/disperser/front{ dir = 4; @@ -3525,7 +3739,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "eKk" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) "eLf" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -3551,6 +3773,18 @@ }, /turf/simulated/floor/tiled/steel, /area/tcommsat/computer) +"eLL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4porthall) "eLR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3576,6 +3810,18 @@ /obj/machinery/atmospherics/pipe/tank/phoron, /turf/simulated/floor/tiled/techmaint, /area/engineering/portnacelle) +"eMc" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardhall) "eMg" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -3672,8 +3918,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4fwdhall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "eSf" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -3694,8 +3941,14 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "eTy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "eTB" = ( /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" @@ -3866,8 +4119,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation) "fee" = ( -/turf/simulated/floor/airless/ceiling, +/turf/simulated/floor/plating, /area/ai/foyer) +"ffx" = ( +/obj/machinery/camera/network/civilian, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "ffD" = ( /obj/structure/sign/deck/fourth, /turf/simulated/wall/r_wall/prepainted/engineering, @@ -3926,6 +4186,12 @@ /obj/structure/cable{ icon_state = "5-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "fjk" = ( @@ -3945,6 +4211,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "fjt" = ( @@ -4011,7 +4280,6 @@ }, /area/tcommsat/chamber) "fns" = ( -/obj/machinery/door/airlock/multi_tile/glass, /obj/map_helper/access_helper/airlock/station/engineering/department, /obj/structure/catwalk, /obj/structure/cable/orange{ @@ -4019,6 +4287,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/plating, /area/maintenance/substation) "fod" = ( @@ -4044,15 +4313,9 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "fow" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 1 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "fqb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 @@ -4115,8 +4378,13 @@ pixel_x = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass/research{ + name = "Hangar Repair Bay"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/hangar, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4fwdhall) +/area/rnd/robotics/smallcraft) "fxi" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -4218,8 +4486,9 @@ /turf/simulated/floor/plating, /area/storage/tech) "fDL" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/station/stairs_one) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/endeavour/station/stairs_four) "fEm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/catwalk, @@ -4354,21 +4623,30 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardafthall) "fLS" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4portforhall) +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d4fwdmaint) "fMD" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) +"fMI" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/rnd/robotics/smallcraft) "fNj" = ( /obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -4474,16 +4752,8 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "fWg" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "fWh" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -4491,6 +4761,17 @@ /obj/structure/lattice, /turf/space, /area/space) +"fWr" = ( +/obj/machinery/door/airlock/glass/research{ + name = "Hangar Repair Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/map_helper/access_helper/airlock/station/hangar, +/turf/simulated/floor/tiled, +/area/rnd/robotics/smallcraft) "fWC" = ( /turf/simulated/floor/tiled/monodark, /area/engineering/drone_fabrication) @@ -4511,15 +4792,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "fZX" = ( -/obj/machinery/door/firedoor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Hallway"; - req_one_access = null +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "fZZ" = ( @@ -4542,10 +4820,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_gas) "gbN" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/engineering/break_room) "gcl" = ( @@ -4628,7 +4903,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "gkk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4709,6 +4984,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) +"gqI" = ( +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d4fwdmaint) "gqP" = ( /turf/simulated/wall/durasteel, /area/ai) @@ -4744,6 +5023,12 @@ icon_state = "4-8" }, /obj/map_helper/access_helper/airlock/station/command/bridge, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "gtA" = ( @@ -4779,6 +5064,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"gvx" = ( +/obj/structure/catwalk, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" + }, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "gvX" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/lightorange/bordercorner, @@ -4791,6 +5085,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) "gwX" = ( @@ -4867,14 +5162,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "gAd" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4fwdhall) "gAz" = ( @@ -5041,6 +5337,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) +"gJd" = ( +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload_foyer) "gJY" = ( /obj/machinery/computer/station_alert{ dir = 8 @@ -5299,7 +5599,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "gXP" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -5380,13 +5680,12 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "hfS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "hfY" = ( /turf/simulated/floor/airless/ceiling, /area/space) @@ -5424,8 +5723,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) "hic" = ( -/turf/simulated/floor/airless/ceiling, -/area/endeavour/hallway/d4fwdmaint) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "hiG" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -5594,6 +5896,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) +"hsE" = ( +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor, +/area/storage/tech) "htc" = ( /obj/effect/floor_decal/corner/navgold{ dir = 6 @@ -5603,6 +5909,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"htI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4porthall) "huc" = ( /obj/structure/table/rack/shelf/steel, /obj/item/radio/off, @@ -5972,14 +6290,20 @@ /area/engineering/portnacelle) "hOe" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 8 + dir = 4 }, /obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardhall) +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "hOo" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -6002,6 +6326,14 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) +"hOM" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/robotics/smallcraft) "hPd" = ( /obj/effect/floor_decal/techfloor/orange, /obj/structure/table/reinforced, @@ -6011,6 +6343,27 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) +"hPj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_y = 38; + req_one_access = list(19,29,38,43,47,63,67); + pixel_x = 7 + }, +/obj/machinery/button/remote/blast_door{ + id = "hangar_lockdown"; + name = "Hangar Lockdown Control"; + pixel_x = -10; + pixel_y = 38; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "hPQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -6020,6 +6373,18 @@ }, /turf/simulated/floor/tiled/monowhite, /area/engineering/drone_fabrication) +"hPS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "hPX" = ( /obj/structure/table/steel, /obj/item/cell/high{ @@ -6175,6 +6540,28 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"icI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardhall) +"icN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portforhall) "ieH" = ( /obj/structure/cable{ icon_state = "0-4" @@ -6253,6 +6640,13 @@ "ikp" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/endeavour/hallway/d4aftmaint) +"ikC" = ( +/obj/machinery/light{ + dir = 1; + pixel_y = 20 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d4aftmaint) "imx" = ( /obj/structure/cable/cyan{ icon_state = "0-8" @@ -6335,6 +6729,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_airlock) +"iqO" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardforhall) "iqQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6457,7 +6861,7 @@ /area/endeavour/hallway/d4portafthall) "iCe" = ( /obj/machinery/power/breakerbox{ - RCon_tag = "SECONDARY CROSSOVER" + RCon_tag = "CROSSOVER - AUX" }, /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) @@ -6495,6 +6899,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "iFc" = ( @@ -6537,6 +6944,18 @@ }, /turf/simulated/floor/tiled/white, /area/engineering/shield_gen) +"iHh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardamidhall) "iHk" = ( /obj/structure/sign/warning, /turf/simulated/wall/r_wall, @@ -6715,6 +7134,9 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_airlock) "iUc" = ( @@ -6754,6 +7176,18 @@ /obj/item/tool/wrench, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) +"iXv" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_smes) "iXz" = ( /obj/structure/railing, /turf/simulated/floor/plating, @@ -6838,6 +7272,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"jgS" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" + }, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "jhg" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -6874,6 +7317,12 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "jiL" = ( @@ -6886,6 +7335,12 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "jjz" = ( @@ -6898,7 +7353,7 @@ /obj/map_helper/airlock/door/int_door, /obj/effect/floor_decal/industrial/warning, /obj/machinery/access_button/airlock_interior{ - frequency = 1380; + frequency = 1381; master_tag = "deck1_airlock"; pixel_x = 24 }, @@ -6906,7 +7361,6 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "jkF" = ( @@ -6923,6 +7377,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) +"jlf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) +"jlo" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardamidhall) "jlM" = ( /obj/effect/floor_decal/spline/fancy{ dir = 6 @@ -7024,6 +7501,22 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/eva) +"jqL" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Port Mass Driver Access" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d4fwdmaint) +"jqM" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "jrF" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled/techmaint, @@ -7048,6 +7541,14 @@ }, /turf/simulated/floor/airless/ceiling, /area/endeavour/hallway/d4fwdmaint) +"jsW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "jsX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -7141,17 +7642,25 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "jyo" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/tiled, -/area/station/stairs_one) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardhall) "jyr" = ( /obj/effect/shuttle_landmark/endeavour/deck1/starboard, /turf/space, /area/space) "jyT" = ( -/obj/machinery/air_alarm/west_mount, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d4fwdhall) +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "jzb" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -7249,13 +7758,15 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_gas) "jFf" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4portforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/air_alarm/west_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "jFB" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -7351,6 +7862,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/workshop) +"jKS" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/station/stairs_four) "jLs" = ( /obj/landmark/spawnpoint/job/ai, /obj/machinery/requests_console{ @@ -7401,9 +7918,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "jMe" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled, -/area/station/stairs_one) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portforhall) "jMU" = ( /turf/simulated/floor/plating, /area/space) @@ -7508,6 +8031,9 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portafthall) +"jSH" = ( +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "jTm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7728,11 +8254,34 @@ }, /turf/simulated/floor/tiled/white, /area/engineering/shield_gen) +"kkX" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4fwdhall) "klt" = ( /obj/machinery/atmospherics/component/quaternary/atmos_filter, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"klQ" = ( +/obj/machinery/shield_diffuser{ + icon_state = "fdiffuser_off" + }, +/turf/space/basic, +/area/space) +"kmv" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portforhall) +"knf" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/rnd/robotics/smallcraft) "kng" = ( /obj/machinery/message_server, /turf/simulated/floor/tiled/techfloor, @@ -7812,12 +8361,9 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/locker_room) "kup" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4fwdhall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "kwb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7997,9 +8543,20 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, -/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) +"kDR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "kEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 @@ -8093,6 +8650,19 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) +"kOd" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4porthall) "kOp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -8114,6 +8684,12 @@ /obj/structure/cable{ icon_state = "1-10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "kRL" = ( @@ -8246,9 +8822,15 @@ /turf/simulated/floor/tiled/white, /area/engineering/shield_gen) "kZE" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardamidhall) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardforhall) "laD" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/techmaint, @@ -8284,7 +8866,7 @@ "lbF" = ( /obj/structure/sign/deck/fourth, /turf/simulated/wall/r_wall/prepainted, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "lbY" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /obj/structure/window/reinforced{ @@ -8387,8 +8969,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4porthall) "liM" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/endeavour/hallway/d4starboardamidhall) +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "ljy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -8687,6 +9281,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"lHh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portafthall) "lHH" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -8726,8 +9333,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4fwdhall) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/mech_recharger, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "lNQ" = ( /obj/effect/floor_decal/spline/fancy{ dir = 4 @@ -8771,6 +9380,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardamidhall) "lRa" = ( @@ -8981,6 +9593,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"lZR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "lZV" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -9080,7 +9700,7 @@ pixel_x = -10 }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "meF" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -9217,15 +9837,24 @@ /turf/simulated/floor/plating, /area/maintenance/substation) "mpg" = ( -/obj/machinery/air_alarm/north_mount, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/endeavour/hallway/d4fwdmaint) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "mqz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "mqE" = ( /obj/structure/table/rack{ dir = 8; @@ -9359,6 +9988,13 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4starboardhall) +"mzn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "mAr" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -9431,6 +10067,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) "mEt" = ( @@ -9511,9 +10151,6 @@ id = "portnacelle_blastdoor"; opacity = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 }, @@ -9653,6 +10290,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardforhall) "mOt" = ( @@ -9762,6 +10402,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"mTY" = ( +/obj/structure/catwalk, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d4fwdmaint) "mVv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9791,6 +10436,12 @@ name = "Aux Bridge"; req_one_access = list() }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/endeavour/command/turrets) "mYw" = ( @@ -9925,6 +10576,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) +"nlL" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "nmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9935,8 +10593,9 @@ /turf/simulated/floor/plating, /area/maintenance/substation) "nmp" = ( +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardamidhall) +/area/endeavour/station/stairs_four) "nmx" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -10030,6 +10689,21 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"npR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/aux{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardafthall) "npV" = ( /obj/effect/floor_decal/techfloor/orange, /obj/structure/table/bench/padded, @@ -10121,6 +10795,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardforhall) "ntt" = ( @@ -10433,7 +11110,7 @@ /obj/machinery/shield_diffuser, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ - frequency = 1380; + frequency = 1381; master_tag = "deck1_airlock"; pixel_x = 24 }, @@ -10549,14 +11226,16 @@ /turf/simulated/wall/r_wall/prepainted, /area/space) "nQw" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "nRc" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "nRE" = ( @@ -10579,6 +11258,10 @@ /obj/effect/floor_decal/corner/lightorange/border, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portforhall) +"nTJ" = ( +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) "nTQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10722,6 +11405,18 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) +"nYx" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "obt" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -10933,7 +11628,7 @@ /area/storage/tech) "ouc" = ( /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardhall) +/area/endeavour/station/stairs_four) "ouE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -10996,8 +11691,15 @@ /area/endeavour/command/turrets) "oyr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4fwdhall) +/area/rnd/robotics/smallcraft) "ozM" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/disposalpipe/segment, @@ -11077,7 +11779,9 @@ capacity = 8000; charge = 21600; output_level = 1500; - output_level_max = 1500 + output_level_max = 1500; + cur_coils = 6; + max_coils = 8 }, /turf/simulated/floor/plating, /area/engineering/engine_smes) @@ -11180,8 +11884,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4porthall) +/area/endeavour/station/stairs_four) "oQL" = ( /obj/structure/filingcabinet, /turf/simulated/floor/tiled/steel, @@ -11280,14 +11985,14 @@ /area/engineering/atmos) "oVv" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 4 + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border{ - dir = 4 + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4porthall) +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "oWx" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -11356,13 +12061,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4porthall) "pbx" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "pcf" = ( /obj/machinery/light/small{ dir = 4 @@ -11383,9 +12083,12 @@ /area/tcommsat/computer) "pdB" = ( /obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"pdK" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/storage/tech) "pec" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -11396,6 +12099,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portamidhall) "pep" = ( @@ -11443,6 +12147,10 @@ /obj/effect/floor_decal/corner/lightorange/border, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4porthall) +"piH" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "piY" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -11489,7 +12197,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardhall) +/area/endeavour/station/stairs_four) "pmA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -11658,6 +12366,16 @@ }, /turf/simulated/floor/plating, /area/engineering/portnacelle) +"pBX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "pCd" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ external_pressure_bound = 0; @@ -11779,14 +12497,15 @@ /turf/simulated/floor/plating, /area/tcommsat/powercontrol) "pMX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardforhall) +/turf/simulated/floor/tiled, +/area/rnd/robotics/smallcraft) "pNL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -11812,6 +12531,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"pPp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4fwdhall) "pQQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /obj/machinery/meter, @@ -11837,6 +12561,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portamidhall) +"pSM" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "pTs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11898,6 +12634,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/eva) +"pVc" = ( +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "pVu" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -11907,9 +12647,8 @@ /area/endeavour/hallway/d4aftmaint) "pVN" = ( /obj/machinery/camera/network/engineering, -/obj/machinery/air_alarm/north_mount, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "pWy" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/starboardnacelle) @@ -11923,6 +12662,18 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardamidhall) +"pXA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) "pXB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12024,6 +12775,7 @@ dir = 8 }, /obj/structure/cable/yellow, +/obj/machinery/light, /turf/simulated/floor/plating, /area/engineering/engine_smes) "qjI" = ( @@ -12058,6 +12810,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/red, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/workshop) +"qmW" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "qoE" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -12070,6 +12826,11 @@ /obj/machinery/door/window/westleft, /turf/simulated/floor/plating, /area/engineering/atmos) +"qpe" = ( +/obj/machinery/air_alarm/west_mount, +/obj/machinery/mecha_part_fabricator, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "qpf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -12116,8 +12877,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4fwdhall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "qsk" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ external_pressure_bound = 0; @@ -12447,7 +13209,8 @@ /obj/machinery/airlock_sensor{ dir = 8; id_tag = "deck1_airlock"; - pixel_x = 22 + pixel_x = 22; + frequency = 1381 }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -12482,6 +13245,18 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/tech) +"qRG" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardamidhall) "qSb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -12501,8 +13276,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardhall) "qSp" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4portamidhall) +/area/endeavour/station/stairs_four) "qSr" = ( /obj/machinery/air_alarm/north_mount, /turf/simulated/floor/wood, @@ -12766,13 +13545,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "rqN" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/steel_grid, -/area/endeavour/hallway/d4fwdhall) +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "rrc" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -12881,7 +13662,8 @@ capacity = 8000; charge = 19200; output_level_max = 1500; - output_level = 1000 + output_level = 1000; + cur_coils = 4 }, /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) @@ -13062,6 +13844,9 @@ /obj/effect/floor_decal/corner/navgold{ dir = 5 }, +/obj/machinery/turretid/lethal{ + pixel_y = 33 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "rQt" = ( @@ -13093,6 +13878,14 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardafthall) +"rRU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardamidhall) "rRY" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, @@ -13104,13 +13897,36 @@ /area/engineering/atmos/workshop) "rSr" = ( /turf/simulated/wall/r_wall/prepainted/engineering, -/area/endeavour/hallway/d4starboardhall) +/area/endeavour/station/stairs_four) +"rSB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/camera/network/engineering, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4portamidhall) "rSD" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, /turf/simulated/floor/reinforced/airless, /area/engineering/starboardnacelle) +"rSE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "rVe" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -13142,6 +13958,14 @@ name = "Mainframe Base" }, /area/tcommsat/chamber) +"rXh" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "rYi" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -13198,14 +14022,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) "saz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4portforhall) +/area/endeavour/hallway/d4fwdhall) "sdP" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/outline/red, @@ -13315,6 +14142,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 4; + id_tag = "deck1_airlock1"; + pixel_x = -26; + frequency = 1381 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "soe" = ( @@ -13342,6 +14175,14 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/maintenance/substation) +"srd" = ( +/obj/machinery/door/airlock/glass/research{ + name = "Hangar Repair Bay"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/hangar, +/turf/simulated/floor/tiled, +/area/rnd/robotics/smallcraft) "srp" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -13386,6 +14227,9 @@ /obj/effect/floor_decal/corner/lightorange/bordercorner2{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardamidhall) "suA" = ( @@ -13410,14 +14254,14 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "swz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4starboardforhall) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "sxr" = ( /obj/machinery/fire_alarm/east_mount{ dir = 4; @@ -13429,7 +14273,7 @@ /area/engineering/atmos) "sya" = ( /obj/structure/table/woodentable, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/wood, @@ -13437,7 +14281,9 @@ "szc" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Point Defense Grid"; - cur_coils = 4 + cur_coils = 2; + charge = 21600; + capacity = 8000 }, /obj/structure/cable{ icon_state = "0-4" @@ -13467,6 +14313,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/engineering/engine_gas) +"sBL" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "sBU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -13533,6 +14388,12 @@ }, /turf/simulated/floor/plating, /area/endeavour/hallway/d4fwdmaint) +"sDU" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) "sEB" = ( /obj/structure/table/standard, /obj/item/aiModule/nanotrasen, @@ -13713,6 +14574,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) +"sRd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/steel, +/area/rnd/robotics/smallcraft) "sRr" = ( /obj/item/radio/intercom{ dir = 4; @@ -13843,11 +14718,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "tdV" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) "tem" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /turf/simulated/floor/tiled/techmaint, @@ -13881,6 +14760,10 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"tlA" = ( +/obj/machinery/air_alarm/west_mount, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "tlR" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -13899,7 +14782,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "tmS" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -13933,10 +14816,10 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/catwalk, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/hallway/d4aftmaint) "tpr" = ( @@ -13954,6 +14837,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"tqe" = ( +/turf/space, +/area/engineering/starboardnacelle) "tqm" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/port_gen/pacman{ @@ -13991,7 +14877,7 @@ dir = 4 }, /obj/machinery/power/breakerbox{ - RCon_tag = "ENGINEERING MAIN" + RCon_tag = "MAIN - ENGINEERING" }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) @@ -14015,6 +14901,27 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"txY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) +"tyy" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4starboardafthall) "tzp" = ( /obj/machinery/telecomms/bus/preset_two/endeavour, /turf/simulated/floor/tiled/dark{ @@ -14140,6 +15047,13 @@ }, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/portnacelle) +"tGL" = ( +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 5 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/white, +/area/engineering/shield_gen) "tHj" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ frequency = 1443; @@ -14290,6 +15204,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portamidhall) "tRp" = ( @@ -14310,12 +15230,19 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "tRS" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/lightorange/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/endeavour/hallway/d4fwdhall) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rnd/robotics/smallcraft) +"tRY" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/smallcraft) "tSf" = ( /obj/machinery/power/port_gen/pacman/mrs{ anchored = 1 @@ -14333,6 +15260,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/bluegrid, /area/ai_upload) "tTb" = ( @@ -14380,6 +15310,12 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardhall) +"tUx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/endeavour/hallway/d4fwdhall) "tUN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14569,6 +15505,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"umi" = ( +/obj/machinery/shield_diffuser, +/obj/machinery/atmospherics/pipe/manifold/visible/fuel{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/starboardnacelle) "unZ" = ( /obj/machinery/computer/borgupload, /obj/machinery/light{ @@ -14596,14 +15539,10 @@ }, /area/tcommsat/chamber) "upV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4portforhall) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/mech_recharger, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "uqm" = ( /obj/machinery/camera/network/engineering, /obj/machinery/air_alarm/north_mount, @@ -14749,15 +15688,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/workshop) "uAo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/bluegrid, /area/ai_upload) "uAt" = ( @@ -14845,7 +15784,7 @@ /area/endeavour/hallway/d4aftmaint) "uEC" = ( /turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d4portamidhall) +/area/endeavour/station/stairs_four) "uEH" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -14954,6 +15893,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "uNt" = ( @@ -15133,13 +16073,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vdH" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightorange/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/light, +/turf/simulated/floor/tiled, /area/endeavour/hallway/d4fwdhall) "vdK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -15182,8 +16117,11 @@ /turf/simulated/floor/plating, /area/maintenance/substation) "vgl" = ( -/turf/simulated/wall/prepainted, -/area/endeavour/hallway/d4fwdmaint) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) "vgA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15252,6 +16190,9 @@ req_access = list(11); dir = 2 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "vip" = ( @@ -15294,6 +16235,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/tcommsat/powercontrol) +"vkt" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "vkW" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15333,8 +16286,17 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vms" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/station/stairs_one) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "vmy" = ( /obj/machinery/light{ dir = 1 @@ -15557,6 +16519,17 @@ /obj/effect/floor_decal/corner/lightorange/bordercorner2, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardhall) +"vzj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4starboardamidhall) "vzo" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock15"; @@ -15565,9 +16538,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "vzY" = ( -/obj/structure/sign/warning/caution, -/turf/simulated/wall/r_wall/prepainted, -/area/endeavour/hallway/d4starboardforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "vAC" = ( /obj/structure/lattice, /obj/machinery/camera/network/outside{ @@ -15579,6 +16557,13 @@ /obj/machinery/atmospherics/pipe/tank, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/eva) +"vCs" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "vCA" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -15595,15 +16580,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/endeavour/hallway/d4portafthall) "vDs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "vDT" = ( @@ -15693,6 +16678,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"vHi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4porthall) "vHr" = ( /obj/structure/cable{ icon_state = "2-8" @@ -15719,6 +16714,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"vJG" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "vJJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -15737,6 +16739,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"vKO" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "vLd" = ( /obj/structure/sign/warning/fire, /turf/simulated/wall/r_wall/prepainted/engineering, @@ -15956,6 +16964,10 @@ dir = 10 }, /obj/structure/catwalk, +/obj/machinery/light{ + dir = 4; + use_power = 0 + }, /turf/simulated/floor/plating, /area/engineering/engine_smes) "vWK" = ( @@ -16018,7 +17030,7 @@ "wah" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4portamidhall) +/area/endeavour/station/stairs_four) "waq" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -16036,6 +17048,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) "wbp" = ( @@ -16233,9 +17248,15 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "wlw" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d4porthall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4portforhall) "wom" = ( /obj/machinery/light/small{ dir = 1 @@ -16341,11 +17362,23 @@ dir = 4 }, /obj/machinery/light, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4starboardforhall) "wtL" = ( /turf/space, /area/endeavour/hallway/d4fwdmaint) +"wum" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d4fwdhall) "wuR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 1 @@ -16477,6 +17510,13 @@ "wEN" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/portnacelle) +"wFy" = ( +/obj/structure/table/rack/shelf, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/machinery/fire_alarm/west_mount, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/robotics/smallcraft) "wGc" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -16518,6 +17558,10 @@ /obj/machinery/computer/station_alert{ dir = 8 }, +/obj/machinery/light{ + dir = 4; + pixel_x = 10 + }, /turf/simulated/floor/wood, /area/engineering/break_room) "wHS" = ( @@ -16654,6 +17698,13 @@ /obj/effect/floor_decal/corner/yellow, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) +"wSS" = ( +/obj/machinery/light{ + dir = 4; + pixel_x = 10 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d4fwdhall) "wTv" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 @@ -16671,12 +17722,6 @@ /obj/structure/lattice, /turf/space, /area/space) -"wTX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/endeavour/command/turrets) "wUW" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/lightorange/border, @@ -16769,6 +17814,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4portafthall) "xbR" = ( @@ -17056,6 +18104,12 @@ /obj/item/stool/padded, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) +"xsM" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 4 + }, +/turf/space, +/area/engineering/starboardnacelle) "xsP" = ( /obj/turbolift_map_holder/endeavour, /turf/simulated/floor/holofloor/tiled/dark, @@ -17254,6 +18308,14 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/endeavour/hallway/d4starboardafthall) +"xBR" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/lightorange/border, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4portamidhall) "xCw" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -17535,8 +18597,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/wood, /area/engineering/break_room) @@ -17564,8 +18626,6 @@ pixel_x = 32; pixel_y = 30 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/air_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/endeavour/command/turrets) @@ -17609,9 +18669,11 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d4portafthall) "yfO" = ( -/obj/machinery/recharge_station, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/endeavour/hallway/d4starboardforhall) +/area/endeavour/hallway/d4fwdhall) "yfR" = ( /obj/machinery/atmospherics/pipe/simple/visible/aux{ dir = 4 @@ -17642,8 +18704,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) "yhC" = ( -/turf/simulated/floor/tiled, -/area/station/stairs_one) +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightorange/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/endeavour/hallway/d4starboardamidhall) "yhV" = ( /obj/effect/floor_decal/borderfloorblack/corner{ alpha = 255; @@ -21339,12 +22410,12 @@ jNg psc jNg psc -dyB -dyB -rAR -dyB -dyB -rAR +tqe +tqe +xsM +tqe +tqe +xsM psc jNg vAC @@ -21490,10 +22561,10 @@ wEN wEN wEN wEN -dvP dyB dyB -dvP +dyB +dyB dyB dyB psc @@ -21534,15 +22605,15 @@ psc jNg psc dvP -dyB -dyB +tqe +tqe dvP -dyB -dyB -wEN -wEN -wEN -wEN +tqe +tqe +hEj +hEj +hEj +hEj gPd gtA jNg @@ -21684,10 +22755,10 @@ wEN wEN wEN wEN -dvP dyB dyB -dvP +dyB +dyB dyB dyB psc @@ -21728,15 +22799,15 @@ psc jNg psc dvP -dyB -dyB +tqe +tqe dvP -dyB -dyB -wEN -wEN -wEN -wEN +tqe +tqe +hEj +hEj +hEj +hEj usY gPd jNg @@ -21921,16 +22992,16 @@ jNg psc jNg psc -lXi -oEU -oEU -ubz -oEU -tGH -wEN -wEN -wEN -wEN +bdO +umi +umi +epH +umi +ckU +hEj +hEj +hEj +hEj gPd gtA jNg @@ -22123,7 +23194,7 @@ jwG hEj vws hEj -wEN +hEj jNg jNg jNg @@ -26765,7 +27836,7 @@ twj twj twj yex -jBO +ikC tIM jBO jBO @@ -28882,8 +29953,8 @@ hBH qNx nfV oQh -bmK -wlw +ouc +wah dOL tfL hvL @@ -28891,7 +29962,7 @@ aWF dOL aOz ouc -hOe +oQh uWc fJD xJy @@ -29075,9 +30146,9 @@ tNG iFZ paZ crB -oVv -bmK -wlw +pmd +ouc +wah dOL oIg qyb @@ -29270,8 +30341,8 @@ hBl hER wNX caF -wcA -wcA +rSr +rSr dOL ieH wWe @@ -29467,7 +30538,7 @@ tWf tWf tWf dOL -ieH +iXv mtZ qiC dOL @@ -30042,7 +31113,7 @@ jZF jZF sWB dpZ -bqC +kOd hER wNX tWf @@ -30615,7 +31686,7 @@ uPE bYZ gMW gMW -dCl +lHh kiI mHH sHl @@ -30630,11 +31701,11 @@ pTs pTs pTs pTs -pTs +htI pTs jYw xGW -xGW +jyo xGW xGW xGW @@ -30824,11 +31895,11 @@ ayo qxt tMG qxt -tMG +eLL qxt uEH eHf -apc +eMc eHf apc eHf @@ -32758,7 +33829,7 @@ fSI rhE bLm fJm -vVK +vHi fVD wNX bAs @@ -32772,7 +33843,7 @@ oPx dkD oJl bAs -omb +icI xAC sSq xsV @@ -33926,7 +34997,7 @@ pEq fVD wNX bAs -drW +tGL kkQ iHa kkQ @@ -33944,7 +35015,7 @@ tqm dvY dvY xsV -lUN +tyy hOB nlt vsf @@ -34313,7 +35384,7 @@ esV fIw ehD iJa -gcn +hPS wRq gcn qrS @@ -34323,11 +35394,11 @@ whe bbF whe uXs -whe +bZM fxM oma pWV -uXs +iHh whe lsT nXz @@ -34507,7 +35578,7 @@ oPs lKf bYQ lKf -vbk +anp bpV vbk vbk @@ -34517,15 +35588,15 @@ hsw kNH hsw hsw -hsw +vzj hsw puY jnR -jnR +jsW jnR jnR nRE -jnR +jsW xkf nez cXX @@ -34701,7 +35772,7 @@ knM sew gDf tFW -oLT +hOe dkm bSY rAC @@ -34711,7 +35782,7 @@ xbS goM xbS hSO -xbS +qRG gXC ufH gvX @@ -34892,9 +35963,9 @@ wiw wiw xsV xsV -gzp -gDf -rqK +vkt +bmK +dQV etM etM etM @@ -34906,9 +35977,9 @@ aQf aQf aQf aQf -aqU -kGS -uXi +yhC +avq +rRU xsV xsV xsV @@ -35509,7 +36580,7 @@ jxR rQt rQt rCS -rxy +npR rxy ouE uCd @@ -36437,9 +37508,9 @@ dvY wiw wiw ycz -eEz +ttr pdB -wTX +ttr hmV wiw dvY @@ -36641,17 +37712,17 @@ iRg vqm gDf dlu -eKk -eKk -eKk +rSr +rSr +rSr hHC hHC hHU hHC hHC -liM -liM -liM +rSr +rSr +rSr aEW kGS uNt @@ -36835,16 +37906,16 @@ xsV gzp gDf rqK -uEC -qSp +nmp +ouc wah hHC otK rax rgn hHC -kZE -avq +aOz +ouc nmp aqU kGS @@ -37030,16 +38101,16 @@ aoU gDf bne uEC -qSp +ouc wah hHC rgn tpr -rgn +pdK hHC -kZE -avq -nmp +aOz +ouc +uEC suA kGS uNt @@ -37223,17 +38294,17 @@ iRg gzp gDf wUW -hHC -hHC -hHC +rSr +rSr +rSr hHC rgn tpr rgn hHC -hHC -hHC -hHC +rSr +rSr +rSr cxN kGS wCu @@ -37419,7 +38490,7 @@ gDf bne hHC hHC -rgn +hsE rgn rgn tpr @@ -37796,7 +38867,7 @@ wiw wiw wiw wiw -cxU +wiw wiw wiw wiw @@ -37816,7 +38887,7 @@ laE mqE hHC hHC -suA +oVv kGS uNt xsV @@ -38384,7 +39455,7 @@ dvY dvY dvY xsV -gzp +rSE gDf rqK hHC @@ -39354,9 +40425,9 @@ dvY dvY dvY xsV -ciF -gDf -bne +rSB +bmK +xBR hHC hHC hHC @@ -39368,9 +40439,9 @@ hHC hHC hHC hHC -suA -kGS -uNt +nYx +avq +jlo xsV dvY dvY @@ -39551,7 +40622,7 @@ xsV gzp rob xaT -lxy +liM lXX lxy eem @@ -39561,7 +40632,7 @@ whe uXs mCr uXs -whe +bZM wrb kGS wCu @@ -39745,7 +40816,7 @@ wbp wHg aUR pTw -sXK +eKk iSB sXK sXK @@ -39755,7 +40826,7 @@ lrh lrh nLY lrh -lrh +aPf bhh gOm uXi @@ -39939,7 +41010,7 @@ xsV vqm oms jpt -bSY +pSM dkm bSY rAC @@ -39949,7 +41020,7 @@ nEC gPH gTj gPH -xbS +qRG lqz kGS iar @@ -40518,7 +41589,7 @@ qBz dvY lUF qBz -nwn +vhU oAp nSo ocO @@ -40920,7 +41991,7 @@ fee fee fee ocO -obt +iqO wqk wLT qBz @@ -41294,7 +42365,7 @@ qBz dvY pEH qBz -nwn +jMe oAp nSo bDO @@ -41493,7 +42564,7 @@ oAp fIT bDO bDO -mAB +gJd rmA vgA oZe @@ -44218,7 +45289,7 @@ tUN bol tmr tmr -xNn +kZE wqk hKp qBz @@ -44398,7 +45469,7 @@ qBz dvY dvY qBz -nwn +jMe huZ nSo tmr @@ -45383,7 +46454,7 @@ vsQ tmr tmr xNn -pMX +wqk xos qBz vFm @@ -45577,11 +46648,11 @@ lMn tmr tmr xNn -pMX +wqk xos -dvY hNp dvY +dvY qBz jNg jNg @@ -45757,7 +46828,7 @@ jHd dvY dvY mZZ -wii +wlw fIT tmr tmr @@ -45965,7 +47036,7 @@ tmr tmr tmr obt -pMX +wqk xos qDt qDt @@ -46145,8 +47216,8 @@ pUe mES kcE mZZ -wii -fIT +icN +kmv tmr tmr tmr @@ -46158,7 +47229,7 @@ tmr tmr tmr tmr -xNn +ekV wsO xos dvY @@ -46338,20 +47409,20 @@ qBz xXL dvY dvY -mZZ -wii -nSo +gGG +fmu +pbx +qBz +dvY qBz -hic -vgl dYW aLa aYc aYc aLa -yfO -mel djL +mel +tlA fow bmP lbF @@ -46529,26 +47600,26 @@ jNg jNg rME qBz -xXL +mTY ciZ dvY eDQ -wii -fIT +fmu +fWg +qBz +dvY qBz -hic -vgl dYW aYc ghc xsP aYc djL -djL -djL -xNn -pMX -vzY +ehr +ehr +pbx +pXA +eDQ dvY dvY dvY @@ -46727,21 +47798,21 @@ xXL ciZ dvY gid -wii -nSo +fmu +pbx +jqL +dvY qBz -hic -vgl dYW aYc ghc ghc ghc djL -djL -djL -obt -pMX +ehr +ehr +fWg +pXA bhF dvY dvY @@ -46921,22 +47992,22 @@ xXL ciZ dvY eDQ -wii -fIT +fmu +fWg +qBz +dvY qBz -hic -vgl dYW nMW ghc ghc ghc djL -djL -djL -xNn -pMX -vzY +ehr +ehr +pbx +pXA +eDQ dvY dvY dvY @@ -47114,22 +48185,22 @@ fwR cRV ciZ dvY -mZZ -lmh -nSo +gGG +agP +pbx +qBz +dvY qBz -hic -vgl dYW aYc ghc ghc aYc djL -djL -djL -obt -pMX +ehr +ehr +fWg +pXA lbF dvY gRl @@ -47307,24 +48378,24 @@ jNg qBz cRV ciZ -dvY -mZZ +kcE +gGG saz -jFf +gAd +qBz +qBz qBz -hic -vgl dYW aLa aYc aYc aLa djL -djL -djL -xNn -wsO -xos +ehr +ehr +pbx +dhN +gGG dvY gRl cRV @@ -47502,24 +48573,24 @@ fwR cRV ciZ dvY -mZZ -sGE -pbx +gGG +lSQ +axg +jFf +ehr qBz -hic -hic -hic -hic -hic -hic qBz -tdV -djL -djL -xNn -pMX -xos -dvY +qBz +qBz +qBz +qBz +gGG +sBL +yiN +kkX +jlf +gGG +gqI gRl cRV fwR @@ -47696,25 +48767,25 @@ fwR cRV ciZ dvY -mZZ -wii -fIT -qBz -hic -hic -hic -hic -hic +gGG +lSQ +fWg +vms hic -qBz +fMI +jyT +wFy +qpe +dDz +vCs +fMI pVN -djL -djL -obt -pMX -xos -dvY -mpg +ehr +fWg +pXA +gGG +vFm +gRl cRV fwR jNg @@ -47890,23 +48961,23 @@ fwR cRV ciZ dvY -mZZ -wii -nSo -qBz -hic -hic -hic -hic -hic -hic -qBz -djL -djL -djL -xNn -pMX -xos +gGG +nTJ +pbx +swz +spe +fMI +ffx +qmW +vKO +jSH +cGj +fMI +ehr +vzY +pPp +fMD +gGG dvY gRl cRV @@ -48083,25 +49154,25 @@ jNg qBz jUm ciZ -dvY -mZZ -lmh -nSo -qBz -qBz -qBz -qBz -qBz -qBz -qBz -qBz -tdV -djL -djL -fow +kcE +gGG +vgl +pbx +eTy +ehr +rXh +piH +kup +upV +kup +jqM +rXh +nQw +mpg +fWg hfS -xos -dvY +gGG +hNp gRl jUm qBz @@ -48278,23 +49349,23 @@ qBz hTL ciZ dvY -mZZ -wii -fIT -eTy -eTy -eTy gGG -dhN lSQ -agP +fWg +eTy +ehr +rXh +piH +kup +upV +kup +jqM +rXh +dbo +mzn +pbx +sDU gGG -djL -djL -djL -kMd -mOl -xos dvY dvY hTL @@ -48473,21 +49544,21 @@ eEF ciZ dvY cyR -upV -fLS -gXG -gXG -gXG +lSQ +pbx fZX -gAd +gXG +cGG +arQ +tRS lNj tRS -fZX -mqz -fMD +txY +bTf +dSP mqz -fWg -swz +tUx +wum tmx dvY dvY @@ -48664,23 +49735,23 @@ gtA gPd qBz eEF -ciZ +fLS dvY qBz qBz -gGG -gGG -gGG -gGG -gGG -dhN -fmu -agP -gGG -gGG -gGG -gGG -gGG +yfO +ehr +ehr +knf +fMI +hOM +sRd +tRY +fMI +knf +ehr +ehr +vdH qBz qBz dvY @@ -48862,16 +49933,16 @@ qBz dvY dvY qBz +pVc ehr ehr -jyT -ehr -ehr -dhN -fmu -agP -ehr -ehr +srd +pMX +nlL +tdV +vJG +pMX +fWr ehr ehr ehr @@ -49245,29 +50316,29 @@ jNg jNg jNg qBz -jNg +usG qBz qBz qBz qBz ehr -ehr +jKS +fDL fDL bwK -bwK -dhN -fmu -agP -bwK +hPj +tdV +vJG bwK fDL -ehr +fDL +jKS ehr qBz qBz qBz qBz -jNg +usG qBz jNg jNg @@ -49445,17 +50516,17 @@ usY qBz qBz ehr -yiN -yhC -jMe -vms +jKS +ouc +wah +fDL aCh qrZ rqN -vms -jyo -yhC -yiN +fDL +aOz +ouc +jKS ehr qBz qBz @@ -49638,19 +50709,19 @@ gtA gPd jMU qBz -ehr -yiN -yhC -jMe -vms -vdH +wSS +qSp +ouc +wah +fDL +nlL kup -nQw -vms -jyo -yhC -yiN -ehr +vJG +fDL +aOz +ouc +qSp +wSS qBz qBz usY @@ -49837,9 +50908,9 @@ gGG gGG gGG gGG -gGG -gGG -gGG +pBX +kup +lZR gGG gGG gGG @@ -50031,9 +51102,9 @@ gGG gGG gGG gGG -gGG -gGG -gGG +kDR +gvx +kDR gGG gGG gGG @@ -50225,9 +51296,9 @@ usY gPd nQj nQj -nQj -nQj -nQj +jgS +jgS +jgS nQj nQj gPd @@ -50419,9 +51490,9 @@ gPd gtA jNg nQj -nQj -nQj -nQj +usG +usG +usG nQj jNg gtA @@ -50613,11 +51684,11 @@ jNg jNg jNg xRj -nQj -nQj -nQj +xRj jNg jNg +mtv +jNg jNg jNg jNg @@ -50808,7 +51879,7 @@ jNg jNg jNg jNg -nQj +jNg jNg jNg jNg @@ -51002,7 +52073,7 @@ jNg jNg jNg jNg -mtv +jNg jNg jNg jNg @@ -51387,22 +52458,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -51581,22 +52652,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +klQ +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -51775,22 +52846,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -51969,22 +53040,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -52163,22 +53234,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -52357,22 +53428,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -52551,22 +53622,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -52745,22 +53816,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -52939,22 +54010,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -53133,22 +54204,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg @@ -53327,22 +54398,22 @@ jNg jNg jNg jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg -jNg +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj +xRj jNg jNg jNg diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index 4df6d23e86e4..93e6ca52dd17 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -1745,6 +1745,7 @@ id_tag = "trade_space_lock"; pixel_x = -25 }, +/obj/effect/shuttle_landmark/trade/hangar, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "gc" = ( @@ -10419,7 +10420,6 @@ id_tag = "tradeport_hangar_docker"; pixel_x = -25 }, -/obj/effect/shuttle_landmark/trade/hangar, /obj/overmap/entity/visitable/ship/landable/trade, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) From 9d6a141e5b672650743c347d9eda782daed18acf Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:41:25 -0800 Subject: [PATCH 2/2] mc update: init stages, better subsystem init tracking, etc (#6857) modifies the hollow metrics API; that'll probably be implemented soon adds init stages changes SSatoms to not abuse its `initialized` variable closes #6858 --- citadel.dme | 20 +- code/__DEFINES/MC.dm | 118 ---- .../__DEFINES/controllers/_master-runlevel.dm | 32 + code/__DEFINES/controllers/_master.dm | 59 ++ .../{_repositories.dm => _repository.dm} | 0 code/__DEFINES/controllers/_subsystem-init.dm | 92 +++ .../controllers/_subsystem-priority.dm | 68 +++ code/__DEFINES/controllers/_subsystem.dm | 164 ++++++ code/__DEFINES/controllers/_subsystems.dm | 237 -------- code/__DEFINES/controllers/atoms.dm | 37 ++ code/__DEFINES/controllers/timer.dm | 10 + code/__DEFINES/metrics.dm | 6 + code/__HELPERS/sorts/comparators.dm | 19 - code/___compile_options.dm | 8 - code/controllers/failsafe.dm | 4 + code/controllers/master.dm | 546 +++++++++++------- code/controllers/subsystem.dm | 256 +++++--- .../subsystem/__test_bad_subsystem_sleeps.dm | 44 ++ code/controllers/subsystem/ai_holders.dm | 3 +- code/controllers/subsystem/ai_movement.dm | 11 +- code/controllers/subsystem/ai_scheduling.dm | 8 +- code/controllers/subsystem/air.dm | 17 +- code/controllers/subsystem/alarm.dm | 2 +- .../controllers/subsystem/ambient_lighting.dm | 2 +- code/controllers/subsystem/ao.dm | 2 +- code/controllers/subsystem/assets.dm | 6 +- code/controllers/subsystem/atoms.dm | 47 +- code/controllers/subsystem/automata.dm | 2 +- .../subsystem/characters/_characters.dm | 2 +- code/controllers/subsystem/chat.dm | 3 +- code/controllers/subsystem/chemistry.dm | 1 + code/controllers/subsystem/dbcore/_dbcore.dm | 3 +- code/controllers/subsystem/early_init.dm | 3 +- .../subsystem/emergency_shuttle.dm | 1 + code/controllers/subsystem/events.dm | 2 +- code/controllers/subsystem/fail2topic.dm | 3 +- code/controllers/subsystem/game_master.dm | 2 +- code/controllers/subsystem/holomaps.dm | 2 +- code/controllers/subsystem/icon_smooth.dm | 4 +- code/controllers/subsystem/inactivity.dm | 4 +- code/controllers/subsystem/input.dm | 9 +- code/controllers/subsystem/ipintel.dm | 3 +- code/controllers/subsystem/job/_job.dm | 3 +- code/controllers/subsystem/legacy_atc.dm | 2 +- code/controllers/subsystem/legacy_lore.dm | 2 +- code/controllers/subsystem/lighting.dm | 2 +- code/controllers/subsystem/machines.dm | 15 +- .../controllers/subsystem/mapping/_mapping.dm | 3 +- code/controllers/subsystem/materials.dm | 2 +- code/controllers/subsystem/media_tracks.dm | 2 +- code/controllers/subsystem/minimaps.dm | 2 +- code/controllers/subsystem/nanoui.dm | 15 +- code/controllers/subsystem/nightshift.dm | 5 +- code/controllers/subsystem/overlays.dm | 3 +- code/controllers/subsystem/overmap.dm | 2 +- code/controllers/subsystem/parallax.dm | 2 +- .../subsystem/persistence/persistence.dm | 5 +- code/controllers/subsystem/planets.dm | 2 +- code/controllers/subsystem/plants.dm | 2 +- code/controllers/subsystem/playtime.dm | 2 +- code/controllers/subsystem/preferences.dm | 3 +- .../subsystem/processing/circuits.dm | 2 +- .../subsystem/processing/instruments.dm | 3 +- .../subsystem/processing/processing.dm | 4 +- code/controllers/subsystem/repository.dm | 3 +- code/controllers/subsystem/shuttles.dm | 3 +- code/controllers/subsystem/sound/_sound.dm | 3 +- code/controllers/subsystem/spatial_grids.dm | 3 +- code/controllers/subsystem/statpanel.dm | 20 +- code/controllers/subsystem/status_effects.dm | 2 +- code/controllers/subsystem/sun.dm | 1 + code/controllers/subsystem/supply.dm | 2 +- code/controllers/subsystem/ticker.dm | 3 +- code/controllers/subsystem/timer.dm | 1 + .../subsystem/{lobby.dm => titlescreen.dm} | 21 +- code/controllers/subsystem/transcore_vr.dm | 4 +- code/controllers/subsystem/transfer.dm | 2 +- code/controllers/subsystem/turbolift.dm | 2 +- code/controllers/subsystem/vis_overlays.dm | 2 +- code/controllers/subsystem/vote.dm | 4 +- code/controllers/subsystem/world.dm | 2 +- code/controllers/subsystem/xenoarch.dm | 2 +- code/controllers/subsystem/zcopy.dm | 2 +- .../atoms/atoms_initializing_EXPENSIVE.dm | 6 +- .../objects/structures/tables/materials.dm | 2 +- .../structures/tables/update_triggers.dm | 2 +- code/modules/ai/holders/ai_holder-movement.dm | 7 + .../ai/holders/ai_holder-scheduling.dm | 1 + code/modules/ai/holders/ai_holder-ticking.dm | 3 + .../ai/holders/polaris/ai_holder_targeting.dm | 2 +- .../middleware/keybindings.dm | 2 +- code/modules/keybindings/bindings_client.dm | 4 +- code/modules/metrics/api.dm | 78 --- code/modules/metrics/api/nested_numerical.dm | 23 + code/modules/metrics/api/numerical.dm | 23 + code/modules/metrics/api/spatial_series.dm | 31 + code/modules/metrics/api/string_set.dm | 17 + code/modules/metrics/api/time_series.dm | 30 + code/modules/metrics/metrics/controllers.dm | 4 + code/modules/mob/mob_helpers.dm | 2 +- code/modules/mob/new_player/login.dm | 2 +- code/modules/power/apc.dm | 2 - 102 files changed, 1343 insertions(+), 925 deletions(-) delete mode 100644 code/__DEFINES/MC.dm create mode 100644 code/__DEFINES/controllers/_master-runlevel.dm create mode 100644 code/__DEFINES/controllers/_master.dm rename code/__DEFINES/controllers/{_repositories.dm => _repository.dm} (100%) create mode 100644 code/__DEFINES/controllers/_subsystem-init.dm create mode 100644 code/__DEFINES/controllers/_subsystem-priority.dm create mode 100644 code/__DEFINES/controllers/_subsystem.dm delete mode 100644 code/__DEFINES/controllers/_subsystems.dm create mode 100644 code/__DEFINES/controllers/atoms.dm create mode 100644 code/__DEFINES/metrics.dm create mode 100644 code/controllers/subsystem/__test_bad_subsystem_sleeps.dm rename code/controllers/subsystem/{lobby.dm => titlescreen.dm} (64%) delete mode 100644 code/modules/metrics/api.dm create mode 100644 code/modules/metrics/api/nested_numerical.dm create mode 100644 code/modules/metrics/api/numerical.dm create mode 100644 code/modules/metrics/api/spatial_series.dm create mode 100644 code/modules/metrics/api/string_set.dm create mode 100644 code/modules/metrics/api/time_series.dm create mode 100644 code/modules/metrics/metrics/controllers.dm diff --git a/citadel.dme b/citadel.dme index a6da8994250c..77dc70d24882 100644 --- a/citadel.dme +++ b/citadel.dme @@ -64,7 +64,7 @@ #include "code\__DEFINES\maps.dm" #include "code\__DEFINES\math.dm" #include "code\__DEFINES\matrices.dm" -#include "code\__DEFINES\MC.dm" +#include "code\__DEFINES\metrics.dm" #include "code\__DEFINES\misc.dm" #include "code\__DEFINES\move_force.dm" #include "code\__DEFINES\movement.dm" @@ -156,9 +156,14 @@ #include "code\__DEFINES\combat\damage.dm" #include "code\__DEFINES\combat\explosions.dm" #include "code\__DEFINES\combat\shieldcall.dm" -#include "code\__DEFINES\controllers\_repositories.dm" -#include "code\__DEFINES\controllers\_subsystems.dm" +#include "code\__DEFINES\controllers\_master-runlevel.dm" +#include "code\__DEFINES\controllers\_master.dm" +#include "code\__DEFINES\controllers\_repository.dm" +#include "code\__DEFINES\controllers\_subsystem-init.dm" +#include "code\__DEFINES\controllers\_subsystem-priority.dm" +#include "code\__DEFINES\controllers\_subsystem.dm" #include "code\__DEFINES\controllers\assets.dm" +#include "code\__DEFINES\controllers\atoms.dm" #include "code\__DEFINES\controllers\dbcore.dm" #include "code\__DEFINES\controllers\grids.dm" #include "code\__DEFINES\controllers\persistence.dm" @@ -570,7 +575,6 @@ #include "code\controllers\subsystem\legacy_atc.dm" #include "code\controllers\subsystem\legacy_lore.dm" #include "code\controllers\subsystem\lighting.dm" -#include "code\controllers\subsystem\lobby.dm" #include "code\controllers\subsystem\machines.dm" #include "code\controllers\subsystem\materials.dm" #include "code\controllers\subsystem\media_tracks.dm" @@ -606,6 +610,7 @@ #include "code\controllers\subsystem\ticker.dm" #include "code\controllers\subsystem\time_track.dm" #include "code\controllers\subsystem\timer.dm" +#include "code\controllers\subsystem\titlescreen.dm" #include "code\controllers\subsystem\transcore_vr.dm" #include "code\controllers\subsystem\transfer.dm" #include "code\controllers\subsystem\turbolift.dm" @@ -3494,9 +3499,14 @@ #include "code\modules\media\media_tracks.dm" #include "code\modules\media\mediamanager.dm" #include "code\modules\media\walkpod.dm" -#include "code\modules\metrics\api.dm" #include "code\modules\metrics\metric.dm" #include "code\modules\metrics\metric_base.dm" +#include "code\modules\metrics\api\nested_numerical.dm" +#include "code\modules\metrics\api\numerical.dm" +#include "code\modules\metrics\api\spatial_series.dm" +#include "code\modules\metrics\api\string_set.dm" +#include "code\modules\metrics\api\time_series.dm" +#include "code\modules\metrics\metrics\controllers.dm" #include "code\modules\mining\mine_turfs.dm" #include "code\modules\mining\drilling\drill.dm" #include "code\modules\mining\drilling\scanner.dm" diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm deleted file mode 100644 index 0cfbf865dd76..000000000000 --- a/code/__DEFINES/MC.dm +++ /dev/null @@ -1,118 +0,0 @@ -#define MC_TICK_CHECK ( ( TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 ) -#define MC_TICK_CHECK_USAGE ( ( TICK_USAGE > Master.current_ticklimit ) ? pause() : 0 ) - -#define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count -#define MC_SPLIT_TICK \ - if(split_tick_phases > 1){\ - Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ - --split_tick_phases;\ - } else {\ - Master.current_ticklimit = original_tick_limit;\ - } - -// Used to smooth out costs to try and avoid oscillation. -#define MC_AVERAGE_FAST(average, current) (0.7 * (average) + 0.3 * (current)) -#define MC_AVERAGE(average, current) (0.8 * (average) + 0.2 * (current)) -#define MC_AVERAGE_SLOW(average, current) (0.9 * (average) + 0.1 * (current)) - -#define MC_AVG_FAST_UP_SLOW_DOWN(average, current) (average > current ? MC_AVERAGE_SLOW(average, current) : MC_AVERAGE_FAST(average, current)) -#define MC_AVG_SLOW_UP_FAST_DOWN(average, current) (average < current ? MC_AVERAGE_SLOW(average, current) : MC_AVERAGE_FAST(average, current)) - -#define NEW_SS_GLOBAL(varname) if(varname != src){if(istype(varname)){PreInit(TRUE);Preload(TRUE);Recover();qdel(varname);}varname = src;} - -#define START_PROCESSING(Processor, Datum) if (!(Datum.datum_flags & DF_ISPROCESSING)) {Datum.datum_flags |= DF_ISPROCESSING;Processor.processing += Datum} -#define STOP_PROCESSING(Processor, Datum) Datum.datum_flags &= ~DF_ISPROCESSING;Processor.processing -= Datum - -//! SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier) - -/// subsystem does not initialize. -#define SS_NO_INIT (1<<0) - -/** subsystem does not fire. */ -/// (like can_fire = 0, but keeps it from getting added to the processing subsystems list) -/// (Requires a MC restart to change) -#define SS_NO_FIRE (1<<1) - -/** subsystem only runs on spare cpu (after all non-background subsystems have ran that tick) */ -/// SS_BACKGROUND has its own priority bracket -#define SS_BACKGROUND (1<<2) - -/// subsystem does not tick check, and should not run unless there is enough time (or its running behind (unless background)) -#define SS_NO_TICK_CHECK (1<<3) - -/** Treat wait as a tick count, not DS, run every wait ticks. */ -/// (also forces it to run first in the tick, above even SS_NO_TICK_CHECK subsystems) -/// (implies all runlevels because of how it works) -/// (overrides SS_BACKGROUND) -/// This is designed for basically anything that works as a mini-mc (like SStimer) -/// -/// * Ticker is its own priority bucket. The highest one. Be careful. -/// * Ticker disables tick overrun punishment. -#define SS_TICKER (1<<4) - -/** keep the subsystem's timing on point by firing early if it fired late last fire because of lag */ -/// ie: if a 20ds subsystem fires say 5 ds late due to lag or what not, its next fire would be in 15ds, not 20ds. -/// -/// * This will only keep timing past the last 10 seconds, it will not attempt to catch the subsystem up without bounds. -/// * This disables tick overrun punishment. -#define SS_KEEP_TIMING (1<<5) - -/** Calculate its next fire after its fired. */ -/// (IE: if a 5ds wait SS takes 2ds to run, its next fire should be 5ds away, not 3ds like it normally would be) -/// This flag overrides SS_KEEP_TIMING -#define SS_POST_FIRE_TIMING (1<<6) - -/// If this subsystem doesn't initialize, it should not report as a hard error in CI. -/// This should be used for subsystems that are flaky for complicated reasons, such as -/// the Lua subsystem, which relies on auxtools, which is unstable. //! We don't have the Lua system, but this is a good example. -/// It should not be used simply to silence CI. -#define SS_OK_TO_FAIL_INIT (1<<7) - -DEFINE_BITFIELD(subsystem_flags, list( - BITFIELD(SS_NO_INIT), - BITFIELD(SS_BACKGROUND), - BITFIELD(SS_NO_TICK_CHECK), - BITFIELD(SS_TICKER), - BITFIELD(SS_KEEP_TIMING), - BITFIELD(SS_POST_FIRE_TIMING), - BITFIELD(SS_OK_TO_FAIL_INIT), -)) - - -//! SUBSYSTEM STATES -/// aint doing shit. -#define SS_IDLE 0 -/// queued to run -#define SS_QUEUED 1 -/// actively running -#define SS_RUNNING 2 -/// paused by mc_tick_check -#define SS_PAUSED 3 -/// fire() slept. -#define SS_SLEEPING 4 -/// in the middle of pausing -#define SS_PAUSING 5 -#define SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/##X);\ -/datum/controller/subsystem/##X/New(){\ - NEW_SS_GLOBAL(SS##X);\ -}\ -/datum/controller/subsystem/##X - -#define PROCESSING_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/processing/##X);\ -/datum/controller/subsystem/processing/##X/New(){\ - NEW_SS_GLOBAL(SS##X);\ -}\ -/datum/controller/subsystem/processing/##X - -// Boilerplate code for multi-step processors. See machines.dm for example use. -#define INTERNAL_PROCESS_STEP(this_step, initial_step, proc_to_call, cost_var, next_step)\ -if(current_step == this_step || (initial_step && !resumed)) /* So we start at step 1 if not resumed.*/ {\ - timer = TICK_USAGE;\ - proc_to_call(resumed);\ - cost_var = MC_AVERAGE(cost_var, TICK_DELTA_TO_MS(TICK_USAGE - timer));\ - if(state != SS_RUNNING){\ - return;\ - }\ - resumed = 0;\ - current_step = next_step;\ -} diff --git a/code/__DEFINES/controllers/_master-runlevel.dm b/code/__DEFINES/controllers/_master-runlevel.dm new file mode 100644 index 000000000000..6f505ef2e8c7 --- /dev/null +++ b/code/__DEFINES/controllers/_master-runlevel.dm @@ -0,0 +1,32 @@ +//* Runlevels *// +//* Must be powers of 2. Runlevels should be in order of progression. *// +//* Only subsystem with a runlevel matching the MC's will be ticked. *// +//* The first runlevel (value '1') will be the default runlevel when the MC is first initialized. *// + +/// "Initialize Only" - Used for subsystems that should never be fired (Should also have SS_NO_FIRE set). +#define RUNLEVEL_INIT 0 +/// Initial runlevel before setup. Returns to here if setup fails. +#define RUNLEVEL_LOBBY 1 +/// While the gamemode setup is running. I.E gameticker.setup() +#define RUNLEVEL_SETUP 2 +/// After successful game ticker setup, while the round is running. +#define RUNLEVEL_GAME 4 +/// When round completes but before reboot. +#define RUNLEVEL_POSTGAME 8 + +/// default runlevels for most subsystems +#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) +/// all valid runlevels - subsystems with this will run all the time after their MC init stage. +#define RUNLEVELS_ALL (RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) + +var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_GAME, RUNLEVEL_POSTGAME) +/// Convert from the runlevel bitfield constants to index in runlevel_flags list. +#define RUNLEVEL_FLAG_TO_INDEX(flag) (log(2, flag) + 1) + +DEFINE_BITFIELD(runlevels, list( + BITFIELD(RUNLEVEL_INIT), + BITFIELD(RUNLEVEL_LOBBY), + BITFIELD(RUNLEVEL_SETUP), + BITFIELD(RUNLEVEL_GAME), + BITFIELD(RUNLEVEL_POSTGAME), +)) diff --git a/code/__DEFINES/controllers/_master.dm b/code/__DEFINES/controllers/_master.dm new file mode 100644 index 000000000000..26502007cf94 --- /dev/null +++ b/code/__DEFINES/controllers/_master.dm @@ -0,0 +1,59 @@ +/** + * This file (and its -dash files) is called MC, but actually holds quite a lot of logic including init orders + * and subsystems as the MC and subsystems make up the global orchestration system of the codebase. + */ + +#define MC_TICK_CHECK ( ( TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 ) +#define MC_TICK_CHECK_USAGE ( ( TICK_USAGE > Master.current_ticklimit ) ? pause() : 0 ) + +#define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count +#define MC_SPLIT_TICK \ + if(split_tick_phases > 1){\ + Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\ + --split_tick_phases;\ + } else {\ + Master.current_ticklimit = original_tick_limit;\ + } + +// Used to smooth out costs to try and avoid oscillation. +#define MC_AVERAGE_FAST(average, current) (0.7 * (average) + 0.3 * (current)) +#define MC_AVERAGE(average, current) (0.8 * (average) + 0.2 * (current)) +#define MC_AVERAGE_SLOW(average, current) (0.9 * (average) + 0.1 * (current)) + +#define MC_AVG_FAST_UP_SLOW_DOWN(average, current) (average > current ? MC_AVERAGE_SLOW(average, current) : MC_AVERAGE_FAST(average, current)) +#define MC_AVG_SLOW_UP_FAST_DOWN(average, current) (average < current ? MC_AVERAGE_SLOW(average, current) : MC_AVERAGE_FAST(average, current)) + +#define START_PROCESSING(Processor, Datum) if (!(Datum.datum_flags & DF_ISPROCESSING)) {Datum.datum_flags |= DF_ISPROCESSING;Processor.processing += Datum} +#define STOP_PROCESSING(Processor, Datum) Datum.datum_flags &= ~DF_ISPROCESSING;Processor.processing -= Datum + +/// Returns true if the MC is initialized and running. +/// Optional argument init_stage controls what stage the mc must have initializted to count as initialized. Defaults to INITSTAGE_MAX if not specified. +#define MC_RUNNING(INIT_STAGE...) (Master && Master.processing > 0 && Master.current_runlevel && Master.init_stage_completed == (max(min(INIT_STAGE_MAX, ##INIT_STAGE), 1))) +/// Returns true if the MC is at atleast a given init stage. Defaults to fully initialized. +/// +/// * This does not check anything else about the MC, including if it's actually running. +#define MC_INITIALIZED(INIT_STAGE...) (Master?.init_stage_completed >= max(INIT_STAGE_MAX, ##INIT_STAGE)) + +//* Recreate_MC() return values *// + +#define MC_RESTART_RTN_FAILED -1 +#define MC_RESTART_RTN_COOLDOWN 0 +#define MC_RESTART_RTN_SUCCESS 1 + +//* Master Controller Loop() return values *// + +/// Unknown or error +#define MC_LOOP_RTN_UNKNOWN 0 +/// New initialize stage happened +#define MC_LOOP_RTN_NEWSTAGES 1 +/// We want the MC to exit. +#define MC_LOOP_RTN_GRACEFUL_EXIT 2 + +//* Master Controller RunQueue() return values *// + +/// Unknown or error +#define MC_RUN_RTN_UNKNOWN 0 +/// Success; full completion +#define MC_RUN_RTN_FULL_COMPLETION 1 +/// Atleast one subsystem was sleeping or pausing +#define MC_RUN_RTN_PARTIAL_COMPLETION 2 diff --git a/code/__DEFINES/controllers/_repositories.dm b/code/__DEFINES/controllers/_repository.dm similarity index 100% rename from code/__DEFINES/controllers/_repositories.dm rename to code/__DEFINES/controllers/_repository.dm diff --git a/code/__DEFINES/controllers/_subsystem-init.dm b/code/__DEFINES/controllers/_subsystem-init.dm new file mode 100644 index 000000000000..12aaff4db93b --- /dev/null +++ b/code/__DEFINES/controllers/_subsystem-init.dm @@ -0,0 +1,92 @@ +//* Initialization Stages *// +//* After each stage, the MC starts ticking that stage while later stages are still waiting to init. *// +//* MC init stages must be a positive number, and init stages must all be consequetive! *// + +/// Early initializations required for server function; database, timers, tgui, etc +#define INIT_STAGE_BACKEND 1 +/// Pre-mapload initializations +#define INIT_STAGE_EARLY 2 +/// Mapload +#define INIT_STAGE_WORLD 3 +/// Late +#define INIT_STAGE_LATE 4 + +/// Last init stage we need to do. +/// +/// * This must be set to the maximum INIT_STAGE. +#define INIT_STAGE_MAX 4 + +//* Initialization Orders *// + +/** + *! Subsystem init_order, from highest priority to lowest priority. + *? Subsystems shutdown in the reverse of the order they initialize in. + *? Subsystems should always have init_order defined, even if they don't initialize, if they use init. + *? The numbers just define the ordering, they are meaningless otherwise. + */ + +//* Backend *// + +#define INIT_ORDER_FAIL2TOPIC 100 +#define INIT_ORDER_DBCORE 50 +#define INIT_ORDER_REPOSITORY 25 +#define INIT_ORDER_TIMER 10 +#define INIT_ORDER_STATPANELS 0 + +//* Early *// + +#define INIT_ORDER_EARLY_INIT 200 +#define INIT_ORDER_INPUT 170 +#define INIT_ORDER_PREFERENCES 150 +#define INIT_ORDER_JOBS 125 +#define INIT_ORDER_ASSETS 100 +#define INIT_ORDER_INSTRUMENTS 50 +#define INIT_ORDER_AI_SCHEDULING 25 +#define INIT_ORDER_AI_MOVEMENT 25 +#define INIT_ORDER_AI_HOLDERS 25 + +//* World *// + +#define INIT_ORDER_CHARACTERS 140 +#define INIT_ORDER_SOUNDS 130 +#define INIT_ORDER_GARBAGE 120 +#define INIT_ORDER_VIS 90 +#define INIT_ORDER_SERVER_MAINT 75 +#define INIT_ORDER_MEDIA_TRACKS 65 +#define INIT_ORDER_CHEMISTRY 60 +#define INIT_ORDER_MATERIALS 55 +#define INIT_ORDER_PHOTOGRAPHY 50 +#define INIT_ORDER_MAPPING 45 +#define INIT_ORDER_SPATIAL_GRIDS 43 //! must be after SSmapping so we know world.maxx and world.maxy +#define INIT_ORDER_GAME_WORLD 40 +#define INIT_ORDER_LEGACY_ATC 37 +#define INIT_ORDER_LEGACY_LORE 35 +#define INIT_ORDER_PLANTS 25 +#define INIT_ORDER_ALARMS 20 +#define INIT_ORDER_RESEARCH 17 +#define INIT_ORDER_ATOMS 15 +#define INIT_ORDER_MACHINES 10 +#define INIT_ORDER_SHUTTLES 3 +#define INIT_ORDER_DEFAULT 0 +#define INIT_ORDER_AIR -1 +#define INIT_ORDER_PLANETS -2 +#define INIT_ORDER_PERSISTENCE -3 +#define INIT_ORDER_AMBIENT_OCCLUSION -5 +#define INIT_ORDER_HOLOMAPS -5 +#define INIT_ORDER_ICON_SMOOTHING -6 +#define INIT_ORDER_EVENTS -10 +#define INIT_ORDER_OVERMAPS -20 +#define INIT_ORDER_TICKER -30 +#define INIT_ORDER_LIGHTING -40 +#define INIT_ORDER_ZMIMIC -45 +#define INIT_ORDER_AMBIENT_LIGHT -46 +#define INIT_ORDER_XENOARCH -50 +#define INIT_ORDER_CIRCUIT -60 +#define INIT_ORDER_AI -70 + +//* Late *// + +#define INIT_ORDER_OVERLAY 200 +#define INIT_ORDER_TITLESCREEN 150 +#define INIT_ORDER_NIGHTSHIFT 75 +#define INIT_ORDER_CHAT -100 //! Should be last to ensure chat remains smooth during init. diff --git a/code/__DEFINES/controllers/_subsystem-priority.dm b/code/__DEFINES/controllers/_subsystem-priority.dm new file mode 100644 index 000000000000..cd006fa47cdc --- /dev/null +++ b/code/__DEFINES/controllers/_subsystem-priority.dm @@ -0,0 +1,68 @@ + +/** + *! Subsystem fire priority, from lowest to highest priority + *? If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) + */ + +//? Background Subsystems - Below normal +// Any ../subsystem/.. is here unless it doesn't have SS_BACKGROUND in subsystem_flags! +// This means by default, ../subsystem/processing/.. is here! + +#define FIRE_PRIORITY_RADIATION 10 //! laggy as hell, bottom barrel until optimizations are done. +#define FIRE_PRIORITY_GARBAGE 15 +#define FIRE_PRIORITY_CHARACTERS 20 +#define FIRE_PRIORITY_PARALLAX 20 +#define FIRE_PRIORITY_AIR 25 +#define FIRE_PRIORITY_ASSET_LOADING 25 +#define FIRE_PRIORITY_PLANETS 25 +#define FIRE_PRIORITY_PROCESS 50 +// DEFAULT PRIORITY IS HERE (50) + +//? Normal Subsystems - Above background, below ticker +// Any ../subsystem/.. without SS_TICKER or SS_BACKGROUND in subsystem_flags is here! + +#define FIRE_PRIORITY_PING 5 +#define FIRE_PRIORITY_SHUTTLES 5 +#define FIRE_PRIORITY_PLANTS 5 +#define FIRE_PRIORITY_NIGHTSHIFT 6 +#define FIRE_PRIORITY_VOTE 9 +#define FIRE_PRIORITY_VIS 10 +#define FIRE_PRIORITY_SERVER_MAINT 10 +#define FIRE_PRIORITY_ZMIMIC 10 +#define FIRE_PRIORITY_ALARMS 20 +#define FIRE_PRIORITY_AIRFLOW 20 +#define FIRE_PRIORITY_SPACEDRIFT 25 +#define FIRE_PRIORITY_OBJ 40 +// DEFAULT PRIORITY IS HERE (50) +#define FIRE_PRIORITY_LIGHTING 50 +#define FIRE_PRIORITY_INSTRUMENTS 50 +#define FIRE_PRIORITY_MACHINES 50 +#define FIRE_PRIORITY_AI 65 +#define FIRE_PRIORITY_AI_HOLDERS 65 +#define FIRE_PRIORITY_AI_MOVEMENT 75 +#define FIRE_PRIORITY_AI_SCHEDULING 75 +#define FIRE_PRIORITY_NANO 80 +#define FIRE_PRIORITY_TGUI 80 +#define FIRE_PRIORITY_OVERMAP_PHYSICS 90 +#define FIRE_PRIORITY_PROJECTILES 90 +#define FIRE_PRIORITY_THROWING 90 +#define FIRE_PRIORITY_STATPANELS 100 +#define FIRE_PRIORITY_OVERLAYS 100 +#define FIRE_PRIORITY_SMOOTHING 100 +#define FIRE_PRIORITY_CHAT 100 +#define FIRE_PRIORITY_INPUT 100 + +//? Ticker Subsystems - Highest priority +// Any subsystem flagged with SS_TICKER is here! +// Do not unnecessarily set your subsystem as TICKER. +// Is your feature as important as movement, chat, or timers? +// Probably not! Go to normal bracket instead! + +// DEFAULT PRIORITY IS HERE (50) +#define FIRE_PRIORITY_DPC 100 +#define FIRE_PRIORITY_TIMER 100 + +//? Special + +/// This is used as the default regardless of bucket. Check above. +#define FIRE_PRIORITY_DEFAULT 50 diff --git a/code/__DEFINES/controllers/_subsystem.dm b/code/__DEFINES/controllers/_subsystem.dm new file mode 100644 index 000000000000..f9fce73f1a02 --- /dev/null +++ b/code/__DEFINES/controllers/_subsystem.dm @@ -0,0 +1,164 @@ +/** + *! Defines for subsystems + * + *? Lots of important stuff in here, make sure you have your brain switched on when editing this file! + */ + +//* Subsystem Definition Macros *// + +/** + * Macro to fire off all logic when a subsystem is created - this is done immediately on New(). + */ +#define NEW_SS_GLOBAL(varname) if(varname != src){if(istype(varname)){PreInit(TRUE);Preload(TRUE);Recover();qdel(varname);}varname = src;} + +/** + * Defines a normal subsystem. + */ +#define SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/##X);\ +/datum/controller/subsystem/##X/New(){\ + NEW_SS_GLOBAL(SS##X);\ +}\ +/datum/controller/subsystem/##X + +/** + * Defines a processing subsystem. + */ +#define PROCESSING_SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/processing/##X);\ +/datum/controller/subsystem/processing/##X/New(){\ + NEW_SS_GLOBAL(SS##X);\ +}\ +/datum/controller/subsystem/processing/##X + +//* Subsystem flags *// +//* Please design any new flags so that the default is off, to make adding flags to subsystems easier. *// + +/** + * Subsystem does not need Initialize() called. + * + * * The subsystem will still fire when its init stage is completed, unless it is + * marked with [SS_NO_FIRE] or its `can_fire` is set to FALSE. + * * The subsystem will still have its `initialized` variable set to TRUE. + */ +#define SS_NO_INIT (1<<0) + +/** + * Subsystem does not need fire() called / does not require scheduling and ticking. + * + * * This is exactly like setting `can_fire` to FALSE, but is permanent without a MC restart. + * * Use for subsystems that will never require processing, rather than one that needs it turned off and on now and then. + */ +#define SS_NO_FIRE (1<<1) + +/** + * Subsystem will try its best to only run on spare CPU, after all non-background subsystems have ran. + * + * * This pushes a subsystem into the background fire_priority bracket. + */ +#define SS_BACKGROUND (1<<2) + +/// subsystem does not tick check, and should not run unless there is enough time (or its running behind (unless background)) +// todo: this should be deprecated; please do not use this on new subsystems without good reason. +#define SS_NO_TICK_CHECK (1<<3) + +/** Treat wait as a tick count, not DS, run every wait ticks. */ +/// (also forces it to run first in the tick, above even SS_NO_TICK_CHECK subsystems) +/// (implies all runlevels because of how it works) +/// (overrides SS_BACKGROUND) +/// This is designed for basically anything that works as a mini-mc (like SStimer) +/// +/// * Ticker is its own priority bucket. The highest one. Be careful. +/// * Ticker disables tick overrun punishment. +#define SS_TICKER (1<<4) + +/** keep the subsystem's timing on point by firing early if it fired late last fire because of lag */ +/// ie: if a 20ds subsystem fires say 5 ds late due to lag or what not, its next fire would be in 15ds, not 20ds. +/// +/// * This will only keep timing past the last 10 seconds, it will not attempt to catch the subsystem up without bounds. +/// * This disables tick overrun punishment. +#define SS_KEEP_TIMING (1<<5) + +/** Calculate its next fire after its fired. */ +/// (IE: if a 5ds wait SS takes 2ds to run, its next fire should be 5ds away, not 3ds like it normally would be) +/// This flag overrides SS_KEEP_TIMING +#define SS_POST_FIRE_TIMING (1<<6) + +/// If this subsystem doesn't initialize, it should not report as a hard error in CI. +/// This should be used for subsystems that are flaky for complicated reasons, such as +/// the Lua subsystem, which relies on auxtools, which is unstable. //! We don't have the Lua system, but this is a good example. +/// It should not be used simply to silence CI. +#define SS_OK_TO_FAIL_INIT (1<<7) + +DEFINE_BITFIELD(subsystem_flags, list( + BITFIELD(SS_NO_INIT), + BITFIELD(SS_BACKGROUND), + BITFIELD(SS_NO_TICK_CHECK), + BITFIELD(SS_TICKER), + BITFIELD(SS_KEEP_TIMING), + BITFIELD(SS_POST_FIRE_TIMING), + BITFIELD(SS_OK_TO_FAIL_INIT), +)) + +//* Subsystem `Initialize()` returns *// +/** + * Negative values incidate a failure or warning of some kind, positive are good. + * 0 and 1 are unused so that TRUE and FALSE are guarenteed to be invalid values. + */ + +/// Subsystem failed to initialize entirely. Print a warning, log, and disable firing. +#define SS_INIT_FAILURE -2 +/// The default return value which must be overriden. Will succeed with a warning. +#define SS_INIT_NONE -1 +/// Subsystem initialized sucessfully. +#define SS_INIT_SUCCESS 2 +/// If your system doesn't need to be initialized (by being disabled or something) +#define SS_INIT_NO_NEED 3 +/// Succesfully initialized, BUT do not announce it to players (generally to hide game mechanics it would otherwise spoil) +#define SS_INIT_NO_MESSAGE 4 + +//* Subsystem 'state' variable *// + +/** + * Not doing anything right now. + */ +#define SS_IDLE 0 +/** + * In the MC's run-queue + */ +#define SS_QUEUED 1 +/** + * Set before the MC ignites a subsystem. This is the state while it's currently running. + */ +#define SS_RUNNING 2 +/** + * We are requesting a pause. + * + * * Set by the pause() proc if we did not sleep yet during our fire(). + */ +#define SS_PAUSED 3 +/** + * fire() is currently sleeping. + */ +#define SS_SLEEPING 4 +/** + * We slept, and now we are requesting a pause. + * + * * Set by the pause() proc if we have slept since fire() was invoked. + * * Converted to SS_PAUSED by ignite() once we finally return from fire(), as we cannot immediately pause if + * we are sleeping. + */ +#define SS_PAUSING 5 + +//* Misc *// + +/// Boilerplate code for multi-step processors. See machines.dm for example use. +#define INTERNAL_SUBSYSTEM_PROCESS_STEP(this_step, initial_step, proc_to_call, cost_var, next_step)\ +if(current_step == this_step || (initial_step && !resumed)) /* So we start at step 1 if not resumed.*/ {\ + timer = TICK_USAGE;\ + proc_to_call(resumed);\ + cost_var = MC_AVERAGE(cost_var, TICK_DELTA_TO_MS(TICK_USAGE - timer));\ + if(state != SS_RUNNING){\ + return;\ + }\ + resumed = 0;\ + current_step = next_step;\ +} diff --git a/code/__DEFINES/controllers/_subsystems.dm b/code/__DEFINES/controllers/_subsystems.dm deleted file mode 100644 index 3a5f1b5360b2..000000000000 --- a/code/__DEFINES/controllers/_subsystems.dm +++ /dev/null @@ -1,237 +0,0 @@ -/** - *! Defines for subsystems and overlays - * - *? Lots of important stuff in here, make sure you have your brain switched on when editing this file! - */ - -//* Subsystem `initialized` variable *// - -// todo: implement these, separate out SSatoms initialization state to its own variable -// #define SUBSYSTEM_INITIALIZED_NOT_STARTED 0 -// #define SUBSYSTEM_INITIALIZED_INITIALIZING 1 -// #define SUBSYSTEM_INITIALIZED_DONE 2 - -//! ## Initialization subsystem - -/// New should not call Initialize. -#define INITIALIZATION_INSSATOMS 0 -/// New should call Initialize(FALSE). -#define INITIALIZATION_INNEW_REGULAR 1 -/// New should call Initialize(TRUE). -#define INITIALIZATION_INNEW_MAPLOAD 2 - -//! ### Initialization hints - -/// Nothing happens -#define INITIALIZE_HINT_NORMAL 0 - -/** - * call LateInitialize at the end of all atom Initalization. - * - * The item will be added to the late_loaders list, this is iterated over after - * initalization of subsystems is complete and calls LateInitalize on the atom - * see [this file for the LateIntialize proc](atom.html#proc/LateInitialize) - */ -#define INITIALIZE_HINT_LATELOAD 1 - -/// Call qdel on the atom after intialization. -#define INITIALIZE_HINT_QDEL 2 - -/// type and all subtypes should always immediately call Initialize in New(). -#define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\ - ..();\ - if(!(atom_flags & ATOM_INITIALIZED)) {\ - var/previous_initialized_value = SSatoms.initialized;\ - SSatoms.initialized = INITIALIZATION_INNEW_MAPLOAD;\ - args[1] = TRUE;\ - SSatoms.InitAtom(src, FALSE, args);\ - SSatoms.initialized = previous_initialized_value;\ - }\ -} - -//! ### SS runlevels - -/// "Initialize Only" - Used for subsystems that should never be fired (Should also have SS_NO_FIRE set). -#define RUNLEVEL_INIT 0 -/// Initial runlevel before setup. Returns to here if setup fails. -#define RUNLEVEL_LOBBY 1 -/// While the gamemode setup is running. I.E gameticker.setup() -#define RUNLEVEL_SETUP 2 -/// After successful game ticker setup, while the round is running. -#define RUNLEVEL_GAME 4 -/// When round completes but before reboot. -#define RUNLEVEL_POSTGAME 8 - -/// default runlevels for most subsystems -#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) -/// all valid runlevels - subsystems with this will run all the time after their MC init stage. -#define RUNLEVELS_ALL (RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) - -var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_GAME, RUNLEVEL_POSTGAME) -/// Convert from the runlevel bitfield constants to index in runlevel_flags list. -#define RUNLEVEL_FLAG_TO_INDEX(flag) (log(2, flag) + 1) - -DEFINE_BITFIELD(runlevels, list( - BITFIELD(RUNLEVEL_INIT), - BITFIELD(RUNLEVEL_LOBBY), - BITFIELD(RUNLEVEL_SETUP), - BITFIELD(RUNLEVEL_GAME), - BITFIELD(RUNLEVEL_POSTGAME), -)) - -/** - *! Subsystem init_order, from highest priority to lowest priority. - *? Subsystems shutdown in the reverse of the order they initialize in. - *? The numbers just define the ordering, they are meaningless otherwise. - */ - -// todo: tg init brackets - -// core security system, used by client/New() -#define INIT_ORDER_FAIL2TOPIC 200 -// core security system, used by client/New() -#define INIT_ORDER_IPINTEL 197 - -// core timing system, used by almost everything -#define INIT_ORDER_TIMER 195 -// just about every feature on the server requires the database backend -// for storage and durability of permeance. -#define INIT_ORDER_DBCORE 190 -// repository is just struct storage. its things depend on database, -// but should depend on nothing else. -// -// for the rare occasion when a prototype requires asset registration, -// it should be able to recognize if SSassets is ready, -// and only queue an udpate if its asset is already loaded. -#define INIT_ORDER_REPOSITORY 187 -// early init initializes what is basically expensive global variables. it needs to go before assets. -#define INIT_ORDER_EARLY_INIT 185 -// assets is loaded early because things hook into this to register *their* assets -#define INIT_ORDER_ASSETS 180 - -#define INIT_ORDER_STATPANELS 170 -#define INIT_ORDER_PREFERENCES 165 -#define INIT_ORDER_INPUT 160 -#define INIT_ORDER_JOBS 150 -#define INIT_ORDER_CHARACTERS 140 -#define INIT_ORDER_SOUNDS 130 -#define INIT_ORDER_GARBAGE 120 -#define INIT_ORDER_VIS 90 -#define INIT_ORDER_SERVER_MAINT 75 -#define INIT_ORDER_INSTRUMENTS 70 -#define INIT_ORDER_MEDIA_TRACKS 65 -#define INIT_ORDER_CHEMISTRY 60 -#define INIT_ORDER_MATERIALS 55 -#define INIT_ORDER_PHOTOGRAPHY 50 -#define INIT_ORDER_AI_SCHEDULING 48 -#define INIT_ORDER_AI_MOVEMENT 48 -#define INIT_ORDER_AI_HOLDERS 48 -#define INIT_ORDER_MAPPING 45 -#define INIT_ORDER_SPATIAL_GRIDS 43 // must be after SSmapping so we know world.maxx and world.maxy -#define INIT_ORDER_GAME_WORLD 40 -#define INIT_ORDER_LEGACY_ATC 37 -#define INIT_ORDER_LEGACY_LORE 35 -#define INIT_ORDER_LOBBY 30 -#define INIT_ORDER_PLANTS 25 -#define INIT_ORDER_ALARMS 20 -#define INIT_ORDER_RESEARCH 17 -#define INIT_ORDER_ATOMS 15 -#define INIT_ORDER_MACHINES 10 -#define INIT_ORDER_SHUTTLES 3 -#define INIT_ORDER_DEFAULT 0 -#define INIT_ORDER_AIR -1 -#define INIT_ORDER_PLANETS -2 -#define INIT_ORDER_PERSISTENCE -3 -#define INIT_ORDER_AMBIENT_OCCLUSION -5 -#define INIT_ORDER_HOLOMAPS -5 -#define INIT_ORDER_NIGHTSHIFT -5 -#define INIT_ORDER_ICON_SMOOTHING -6 -#define INIT_ORDER_OVERLAY -7 -#define INIT_ORDER_EVENTS -10 -#define INIT_ORDER_OVERMAPS -20 -#define INIT_ORDER_TICKER -30 -#define INIT_ORDER_LIGHTING -40 -#define INIT_ORDER_ZMIMIC -45 -#define INIT_ORDER_AMBIENT_LIGHT -46 -#define INIT_ORDER_XENOARCH -50 -#define INIT_ORDER_CIRCUIT -60 -#define INIT_ORDER_AI -70 -#define INIT_ORDER_CHAT -100 //! Should be last to ensure chat remains smooth during init. - - -/** - *! Subsystem fire priority, from lowest to highest priority - *? If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) - */ - -//? Background Subsystems - Below normal -// Any ../subsystem/.. is here unless it doesn't have SS_BACKGROUND in subsystem_flags! -// This means by default, ../subsystem/processing/.. is here! - -#define FIRE_PRIORITY_RADIATION 10 //! laggy as hell, bottom barrel until optimizations are done. -#define FIRE_PRIORITY_GARBAGE 15 -#define FIRE_PRIORITY_CHARACTERS 20 -#define FIRE_PRIORITY_PARALLAX 20 -#define FIRE_PRIORITY_AIR 25 -#define FIRE_PRIORITY_ASSET_LOADING 25 -#define FIRE_PRIORITY_PLANETS 25 -#define FIRE_PRIORITY_PROCESS 50 -// DEFAULT PRIORITY IS HERE (50) - -//? Normal Subsystems - Above background, below ticker -// Any ../subsystem/.. without SS_TICKER or SS_BACKGROUND in subsystem_flags is here! - -#define FIRE_PRIORITY_PING 5 -#define FIRE_PRIORITY_SHUTTLES 5 -#define FIRE_PRIORITY_PLANTS 5 -#define FIRE_PRIORITY_NIGHTSHIFT 6 -#define FIRE_PRIORITY_VOTE 9 -#define FIRE_PRIORITY_VIS 10 -#define FIRE_PRIORITY_SERVER_MAINT 10 -#define FIRE_PRIORITY_ZMIMIC 10 -#define FIRE_PRIORITY_ALARMS 20 -#define FIRE_PRIORITY_AIRFLOW 20 -#define FIRE_PRIORITY_SPACEDRIFT 25 -#define FIRE_PRIORITY_OBJ 40 -// DEFAULT PRIORITY IS HERE (50) -#define FIRE_PRIORITY_LIGHTING 50 -#define FIRE_PRIORITY_INSTRUMENTS 50 -#define FIRE_PRIORITY_MACHINES 50 -#define FIRE_PRIORITY_AI 65 -#define FIRE_PRIORITY_AI_HOLDERS 65 -#define FIRE_PRIORITY_AI_MOVEMENT 75 -#define FIRE_PRIORITY_AI_SCHEDULING 75 -#define FIRE_PRIORITY_NANO 80 -#define FIRE_PRIORITY_TGUI 80 -#define FIRE_PRIORITY_OVERMAP_PHYSICS 90 -#define FIRE_PRIORITY_PROJECTILES 90 -#define FIRE_PRIORITY_THROWING 90 -#define FIRE_PRIORITY_STATPANELS 100 -#define FIRE_PRIORITY_OVERLAYS 100 -#define FIRE_PRIORITY_SMOOTHING 100 -#define FIRE_PRIORITY_CHAT 100 -#define FIRE_PRIORITY_INPUT 100 - -//? Ticker Subsystems - Highest priority -// Any subsystem flagged with SS_TICKER is here! -// Do not unnecessarily set your subsystem as TICKER. -// Is your feature as important as movement, chat, or timers? -// Probably not! Go to normal bracket instead! - -// DEFAULT PRIORITY IS HERE (50) -#define FIRE_PRIORITY_DPC 100 -#define FIRE_PRIORITY_TIMER 100 - -//? Special - -/// This is used as the default regardless of bucket. Check above. -#define FIRE_PRIORITY_DEFAULT 50 - -/** - * Create a new timer and add it to the queue. - * Arguments: - * * callback the callback to call on timer finish - * * wait deciseconds to run the timer for - * * atom_flags atom_flags for this timer, see: code\__DEFINES\subsystems.dm - */ -#define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__) diff --git a/code/__DEFINES/controllers/atoms.dm b/code/__DEFINES/controllers/atoms.dm new file mode 100644 index 000000000000..851ab297914c --- /dev/null +++ b/code/__DEFINES/controllers/atoms.dm @@ -0,0 +1,37 @@ +//* Values for the `atom_init_status` variable on SSatoms. *// + +/// New should not call Initialize. +#define ATOM_INIT_IN_SUBSYSTEM 0 +/// New should call Initialize(FALSE) - not mapload +#define ATOM_INIT_IN_NEW_REGULAR 1 +/// New should call Initialize(TRUE) - is in a mapload +#define ATOM_INIT_IN_NEW_MAPLOAD 2 + +//! ### Initialization hints + +/// Nothing happens +#define INITIALIZE_HINT_NORMAL 0 + +/** + * call LateInitialize at the end of all atom Initalization. + * + * The item will be added to the late_loaders list, this is iterated over after + * initalization of subsystems is complete and calls LateInitalize on the atom + * see [this file for the LateIntialize proc](atom.html#proc/LateInitialize) + */ +#define INITIALIZE_HINT_LATELOAD 1 + +/// Call qdel on the atom after intialization. +#define INITIALIZE_HINT_QDEL 2 + +/// type and all subtypes should always immediately call Initialize in New(). +#define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\ + ..();\ + if(!(atom_flags & ATOM_INITIALIZED)) {\ + var/previous_initialized_value = SSatoms.initialized;\ + SSatoms.initialized = ATOM_INIT_IN_NEW_MAPLOAD;\ + args[1] = TRUE;\ + SSatoms.InitAtom(src, FALSE, args);\ + SSatoms.initialized = previous_initialized_value;\ + }\ +} diff --git a/code/__DEFINES/controllers/timer.dm b/code/__DEFINES/controllers/timer.dm index 500019080619..2d6de7928b1b 100644 --- a/code/__DEFINES/controllers/timer.dm +++ b/code/__DEFINES/controllers/timer.dm @@ -1,4 +1,14 @@ //! ## Timing subsystem + +/** + * Create a new timer and add it to the queue. + * Arguments: + * * callback the callback to call on timer finish + * * wait deciseconds to run the timer for + * * atom_flags atom_flags for this timer, see: code\__DEFINES\subsystems.dm + */ +#define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__) + /** * Don't run if there is an identical unique timer active * diff --git a/code/__DEFINES/metrics.dm b/code/__DEFINES/metrics.dm new file mode 100644 index 000000000000..4286dc004792 --- /dev/null +++ b/code/__DEFINES/metrics.dm @@ -0,0 +1,6 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +//* Metric Categories *// + +#define METRIC_CATEGORY_SERVER "server" diff --git a/code/__HELPERS/sorts/comparators.dm b/code/__HELPERS/sorts/comparators.dm index ace8dd066988..5049291233e3 100644 --- a/code/__HELPERS/sorts/comparators.dm +++ b/code/__HELPERS/sorts/comparators.dm @@ -92,25 +92,6 @@ GLOBAL_VAR_INIT(cmp_field, "name") /proc/cmp_ckey_dsc(client/a, client/b) return sorttext(a.ckey, b.ckey) -/** - * Sorts subsystems alphabetically. - */ -/proc/cmp_subsystem_display(datum/controller/subsystem/a, datum/controller/subsystem/b) - return sorttext(b.name, a.name) - -/** - * Sorts subsystems by init_order. - */ -/proc/cmp_subsystem_init(datum/controller/subsystem/a, datum/controller/subsystem/b) - // Uses initial() so it can be used on types. - return initial(b.init_order) - initial(a.init_order) - -/** - * Sorts subsystems by priority. - */ -/proc/cmp_subsystem_priority(datum/controller/subsystem/a, datum/controller/subsystem/b) - return a.priority - b.priority - /proc/cmp_filter_data_priority(list/A, list/B) return A["priority"] - B["priority"] diff --git a/code/___compile_options.dm b/code/___compile_options.dm index ed656eb5a738..456b5cabb66a 100644 --- a/code/___compile_options.dm +++ b/code/___compile_options.dm @@ -79,19 +79,11 @@ */ // #define USE_BYOND_TRACY -/** - * If this is uncommented, Autowiki will generate edits and shut down the server. - * Prefer the autowiki build target instead. - */ -// #define AUTOWIKI - - /** * If this is uncommented, will profile mapload atom initializations. */ // #define PROFILE_MAPLOAD_INIT_ATOM - /** * If this is uncommented, force our verb processing into just the 2% of a tick. * We normally reserve for it. diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 3384590cfb3c..657bf083ffb5 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -36,6 +36,10 @@ var/datum/controller/failsafe/Failsafe /datum/controller/failsafe/New() + // Do not contaminate `usr`; if this is set, the MC main loop will have the usr of whoever called it, + // which results in all procs called by the MC inheriting that usr. + usr = null + // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(Failsafe != src) if(istype(Failsafe)) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 71dc99baf347..7d0c002dad77 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -27,9 +27,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /// How many times have we ran? var/iteration = 0 - /// Are we initialized? - var/initialized = FALSE - /// world.time of last fire, for tracking lag outside of the mc. var/last_run @@ -37,8 +34,15 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/list/subsystems //# Vars for keeping track of tick drift. - var/init_timeofday - var/init_time + + /** + * The world.timeofday that the current Loop() started at. + */ + var/loop_start_timeofday + /** + * The world.time that the current Loop() started at. + */ + var/loop_start_time var/tickdrift = 0 /// How long is the MC sleeping between runs, read only (set by Loop() based off of anti-tick-contention heuristics). @@ -47,15 +51,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /// Makes the mc main loop runtime. var/make_runtime = FALSE - var/initializations_finished_with_no_players_logged_in // I wonder what this could be? - /// The type of the last subsystem to be process()'d. var/last_type_processed /// For scheduling different subsystems for different stages of the round. var/current_runlevel - var/sleep_offline_after_initializations = TRUE var/static/restart_clear = 0 var/static/restart_timeout = 0 @@ -63,7 +64,29 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/random_seed - //* Processing Variables *// + //* Iniitialization *// + + /// The subsystem currently being initialized. + var/datum/controller/subsystem/current_initializing_subsystem + /// Are we initialized? This means all subsystems have been initialized. + var/initialized = FALSE + /// Set if it is specified to pause the world while no one is logged in after initializations, and we did pause. + var/initializations_finished_with_no_players_logged_in + /// Set to determine if we should sleep offline after initializations if no one is connected. + /// + /// * This is turned off by unit tests automatically. + var/sleep_offline_after_initializations = TRUE + + //* Global State *// + //* These are tracked through MC restarts. *// + + /// The current initialization stage we're at. + var/static/init_stage_completed = 0 + /// The init stage currently being ran by the main ticker loop + var/init_stage_ticking + + //* Processing Variables *// + //* These are set during a Loop(). *// /// total fire_priority of all non-background subsystems in the queue var/queue_priority_count = 0 @@ -75,6 +98,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /// End of queue linked list (used for appending to the list). var/datum/controller/subsystem/queue_tail + //* Control Variables *// + //* These are accessed globally and are used to allow the MC to control the server's tick when outside of a MC proc. *// + /** * current tick limit, assigned before running a subsystem. * used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits. @@ -82,6 +108,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() + // Do not contaminate `usr`; if this is set, the MC main loop will have the usr of whoever called it, + // which results in all procs called by the MC inheriting that usr. + usr = null + //# 1. load configs if(!config_legacy) load_configuration() @@ -129,13 +159,11 @@ GLOBAL_REAL(Master, /datum/controller/master) = new for(var/datum/controller/subsystem/S in _subsystems) S.Preload(FALSE) - /datum/controller/master/Destroy() ..() // Tell qdel() to Del() this object. return QDEL_HINT_HARDDEL_NOW - /datum/controller/master/Shutdown() processing = FALSE tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) @@ -146,18 +174,18 @@ GLOBAL_REAL(Master, /datum/controller/master) = new log_world("Shutdown complete") - /** + * MC reboot proc. + * * Returns: * - 1 If we created a new mc. * - 0 If we couldn't due to a recent restart. * - -1 If we encountered a runtime trying to recreate it. */ /proc/Recreate_MC() - usr = null // yeah let's not contaminate the MC call stack with our usr. - . = -1 // So if we runtime, things know we failed. + . = MC_RESTART_RTN_FAILED // So if we runtime, things know we failed. if (world.time < Master.restart_timeout) - return 0 + return MC_RESTART_RTN_COOLDOWN if (world.time < Master.restart_clear) Master.restart_count *= 0.5 @@ -168,27 +196,28 @@ GLOBAL_REAL(Master, /datum/controller/master) = new try new/datum/controller/master() catch - return -1 - - return 1 + return MC_RESTART_RTN_FAILED + return MC_RESTART_RTN_SUCCESS /datum/controller/master/Recover() var/msg = "## DEBUG: [time2text(world.timeofday)] MC restarted. Reports:\n" - for (var/varname in Master.vars) - switch (varname) - if("name", "tag", "bestF", "type", "parent_type", "vars", "statclick") // Built-in junk. - continue - - else - var/varval = Master.vars[varname] - if (istype(varval, /datum)) // Check if it has a type var. - var/datum/D = varval - msg += "\t [varname] = [D]([D.type])\n" - - else - msg += "\t [varname] = [varval]\n" - + var/list/master_attributes = Master.vars + var/list/filtered_variables = list( + NAMEOF(src, name), + NAMEOF(src, parent_type), + NAMEOF(src, statclick), + NAMEOF(src, tag), + NAMEOF(src, type), + NAMEOF(src, vars), + ) + for (var/varname in master_attributes - filtered_variables) + var/varval = master_attributes[varname] + if (isdatum(varval)) // Check if it has a type var. + var/datum/D = varval + msg += "\t [varname] = [D]([D.type])\n" + else + msg += "\t [varname] = [varval]\n" log_world(msg) var/datum/controller/subsystem/BadBoy = Master.last_type_processed @@ -200,96 +229,169 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(2) msg = "The [BadBoy.name] subsystem was the last to fire for 2 controller restarts. It will be recovered now and disabled if it happens again." FireHim = TRUE - if(3) - msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined." + msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be put offline." BadBoy.subsystem_flags |= SS_NO_FIRE - if(msg) to_chat(GLOB.admins, SPAN_BOLDANNOUNCE("[msg]")) log_world(msg) if (istype(Master.subsystems)) if(FireHim) - Master.subsystems += new BadBoy.type // NEW_SS_GLOBAL will remove the old one. - + Master.subsystems += new BadBoy.type //NEW_SS_GLOBAL will remove the old one subsystems = Master.subsystems current_runlevel = Master.current_runlevel - initialized = TRUE StartProcessing(10) - else to_chat(world, SPAN_BOLDANNOUNCE("The Master Controller is having some issues, we will need to re-initialize EVERYTHING")) - Initialize(20, TRUE) - + Initialize(20, TRUE, FALSE) /** * Please don't stuff random bullshit here, * Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize() + * + * @params + * * delay - wait this many deciseconds before initializing + * * init_sss - initialize all subsystems + * * tgs_prime - notify TGS that initializations are done after */ /datum/controller/master/Initialize(delay, init_sss, tgs_prime) set waitfor = FALSE if(delay) sleep(delay) - - if(tgs_prime) - world.TgsInitializationComplete() - if(init_sss) init_subtypes(/datum/controller/subsystem, subsystems) + // Announce start to_chat(world, SPAN_BOLDANNOUNCE("Initializing subsystems...")) + var/mc_started = FALSE + + // We want to initialize subsystems by stage, in the init_order provided for subsystems within the same stage. + init_stage_completed = 0 + var/list/stage_sorted_subsystems = new(INIT_STAGE_MAX) + for(var/i in 1 to INIT_STAGE_MAX) + stage_sorted_subsystems[i] = list() // Sort subsystems by init_order, so they initialize in the correct order. tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) - var/start_timeofday = REALTIMEOFDAY - // Initialize subsystems. - current_ticklimit = config_legacy.tick_limit_mc_init - for (var/datum/controller/subsystem/SS in subsystems) - if (SS.subsystem_flags & SS_NO_INIT) - continue - - SS.Initialize(REALTIMEOFDAY) - CHECK_TICK + // Collect subsystems by init_stage. This has precedence over init_order. + for(var/datum/controller/subsystem/subsystem as anything in subsystems) + var/subsystem_init_stage = subsystem.init_stage + if (!isnum(subsystem_init_stage) || subsystem_init_stage < 1 || subsystem_init_stage > INIT_STAGE_MAX || round(subsystem_init_stage) != subsystem_init_stage) + stack_trace("ERROR: MC: subsystem `[subsystem.type]` has invalid init_stage: `[subsystem_init_stage]`. Setting to `[INIT_STAGE_MAX]`") + subsystem_init_stage = subsystem.init_stage = INIT_STAGE_MAX + stage_sorted_subsystems[subsystem_init_stage] += subsystem - current_ticklimit = TICK_LIMIT_RUNNING - var/time = (REALTIMEOFDAY - start_timeofday) / 10 + // Sort subsystems by display setting for easy access. + tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display)) - var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" + // Initialize subsystems. The ticker loop will be started immediately upon the first stage being done. + var/rtod_start = REALTIMEOFDAY + + for(var/current_init_stage in 1 to INIT_STAGE_MAX) + for(var/datum/controller/subsystem/subsystem in stage_sorted_subsystems[current_init_stage]) + current_initializing_subsystem = subsystem + initialize_subsystem(subsystem) + current_initializing_subsystem = null + CHECK_TICK + init_stage_completed = current_init_stage + if(!mc_started) + mc_started = TRUE + if(!current_runlevel) + // intentionally not using the defines here as the MC does not care about runlevel semantics; + // the first runlevel is always used. + SetRunLevel(1) + Master.StartProcessing(0) + + var/rtod_end = REALTIMEOFDAY + var/took_seconds = round((rtod_end - rtod_start) / 10, 0.01) + + // Announce, log, and record end + var/msg = "Initializations complete within [took_seconds] second[took_seconds == 1 ? "" : "s"]!" to_chat(world, SPAN_BOLDANNOUNCE("[msg]")) log_world(msg) - if (!current_runlevel) - SetRunLevel(RUNLEVEL_LOBBY) - - // Sort subsystems by display setting for easy access. - tim_sort(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display)) + // Set world options. + world.set_fps(config_legacy.fps) + // Fire initialization toast if(world.system_type == MS_WINDOWS && CONFIG_GET(flag/toast_notification_on_init) && !length(GLOB.clients)) world.shelleo("start /min powershell -ExecutionPolicy Bypass -File tools/initToast/initToast.ps1 -name \"[world.name]\" -icon %CD%\\icons\\CS13_16.png -port [world.port]") - // Set world options. - - world.set_fps(config_legacy.fps) + // Tell TGS we're initialized + if(tgs_prime) + world.TgsInitializationComplete() - var/initialized_tod = REALTIMEOFDAY + // Handle sleeping offline after initializations. + var/rtod_sleep_offline_check = REALTIMEOFDAY if(sleep_offline_after_initializations) world.sleep_offline = TRUE - - sleep(1) - + sleep(1 TICK) if(sleep_offline_after_initializations) // && CONFIG_GET(flag/resume_after_initializations)) world.sleep_offline = FALSE + initializations_finished_with_no_players_logged_in = rtod_sleep_offline_check < REALTIMEOFDAY - 10 - initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 +/** + * Initialize a given subsystem and handle the results. + * + * Arguments: + * * subsystem - the subsystem to initialize. + */ +/datum/controller/master/proc/initialize_subsystem(datum/controller/subsystem/subsystem) + // Do not re-init already initialized subsystems if it's somehow called again. + if(subsystem.subsystem_flags & SS_NO_INIT) + subsystem.initialized = TRUE + return + if(subsystem.initialized) + return - initialized = TRUE + // todo: dylib high-precision timers + var/rtod_start = REALTIMEOFDAY + var/initialize_result = subsystem.Initialize() + var/rtod_end = REALTIMEOFDAY + var/took_seconds = round((rtod_end - rtod_start) / 10, 0.01) + + metric_set_nested_numerical(/datum/metric/nested_numerical/subsystem_init_time, "[subsystem.type]", took_seconds) + + // "[message_prefix] [seconds] seconds." + var/message_prefix + // should to_chat the message to world rather than just log + var/tell_everyone + // use a warning spans + var/chat_warning + + switch(initialize_result) + if(SS_INIT_FAILURE) + message_prefix = "Failed to initialize [subsystem.name] subsystem after" + tell_everyone = TRUE + chat_warning = TRUE + // Since this is an explicit failure, shut its ticking off. We also will not set its initialized variable. + subsystem.subsystem_flags |= SS_NO_FIRE + if(SS_INIT_NONE) + message_prefix = "Initialized [subsystem.name] subsystem with errors within" + tell_everyone = TRUE + chat_warning = TRUE + subsystem.initialized = TRUE + warning("[subsystem.name] subsystem does not implement Initialize() or it returns ..(). If the former is true, the SS_NO_INIT flag should be set for this subsystem.") + if(SS_INIT_SUCCESS) + message_prefix = "Initialized [subsystem.name] subsystem within" + tell_everyone = TRUE + subsystem.initialized = TRUE + if(SS_INIT_NO_MESSAGE) + message_prefix = "Initialized [subsystem.name] subsystem within" + subsystem.initialized = TRUE + if(SS_INIT_NO_NEED) + else + warning("[subsystem.name] subsystem initialized, returning invalid result [initialize_result]. This is a bug.") - // Loop. - Master.StartProcessing(0) + var/message = "[message_prefix] [took_seconds] second[took_seconds == 1 ? "" : "s"]." + var/chat_message = chat_warning ? SPAN_BOLDWARNING(message) : SPAN_BOLDANNOUNCE(message) + if(tell_everyone && message_prefix) + to_chat(world, chat_message) + log_world(message) /datum/controller/master/proc/SetRunLevel(new_runlevel) var/old_runlevel = current_runlevel @@ -311,11 +413,17 @@ GLOBAL_REAL(Master, /datum/controller/master) = new sleep(delay) testing("Master starting processing") - var/rtn = Loop() - if (rtn > 0 || processing < 0) - return // This was suppose to happen. + var/started_stage + var/rtn = MC_LOOP_RTN_UNKNOWN + do + started_stage = init_stage_completed + rtn = Loop(started_stage) + while (rtn == MC_LOOP_RTN_NEWSTAGES && processing > 0 && started_stage < init_stage_completed) + + if (rtn >= MC_LOOP_RTN_GRACEFUL_EXIT || processing < 0) + return //this was suppose to happen. - // Loop ended, restart the mc. + //loop ended, restart the mc log_game("MC crashed or runtimed, restarting") message_admins("MC crashed or runtimed, restarting") var/rtn2 = Recreate_MC() @@ -324,23 +432,26 @@ GLOBAL_REAL(Master, /datum/controller/master) = new message_admins("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") Failsafe.defcon = 2 - /** * Main loop! * This is where the magic happens. */ -/datum/controller/master/proc/Loop() +/datum/controller/master/proc/Loop(init_stage) . = -1 // Prep the loop (most of this is because we want MC restarts to reset as much state as we can, and because local vars rock // All this shit is here so that flag edits can be refreshed by restarting the MC. (and for speed) - var/list/SStickersubsystems = list() + var/list/ticker_subsystems = list() var/list/runlevel_sorted_subsystems = list(list()) // Ensure we always have at least one runlevel. var/timer = world.time for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing - if (SS.subsystem_flags & SS_NO_FIRE) + // Skip non-firing + if(SS.subsystem_flags & SS_NO_FIRE) + continue + // Skip those that are after our init stage, or are not initialized. + if(SS.init_stage > init_stage) continue SS.queued_time = 0 @@ -352,7 +463,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new SS.recompute_wait_dt() if (SS.subsystem_flags & SS_TICKER) - SStickersubsystems += SS + ticker_subsystems += SS // Timer subsystems aren't allowed to bunch up, so we offset them a bit. timer += world.tick_lag * rand(0, 1) SS.next_fire = timer @@ -378,52 +489,74 @@ GLOBAL_REAL(Master, /datum/controller/master) = new * These sort by lower priorities first to reduce the number of loops needed to add subsequent SS's to the queue. * (higher subsystems will be sooner in the queue, adding them later in the loop means we don't have to loop thru them next queue add) */ - tim_sort(SStickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority)) + tim_sort(ticker_subsystems, GLOBAL_PROC_REF(cmp_subsystem_priority)) for(var/I in runlevel_sorted_subsystems) tim_sort(I, GLOBAL_PROC_REF(cmp_subsystem_priority)) - I += SStickersubsystems + I += ticker_subsystems var/cached_runlevel = current_runlevel var/list/current_runlevel_subsystems = runlevel_sorted_subsystems[cached_runlevel] - init_timeofday = REALTIMEOFDAY - init_time = world.time + loop_start_timeofday = REALTIMEOFDAY + loop_start_time = world.time + init_stage_ticking = init_stage iteration = 1 + + var/init_stage_change_pending = FALSE var/error_level = 0 var/sleep_delta = 1 //# The actual loop. while (1) - tickdrift = max(0, MC_AVERAGE_FAST(tickdrift, (((REALTIMEOFDAY - init_timeofday) - (world.time - init_time)) / world.tick_lag))) + var/new_tickdrift = (((REALTIMEOFDAY - loop_start_timeofday) - (world.time - loop_start_time)) / world.tick_lag) + tickdrift = max(0, MC_AVERAGE_FAST(tickdrift, new_tickdrift)) var/starting_tick_usage = TICK_USAGE + + // check if we need to queue an init stage change + if(init_stage != init_stage_completed) + // set stage change pending; this'll stop new (but not paused / sleeping) subsystems from being queued to run. + init_stage_change_pending = TRUE + // ensure that 1. queue is empty and 2. no sleeping subsystems (as those don't stay in queue) exist + if(!queue_head && !laggy_sleeping_subsystem_check()) + return MC_LOOP_RTN_NEWSTAGES + + // If we're paused for some reason, well, pause. if (processing <= 0) current_ticklimit = TICK_LIMIT_RUNNING sleep(10) continue - /** - * Anti-tick-contention heuristics: - * If there are mutiple sleeping procs running before us hogging the cpu, we have to run later. - * (because sleeps are processed in the order received, longer sleeps are more likely to run first) - */ - if (starting_tick_usage > TICK_LIMIT_MC) // If there isn't enough time to bother doing anything this tick, sleep a bit. - sleep_delta *= 2 - current_ticklimit = TICK_LIMIT_RUNNING * 0.5 - sleep(world.tick_lag * (processing * sleep_delta)) - continue + // If we're fully initialized, run normal tick heuristics. Otherwise, always run every tick. + if (init_stage == INIT_STAGE_MAX) + /** + * Anti-tick-contention heuristics: + * If there are mutiple sleeping procs running before us hogging the cpu, we have to run later. + * (because sleeps are processed in the order received, longer sleeps are more likely to run first) + */ + if (starting_tick_usage > TICK_LIMIT_MC) + // If there isn't enough time to bother doing anything this tick, sleep increasingly longer times. + sleep_delta *= 2 + // Instruct CHECK_TICK to use a lot less tick than it usually wouldb e allowed to. + current_ticklimit = TICK_LIMIT_RUNNING * 0.5 + sleep(world.tick_lag * (processing * sleep_delta)) + continue - /** - * Byond resumed us late. - * Assume it might have to do the same next tick. - */ - if (last_run + CEILING(world.tick_lag * (processing * sleep_delta), world.tick_lag) < world.time) - sleep_delta += 1 + /** + * Byond resumed us late. + * Assume it might have to do the same next tick. + */ + if (last_run + CEILING(world.tick_lag * (processing * sleep_delta), world.tick_lag) < world.time) + sleep_delta += 1 - sleep_delta = MC_AVERAGE_FAST(sleep_delta, 1) // Decay sleep_delta. + // Decay sleep_delta + sleep_delta = MC_AVERAGE_FAST(sleep_delta, 1) - if (starting_tick_usage > (TICK_LIMIT_MC*0.75)) // We ran 3/4 of the way into the tick. - sleep_delta += 1 + // We ran 3/4 of the way into the tick + if (starting_tick_usage > (TICK_LIMIT_MC*0.75)) + sleep_delta += 1 + else + sleep_delta = 1 //# Debug. if (make_runtime) @@ -435,96 +568,103 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //# Now do the actual stuff. - //* **Experimental**: Check every tick. + // Check if runlevel changed if(cached_runlevel != current_runlevel) - // Resechedule subsystems. - var/list/old_subsystems = current_runlevel_subsystems + // Resechedule subsystems that are not already part of the runlevel, and are running behind. + var/list/old_runlevel_subsystems = current_runlevel_subsystems cached_runlevel = current_runlevel current_runlevel_subsystems = runlevel_sorted_subsystems[cached_runlevel] - - // Now we'll go through all the subsystems we want to offset and give them a next_fire. - for(var/datum/controller/subsystem/SS as anything in current_runlevel_subsystems) - // We only want to offset it if it's new and also behind. - if(SS.next_fire > world.time || (SS in old_subsystems)) + for(var/datum/controller/subsystem/adding_to_runlevel as anything in (current_runlevel_subsystems - old_runlevel_subsystems)) + if(adding_to_runlevel.next_fire > world.time) continue + adding_to_runlevel.next_fire = world.time + world.tick_lag * rand(0, DS2TICKS(min(adding_to_runlevel.wait, 2 SECONDS))) - SS.next_fire = world.time + world.tick_lag * rand(0, DS2TICKS(min(SS.wait, 2 SECONDS))) - - //* **Experimental**: Check every queue, every tick. - if (CheckQueue(current_runlevel_subsystems) <= 0 || CheckQueue(SStickersubsystems) <= 0) - if (!SoftReset(SStickersubsystems, runlevel_sorted_subsystems)) - log_world("MC: SoftReset() failed, crashing") - return + // If no init stage change is pending, re-queue any subsystems that are idle and are ready to fire. + if(!init_stage_change_pending) + if (CheckQueue(current_runlevel_subsystems) <= 0 || CheckQueue(ticker_subsystems) <= 0) + stack_trace("MC: CheckQueue failed. Current error_level is [round(error_level, 0.25)]") + if (!SoftReset(ticker_subsystems, runlevel_sorted_subsystems)) + error_level++ + CRASH("MC: SoftReset() failed, exiting loop()") - if (!error_level) - iteration++ - - error_level++ - current_ticklimit = TICK_LIMIT_RUNNING - sleep(10) - continue - - if (queue_head) - if (RunQueue() <= 0) - if (!SoftReset(SStickersubsystems, runlevel_sorted_subsystems)) - log_world("MC: SoftReset() failed, crashing") - return - - if (!error_level) + if (error_level < 2) //except for the first strike, stop incrmenting our iteration so failsafe enters defcon iteration++ - - error_level++ + else + cached_runlevel = null //3 strikes, Lets reset the runlevel lists current_ticklimit = TICK_LIMIT_RUNNING - sleep(10) + sleep((1 SECONDS) * error_level) + error_level++ continue - error_level-- - if (!queue_head) // Reset the counts if the queue is empty, in the off chance they get out of sync. + if (queue_head) + var/run_result = RunQueue() + switch(run_result) + if(MC_RUN_RTN_UNKNOWN) + // Error running queue + stack_trace("MC: RunQueue failed. Current error_level is [round(error_level, 0.25)]") + if (error_level > 1) //skip the first error, + if (!SoftReset(ticker_subsystems, runlevel_sorted_subsystems)) + CRASH("MC: SoftReset() failed, exiting loop()") + + if (error_level <= 2) //after 3 strikes stop incrmenting our iteration so failsafe enters defcon + iteration++ + else + cached_runlevel = null //3 strikes, Lets also reset the runlevel lists + current_ticklimit = TICK_LIMIT_RUNNING + sleep((1 SECONDS) * error_level) + error_level++ + continue + error_level++ + + if (error_level > 0) + error_level = max(MC_AVERAGE_SLOW(error_level-1, error_level), 0) + if (!queue_head) //reset the counts if the queue is empty, in the off chance they get out of sync queue_priority_count = 0 queue_priority_count_bg = 0 iteration++ last_run = world.time src.sleep_delta = MC_AVERAGE_FAST(src.sleep_delta, sleep_delta) - current_ticklimit = TICK_LIMIT_RUNNING - if (processing * sleep_delta <= world.tick_lag) - current_ticklimit -= (TICK_LIMIT_RUNNING * 0.25) // Reserve the tail 1/4 of the next tick for the mc if we plan on running next tick. - sleep(world.tick_lag * (processing * sleep_delta)) + // We're about to go to sleep. Set the tick budget for other sleeping procs. + if (init_stage != INIT_STAGE_MAX) + // Still initializing, allow up to 100% dilation (50% of normal FPS). + current_ticklimit = TICK_LIMIT_RUNNING * 2 + else + // Already initialized; use normal heuristics. + current_ticklimit = TICK_LIMIT_RUNNING + if (processing * sleep_delta <= world.tick_lag) + current_ticklimit -= (TICK_LIMIT_RUNNING * 0.25) //reserve the tail 1/4 of the next tick for the mc if we plan on running next tick + sleep(world.tick_lag * (processing * sleep_delta)) /** - * This is what decides if something should run. + * Checks a list of subsystems and enqueues anything that is idle and is ready to run. * - * Arguments: + * @params * * subsystemstocheck - List of systems to check. */ -/datum/controller/master/proc/CheckQueue(list/subsystemstocheck) +/datum/controller/master/proc/CheckQueue(list/datum/controller/subsystem/subsystemstocheck) . = FALSE // So the mc knows if we runtimed. - // We create our variables outside of the loops to save on overhead. - var/datum/controller/subsystem/SS - var/SS_flags - - for (var/thing in subsystemstocheck) - if (!thing) - subsystemstocheck -= thing + for (var/datum/controller/subsystem/SS as anything in subsystemstocheck) + if(!SS) + subsystemstocheck -= SS - SS = thing if (SS.state != SS_IDLE) continue - if (SS.can_fire <= 0) continue - if (SS.next_fire > world.time) continue - SS_flags = SS.subsystem_flags + var/SS_flags = SS.subsystem_flags + + // if it's flagged as NO_FIRE for some reason (probably because something faulted and shut it off), completely boot it if (SS_flags & SS_NO_FIRE) subsystemstocheck -= SS continue - + // keep timing: do not run faster than 1.33x of base speed, to prevent catch-up from going too fast if ((SS_flags & (SS_TICKER|SS_KEEP_TIMING)) == SS_KEEP_TIMING && SS.last_fire + (SS.wait * 0.75) > world.time) continue @@ -532,10 +672,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new . = TRUE - /// Run thru the queue of subsystems to run, running them while balancing out their allocated tick precentage. /datum/controller/master/proc/RunQueue() - . = FALSE + . = MC_RUN_RTN_UNKNOWN var/datum/controller/subsystem/queue_node var/queue_node_flags var/queue_node_priority @@ -545,11 +684,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/tick_precentage var/tick_remaining var/ran = TRUE // This is right. - var/ran_non_SSticker = FALSE + var/ran_non_ticker = FALSE var/bg_calc // Have we swtiched current_tick_budget to background mode yet? // the % of tick used by the current running subsystem var/queue_node_tick_usage + // is a subsystem stopping mid-cycle? this means either pausing or sleeping + var/something_is_mid_cycle /** * Keep running while we have stuff to run and we haven't gone over a tick @@ -573,7 +714,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new * (unless we haven't even ran anything this tick, since its unlikely they will ever be able run in those cases, so we just let them run) */ if (queue_node_flags & SS_NO_TICK_CHECK) - if (queue_node.tick_usage > TICK_LIMIT_RUNNING - TICK_USAGE && ran_non_SSticker) + if (queue_node.tick_usage > TICK_LIMIT_RUNNING - TICK_USAGE && ran_non_ticker) queue_node.queued_priority += queue_priority_count * 0.1 queue_priority_count -= queue_node_priority queue_priority_count += queue_node.queued_priority @@ -599,47 +740,58 @@ GLOBAL_REAL(Master, /datum/controller/master) = new current_ticklimit = round(TICK_USAGE + tick_precentage) if (!(queue_node_flags & SS_TICKER)) - ran_non_SSticker = TRUE + ran_non_ticker = TRUE ran = TRUE - queue_node_paused = (queue_node.state == SS_PAUSED || queue_node.state == SS_PAUSING) + queue_node_paused = (queue_node.state == SS_PAUSED) last_type_processed = queue_node queue_node.state = SS_RUNNING - // ignite / fire the head node + // ignite() will return immediately even if fire() sleeps. queue_node_tick_usage = TICK_USAGE var/state = queue_node.ignite(queue_node_paused) queue_node_tick_usage = TICK_USAGE - queue_node_tick_usage - if (state == SS_RUNNING) - state = SS_IDLE + switch(state) + if(SS_RUNNING) + // fire() ran to completion + state = SS_IDLE + if(SS_PAUSED) + // fire() ran and then pause()'d + something_is_mid_cycle = TRUE + if(SS_SLEEPING) + // fire() slept; the subsystem may or may not pause later + something_is_mid_cycle = TRUE + else + stack_trace("subsystem had unexpected state: [state]") + state = SS_IDLE current_tick_budget -= queue_node_priority - if (queue_node_tick_usage < 0) queue_node_tick_usage = 0 queue_node.tick_overrun = max(0, MC_AVG_FAST_UP_SLOW_DOWN(queue_node.tick_overrun, queue_node_tick_usage-tick_precentage)) queue_node.state = state - // if it paused mid-run, track that + // if it paused mid-run, track that ; do not eject it from the queue if (state == SS_PAUSED) queue_node.paused_ticks++ queue_node.paused_tick_usage += queue_node_tick_usage queue_node = queue_node.queue_next continue - // it did not pause; this is a complete run - + // it did not pause. either this is a complete run, or the subsystem is sleeping. + // in either case, we will track what we can and eject it; if it's sleeping, we can no longer manage the fire() call. queue_node.ticks = MC_AVERAGE(queue_node.ticks, queue_node.paused_ticks) - queue_node_tick_usage += queue_node.paused_tick_usage + queue_node_tick_usage += queue_node.paused_tick_usage queue_node.tick_usage = MC_AVERAGE_FAST(queue_node.tick_usage, queue_node_tick_usage) queue_node.cost = MC_AVERAGE_FAST(queue_node.cost, TICK_DELTA_TO_MS(queue_node_tick_usage)) + queue_node.paused_ticks = 0 queue_node.paused_tick_usage = 0 @@ -651,29 +803,14 @@ GLOBAL_REAL(Master, /datum/controller/master) = new queue_node.last_fire = world.time queue_node.times_fired++ - // schedule next run - if (queue_node_flags & SS_TICKER) - // ticker: run this many ticks after always - queue_node.next_fire = world.time + (world.tick_lag * queue_node.wait) - else if (queue_node_flags & SS_POST_FIRE_TIMING) - // post fire timing: fire this much wait after current time, with tick overrun punishment - queue_node.next_fire = world.time + queue_node.wait + (world.tick_lag * (queue_node.tick_overrun/100)) - else if (queue_node_flags & SS_KEEP_TIMING) - // keep timing: fire this much wait after *the last time we should have fired*, without tick overrun punishment - // **experimental**: do not keep timing past last 10 seconds, if something is running behind that much don't permanently accelerate it. - queue_node.next_fire = max(world.time - 10 SECONDS, queue_node.next_fire + queue_node.wait) - else - // normal: fire this much wait after when we were queued, with tick overrun punishment - queue_node.next_fire = queue_node.queued_time + queue_node.wait + (world.tick_lag * (queue_node.tick_overrun/100)) - - queue_node.queued_time = 0 - - // Remove from queue. + // update the next time it should be available to queue + queue_node.update_next_fire() + // remove from queue queue_node.dequeue() // move to next queue_node = queue_node.queue_next - . = TRUE + . = something_is_mid_cycle ? MC_RUN_RTN_PARTIAL_COMPLETION : MC_RUN_RTN_FULL_COMPLETION /** * Resets the queue, and all subsystems, while filtering out the subsystem lists called if any mc's queue procs runtime or exit improperly. @@ -729,11 +866,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new log_world("MC: SoftReset: Finished.") . = TRUE - /datum/controller/master/stat_entry() return "(TickRate:[Master.processing]) (Iteration:[Master.iteration])" - /datum/controller/master/StartLoadingMap() // todo: this is kind of awful because this procs every subsystem unnecessarily // you might say this is microoptimizations but this is called a seriously high number of times during a load. @@ -748,19 +883,16 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/datum/controller/subsystem/SS = S SS.StopLoadingMap() -/* -/datum/controller/master/proc/UpdateTickRate() - if (!processing) - return - var/client_count = length(GLOB.clients) - if (client_count < CONFIG_GET(number/mc_tick_rate/disable_high_pop_mc_mode_amount)) - processing = CONFIG_GET(number/mc_tick_rate/base_mc_tick_rate) - else if (client_count > CONFIG_GET(number/mc_tick_rate/high_pop_mc_mode_amount)) - processing = CONFIG_GET(number/mc_tick_rate/high_pop_mc_tick_rate) -*/ - - /datum/controller/master/proc/OnConfigLoad() for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing SS.OnConfigLoad() + +/** + * CitRP snowflake special: Check if any subsystems are sleeping. + */ +/datum/controller/master/proc/laggy_sleeping_subsystem_check() + for(var/datum/controller/subsystem/ss in subsystems) + if(ss.state == SS_SLEEPING) + return TRUE + return FALSE diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index b12deb3adb41..bf1333d28b4e 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -1,3 +1,26 @@ +/** + * Sorts subsystems for display (alphabetically). + */ +/proc/cmp_subsystem_display(datum/controller/subsystem/a, datum/controller/subsystem/b) + return sorttext(b.name, a.name) + +/** + * Sorts subsystems by init_order and init_stage. + */ +/proc/cmp_subsystem_init(datum/controller/subsystem/a, datum/controller/subsystem/b) + // Uses initial() so it can be used on types. + if(a.init_stage != b.init_stage) + return initial(a.init_stage) - initial(b.init_stage) + return initial(b.init_order) - initial(a.init_order) + +/** + * Sorts subsystems by priority, from lowest to highest. + * + * * This does not take into account SS_BACKGROUND and SS_TICKER flags! + */ +/proc/cmp_subsystem_priority(datum/controller/subsystem/a, datum/controller/subsystem/b) + return a.priority - b.priority + /** * # Subsystem base class * @@ -5,6 +28,15 @@ * * Simply define a child of this subsystem, using the [SUBSYSTEM_DEF] macro, and the MC will handle registration. * Changing the name is required. + * + * ## Sleeping + * + * If a subsystem sleeps during a tick, it is very, very bad. + * + * * Sleeping orphans the subsystem's call stack from the MC's. The MC is no longer able to control the subsystem's tick usage. + * * Sleeping is handled, but not perfect. This means the MC won't crash / do anything nasty, but normal timing will nonetheless + * be affected. + * * Sleeping causes things like paused tick tracking to be inaccurate. */ /datum/controller/subsystem //# Metadata; you should define these. @@ -15,12 +47,30 @@ */ name = "fire coderbus" + //* Initialization & Shutdown *// + /** * Order of initialization. * Higher numbers are initialized first, lower numbers later. * Use or create defines such as [INIT_ORDER_DEFAULT] so we can see the order in one file. + * + * * This is secondary to [init_stage]. */ var/init_order = INIT_ORDER_DEFAULT + /** + * Which stage does this subsystem init at. Earlier stages can fire while later stages init. + * + * * This is higher in precedence than [init_order]. + * * This determines when the subsystem starts firing; besure to set this if you need ticking even if you are using SS_NO_INIT! + */ + var/init_stage = INIT_STAGE_WORLD + /** + * This variable is set to TRUE after the subsystem has been initialized. + * + * * If this subsystem is marked as SS_NO_FIRE, this still will be set to TRUE. We just won't call Initialize(). + * * This will remain FALSE if initialization is an explicit failure. + */ + var/initialized = FALSE /** * Time to wait (in deciseconds) between each call to fire(). @@ -44,16 +94,6 @@ */ var/subsystem_flags = NONE - /** - * Which stage does this subsystem init at. - * Earlier stages can fire while later stages init. - */ - //var/init_stage = INITSTAGE_MAIN - - /// This var is set to TRUE after the subsystem has been initialized. - // todo: see __DEFINES/controllers/_subsystems.dm; this shouldn't just be TRUE / FALSE - var/initialized = FALSE - /** * Set to FALSE to prevent fire() calls, mostly for admin use or subsystems that may be resumed later. * use the [SS_NO_FIRE] flag instead for systems that never fire to keep it from even being added to list that is checked every tick. @@ -68,16 +108,20 @@ //# The following variables are managed by the MC and should not be modified directly. - /// Last world.time we did a full ignite()/fire() without pausing + /// Last time ignite() was called and fire() ran to completion. /// /// * this is set by the MC's processing loop - /// * this is a heuristic; subsystems that have weird pausing behaviors won't work right with this. - /// * this is why it's crucial subsystems call pause() if they didn't finish a run! + /// * sleeping will count as a fire(), despite potentially not finishing a cycle. var/last_fire = 0 /// Scheduled world.time for next ignite(). /// /// * this is set by the MC's processing loop var/next_fire = 0 + /// Tracks the number of times fire() was ran to completion after an ignite(). + /// + /// * this is set by the MC's processing loop + /// * sleeping will count as a time fired, despite potentially not finishing a cycle. + var/times_fired = 0 /// Running average of the amount of milliseconds it takes the subsystem to complete a run (including all resumes but not the time spent paused). var/cost = 0 @@ -100,10 +144,10 @@ /// Tracks how many fires the subsystem takes to complete a run on average. var/ticks = 1 - /// Tracks the amount of completed runs for the subsystem. - var/times_fired = 0 - /// Time the subsystem entered the queue, (for timing and priority reasons). + /// + /// * This doesn't take into account pauses and sleeps. queued_time is the time it was initially put into queue + /// for a full firing cycle. var/queued_time = 0 /** @@ -140,21 +184,20 @@ /// /// * this is pretty much time dilation for this subsystem /// * this is based on wait time; e.g. 100% means we're running twice as slow, etc - var/tick_dilation_avg = 0 - /// How much of a tick (in percents of a tick) were we allocated last fire. - var/tick_allocation_last = 0 - /// How much of a tick (in percents of a tick) do we get allocated by the mc on avg. - var/tick_allocation_avg = 0 + /// * this is also reset by update_next_fire() if 'reset timing' arg is specified + var/tracked_average_dilation = 0 + /// Last world.time we did a full ignite()/fire() without pausing + /// + /// * this is set when fire() finishes, whether normally or by sleeping, without pausing. + /// * this is set by ignite() + var/tracked_last_completion = 0 + /** * # Do not blindly add vars here to the bottom, put it where it goes above. * # If your var only has two values, put it in as a flag. */ -// Do not override -// /datum/controller/subsystem/New() -// return - /** * Called before global vars are initialized * Called before Recover() @@ -182,34 +225,60 @@ return /** - * This is used so the mc knows when the subsystem sleeps. - * DO NOT OVERRIDE THIS. + * Used to initialize the subsystem AFTER the map has loaded. + * This is expected to be overriden by subtypes. + */ +/datum/controller/subsystem/Initialize() + return SS_INIT_NONE + +/** + * Usually called via datum/controller/subsystem/New() when replacing a subsystem (i.e. due to a recurring crash). + * Should attempt to salvage what it can from the old instance of subsystem. + */ +/datum/controller/subsystem/Recover() + return TRUE + +/** + * Handles logic used to track fire() and sleeps. + * + * * If fire() sleeps, the return value will be SS_SLEEPING. + * * If fire() does not sleep, the return value will be SS_PAUSED or SS_RUNNING. + * + * @return the state we're now in. This return value is only used if fire() does not sleep. */ /datum/controller/subsystem/proc/ignite(resumed = FALSE) SHOULD_NOT_OVERRIDE(TRUE) + // This makes us return the last return value when we (or anything we call; e.g. fire()) sleeps. set waitfor = FALSE + // Paranoid set. . = SS_IDLE - - tick_allocation_last = Master.current_ticklimit-(TICK_USAGE) - tick_allocation_avg = MC_AVERAGE(tick_allocation_avg, tick_allocation_last) - + // Set to SLEEPING so the MC knows if anything below this sleeps. . = SS_SLEEPING + // Fire. This can potentially sleep. If it does, the rest of the proc will be disregarded by the MC. fire(resumed) + // If fire() does not sleep, this will set our return value to RUNNING or PAUSED, depending on if we hit pause(). + // If fire() does sleep, 'state' will have already been overwritten by the MC to be SLEEPING, + // and if pause() is hit after the sleep, it will be changed to PAUSING. . = state - if (state == SS_SLEEPING) - state = SS_IDLE - if (state == SS_PAUSING) - var/QT = queued_time - enqueue() - state = SS_PAUSED - queued_time = QT - else - // track time between runs - var/full_run_took = world.time - last_fire - var/new_tick_dilation = (full_run_took / nominal_dt_ds) * 100 - 100 - tick_dilation_avg = max(0, MC_AVERAGE_SLOW(tick_dilation_avg, new_tick_dilation)) - last_fire = world.time + switch(state) + if(SS_PAUSING) + // sleeping & did pause; MC already moved on, and we've been ejected from queue. Re-insert into queue. + var/was_queued_at = queued_time + enqueue() + state = SS_PAUSED + queued_time = was_queued_at + if(SS_RUNNING, SS_SLEEPING) + // full run finished ; track tick dilation average, last fire, and prepare to re-insert into queue. + var/full_run_took = world.time - tracked_last_completion + var/new_tick_dilation = (full_run_took / nominal_dt_ds) * 100 - 100 + tracked_average_dilation = max(0, MC_AVERAGE_SLOW(tracked_average_dilation, new_tick_dilation)) + tracked_last_completion = world.time + state = SS_IDLE + if(SS_PAUSED) + // we paused; nothing special, move on. the MC will handle it. + else + CRASH("unexpected state in [src] ([type]): [state]") /** * previously, this would have been named 'process()' but that name is used everywhere for different things! @@ -222,13 +291,40 @@ /datum/controller/subsystem/Destroy() dequeue() - can_fire = 0 + can_fire = FALSE subsystem_flags |= SS_NO_FIRE if (Master) Master.subsystems -= src - return ..() +/** + * Updates `next_fire` for the next run. + * + * @params + * * reset_time - Entirely reset the subsystem's stateful time tracking including tick-overrun, post fire timing, etc. + */ +/datum/controller/subsystem/proc/update_next_fire(reset_time) + if(reset_time) + next_fire = (subsystem_flags & SS_TICKER) ? (world.time + (world.tick_lag * wait)) : (world.time + wait) + tracked_last_completion = world.time + return + + var/queue_node_flags = subsystem_flags + + if (queue_node_flags & SS_TICKER) + // ticker: run this many ticks after always + next_fire = world.time + (world.tick_lag * wait) + else if (queue_node_flags & SS_POST_FIRE_TIMING) + // post fire timing: fire this much wait after current time, with tick overrun punishment + next_fire = world.time + wait + (world.tick_lag * (tick_overrun / 100)) + else if (queue_node_flags & SS_KEEP_TIMING) + // keep timing: fire this much wait after *the last time we should have fired*, without tick overrun punishment + // **experimental**: do not keep timing past last 10 seconds, if something is running behind that much don't permanently accelerate it. + next_fire = max(world.time - 10 SECONDS, next_fire + wait) + else + // normal: fire this much wait after when we were queued, with tick overrun punishment + next_fire = queued_time + wait + (world.tick_lag * (tick_overrun / 100)) + /** * Queue it to run. * (we loop thru a linked list until we get to the end or find the right point) @@ -321,7 +417,6 @@ switch(state) if(SS_RUNNING) state = SS_PAUSED - if(SS_SLEEPING) state = SS_PAUSING @@ -329,43 +424,50 @@ /datum/controller/subsystem/proc/OnConfigLoad() return -/** - * Used to initialize the subsystem AFTER the map has loaded. - * This is expected to be overriden by subtypes. - */ -/datum/controller/subsystem/Initialize(start_timeofday) - initialized = TRUE - var/time = (REALTIMEOFDAY - start_timeofday) / 10 - var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, SPAN_BOLDANNOUNCE("[msg]")) - log_world(msg) - log_subsystem("INIT", msg) - return time - /** * Hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. */ /datum/controller/subsystem/stat_entry() if(can_fire && !(SS_NO_FIRE & subsystem_flags)) - . = "[round(cost,1)]ms | D:[round(tick_dilation_avg,1)]% | U:[round(tick_usage,1)]% | O:[round(tick_overrun,1)]% | T:[round(ticks,0.1)] " + . = "[round(cost,1)]ms | D:[round(tracked_average_dilation,1)]% | U:[round(tick_usage,1)]% | O:[round(tick_overrun,1)]% | T:[round(ticks,0.1)] " else . = "OFFLINE " /datum/controller/subsystem/stat_key() - return can_fire? "\[[state_letter()]\][name]" : name + return "\[[state_letter()]\] [name]" +/** + * Returns our status symbol. + */ /datum/controller/subsystem/proc/state_letter() - switch (state) - if (SS_RUNNING) - . = "R" - if (SS_QUEUED) - . = "Q" - if (SS_PAUSED, SS_PAUSING) - . = "P" - if (SS_SLEEPING) - . = "S" - if (SS_IDLE) - . = " " + // R: running + // Q: queued + // P: pausing / paused + // S: sleeping + // I: initializing + // D: done initializing, waiting for init stage to finish + // blank: idle + if(Master.init_stage_completed >= init_stage) + switch (state) + if (SS_RUNNING) + . = "ï¼²" + if (SS_QUEUED) + . = "ï¼±" + if (SS_PAUSED, SS_PAUSING) + . = "ï¼°" + if (SS_SLEEPING) + . = "ï¼³" + if (SS_IDLE) + . = "   " + else + if(subsystem_flags & SS_NO_INIT) + . = "Ｄ" + if(src == Master.current_initializing_subsystem) + . = "Ｉ" + else if(initialized) + . = "Ｄ" + else + . = "ï¼·" /** * Could be used to postpone a costly subsystem for (default one) var/cycles, cycles. @@ -375,14 +477,6 @@ if(next_fire - world.time < wait) next_fire += (wait*cycles) -/** - * Usually called via datum/controller/subsystem/New() when replacing a subsystem (i.e. due to a recurring crash). - * Should attempt to salvage what it can from the old instance of subsystem. - */ -/datum/controller/subsystem/Recover() - return TRUE - - /datum/controller/subsystem/vv_edit_var(var_name, var_value) switch (var_name) if (NAMEOF(src, can_fire)) diff --git a/code/controllers/subsystem/__test_bad_subsystem_sleeps.dm b/code/controllers/subsystem/__test_bad_subsystem_sleeps.dm new file mode 100644 index 000000000000..0b9f7ddd8833 --- /dev/null +++ b/code/controllers/subsystem/__test_bad_subsystem_sleeps.dm @@ -0,0 +1,44 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * Used to intentionally fuck up the MC fire() by sleeping ridiculous + * amounts of time. + * + * Used to test sleep handling and stage change behavior. + * + * **This file should not be ticked outside of special development testing.** + */ +#warn Bad subsystem sleep tester is ticked. + +SUBSYSTEM_DEF(__test_bad_subsystem_sleeps) + name = "-- TEST BAD SUBSYSTEM SLEEPS --" + init_stage = INIT_STAGE_BACKEND + init_order = 100 // this doesn't matter tbh; what matters is it runs as soon as possible so the test goes faster + subsystem_flags = SS_NO_INIT + runlevels = RUNLEVELS_ALL + + var/is_currently_sleeping = FALSE + var/should_resume = FALSE + var/first_fire = TRUE + var/mc_init_stage_at_start_of_sleep + +/datum/controller/subsystem/__test_bad_subsystem_sleeps/fire(resumed) + if(first_fire) + is_currently_sleeping = TRUE + mc_init_stage_at_start_of_sleep = Master.init_stage_ticking + sleep(10 SECONDS) + is_currently_sleeping = FALSE + if(mc_init_stage_at_start_of_sleep != Master.init_stage_ticking) + CRASH("master controller moved on when we were trying to block init") + should_resume = TRUE + pause() + return + if(is_currently_sleeping) + CRASH("re-fired while sleeping") + if(!resumed && should_resume) + CRASH("wasn't resumed when we should resume") + if(resumed) + should_resume = FALSE + if(mc_init_stage_at_start_of_sleep != Master.init_stage_ticking) + CRASH("master controller moved on when we were trying to block init") diff --git a/code/controllers/subsystem/ai_holders.dm b/code/controllers/subsystem/ai_holders.dm index 2ecfc9b96c02..a4b304c37575 100644 --- a/code/controllers/subsystem/ai_holders.dm +++ b/code/controllers/subsystem/ai_holders.dm @@ -14,6 +14,7 @@ SUBSYSTEM_DEF(ai_holders) subsystem_flags = NONE priority = FIRE_PRIORITY_AI_HOLDERS init_order = INIT_ORDER_AI_HOLDERS + init_stage = INIT_STAGE_EARLY wait = 0 /// all ticking ai holders @@ -37,7 +38,7 @@ SUBSYSTEM_DEF(ai_holders) /datum/controller/subsystem/ai_holders/Initialize() active_holders = list() rebuild() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ai_holders/on_ticklag_changed(old_ticklag, new_ticklag) rebuild() diff --git a/code/controllers/subsystem/ai_movement.dm b/code/controllers/subsystem/ai_movement.dm index 619744ad82fb..0c228e285c4e 100644 --- a/code/controllers/subsystem/ai_movement.dm +++ b/code/controllers/subsystem/ai_movement.dm @@ -18,6 +18,7 @@ SUBSYSTEM_DEF(ai_movement) subsystem_flags = NONE priority = FIRE_PRIORITY_AI_MOVEMENT init_order = INIT_ORDER_AI_MOVEMENT + init_stage = INIT_STAGE_EARLY wait = 0 /// ais that are moving using a movement handler right now @@ -45,7 +46,7 @@ SUBSYSTEM_DEF(ai_movement) moving_ais = list() rebuild() init_ai_pathfinders() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ai_movement/on_ticklag_changed(old_ticklag, new_ticklag) rebuild() @@ -86,8 +87,10 @@ SUBSYSTEM_DEF(ai_movement) if(reschedule_delay) // eject; we don't change being_processed.ticking_(next|previous) if(being_processed.movement_bucket_next == being_processed) + // this was the only holder in the bucket buckets[bucket_offset] = null else + // this was not the only holder in the bucket, stitch it back together after the ejection. buckets[bucket_offset] = being_processed.movement_bucket_next being_processed.movement_bucket_next.movement_bucket_prev = being_processed.movement_bucket_prev being_processed.movement_bucket_prev.movement_bucket_next = being_processed.movement_bucket_next @@ -105,7 +108,7 @@ SUBSYSTEM_DEF(ai_movement) being_processed.movement_bucket_next = being_processed.movement_bucket_prev = being_processed being_processed.movement_bucket_position = inject_offset else - // get out + // get out if not rescheduling unregister_moving(being_processed) if(MC_TICK_CHECK) break @@ -136,7 +139,7 @@ SUBSYSTEM_DEF(ai_movement) moving_ais -= holder stack_trace("bad holder found") continue - // doubly linked list inject + // circular double-linked list inject if(!isnull(buckets[position])) var/datum/ai_holder/existing = buckets[position] holder.movement_bucket_next = existing.movement_bucket_next @@ -156,7 +159,7 @@ SUBSYSTEM_DEF(ai_movement) buckets.len = BUCKET_AMOUNT for(var/i in 1 to length(moving_ais)) var/datum/ai_holder/holder = buckets[i] - holder.movement_bucket_next = holder.movement_bucket_prev = null + holder.movement_bucket_next = holder.movement_bucket_prev = holder holder.movement_bucket_position = i /** diff --git a/code/controllers/subsystem/ai_scheduling.dm b/code/controllers/subsystem/ai_scheduling.dm index 0919a8e4c08a..13d7042b2d9b 100644 --- a/code/controllers/subsystem/ai_scheduling.dm +++ b/code/controllers/subsystem/ai_scheduling.dm @@ -14,6 +14,7 @@ SUBSYSTEM_DEF(ai_scheduling) subsystem_flags = NONE priority = FIRE_PRIORITY_AI_SCHEDULING init_order = INIT_ORDER_AI_SCHEDULING + init_stage = INIT_STAGE_EARLY wait = 0 /// rolling bucket list; these hold the head node of linked ai_holders. @@ -34,7 +35,7 @@ SUBSYSTEM_DEF(ai_scheduling) /datum/controller/subsystem/ai_scheduling/Initialize() rebuild() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ai_scheduling/on_ticklag_changed(old_ticklag, new_ticklag) rebuild() @@ -116,6 +117,10 @@ SUBSYSTEM_DEF(ai_scheduling) * List of things allowed to use this: * * /datum/ai_holder * * /datum/ai_network + * + * Quirks: + * * This will never sleep on invocation. If the called proc sleeps, we blow right past. + * * Try to not have the called proc be ridiculously expensive as we are on a very fast-firing subsystem. */ /datum/ai_callback var/proc_ref @@ -143,4 +148,5 @@ SUBSYSTEM_DEF(ai_scheduling) /datum/ai_callback/proc/invoke() SHOULD_NOT_SLEEP(TRUE) + set waitfor = FALSE call(parent, proc_ref)(arglist(arguments)) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index a7b59ec711b0..4d5637252898 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -89,7 +89,7 @@ SUBSYSTEM_DEF(air) continue generated_atmospheres[id] = SSair.generated_atmospheres[id] -/datum/controller/subsystem/air/Initialize(timeofday) +/datum/controller/subsystem/air/Initialize() #ifndef FASTBOOT_DISABLE_ZONES report_progress("Initializing [name] subsystem...") @@ -114,9 +114,7 @@ SUBSYSTEM_DEF(air) startup_active_edge_log = edge_log.Copy() //! Fancy blockquote of data. - var/time = (REALTIMEOFDAY - timeofday) / 10 var/list/blockquote_data = list( - SPAN_BOLDANNOUNCE("Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!
"), SPAN_DEBUGINFO("Total Zones: [zones.len]"), SPAN_DEBUGINFO("\nTotal Edges: [edges.len]"), SPAN_DEBUGINFO("\nTotal Active Edges: [active_edges.len ? SPAN_DANGER("[active_edges.len]") : "None"]"), @@ -131,7 +129,8 @@ SUBSYSTEM_DEF(air) ) #endif - return ..() + + return SS_INIT_SUCCESS /datum/controller/subsystem/air/fire(resumed = FALSE) var/timer @@ -144,11 +143,11 @@ SUBSYSTEM_DEF(air) current_step = SSAIR_TURFS current_cycle++ - INTERNAL_PROCESS_STEP(SSAIR_TURFS, TRUE, process_tiles_to_update, cost_turfs, SSAIR_EDGES) - INTERNAL_PROCESS_STEP(SSAIR_EDGES, FALSE, process_active_edges, cost_edges, SSAIR_FIREZONES) - INTERNAL_PROCESS_STEP(SSAIR_FIREZONES, FALSE, process_active_fire_zones, cost_firezones, SSAIR_HOTSPOTS) - INTERNAL_PROCESS_STEP(SSAIR_HOTSPOTS, FALSE, process_active_hotspots, cost_hotspots, SSAIR_ZONES) - INTERNAL_PROCESS_STEP(SSAIR_ZONES, FALSE, process_zones_to_update, cost_zones, SSAIR_DONE) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSAIR_TURFS, TRUE, process_tiles_to_update, cost_turfs, SSAIR_EDGES) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSAIR_EDGES, FALSE, process_active_edges, cost_edges, SSAIR_FIREZONES) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSAIR_FIREZONES, FALSE, process_active_fire_zones, cost_firezones, SSAIR_HOTSPOTS) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSAIR_HOTSPOTS, FALSE, process_active_hotspots, cost_hotspots, SSAIR_ZONES) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSAIR_ZONES, FALSE, process_zones_to_update, cost_zones, SSAIR_DONE) // Okay, we're done! Woo! Got thru a whole SSair cycle! if(LAZYLEN(currentrun) != 0) diff --git a/code/controllers/subsystem/alarm.dm b/code/controllers/subsystem/alarm.dm index 749ce940ffcb..9a20e427768e 100644 --- a/code/controllers/subsystem/alarm.dm +++ b/code/controllers/subsystem/alarm.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(alarms) /datum/controller/subsystem/alarms/Initialize() SSalarms.all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm) - . = ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/alarms/fire(resumed = FALSE) if(!resumed) diff --git a/code/controllers/subsystem/ambient_lighting.dm b/code/controllers/subsystem/ambient_lighting.dm index 222be9449a7f..56b5e46c45c5 100644 --- a/code/controllers/subsystem/ambient_lighting.dm +++ b/code/controllers/subsystem/ambient_lighting.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(ambient_lighting) /datum/controller/subsystem/ambient_lighting/Initialize(start_timeofday) fire(FALSE, TRUE) - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ambient_lighting/fire(resumed = FALSE, no_mc_tick = FALSE) var/list/curr = queued diff --git a/code/controllers/subsystem/ao.dm b/code/controllers/subsystem/ao.dm index f038c6ff78d8..2baa405c8281 100644 --- a/code/controllers/subsystem/ao.dm +++ b/code/controllers/subsystem/ao.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(ao) /datum/controller/subsystem/ao/Initialize(start_timeofday) fire(FALSE, TRUE) - ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ao/fire(resumed = 0, no_mc_tick = FALSE) if (!resumed) diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index 210359902069..eff83427a200 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(assets) name = "Assets" init_order = INIT_ORDER_ASSETS + init_stage = INIT_STAGE_EARLY subsystem_flags = SS_NO_FIRE /// asset packs by type; this is for hardcoded assets @@ -31,13 +32,11 @@ SUBSYSTEM_DEF(assets) /datum/controller/subsystem/assets/Initialize(timeofday) // detect_cache_worthiness() - for(var/datum/asset_pack/path as anything in typesof(/datum/asset_pack)) if(path == initial(path.abstract_type)) continue var/datum/asset_pack/instance = new path register_asset_pack(instance, TRUE) - #ifndef DO_NOT_DEFER_ASSETS if(initial(instance.load_deferred)) continue @@ -48,8 +47,7 @@ SUBSYSTEM_DEF(assets) #else instance.load() #endif - - return ..() + return SS_INIT_SUCCESS /** * register an asset pack to make it able to be resolved or loaded diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 74ebf6cd6021..33e4e1156c9b 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(atoms) name = "Atoms" init_order = INIT_ORDER_ATOMS + init_stage = INIT_STAGE_WORLD subsystem_flags = SS_NO_FIRE /// A stack of list(source, desired initialized state) @@ -24,28 +25,29 @@ SUBSYSTEM_DEF(atoms) var/list/mapload_init_times = list() #endif - initialized = INITIALIZATION_INSSATOMS + /// Status to use for atom New() / Initialize(). + var/atom_init_status = ATOM_INIT_IN_SUBSYSTEM /datum/controller/subsystem/atoms/Initialize(timeofday) init_start_time = world.time - initialized = INITIALIZATION_INNEW_MAPLOAD + atom_init_status = ATOM_INIT_IN_NEW_MAPLOAD InitializeAtoms() - initialized = INITIALIZATION_INNEW_REGULAR + atom_init_status = ATOM_INIT_IN_NEW_REGULAR - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms, list/atoms_to_return) - if(initialized == INITIALIZATION_INSSATOMS) + if(atom_init_status == ATOM_INIT_IN_SUBSYSTEM) return // Generate a unique mapload source for this run of InitializeAtoms var/static/uid = 0 uid = (uid + 1) % (SHORT_REAL_LIMIT - 1) var/source = "subsystem init [uid]" - set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, source) + set_tracked_initalized(ATOM_INIT_IN_NEW_MAPLOAD, source) - // This may look a bit odd, but if the actual atom creation runtimes for some reason, we absolutely need to set initialized BACK + // This may look a bit odd, but if the actual atom creation runtimes for some reason, we absolutely need to set atom_init_status BACK CreateAtoms(atoms, atoms_to_return, source) clear_tracked_initalize(source) @@ -56,6 +58,7 @@ SUBSYSTEM_DEF(atoms) if(QDELETED(A)) continue A.LateInitialize() + CHECK_TICK testing("Late initialized [late_loaders.len] atoms") late_loaders.Cut() @@ -97,7 +100,7 @@ SUBSYSTEM_DEF(atoms) clear_tracked_initalize(mapload_source) stoplag() if(mapload_source) - set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, mapload_source) + set_tracked_initalized(ATOM_INIT_IN_NEW_MAPLOAD, mapload_source) PROFILE_INIT_ATOM_BEGIN() InitAtom(A, TRUE, mapload_arg) PROFILE_INIT_ATOM_END(A) @@ -118,7 +121,7 @@ SUBSYSTEM_DEF(atoms) clear_tracked_initalize(mapload_source) stoplag() if(mapload_source) - set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD, mapload_source) + set_tracked_initalized(ATOM_INIT_IN_NEW_MAPLOAD, mapload_source) testing("Initialized [count] atoms") @@ -132,14 +135,14 @@ SUBSYSTEM_DEF(atoms) * * ... - rest of args are passed to new() / Initialize(). */ /datum/controller/subsystem/atoms/proc/instance_atom_immediate(path, mapload, atom/where, ...) - var/old_initialized = initialized - initialized = mapload? INITIALIZATION_INNEW_MAPLOAD : INITIALIZATION_INNEW_REGULAR + var/old_init_status = atom_init_status + atom_init_status = mapload? ATOM_INIT_IN_NEW_MAPLOAD : ATOM_INIT_IN_NEW_REGULAR var/atom/created = new path(arglist(args.Copy())) - initialized = old_initialized + atom_init_status = old_init_status return created /datum/controller/subsystem/atoms/proc/map_loader_begin(source) - set_tracked_initalized(INITIALIZATION_INSSATOMS, source) + set_tracked_initalized(ATOM_INIT_IN_SUBSYSTEM, source) /datum/controller/subsystem/atoms/proc/map_loader_stop(source) clear_tracked_initalize(source) @@ -155,9 +158,9 @@ SUBSYSTEM_DEF(atoms) /// Accepts a state and a source, the most recent state is used, sources exist to prevent overriding old values accidentally /datum/controller/subsystem/atoms/proc/set_tracked_initalized(state, source) if(!length(initialized_state)) - base_initialized = initialized + base_initialized = atom_init_status initialized_state += list(list(source, state)) - initialized = state + atom_init_status = state /datum/controller/subsystem/atoms/proc/clear_tracked_initalize(source) if(!length(initialized_state)) @@ -168,17 +171,17 @@ SUBSYSTEM_DEF(atoms) break if(!length(initialized_state)) - initialized = base_initialized - base_initialized = INITIALIZATION_INNEW_REGULAR + atom_init_status = base_initialized + base_initialized = ATOM_INIT_IN_NEW_REGULAR return - initialized = initialized_state[length(initialized_state)][2] + atom_init_status = initialized_state[length(initialized_state)][2] /// Returns TRUE if anything is currently being initialized /datum/controller/subsystem/atoms/proc/initializing_something() return length(initialized_state) > 1 /datum/controller/subsystem/atoms/proc/init_map_bounds(list/bounds) - if (initialized == INITIALIZATION_INSSATOMS) + if (atom_init_status == ATOM_INIT_IN_SUBSYSTEM) return // Let proper initialisation handle it later var/prev_shuttle_queue_state = SSshuttle.block_init_queue @@ -228,8 +231,8 @@ SUBSYSTEM_DEF(atoms) /datum/controller/subsystem/atoms/Recover() - initialized = SSatoms.initialized - if(initialized == INITIALIZATION_INNEW_MAPLOAD) + atom_init_status = SSatoms.atom_init_status + if(atom_init_status == ATOM_INIT_IN_NEW_MAPLOAD) InitializeAtoms() initialized_state = SSatoms.initialized_state BadInitializeCalls = SSatoms.BadInitializeCalls @@ -250,7 +253,7 @@ SUBSYSTEM_DEF(atoms) /// Prepares an atom to be deleted once the atoms SS is initialized. /datum/controller/subsystem/atoms/proc/prepare_deletion(atom/target) - if (initialized == INITIALIZATION_INNEW_REGULAR) + if (atom_init_status == ATOM_INIT_IN_NEW_REGULAR) // Atoms SS has already completed, just kill it now. qdel(target) else diff --git a/code/controllers/subsystem/automata.dm b/code/controllers/subsystem/automata.dm index 6e7777980137..e1940555a400 100644 --- a/code/controllers/subsystem/automata.dm +++ b/code/controllers/subsystem/automata.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(automata) name = "Automata" wait = 1 - subsystem_flags = SS_TICKER + subsystem_flags = SS_TICKER | SS_NO_INIT /// all automata in world var/static/list/datum/automata/automatons = list() diff --git a/code/controllers/subsystem/characters/_characters.dm b/code/controllers/subsystem/characters/_characters.dm index 139ea5f58572..3fce249db414 100644 --- a/code/controllers/subsystem/characters/_characters.dm +++ b/code/controllers/subsystem/characters/_characters.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(characters) stack_trace("what?") continue P.Initialize() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/characters/Recover() . = ..() diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index 3e20925ad97c..67b7f81a6ca8 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -5,11 +5,12 @@ SUBSYSTEM_DEF(chat) name = "Chat" - subsystem_flags = NONE + subsystem_flags = SS_NO_INIT wait = 0.25 // scale up to 40 fps runlevels = RUNLEVELS_ALL priority = FIRE_PRIORITY_CHAT init_order = INIT_ORDER_CHAT + init_stage = INIT_STAGE_LATE var/list/payload_by_client = list() diff --git a/code/controllers/subsystem/chemistry.dm b/code/controllers/subsystem/chemistry.dm index ec025f09b03e..602a248c0e92 100644 --- a/code/controllers/subsystem/chemistry.dm +++ b/code/controllers/subsystem/chemistry.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(chemistry) name = "Chemistry" wait = 10 init_order = INIT_ORDER_CHEMISTRY + subsystem_flags = SS_NO_INIT /// id to instance dict of reagents var/list/reagent_lookup = list() diff --git a/code/controllers/subsystem/dbcore/_dbcore.dm b/code/controllers/subsystem/dbcore/_dbcore.dm index 728980a93fc8..106a7fe09119 100644 --- a/code/controllers/subsystem/dbcore/_dbcore.dm +++ b/code/controllers/subsystem/dbcore/_dbcore.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(dbcore) subsystem_flags = SS_BACKGROUND wait = 1 MINUTES init_order = INIT_ORDER_DBCORE + init_stage = INIT_STAGE_BACKEND var/failed_connection_timeout = 0 var/schema_mismatch = 0 @@ -26,7 +27,7 @@ SUBSYSTEM_DEF(dbcore) if(2) message_admins("Could not get schema version from database") - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/dbcore/fire() for(var/I in active_queries) diff --git a/code/controllers/subsystem/early_init.dm b/code/controllers/subsystem/early_init.dm index 603af16e47fc..0460bc5da4dd 100644 --- a/code/controllers/subsystem/early_init.dm +++ b/code/controllers/subsystem/early_init.dm @@ -1,9 +1,10 @@ SUBSYSTEM_DEF(early_init) name = "Early Init" init_order = INIT_ORDER_EARLY_INIT + init_stage = INIT_STAGE_EARLY subsystem_flags = SS_NO_FIRE /datum/controller/subsystem/early_init/Initialize() init_inventory_slot_meta() init_crayon_decal_meta() - return ..() + return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/emergency_shuttle.dm b/code/controllers/subsystem/emergency_shuttle.dm index b1c07d9cc338..767db15201d7 100644 --- a/code/controllers/subsystem/emergency_shuttle.dm +++ b/code/controllers/subsystem/emergency_shuttle.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(emergencyshuttle) name = "Emergency Shuttle" wait = 20 + subsystem_flags = SS_NO_INIT /datum/controller/subsystem/emergencyshuttle var/datum/shuttle/autodock/ferry/emergency/shuttle // Set in shuttle_emergency.dm TODO - is it really? diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index f846f197e125..b04bfb4b2e39 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(events) // unfortunately, character setup server startup hooks fire before /Initialize so :/ // SScharactersetup but not shit when :) InitializeHolidays() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/events/fire(resumed) if (!resumed) diff --git a/code/controllers/subsystem/fail2topic.dm b/code/controllers/subsystem/fail2topic.dm index cabfd73553a1..74e5c24040cf 100644 --- a/code/controllers/subsystem/fail2topic.dm +++ b/code/controllers/subsystem/fail2topic.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(fail2topic) name = "Fail2Topic" init_order = INIT_ORDER_FAIL2TOPIC + init_stage = INIT_STAGE_BACKEND subsystem_flags = SS_BACKGROUND runlevels = ALL @@ -28,7 +29,7 @@ SUBSYSTEM_DEF(fail2topic) subsystem_flags |= SS_NO_FIRE can_fire = FALSE - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/fail2topic/fire() if(length(rate_limiting)) diff --git a/code/controllers/subsystem/game_master.dm b/code/controllers/subsystem/game_master.dm index b6ec462c586c..6167c617639e 100644 --- a/code/controllers/subsystem/game_master.dm +++ b/code/controllers/subsystem/game_master.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(gamemaster) suspended = FALSE else sleep(30 SECONDS) - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/gamemaster/fire(resumed) if(SSticker && SSticker.current_state == GAME_STATE_PLAYING && !suspended) diff --git a/code/controllers/subsystem/holomaps.dm b/code/controllers/subsystem/holomaps.dm index b0ed4e6325a8..f26e2d178eb2 100644 --- a/code/controllers/subsystem/holomaps.dm +++ b/code/controllers/subsystem/holomaps.dm @@ -16,4 +16,4 @@ SUBSYSTEM_DEF(holomaps) /datum/controller/subsystem/holomaps/Initialize(timeofday) generateHoloMinimaps() - . = ..() + return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 737fcee26167..a2008657cea3 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -44,9 +44,7 @@ SUBSYSTEM_DEF(icon_smooth) smoothing_atom.smooth_icon() CHECK_TICK #endif - - return ..() - + return SS_INIT_SUCCESS /datum/controller/subsystem/icon_smooth/proc/add_to_queue(atom/thing) if(thing.smoothing_flags & SMOOTH_QUEUED) diff --git a/code/controllers/subsystem/inactivity.dm b/code/controllers/subsystem/inactivity.dm index 53e15c3bc179..70d04751155b 100644 --- a/code/controllers/subsystem/inactivity.dm +++ b/code/controllers/subsystem/inactivity.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(inactivity) - name = "AFK Kick" + name = "Inactivity" wait = 600 - subsystem_flags = SS_BACKGROUND | SS_NO_TICK_CHECK + subsystem_flags = SS_BACKGROUND | SS_NO_TICK_CHECK | SS_NO_INIT /datum/controller/subsystem/inactivity/fire() if(config_legacy.kick_inactive) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 31d921504741..b1c113aa2d62 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(input) name = "Input" wait = 0.25 // scale to 40 fps init_order = INIT_ORDER_INPUT - subsystem_flags = NONE + init_stage = INIT_STAGE_EARLY priority = FIRE_PRIORITY_INPUT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY @@ -23,16 +23,13 @@ SUBSYSTEM_DEF(input) /datum/controller/subsystem/input/Initialize() setup_macrosets() - // set init early so refresh macrosets works - initialized = TRUE refresh_client_macro_sets() - - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/input/Recover() - initialized = SSinput.initialized setup_macrosets() refresh_client_macro_sets() + initialized = SSinput.initialized /// Sets up the key list for classic mode for when badmins screw up vv's. /datum/controller/subsystem/input/proc/setup_macrosets() diff --git a/code/controllers/subsystem/ipintel.dm b/code/controllers/subsystem/ipintel.dm index e35e0c9e3941..170e520e4cfe 100644 --- a/code/controllers/subsystem/ipintel.dm +++ b/code/controllers/subsystem/ipintel.dm @@ -3,8 +3,7 @@ */ SUBSYSTEM_DEF(ipintel) name = "IPIntel" - init_order = INIT_ORDER_IPINTEL - subsystem_flags = SS_NO_FIRE + subsystem_flags = SS_NO_FIRE | SS_NO_INIT /// is ipintel enabled? var/enabled = FALSE diff --git a/code/controllers/subsystem/job/_job.dm b/code/controllers/subsystem/job/_job.dm index 8d3e88e0349b..dc63fb444b0f 100644 --- a/code/controllers/subsystem/job/_job.dm +++ b/code/controllers/subsystem/job/_job.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(job) name = "Job" init_order = INIT_ORDER_JOBS + init_stage = INIT_STAGE_EARLY subsystem_flags = SS_NO_FIRE /// List of all jobs @@ -27,7 +28,7 @@ SUBSYSTEM_DEF(job) if(!length(occupations)) setup_occupations() reconstruct_job_ui_caches() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/job/Recover() init_access() diff --git a/code/controllers/subsystem/legacy_atc.dm b/code/controllers/subsystem/legacy_atc.dm index 68ed238958f5..407bc57ad910 100644 --- a/code/controllers/subsystem/legacy_atc.dm +++ b/code/controllers/subsystem/legacy_atc.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(legacy_atc) next_message = world.time + initial_delay START_PROCESSING(SSobj, src) - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/legacy_atc/process(delta_time) if(world.time >= next_message) diff --git a/code/controllers/subsystem/legacy_lore.dm b/code/controllers/subsystem/legacy_lore.dm index 163dedfd9e91..56001882b5b8 100644 --- a/code/controllers/subsystem/legacy_lore.dm +++ b/code/controllers/subsystem/legacy_lore.dm @@ -13,4 +13,4 @@ SUBSYSTEM_DEF(legacy_lore) if(initial(instance.name)) instance = new path() organizations[path] = instance - return ..() + return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 5bff0ce41f92..2413696bd967 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -114,7 +114,7 @@ SUBSYSTEM_DEF(lighting) ) log_subsystem("lighting", "NOv:[overlaycount] L:[processed_lights] C:[processed_corners] O:[processed_overlays]") - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/lighting/proc/InitializeZlev(zlev) for (var/thing in Z_ALL_TURFS(zlev)) diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index d0fa25883a7f..d377218545d0 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -44,16 +44,17 @@ SUBSYSTEM_DEF(machines) makepowernets() report_progress("Initializing atmos machinery...") setup_atmos_machinery(GLOB.machines) + update_all_apcs() fire() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/machines/fire(resumed = 0) var/timer = TICK_USAGE - INTERNAL_PROCESS_STEP(SSMACHINES_POWER_OBJECTS,FALSE,process_power_objects,cost_power_objects,SSMACHINES_PIPENETS) // Higher priority, damnit - INTERNAL_PROCESS_STEP(SSMACHINES_PIPENETS,TRUE,process_pipenets,cost_pipenets,SSMACHINES_MACHINERY) - INTERNAL_PROCESS_STEP(SSMACHINES_MACHINERY,FALSE,process_machinery,cost_machinery,SSMACHINES_POWERNETS) - INTERNAL_PROCESS_STEP(SSMACHINES_POWERNETS,FALSE,process_powernets,cost_powernets,SSMACHINES_POWER_OBJECTS) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSMACHINES_POWER_OBJECTS,FALSE,process_power_objects,cost_power_objects,SSMACHINES_PIPENETS) // Higher priority, damnit + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSMACHINES_PIPENETS,TRUE,process_pipenets,cost_pipenets,SSMACHINES_MACHINERY) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSMACHINES_MACHINERY,FALSE,process_machinery,cost_machinery,SSMACHINES_POWERNETS) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSMACHINES_POWERNETS,FALSE,process_powernets,cost_powernets,SSMACHINES_POWER_OBJECTS) // rebuild all power networks from scratch - only called at world creation or by the admin verb // The above is a lie. Turbolifts also call this proc. @@ -89,6 +90,10 @@ SUBSYSTEM_DEF(machines) T.broadcast_status() CHECK_TICK +/datum/controller/subsystem/machines/proc/update_all_apcs() + for(var/obj/machinery/power/apc/apc in GLOB.apcs) + apc.update() + /datum/controller/subsystem/machines/proc/process_pipenets(resumed = 0) if (!resumed) src.current_run = global.pipe_networks.Copy() diff --git a/code/controllers/subsystem/mapping/_mapping.dm b/code/controllers/subsystem/mapping/_mapping.dm index eabccb9b489d..b51368f09eb9 100644 --- a/code/controllers/subsystem/mapping/_mapping.dm +++ b/code/controllers/subsystem/mapping/_mapping.dm @@ -43,8 +43,7 @@ SUBSYSTEM_DEF(mapping) // finalize // todo: refactor repopulate_sorted_areas() - - return ..() + return SS_INIT_SUCCESS // // Mapping subsystem handles initialization of random map elements at server start diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 4b53be2b5be1..7311cbbc0976 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -25,7 +25,7 @@ SUBSYSTEM_DEF(materials) /datum/controller/subsystem/materials/Initialize() initialize_material_recipes() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/materials/Recover() initialize_material_recipes() diff --git a/code/controllers/subsystem/media_tracks.dm b/code/controllers/subsystem/media_tracks.dm index 960e1be5b261..968dea1f9a5d 100644 --- a/code/controllers/subsystem/media_tracks.dm +++ b/code/controllers/subsystem/media_tracks.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(media_tracks) /datum/controller/subsystem/media_tracks/Initialize(timeofday) load_tracks() sort_tracks() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/media_tracks/proc/load_tracks() var/jukebox_track_file = "config_static/jukebox.json" diff --git a/code/controllers/subsystem/minimaps.dm b/code/controllers/subsystem/minimaps.dm index 893554388f5d..63a4d3bb9a13 100644 --- a/code/controllers/subsystem/minimaps.dm +++ b/code/controllers/subsystem/minimaps.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(minimaps) to_chat(world, "Minimaps disabled! Skipping init.") return ..() build_minimaps() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/minimaps/proc/build_minimaps() station_minimaps = list() diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm index e5bc5d6314f7..301ca96e7ced 100644 --- a/code/controllers/subsystem/nanoui.dm +++ b/code/controllers/subsystem/nanoui.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(nanoui) name = "NanoUI" priority = FIRE_PRIORITY_NANO + subsystem_flags = SS_NO_INIT wait = 7 /// A list of current open /nanoui UIs, grouped by src_object and ui_key. @@ -9,25 +10,20 @@ SUBSYSTEM_DEF(nanoui) /// A list of current open /nanoui UIs, not grouped, for use in processing. var/list/processing_uis = list() - - /datum/controller/subsystem/nanoui/fire(resumed) for(var/thing in processing_uis) var/datum/nanoui/UI = thing UI.process() - /datum/controller/subsystem/nanoui/Recover() if(SSnanoui.open_uis) open_uis |= SSnanoui.open_uis if(SSnanoui.processing_uis) processing_uis |= SSnanoui.processing_uis - /datum/controller/subsystem/nanoui/stat_entry() return ..() + " [processing_uis.len] UIs" - /** * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data * @@ -56,7 +52,6 @@ SUBSYSTEM_DEF(nanoui) return ui - /** * Get an open /nanoui ui for the current user, src_object and ui_key * @@ -75,7 +70,6 @@ SUBSYSTEM_DEF(nanoui) if (ui.user == user) return ui - /** * Update all /nanoui uis attached to src_object * @@ -98,7 +92,6 @@ SUBSYSTEM_DEF(nanoui) else ui.close() - /** * Close all /nanoui uis attached to src_object * @@ -117,7 +110,6 @@ SUBSYSTEM_DEF(nanoui) ui.close() // If it's missing src_object or user, we want to close it even more. .++ - /** * Update /nanoui uis belonging to user * @@ -137,7 +129,6 @@ SUBSYSTEM_DEF(nanoui) ui.try_update(1) .++ - /** * Close /nanoui uis belonging to user * @@ -157,7 +148,6 @@ SUBSYSTEM_DEF(nanoui) ui.close() .++ - /** * Add a /nanoui ui to the list of open uis * This is called by the /nanoui open() proc @@ -173,7 +163,6 @@ SUBSYSTEM_DEF(nanoui) LAZYDISTINCTADD(ui.user.open_uis, ui) processing_uis += ui - /** * Remove a /nanoui ui from the list of open uis * This is called by the /nanoui close() proc @@ -199,7 +188,6 @@ SUBSYSTEM_DEF(nanoui) return TRUE - /** * This is called on user logout * Closes/clears all uis attached to the user's /mob @@ -211,7 +199,6 @@ SUBSYSTEM_DEF(nanoui) /datum/controller/subsystem/nanoui/proc/user_logout(mob/user) return close_user_uis(user) - /** * This is called when a player transfers from one mob to another * Transfers all open UIs to the new mob diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 7321979537bb..f0fa4f7388b1 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(nightshift) name = "Night Shift" init_order = INIT_ORDER_NIGHTSHIFT + init_stage = INIT_STAGE_LATE priority = FIRE_PRIORITY_NIGHTSHIFT wait = 60 SECONDS subsystem_flags = SS_NO_TICK_CHECK @@ -22,9 +23,7 @@ SUBSYSTEM_DEF(nightshift) /datum/controller/subsystem/nightshift/Initialize() if (!CONFIG_GET(flag/nightshifts_enabled)) can_fire = FALSE - //if(CONFIG_GET(flag/randomized_start_time_enabled)) - //GLOB.gametime_offset = rand(0, 23) HOURS - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/nightshift/fire(resumed = FALSE) if(world.time - round_duration_in_ds < nightshift_first_check) diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 1545a91280b0..5ed931866d9b 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -3,6 +3,7 @@ SUBSYSTEM_DEF(overlays) wait = 1 priority = FIRE_PRIORITY_OVERLAYS init_order = INIT_ORDER_OVERLAY + init_stage = INIT_STAGE_LATE runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY var/list/processing = list() @@ -23,7 +24,7 @@ SUBSYSTEM_DEF(overlays) /datum/controller/subsystem/overlays/Initialize() overlays_initialized = TRUE Flush() - ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/overlays/Shutdown() text2file(render_stats(stats), "[GLOB.log_directory]/overlay.log") diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm index bc994f2c4e2b..224e460db3c8 100644 --- a/code/controllers/subsystem/overmap.dm +++ b/code/controllers/subsystem/overmap.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(overmaps) /datum/controller/subsystem/overmaps/Initialize() make_default_overmap() rebuild_helm_computers() - return ..() + return SS_INIT_SUCCESS //! legacy code below diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index 5c1b72de730e..0d5874546188 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(parallax) name = "Parallax" wait = 2 - subsystem_flags = SS_POST_FIRE_TIMING | SS_BACKGROUND + subsystem_flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT priority = FIRE_PRIORITY_PARALLAX runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/list/currentrun diff --git a/code/controllers/subsystem/persistence/persistence.dm b/code/controllers/subsystem/persistence/persistence.dm index 806071a997be..e5965a985a0c 100644 --- a/code/controllers/subsystem/persistence/persistence.dm +++ b/code/controllers/subsystem/persistence/persistence.dm @@ -24,14 +24,11 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/Initialize() /// build prototype lookup list build_prototype_id_lookup() - LoadPersistence() - // todo: should this be here? save_the_world is in ticker. if(CONFIG_GET(flag/persistence)) load_the_world() - - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/persistence/Shutdown() SavePersistence() diff --git a/code/controllers/subsystem/planets.dm b/code/controllers/subsystem/planets.dm index b01d171eff85..74e2b069c440 100644 --- a/code/controllers/subsystem/planets.dm +++ b/code/controllers/subsystem/planets.dm @@ -21,7 +21,7 @@ SUBSYSTEM_DEF(planets) report_progress("Initializing planetary weather.") allocateTurfs(TRUE) fire() // Fire once to preemptively set up weather and planetary ambient lighting. - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/planets/on_max_z_changed(old_z_count, new_z_count) . = ..() diff --git a/code/controllers/subsystem/plants.dm b/code/controllers/subsystem/plants.dm index 0ed5ca68eb1f..d32669e0be5f 100644 --- a/code/controllers/subsystem/plants.dm +++ b/code/controllers/subsystem/plants.dm @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(plants) /datum/controller/subsystem/plants/Initialize(timeofday) setup() - return ..() + return SS_INIT_SUCCESS /** * Predefined/roundstart varieties use a string key to make it diff --git a/code/controllers/subsystem/playtime.dm b/code/controllers/subsystem/playtime.dm index 4dbfd544fc68..617cdbf03350 100644 --- a/code/controllers/subsystem/playtime.dm +++ b/code/controllers/subsystem/playtime.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(playtime) name = "Playtime" wait = 10 MINUTES - subsystem_flags = SS_NO_TICK_CHECK + subsystem_flags = SS_NO_TICK_CHECK | SS_NO_INIT /datum/controller/subsystem/playtime/Shutdown() flush_playtimes() diff --git a/code/controllers/subsystem/preferences.dm b/code/controllers/subsystem/preferences.dm index cf35c223cf47..f9090109db7d 100644 --- a/code/controllers/subsystem/preferences.dm +++ b/code/controllers/subsystem/preferences.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(preferences) name = "Preferences" init_order = INIT_ORDER_PREFERENCES + init_stage = INIT_STAGE_EARLY subsystem_flags = SS_NO_FIRE var/list/datum/game_preference_entry/entries_by_key @@ -13,7 +14,7 @@ SUBSYSTEM_DEF(preferences) for(var/key in preferences_by_key) var/datum/game_preferences/prefs = preferences_by_key[key] prefs.initialize() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/preferences/proc/resolve_preference_entry(datum/game_preference_entry/entrylike) if(ispath(entrylike)) diff --git a/code/controllers/subsystem/processing/circuits.dm b/code/controllers/subsystem/processing/circuits.dm index cbf0adcf1b8b..52ded6c5325c 100644 --- a/code/controllers/subsystem/processing/circuits.dm +++ b/code/controllers/subsystem/processing/circuits.dm @@ -23,7 +23,7 @@ PROCESSING_SUBSYSTEM_DEF(circuit) /datum/controller/subsystem/processing/circuit/Initialize(timeofday) SScircuit.cipherkey = uppertext(random_string(2000+rand(0,10), GLOB.alphabet)) circuits_init() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/processing/circuit/proc/circuits_init() //Cached lists for free performance diff --git a/code/controllers/subsystem/processing/instruments.dm b/code/controllers/subsystem/processing/instruments.dm index 730f89d4b8ea..129506f2c5fe 100644 --- a/code/controllers/subsystem/processing/instruments.dm +++ b/code/controllers/subsystem/processing/instruments.dm @@ -2,6 +2,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments) name = "Instruments" wait = 0.5 init_order = INIT_ORDER_INSTRUMENTS + init_stage = INIT_STAGE_EARLY subsystem_flags = SS_KEEP_TIMING priority = FIRE_PRIORITY_INSTRUMENTS var/static/list/datum/instrument/instrument_data = list() //id = datum @@ -14,7 +15,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments) /datum/controller/subsystem/processing/instruments/Initialize() initialize_instrument_data() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/processing/instruments/proc/on_song_new(datum/song/S) songs += S diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 3e4829857a2a..1b98510c602f 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -1,12 +1,12 @@ //Used to process objects. SUBSYSTEM_DEF(processing) - name = "Processing" + name = "Processing - 1 FPS" priority = FIRE_PRIORITY_PROCESS subsystem_flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT wait = 1 SECONDS - var/stat_tag = "P" //Used for logging + var/stat_tag = "P1" //Used for logging var/list/processing = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/repository.dm b/code/controllers/subsystem/repository.dm index 17a553eaa18d..04db037a4973 100644 --- a/code/controllers/subsystem/repository.dm +++ b/code/controllers/subsystem/repository.dm @@ -4,9 +4,10 @@ SUBSYSTEM_DEF(repository) name = "Repository System" init_order = INIT_ORDER_REPOSITORY + init_stage = INIT_STAGE_BACKEND subsystem_flags = SS_NO_FIRE /datum/controller/subsystem/repository/Initialize() __create_repositories() __init_repositories() - return ..() + return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 2f1019cfa039..4bb02c2c0eca 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -49,7 +49,6 @@ SUBSYSTEM_DEF(shuttle) /// Shuttles remaining to process this fire() tick var/tmp/list/current_run - /** *! I made these shitty vars so we don't search for these in GOD DAMN WORLD *! If I find these are still here in 2023 I'll be very upset. @@ -63,7 +62,7 @@ SUBSYSTEM_DEF(shuttle) last_landmark_registration_time = world.time block_init_queue = FALSE process_init_queues() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/shuttle/fire(resumed = 0) if (!resumed) diff --git a/code/controllers/subsystem/sound/_sound.dm b/code/controllers/subsystem/sound/_sound.dm index 477ff2965771..3a2121a2fe78 100644 --- a/code/controllers/subsystem/sound/_sound.dm +++ b/code/controllers/subsystem/sound/_sound.dm @@ -3,8 +3,9 @@ SUBSYSTEM_DEF(sounds) name = "Sounds" subsystem_flags = SS_NO_FIRE init_order = INIT_ORDER_SOUNDS + init_stage = INIT_STAGE_BACKEND /datum/controller/subsystem/sounds/Initialize() setup_available_channels() setup_soundbytes() - return ..() + return SS_INIT_SUCCESS diff --git a/code/controllers/subsystem/spatial_grids.dm b/code/controllers/subsystem/spatial_grids.dm index 5f782bbc4ddd..b19dfcced2a1 100644 --- a/code/controllers/subsystem/spatial_grids.dm +++ b/code/controllers/subsystem/spatial_grids.dm @@ -8,6 +8,7 @@ SUBSYSTEM_DEF(spatial_grids) name = "Spatial Grids" init_order = INIT_ORDER_SPATIAL_GRIDS + init_stage = INIT_STAGE_WORLD subsystem_flags = SS_NO_FIRE /// /living mobs. they don't have to be alive, just a subtype of /living. @@ -19,7 +20,7 @@ SUBSYSTEM_DEF(spatial_grids) /datum/controller/subsystem/spatial_grids/Initialize() make_grids() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/spatial_grids/proc/make_grids() living = new /datum/spatial_grid(/mob/living) diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 5c5ea3e4dfaf..a7fbbe9abaa5 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -2,7 +2,9 @@ SUBSYSTEM_DEF(statpanels) name = "Stat Panels" wait = 4 init_order = INIT_ORDER_STATPANELS + init_stage = INIT_STAGE_BACKEND priority = FIRE_PRIORITY_STATPANELS + subsystem_flags = SS_NO_INIT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY //! ticking @@ -19,11 +21,6 @@ SUBSYSTEM_DEF(statpanels) /// cached sdql2 data var/cache_sdql_data -/datum/controller/subsystem/statpanels/Initialize() - spawn() - manual_ticking() - return ..() - /datum/controller/subsystem/statpanels/fire(resumed = FALSE, no_tick_check) if(!resumed) // dispose / rebuild caches @@ -144,16 +141,3 @@ SUBSYSTEM_DEF(statpanels) . += Q.generate_stat() . = url_encode(json_encode(.)) cache_sdql_data = . - -/** - * is this shitcode? - * yes it is - * if you wanna do better, do better; i'm not at the point of janking up our MC with my own - * fuckery. - * - * tl;dr this ensures we push data while MC is initializing. - */ -/datum/controller/subsystem/statpanels/proc/manual_ticking() - while(!Master.initialized) - fire(null, TRUE) - sleep(10) diff --git a/code/controllers/subsystem/status_effects.dm b/code/controllers/subsystem/status_effects.dm index cceedbafb1b4..03ec92e68bfa 100644 --- a/code/controllers/subsystem/status_effects.dm +++ b/code/controllers/subsystem/status_effects.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(status_effects) wait = 0.5 - subsystem_flags = NONE + subsystem_flags = SS_NO_INIT name = "Status Effects" /// ticking effects diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 59ef967b6069..c93852ef30fa 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -1,6 +1,7 @@ SUBSYSTEM_DEF(sun) name = "Sun" wait = 1 MINUTE + subsystem_flags = SS_NO_INIT var/static/datum/sun/sun = new /datum/controller/subsystem/sun/fire() diff --git a/code/controllers/subsystem/supply.dm b/code/controllers/subsystem/supply.dm index c830a7159281..00b3f3856b9b 100644 --- a/code/controllers/subsystem/supply.dm +++ b/code/controllers/subsystem/supply.dm @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(supply) for(var/key in legacy_supply_categories) flattened += key legacy_supply_categories = flattened - return ..() + return SS_INIT_SUCCESS // Supply shuttle SSticker - handles supply point regeneration // This is called by the process scheduler every thirty seconds diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 85c11386e172..a997765b4bd5 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -75,8 +75,7 @@ SUBSYSTEM_DEF(ticker) syndicate_code_response = generate_code_phrase() start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) - - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/ticker/fire() switch(current_state) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index 865e1d7c30b4..f812db13b9f3 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -18,6 +18,7 @@ SUBSYSTEM_DEF(timer) name = "Timer" wait = 1 // SS_TICKER subsystem, so wait is in ticks init_order = INIT_ORDER_TIMER + init_stage = INIT_STAGE_BACKEND runlevels = RUNLEVELS_ALL priority = FIRE_PRIORITY_TIMER subsystem_flags = SS_TICKER|SS_NO_INIT diff --git a/code/controllers/subsystem/lobby.dm b/code/controllers/subsystem/titlescreen.dm similarity index 64% rename from code/controllers/subsystem/lobby.dm rename to code/controllers/subsystem/titlescreen.dm index e0c8f1b8d8d5..b2f834a97b57 100644 --- a/code/controllers/subsystem/lobby.dm +++ b/code/controllers/subsystem/titlescreen.dm @@ -1,29 +1,30 @@ /** - * manager for everything involving the lobby, including the title screen + * Manages the lobby's titlescreen. */ -SUBSYSTEM_DEF(lobby) - name = "Lobby Manager" +SUBSYSTEM_DEF(titlescreen) + name = "Titlescreens" subsystem_flags = SS_NO_FIRE - init_order = INIT_ORDER_LOBBY + init_order = INIT_ORDER_TITLESCREEN + init_stage = INIT_STAGE_LATE /// our titlescreen var/datum/cutscene/titlescreen -/datum/controller/subsystem/lobby/Initialize() +/datum/controller/subsystem/titlescreen/Initialize() initialize_title_scene() - return ..() + return SS_INIT_NO_MESSAGE -/datum/controller/subsystem/lobby/proc/initialize_title_scene() +/datum/controller/subsystem/titlescreen/proc/initialize_title_scene() refresh_title_scene() for(var/client/C as anything in GLOB.clients) if(!isnewplayer(C.mob)) continue C.start_cutscene(titlescreen) -/datum/controller/subsystem/lobby/proc/refresh_title_scene() +/datum/controller/subsystem/titlescreen/proc/refresh_title_scene() set_title_scene(make_title_scene()) -/datum/controller/subsystem/lobby/proc/make_title_scene() +/datum/controller/subsystem/titlescreen/proc/make_title_scene() var/picked = pickweight((LEGACY_MAP_DATUM).titlescreens.Copy()) if(isnull(picked)) return @@ -41,7 +42,7 @@ SUBSYSTEM_DEF(lobby) built.init() return built -/datum/controller/subsystem/lobby/proc/set_title_scene(datum/cutscene/scene) +/datum/controller/subsystem/titlescreen/proc/set_title_scene(datum/cutscene/scene) var/list/client/old_viewing if(!isnull(titlescreen)) old_viewing = titlescreen.viewing?.Copy() diff --git a/code/controllers/subsystem/transcore_vr.dm b/code/controllers/subsystem/transcore_vr.dm index 70b1e3fa8fed..fe550f4f95ca 100644 --- a/code/controllers/subsystem/transcore_vr.dm +++ b/code/controllers/subsystem/transcore_vr.dm @@ -32,8 +32,8 @@ SUBSYSTEM_DEF(transcore) /datum/controller/subsystem/transcore/fire(resumed = 0) var/timer = TICK_USAGE - INTERNAL_PROCESS_STEP(SSTRANSCORE_IMPLANTS,TRUE,process_implants,cost_implants,SSTRANSCORE_BACKUPS) -// INTERNAL_PROCESS_STEP(SSTRANSCORE_BACKUPS,FALSE,process_backups,cost_backups,SSTRANSCORE_IMPLANTS) + INTERNAL_SUBSYSTEM_PROCESS_STEP(SSTRANSCORE_IMPLANTS,TRUE,process_implants,cost_implants,SSTRANSCORE_BACKUPS) +// INTERNAL_SUBSYSTEM_PROCESS_STEP(SSTRANSCORE_BACKUPS,FALSE,process_backups,cost_backups,SSTRANSCORE_IMPLANTS) /datum/controller/subsystem/transcore/proc/process_implants(resumed = 0) if (!resumed) diff --git a/code/controllers/subsystem/transfer.dm b/code/controllers/subsystem/transfer.dm index 0040f5b42ce9..9820da271ec1 100644 --- a/code/controllers/subsystem/transfer.dm +++ b/code/controllers/subsystem/transfer.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(transfer) timerbuffer = config_legacy.vote_autotransfer_initial shift_hard_end = config_legacy.vote_autotransfer_initial + (config_legacy.vote_autotransfer_interval * NUMBER_OF_VOTE_EXTENSIONS) //Change this "1" to how many extend votes you want there to be. shift_last_vote = shift_hard_end - config_legacy.vote_autotransfer_interval - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/transfer/fire(resumed) currenttick = currenttick + 1 diff --git a/code/controllers/subsystem/turbolift.dm b/code/controllers/subsystem/turbolift.dm index fd506f39f669..0afd8de21b43 100644 --- a/code/controllers/subsystem/turbolift.dm +++ b/code/controllers/subsystem/turbolift.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(turbolifts) name = "Turbolifts" - subsystem_flags = SS_NO_TICK_CHECK + subsystem_flags = SS_NO_TICK_CHECK | SS_NO_INIT wait = 10 var/static/list/moving_lifts = list() diff --git a/code/controllers/subsystem/vis_overlays.dm b/code/controllers/subsystem/vis_overlays.dm index b0e5d6c6896d..e8f0c71e7ba9 100644 --- a/code/controllers/subsystem/vis_overlays.dm +++ b/code/controllers/subsystem/vis_overlays.dm @@ -11,7 +11,7 @@ SUBSYSTEM_DEF(vis_overlays) /datum/controller/subsystem/vis_overlays/Initialize() vis_overlay_cache = list() unique_vis_overlays = list() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/vis_overlays/fire(resumed = FALSE) if(!resumed) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 32a95513032c..3b57bd293c9a 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -35,9 +35,9 @@ SUBSYSTEM_DEF(vote) /datum/config_entry/string/default_on_transfer_tie default = "Extend the Shift" -/datum/controller/subsystem/vote/Initialize(start_timeofday) - . = ..() +/datum/controller/subsystem/vote/Initialize() ghost_weight_percent = CONFIG_GET(number/ghost_weight) + return SS_INIT_SUCCESS /datum/controller/subsystem/vote/fire(resumed) if(mode) diff --git a/code/controllers/subsystem/world.dm b/code/controllers/subsystem/world.dm index 36f95e492e2a..ff43eb9d9be5 100644 --- a/code/controllers/subsystem/world.dm +++ b/code/controllers/subsystem/world.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(game_world) initialize_locations() initialize_factions() initialize_map() - return ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/game_world/proc/initialize_locations() location_lookup = list() diff --git a/code/controllers/subsystem/xenoarch.dm b/code/controllers/subsystem/xenoarch.dm index 0c0574a95f2b..e833522e1910 100644 --- a/code/controllers/subsystem/xenoarch.dm +++ b/code/controllers/subsystem/xenoarch.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(xenoarch) /datum/controller/subsystem/xenoarch/Initialize(timeofday) SetupXenoarch() - ..() + return SS_INIT_SUCCESS /datum/controller/subsystem/xenoarch/Recover() if (istype(SSxenoarch.artifact_spawning_turfs)) diff --git a/code/controllers/subsystem/zcopy.dm b/code/controllers/subsystem/zcopy.dm index c745fdca6731..9adf8a3e0cf4 100644 --- a/code/controllers/subsystem/zcopy.dm +++ b/code/controllers/subsystem/zcopy.dm @@ -180,7 +180,7 @@ SUBSYSTEM_DEF(zcopy) calculate_zstack_limits() // Flush the queue. fire(FALSE, TRUE) - return ..() + return SS_INIT_SUCCESS // If you add a new Zlevel or change Z-connections, call this. /datum/controller/subsystem/zcopy/proc/calculate_zstack_limits() diff --git a/code/game/atoms/atoms_initializing_EXPENSIVE.dm b/code/game/atoms/atoms_initializing_EXPENSIVE.dm index 3c1dbacb0149..1cb28418a64e 100644 --- a/code/game/atoms/atoms_initializing_EXPENSIVE.dm +++ b/code/game/atoms/atoms_initializing_EXPENSIVE.dm @@ -70,9 +70,9 @@ if(datum_flags & DF_USE_TAG) generate_tag() - var/do_initialize = SSatoms.initialized - if(do_initialize != INITIALIZATION_INSSATOMS) - args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD + var/do_initialize = SSatoms.atom_init_status + if(do_initialize != ATOM_INIT_IN_SUBSYSTEM) + args[1] = do_initialize == ATOM_INIT_IN_NEW_MAPLOAD if(SSatoms.InitAtom(src, FALSE, args)) //we were deleted return diff --git a/code/game/objects/structures/tables/materials.dm b/code/game/objects/structures/tables/materials.dm index 6fdf575888dd..63bbcffae7b9 100644 --- a/code/game/objects/structures/tables/materials.dm +++ b/code/game/objects/structures/tables/materials.dm @@ -13,7 +13,7 @@ (reinforcing) = MATERIAL_SIGNIFICANCE_TABLE_REINFORCEMENT, ))) // sigh - if(SSatoms.initialized == INITIALIZATION_INNEW_REGULAR) + if(SSatoms.atom_init_status == ATOM_INIT_IN_NEW_REGULAR) update_connections(TRUE) update_appearance() diff --git a/code/game/objects/structures/tables/update_triggers.dm b/code/game/objects/structures/tables/update_triggers.dm index 237842124f91..cb7e785e52d4 100644 --- a/code/game/objects/structures/tables/update_triggers.dm +++ b/code/game/objects/structures/tables/update_triggers.dm @@ -1,6 +1,6 @@ /obj/structure/window/Initialize(mapload) . = ..() - if(SSatoms.initialized == INITIALIZATION_INNEW_REGULAR) + if(SSatoms.atom_init_status == ATOM_INIT_IN_NEW_REGULAR) for(var/obj/structure/table/T in view(src, 1)) T.update_connections() T.update_icon() diff --git a/code/modules/ai/holders/ai_holder-movement.dm b/code/modules/ai/holders/ai_holder-movement.dm index ce2b6e76d3de..c0a2f1d62a2b 100644 --- a/code/modules/ai/holders/ai_holder-movement.dm +++ b/code/modules/ai/holders/ai_holder-movement.dm @@ -11,8 +11,12 @@ /// bucket position var/movement_bucket_position /// last datum in bucket + /// + /// * We are a circularly double-linked list. If we are the only one in the bucket, this is ourselves. var/datum/ai_holder/movement_bucket_prev /// next datum in bucket + /// + /// * We are a circularly double-linked list. If we are the only one in the bucket, this is ourselves. var/datum/ai_holder/movement_bucket_next /// movement cycle var/movement_cycle @@ -23,6 +27,7 @@ * @return amount of time to next move; 0 to stop moving */ /datum/ai_holder/proc/move(cycles) + SHOULD_NOT_SLEEP(TRUE) . = 0 CRASH("unimplemented move proc called; what happened here?") @@ -30,10 +35,12 @@ * register on movement subsystem to move */ /datum/ai_holder/proc/start_moving(initial_delay) + SHOULD_NOT_SLEEP(TRUE) return SSai_movement.register_moving(src) /** * stop moving */ /datum/ai_holder/proc/stop_moving() + SHOULD_NOT_SLEEP(TRUE) return SSai_movement.unregister_moving(src) diff --git a/code/modules/ai/holders/ai_holder-scheduling.dm b/code/modules/ai/holders/ai_holder-scheduling.dm index 80d29a46a6ce..59454eee8754 100644 --- a/code/modules/ai/holders/ai_holder-scheduling.dm +++ b/code/modules/ai/holders/ai_holder-scheduling.dm @@ -19,5 +19,6 @@ * * arguments - a list of arguments to use with the call */ /datum/ai_holder/proc/schedule(time, proc_ref, list/arguments) + SHOULD_NOT_SLEEP(TRUE) var/datum/ai_callback/ai_callback = new(proc_ref, arguments, src) SSai_scheduling.schedule_callback(ai_callback, time) diff --git a/code/modules/ai/holders/ai_holder-ticking.dm b/code/modules/ai/holders/ai_holder-ticking.dm index 872bf0e306d7..08db4bc01b37 100644 --- a/code/modules/ai/holders/ai_holder-ticking.dm +++ b/code/modules/ai/holders/ai_holder-ticking.dm @@ -23,6 +23,7 @@ * correct bucket for our target cycle. */ /datum/ai_holder/proc/set_ticking(delay) + SHOULD_NOT_SLEEP(TRUE) ASSERT(delay > 0) ASSERT(delay <= AI_SCHEDULING_LIMIT) if(ticking > 0) @@ -39,6 +40,7 @@ * Unregister us from the doubly linked list we're in and removes us from the ai_holders subsystem. */ /datum/ai_holder/proc/stop_ticking() + SHOULD_NOT_SLEEP(TRUE) if(!ticking) return SSai_holders.bucket_evict(src) @@ -50,6 +52,7 @@ * Called by subsystem to tick this holder. */ /datum/ai_holder/proc/tick(cycles) + SHOULD_NOT_SLEEP(TRUE) return /** diff --git a/code/modules/ai/holders/polaris/ai_holder_targeting.dm b/code/modules/ai/holders/polaris/ai_holder_targeting.dm index 9f2f90656264..b6028156a45e 100644 --- a/code/modules/ai/holders/polaris/ai_holder_targeting.dm +++ b/code/modules/ai/holders/polaris/ai_holder_targeting.dm @@ -235,7 +235,7 @@ if(!hostile && !retaliate) // Not allowed to defend ourselves. ai_log("react_to_attack_polaris() : Was attacked by [attacker], but we are not allowed to attack back.", AI_LOG_TRACE) return FALSE - if(holder.IIsAlly(attacker)) // I'll overlook it THIS time... + if(ismob(attacker) && holder.IIsAlly(attacker)) // I'll overlook it THIS time... ai_log("react_to_attack_polaris() : Was attacked by [attacker], but they were an ally.", AI_LOG_TRACE) return FALSE if(target) // Already fighting someone. Switching every time we get hit would impact our combat performance. diff --git a/code/modules/client/game_preferences/middleware/keybindings.dm b/code/modules/client/game_preferences/middleware/keybindings.dm index 006a156a7a5d..607b9e040db2 100644 --- a/code/modules/client/game_preferences/middleware/keybindings.dm +++ b/code/modules/client/game_preferences/middleware/keybindings.dm @@ -6,8 +6,8 @@ key = "keybindings" /datum/game_preference_middleware/keybindings/on_initial_load(datum/game_preferences/prefs) - prefs.active?.update_movement_keys(src) prefs.active?.set_macros() + prefs.active?.update_movement_keys(src) return ..() /datum/game_preference_middleware/keybindings/handle_reset(datum/game_preferences/prefs) diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index 71775b65f6a2..517cbb2fcbdd 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -75,7 +75,7 @@ else full_key = "[AltMod][CtrlMod][ShiftMod][_key]" var/keycount = 0 - for(var/kb_name in preferences.keybindings[full_key]) + for(var/kb_name in preferences?.keybindings[full_key]) keycount++ var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name] if(kb.can_use(src) && kb.down(src) && keycount >= MAX_COMMANDS_PER_KEY) @@ -137,7 +137,7 @@ // We don't do full key for release, because for mod keys you // can hold different keys and releasing any should be handled by the key binding specifically - for (var/kb_name in preferences.keybindings[_key]) + for (var/kb_name in preferences?.keybindings[_key]) var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name] if(kb.can_use(src) && kb.up(src)) break diff --git a/code/modules/metrics/api.dm b/code/modules/metrics/api.dm deleted file mode 100644 index f8dd53c35b56..000000000000 --- a/code/modules/metrics/api.dm +++ /dev/null @@ -1,78 +0,0 @@ -//* This file is explicitly licensed under the MIT license. *// -//* Copyright (c) 2024 Citadel Station Developers *// - -/** - * counter metric - * - * * numerical, can only go up through a round - */ -/datum/metric/counter - -/** - * increments a counter metric by an amount, defaulting to 1 - * - * * The time at which this is called does matter. The recorded metric will be at the current - * time of the recording. - * - * This is what you can use for things like: - * - * * How many times an admin verb was pressed in a round - * * How many times a thing happened in a round - */ -/proc/metric_record_counter(datum/metric/counter/typepath, amount = 1) - return - -/** - * records a series of values at given times - * - * * Supports a number, string, or both. - * - * This is what you can use for things like: - * - * * Time dilation tracking - */ -/datum/metric/series - /// has numerical data to graph - /// - /// * doesn't limit the data, only determines if we try to pull a graph - var/graph_exists = FALSE - /// representation of numerical data in graph - /// - /// * valid values are ["average", "tally"] - var/graph_collate = "tally" - -/** - * records a number or a string in a series metric - * - * * The time at which this is called does matter. The recorded metric will be at the current - * time of the recording. - */ -/proc/metric_record_series(datum/metric/series/typepath, tally, comment) - return - -/** - * Records an event at a specific tile of a map - * - * * Supports a single tile event with annotation of number and/or string - * * Supports a rectangular event with annotation of number and/or string - * - * This is usually used for game-map purposes, but is actually usable as an arbitrary - * spatial metric if you need it for whatever reason. - * - * This is what you can use for things like: - * - * * Tracking where people died - * * Tracking what explodes - * * Tracking what goes wrong where - */ -/datum/metric/spatial - /// Whether the spatial metric corrosponds to the actual in-game map - var/is_game_world = FALSE - /// Don't render a tally of '1' - var/elide_singular_tally = TRUE - -/proc/metric_record_spatial_single(datum/metric/spatial/typepath, x, y, level_id, tally, comment) - return - -/proc/metric_record_spatial_box(datum/metric/spatial/typepath, x1, y1, x2, y2, level_id, tally, comment) - return diff --git a/code/modules/metrics/api/nested_numerical.dm b/code/modules/metrics/api/nested_numerical.dm new file mode 100644 index 000000000000..6bcddacf95da --- /dev/null +++ b/code/modules/metrics/api/nested_numerical.dm @@ -0,0 +1,23 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * nested numerical metric + * + * This is what you can use for things like: + * + * * How many times an admin verb was pressed in a round + */ +/datum/metric/nested_numerical + +/** + * overwrites a nested numerical metric + */ +/proc/metric_set_nested_numerical(datum/metric/nested_numerical/typepath, key = "--unset--", amount) + return + +/** + * increments a nested numerical metric + */ +/proc/metric_increment_nested_numerical(datum/metric/nested_numerical/typepath, key = "--unset--", amount = 1) + return diff --git a/code/modules/metrics/api/numerical.dm b/code/modules/metrics/api/numerical.dm new file mode 100644 index 000000000000..517efd200f01 --- /dev/null +++ b/code/modules/metrics/api/numerical.dm @@ -0,0 +1,23 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * numerical metric + * + * This is what you can use for things like: + * + * * How many times a thing happened in a round + */ +/datum/metric/numerical + +/** + * overwrites a numerical metric + */ +/proc/metric_set_numerical(datum/metric/numerical/typepath, amount) + return + +/** + * increments a numerical metric + */ +/proc/metric_increment_numerical(datum/metric/numerical/typepath, amount = 1) + return diff --git a/code/modules/metrics/api/spatial_series.dm b/code/modules/metrics/api/spatial_series.dm new file mode 100644 index 000000000000..36fa66f3bce3 --- /dev/null +++ b/code/modules/metrics/api/spatial_series.dm @@ -0,0 +1,31 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * Records an event at a specific tile of a map + * + * * Supports a single tile event with annotation of number and/or string + * * Supports a rectangular event with annotation of number and/or string + * + * This is usually used for game-map purposes, but is actually usable as an arbitrary + * spatial metric if you need it for whatever reason. + * + * This is what you can use for things like: + * + * * Tracking where people died + * * Tracking what explodes + * * Tracking what goes wrong where + */ +/datum/metric/spatial_series + /// Whether the spatial metric corrosponds to the actual in-game map + var/is_game_world = FALSE + /// Don't render a tally of '1' + var/elide_singular_tally = TRUE + /// We care about time + var/is_time_series = FALSE + +/proc/metric_record_spatial_series_single(datum/metric/spatial_series/typepath, x, y, level_id, tally, comment) + return + +/proc/metric_record_spatial_series_box(datum/metric/spatial_series/typepath, x1, y1, x2, y2, level_id, tally, comment) + return diff --git a/code/modules/metrics/api/string_set.dm b/code/modules/metrics/api/string_set.dm new file mode 100644 index 000000000000..c3b75fc7ba12 --- /dev/null +++ b/code/modules/metrics/api/string_set.dm @@ -0,0 +1,17 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * Records an unique set of strings. + * + * This is what you can use for things like: + * + * * What subsystems failed init + */ +/datum/metric/string_set + +/** + * records a string into a string set + */ +/proc/metric_record_string_set(datum/metric/string_set/typepath, string) + return diff --git a/code/modules/metrics/api/time_series.dm b/code/modules/metrics/api/time_series.dm new file mode 100644 index 000000000000..94cea76620bc --- /dev/null +++ b/code/modules/metrics/api/time_series.dm @@ -0,0 +1,30 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 Citadel Station Developers *// + +/** + * records a series of values at given times + * + * * Supports a number, string, or both. + * + * This is what you can use for things like: + * + * * Time dilation tracking + */ +/datum/metric/time_series + /// has numerical data to graph + /// + /// * doesn't limit the data, only determines if we try to pull a graph + var/graph_exists = FALSE + /// representation of numerical data in graph + /// + /// * valid values are ["average", "tally"] + var/graph_collate = "tally" + +/** + * records a number or a string in a series metric + * + * * The time at which this is called does matter. The recorded metric will be at the current + * time of the recording. + */ +/proc/metric_record_time_series(datum/metric/time_series/typepath, value, comment) + return diff --git a/code/modules/metrics/metrics/controllers.dm b/code/modules/metrics/metrics/controllers.dm new file mode 100644 index 000000000000..9fa1d5837fa3 --- /dev/null +++ b/code/modules/metrics/metrics/controllers.dm @@ -0,0 +1,4 @@ +/datum/metric/nested_numerical/subsystem_init_time + id = "subsystem-init-time" + name = "Init Time - Subsystem" + category = METRIC_CATEGORY_SERVER diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b81b51c2bd56..8107d87fc978 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -389,7 +389,7 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM) */ /proc/notify_ghosts(message, ghost_sound, enter_link, atom/source, mutable_appearance/alert_overlay, action = NOTIFY_JUMP, flashwindow = TRUE, ignore_mapload = TRUE, ignore_key, ignore_dnr_observers = FALSE, header) //Easy notification of ghosts. // Don't notify for objects created during a mapload. - if(ignore_mapload && SSatoms.initialized != INITIALIZATION_INNEW_REGULAR) + if(ignore_mapload && SSatoms.atom_init_status != ATOM_INIT_IN_NEW_REGULAR) return for(var/mob/observer/dead/O in GLOB.player_list) if(!O.client) diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 0aa83c75b444..4644f71fa8e9 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -22,4 +22,4 @@ return ..() /mob/new_player/login_cutscene() - client.start_cutscene(SSlobby.titlescreen) + client.start_cutscene(SStitlescreen.titlescreen) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e42290cc3c60..69230f569620 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -321,8 +321,6 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) make_terminal() - addtimer(CALLBACK(src, PROC_REF(update)), 5) - /obj/machinery/power/apc/examine(mob/user, dist) . = ..() if(Adjacent(user))