diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 9ada9201f26..4cbb62b1f0f 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -204,6 +204,11 @@ desc = "A direction sign, pointing out which way the medical department is." icon_state = "direction_med" +/obj/structure/sign/directions/custodial + name = "\improper CUSTODIAL CLOSET sign" + desc = "A direction sign, pointing out which way a custodial closet is." + icon_state = "direction_custodial" + /obj/structure/sign/directions/evac name = "\improper ESCAPE DOCK sign" desc = "A direction sign, pointing out which way the escape dock is." diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 445edfc6c22..6fe864b9afe 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -198,21 +198,23 @@ allowed_directions = UP|DOWN icon_state = "ladder11" +// Stairs /obj/structure/stairs name = "stairs" - desc = "Stairs leading to another level. Not too useful if the gravity goes out." + desc = "Stairs leading to another floor. Not too useful if the gravity goes out." icon = 'icons/obj/stairs.dmi' - density = 0 - opacity = 0 - anchored = 1 + icon_state = "solid" layer = TURF_LAYER + density = FALSE + opacity = FALSE + anchored = TRUE /obj/structure/stairs/Initialize() . = ..() for(var/turf/turf in locs) var/turf/simulated/open/above = GetAbove(turf) if(!above) - warning("Stair created without level above: ([loc.x], [loc.y], [loc.z])") + warning("Stair created without z-level above: ([loc.x], [loc.y], [loc.z])") return qdel(src) if(!istype(above)) above.ChangeToOpenturf() @@ -266,7 +268,6 @@ "You hear a thump." ) -// type paths to make mapping easier. /obj/structure/stairs/north dir = NORTH bound_height = 64 @@ -285,4 +286,4 @@ /obj/structure/stairs/west dir = WEST - bound_width = 64 + bound_width = 64 \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 54bce541020..985a76e72a2 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -76,7 +76,7 @@ new /obj/item/clothing/head/hardhat(src) /obj/structure/closet/excavation - name = "xenoarchaeology excavation tools" + name = "excavation tools" icon_state = "eng" icon_door = "eng_tool" @@ -97,6 +97,10 @@ new /obj/item/device/hand_labeler(src) new /obj/item/ore_detector(src) + // 2 Drills + new /obj/item/pickaxe/drill(src) + new /obj/item/pickaxe/drill(src) + //---- Isolation room air alarms /obj/machinery/alarm/isolation diff --git a/html/changelogs/residential_deck_immersion.yml b/html/changelogs/residential_deck_immersion.yml new file mode 100644 index 00000000000..46140221b2b --- /dev/null +++ b/html/changelogs/residential_deck_immersion.yml @@ -0,0 +1,8 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Moves the residential lifts to deck 1 next to the main elevator." + - maptweak: "Adds a residential deck stairwell to the central stairwell on deck 1." + - maptweak: "Moves the auxiliary custodial closet to where the residential lifts used to be on deck 2." \ No newline at end of file diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index d9faa6b5a31..2a224726734 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi index 73aedef1472..dc1042c5efc 100644 Binary files a/icons/obj/stairs.dmi and b/icons/obj/stairs.dmi differ diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 710244e207d..26970ea4f7d 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -310,6 +310,7 @@ name = "Horizon (PARENT AREA - DON'T USE)" icon_state = "unknown" station_area = TRUE + ambience = AMBIENCE_GENERIC // Exterior /area/horizon/exterior @@ -321,6 +322,7 @@ has_gravity = FALSE no_light_control = TRUE allow_nightmode = FALSE + ambience = AMBIENCE_SPACE /********** Maintenance Start **********/ // Maintenance @@ -387,6 +389,7 @@ name = "Horizon - Bridge Stairwell" icon_state = "bridge_stairs" sound_env = SMALL_ENCLOSED + ambience = AMBIENCE_HIGHSEC /********** Stairwells End **********/ /********** Crew Quarters Start **********/ @@ -607,6 +610,21 @@ icon_state = "bar" allow_nightmode = FALSE +/area/horizon/bar/backroom + name = "Horizon - Bar - Backroom" + +// Custodial +/area/horizon/custodial + name = "Horizon - Custodial Closet" + icon_state = "janitor" + allow_nightmode = FALSE + sound_env = LARGE_ENCLOSED + ambience = AMBIENCE_FOREBODING + +/area/horizon/custodial/auxiliary + name = "Horizon - Auxiliary Custodial Closet" + sound_env = SMALL_ENCLOSED + // ZTA /area/horizon/zta name = "Horizon - Primary Armament Hold" diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 79aba5f1289..bc3523774c6 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -5,7 +5,8 @@ name = "E.V.A. Maintenance"; req_access = list(18) }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/storage/eva) "abr" = ( /obj/structure/grille/diagonal{ @@ -42,9 +43,16 @@ /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/lower) "acY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/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/corner/blue{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "adj" = ( /obj/machinery/vending/vendors, /obj/effect/floor_decal/corner/purple/full{ @@ -52,7 +60,7 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "adv" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -66,13 +74,6 @@ }, /turf/simulated/floor/plating, /area/hangar/auxiliary) -"aeA" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mwr4" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "aeJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -108,9 +109,14 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "ahw" = ( -/obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/machinery/door/airlock/security{ + name = "Security Checkpoint"; + req_access = list(63) + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, +/area/security/checkpoint) "aix" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -154,52 +160,29 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "als" = ( -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/corner/yellow{ dir = 1 }, -/obj/structure/railing/mapped{ +/obj/effect/floor_decal/corner/blue{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/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/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/research_port) -"amw" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mlw3" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "amz" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/cryopod/living_quarters{ + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/sign/directions/civ{ + desc = "A sign pointing out that a lift leads to the ship's residential deck."; + dir = 1; + name = "\improper Lift to Residential Deck sign"; + pixel_y = -10 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/structure/lattice/catwalk/indoor/grate/damaged, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "any" = ( /obj/structure/lattice/catwalk/indoor, /obj/structure/cable{ @@ -327,7 +310,7 @@ /area/maintenance/substation/civilian_west) "arr" = ( /turf/simulated/wall, -/area/janitor) +/area/horizon/custodial) "ars" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, @@ -356,9 +339,6 @@ /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 }, @@ -366,6 +346,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "atA" = ( @@ -420,30 +404,21 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "awo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "awr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "awx" = ( @@ -533,6 +508,18 @@ /obj/machinery/chem_master, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) +"aBw" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/operations) "aBy" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -544,34 +531,38 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "aCi" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/door/window/southleft{ - name = "Suit Storage"; +/obj/machinery/suit_storage_unit/standard_unit, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window/southright{ + name = "Softsuit Storage"; req_access = list(18) }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "aCn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "aCu" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "shutters_evarecharging"; - layer = 5; - name = "E.V.A. Recharging Shutter" +/obj/structure/closet/excavation, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/white, +/area/storage/eva) "aDj" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/door/firedoor, @@ -597,14 +588,11 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "aDv" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 - }, /obj/machinery/power/apc/low{ dir = 4; name = "east bump"; @@ -613,7 +601,11 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/plating, /area/maintenance/operations) "aEl" = ( /obj/machinery/door/blast/shutters/open{ @@ -743,7 +735,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/alarm{ pixel_y = 28 @@ -828,7 +819,7 @@ name = "Security Checkpoint Shutter" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "aLu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -871,7 +862,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -879,7 +869,7 @@ pixel_y = 32 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "aNO" = ( /obj/machinery/hologram/holopad/long_range, /obj/structure/cable/green{ @@ -904,9 +894,6 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -973,16 +960,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "shutters_evarecharging"; - name = "E.V.A. Recharging Shutters"; - pixel_x = -7; - pixel_y = -25; +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; req_access = list(18) }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/turf/simulated/floor/tiled/full, +/area/storage/eva) "aQr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1093,15 +1078,18 @@ }, /area/maintenance/wing/port/deck1) "aVU" = ( -/obj/structure/closet/walllocker/medical{ +/obj/structure/reagent_dispensers/extinguisher, +/obj/machinery/light/spot/weak{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ pixel_x = 32 }, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/effect/floor_decal/industrial/outline/medical, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "aWr" = ( /obj/structure/cable{ @@ -1139,7 +1127,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/closet/crate/bin, /obj/random/loot, @@ -1161,10 +1148,12 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "aXh" = ( -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/wall, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "aXq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1262,38 +1251,20 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "bap" = ( -/obj/structure/railing/mapped{ +/obj/machinery/disposal/small/north, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "baq" = ( /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -1409,20 +1380,12 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "bfs" = ( -/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 - }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 15" }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "bfA" = ( /obj/effect/floor_decal/industrial/warning, @@ -1479,7 +1442,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 4 }, /area/maintenance/research_port) @@ -1501,13 +1464,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 5"; dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "bkV" = ( @@ -1640,15 +1603,13 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) "bpL" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "bqi" = ( @@ -1730,23 +1691,22 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Deck 1 Central Stairwell" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "buI" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/sci, -/obj/item/clothing/head/helmet/space/void/sci, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "shutters_hangarseccpexternal"; + name = "Security Checkpoint External Shutter" }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/northleft{ - name = "Research Voidsuit"; - req_access = list(47) +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "hangarlockdown"; + name = "Hangar Lockdown" }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "buS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1775,13 +1735,13 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "bvv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; + req_access = list(18) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/storage/eva) "bvL" = ( /obj/effect/floor_decal/industrial/warning{ @@ -1860,24 +1820,26 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "byS" = ( +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/hangar/port) -"bzh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass_command{ - name = "E.V.A."; - req_access = list(18) +"bzc" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "bzv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/firealarm/east, @@ -1901,27 +1863,40 @@ dir = 1 }, /obj/structure/sign/emergency/evacuation{ - dir = 4 + dir = 4; + layer = 2.1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "bAM" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "bBA" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mwr1"; - opacity = 1 +/obj/structure/cryofeed, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 + }, +/obj/machinery/ai_status_display{ + pixel_y = -32 + }, +/turf/simulated/floor, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "bBD" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -2142,25 +2117,26 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) "bGM" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = 24; + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "bGQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/floor_decal/corner/green{ + dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "bHs" = ( /obj/item/modular_computer/console/preset/engineering{ @@ -2178,7 +2154,7 @@ }, /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "bHP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2190,16 +2166,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) "bHV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/door/airlock/maintenance{ req_access = list(73) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/hangar/control) "bID" = ( /obj/structure/tank_wall/hydrogen{ @@ -2222,7 +2193,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/atmos_compartment) "bKx" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -2335,40 +2306,29 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "bMO" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) -"bNT" = ( -/obj/machinery/light, -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) "bNW" = ( -/obj/effect/floor_decal/corner_wide/purple/full{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) -"bOs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/effect/floor_decal/corner/mauve{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/white, /area/storage/eva) +"bOs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/aft) "bOv" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/railing/mapped{ @@ -2379,7 +2339,7 @@ }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "bOR" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -2481,12 +2441,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/machinery/newscaster{ pixel_x = 29 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "bVc" = ( @@ -2558,12 +2518,13 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "bZn" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "bZp" = ( @@ -2632,14 +2593,6 @@ temperature = 278.15 }, /area/medical/morgue/lower) -"cbM" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mwr3"; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "cch" = ( /obj/machinery/atmospherics/omni/filter{ tag_east = 2; @@ -2704,7 +2657,7 @@ }, /obj/effect/floor_decal/corner/purple/full, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "cen" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2737,23 +2690,13 @@ /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "cfg" = ( -/obj/machinery/suspension_gen{ +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/corner/blue/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) -"cfF" = ( -/obj/structure/window/reinforced, -/obj/machinery/door/window/westleft, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/ramp{ - dir = 8 - }, -/area/hangar/auxiliary) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "cfS" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -2813,24 +2756,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"cjr" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/firealarm/north, -/obj/item/modular_computer/console/preset/command{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) "ckb" = ( /obj/structure/stairs/south, -/turf/simulated/floor/holofloor/tiled/ramp{ - dir = 1 - }, +/turf/simulated/floor/plating, /area/horizon/stairwell/central) "ckd" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -2842,11 +2770,13 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "ckL" = ( -/obj/effect/floor_decal/corner_wide/purple{ +/obj/structure/closet/excavation, +/obj/effect/floor_decal/corner/mauve{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline/research, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "ckY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning, @@ -2907,16 +2837,15 @@ /turf/space/dynamic, /area/template_noop) "cnV" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/power/apc/low{ + dir = 1; + name = "west bump"; + pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "0-2" }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "con" = ( @@ -2979,8 +2908,9 @@ /obj/machinery/light/spot/weak{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/green{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) @@ -3008,7 +2938,7 @@ name = "Security Checkpoint Shutter" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "crh" = ( /obj/structure/cable/green{ @@ -3065,7 +2995,7 @@ req_one_access = list(31,48,67) }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/outpost/mining_main/refinery) "ctX" = ( /obj/structure/disposalpipe/junction{ @@ -3158,7 +3088,7 @@ /obj/effect/floor_decal/industrial/outline/custodial, /obj/structure/janitorialcart, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "cya" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3260,8 +3190,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 10 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -3310,11 +3240,15 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "cEl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "cEv" = ( -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "cEy" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3347,6 +3281,9 @@ /turf/simulated/floor/greengrid, /area/rnd/xenoarch_atrium) "cIj" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 + }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -3396,16 +3333,13 @@ /turf/simulated/floor/plating, /area/hallway/engineering) "cJJ" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/light/spot/weak{ +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + id = "shutters_deck2_portstairwellsec"; + name = "Security Shutter"; dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/hangar/auxiliary) "cKY" = ( /obj/effect/landmark/entry_point/starboard{ @@ -3470,12 +3404,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "cLv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/paleblue{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "cLC" = ( /obj/machinery/space_heater, /turf/simulated/floor/tiled/dark, @@ -3492,17 +3426,16 @@ }, /area/hangar/intrepid) "cMq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/light, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "cMu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_mining{ @@ -3564,23 +3497,6 @@ }, /turf/simulated/floor/tiled, /area/operations/storage) -"cPm" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) "cPq" = ( /obj/effect/shuttle_landmark/horizon/deckone/starboard_propulsion, /turf/template_noop, @@ -3612,6 +3528,9 @@ /obj/structure/sign/emergency/evacuation/pods{ pixel_x = 32 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "cRg" = ( @@ -3800,12 +3719,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"cWQ" = ( -/obj/effect/floor_decal/corner_wide/purple{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) "cWX" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 @@ -3886,7 +3799,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "dcs" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -3917,13 +3830,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "ded" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/corner/blue{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -4089,8 +4003,12 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "dlM" = ( +/obj/machinery/suit_cycler/engineering, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "dmS" = ( /obj/machinery/door/firedoor, @@ -4101,18 +4019,9 @@ /turf/simulated/floor/tiled/full, /area/operations/lower/machinist) "dns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_command{ - name = "E.V.A."; - req_access = list(18) - }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/storage/eva) "dnJ" = ( @@ -4147,10 +4056,23 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning, /obj/structure/table/standard, -/obj/item/material/ashtray/bronze, +/obj/item/material/ashtray/bronze{ + pixel_x = 2; + pixel_y = 1 + }, /obj/item/material/stool/chair/folding{ pixel_y = 19 }, +/obj/item/paper/cig{ + pixel_x = -6; + pixel_y = -2; + name = "written-on rolling paper"; + desc = "A thin piece of paper used to make smokables. Someone has written the text 'Hope to see you again sometime, my friend.' on it." + }, +/obj/item/clothing/mask/smokable/cigarette{ + pixel_x = 8; + pixel_y = -4 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "dod" = ( @@ -4184,16 +4106,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/glass_mining{ - name = "Operations Hangar"; - req_access = null; - req_one_access = list(26,31,48,67) - }, -/obj/machinery/door/firedoor, -/obj/effect/map_effect/door_helper/unres{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "doK" = ( /obj/effect/floor_decal/corner/lime{ @@ -4205,11 +4119,13 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "doM" = ( -/obj/effect/floor_decal/corner_wide/purple{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "doR" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/tank_wall/nitrous_oxide{ @@ -4262,15 +4178,20 @@ /turf/simulated/floor/tiled, /area/operations/loading) "dsG" = ( -/obj/machinery/suit_cycler/medical, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "dsI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) @@ -4298,6 +4219,15 @@ /obj/machinery/light/spot/weak{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm{ + pixel_x = -28; + dir = 4 + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "duz" = ( @@ -4377,12 +4307,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "dxv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/closet/crate/bin, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) +/turf/simulated/floor/plating, +/area/maintenance/hangar/port) "dzg" = ( /obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/door/window/westright, @@ -4561,9 +4491,6 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod1) "dFQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/atmospherics/unary/engine{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "me3" @@ -4578,7 +4505,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, @@ -4586,18 +4513,6 @@ "dGu" = ( /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) -"dGR" = ( -/obj/structure/table/steel, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) "dHW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4623,14 +4538,20 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "dIS" = ( -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner_wide/purple/full{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "dJm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -4642,8 +4563,11 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "dJJ" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "dJQ" = ( @@ -4785,7 +4709,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "dOc" = ( /obj/structure/lattice, /obj/structure/grille/diagonal{ @@ -4806,11 +4730,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "dQH" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/hangar/starboard) "dQP" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -4866,21 +4790,6 @@ temperature = 278.15 }, /area/medical/morgue/lower) -"dVs" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/low{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Port Hangar Subgrid"; - name_tag = "Port Hangar Subgrid" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/security) "dVz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -4903,6 +4812,15 @@ /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) +"dWt" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_command{ + name = "EVA Storage"; + req_access = list(18) + }, +/turf/simulated/floor/tiled/full, +/area/storage/eva) "dWw" = ( /obj/machinery/door/airlock/glass_service{ name = "Bridge Stairwell"; @@ -4933,7 +4851,7 @@ name = "Tools Access"; req_access = list(48) }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "dWL" = ( /obj/random/junk, @@ -4943,36 +4861,44 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "dYf" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/machinery/light/spot/weak{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) -"dZB" = ( -/obj/structure/cable{ - icon_state = "4-8" +"dYF" = ( +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - EVA Storage 2" + }, +/obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) +"dZB" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Residential Deck Lifts" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "dZQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -5175,16 +5101,8 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "eev" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/hangar/control) "eeD" = ( @@ -5283,21 +5201,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "ekT" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Hangar 10"; - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) +/area/hangar/control) "elI" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/floodlight, @@ -5385,6 +5293,16 @@ /obj/machinery/door/window/brigdoor/northright, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) +"epB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "eqa" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5433,10 +5351,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "erd" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/obj/structure/foamedmetal, +/turf/simulated/floor/plating, +/area/rnd/eva) "erk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5492,7 +5409,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/horizon/custodial) "eth" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5815,6 +5732,9 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) "eDV" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, @@ -5841,13 +5761,17 @@ /turf/simulated/floor/tiled, /area/operations/loading) "eFl" = ( -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" +/obj/machinery/light{ + dir = 4 }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/rnd/eva) +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "eFn" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -5905,6 +5829,9 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/loading/yellow, +/obj/machinery/status_display{ + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "eIC" = ( @@ -5917,6 +5844,9 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, +/obj/effect/floor_decal/corner/green{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "eIE" = ( @@ -5939,7 +5869,7 @@ /area/engineering/atmos/air) "eIS" = ( /turf/simulated/wall/r_wall, -/area/janitor) +/area/horizon/custodial) "eJu" = ( /obj/structure/window/reinforced, /obj/structure/table/standard, @@ -5965,15 +5895,16 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical_compartment) "eJG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/door/airlock/engineering{ + name = "Deck 2 Civilian Substation"; + req_one_access = list(11,24) }, -/turf/simulated/floor/plating, -/area/maintenance/hangar/starboard) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/civilian_west) "eKb" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 @@ -6178,35 +6109,27 @@ /turf/simulated/floor/plating, /area/shuttle/mining) "eQH" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/sci, -/obj/item/clothing/head/helmet/space/void/sci, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/corner/blue/full, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/table/steel, +/obj/item/storage/box/flares, +/obj/item/storage/box/flares, +/obj/item/storage/box/flares{ + pixel_y = 11 }, -/obj/machinery/door/window/southright{ - name = "Research Voidsuit"; - req_access = list(47) +/obj/item/storage/box/flares{ + pixel_y = 11 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "eQI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_research{ - name = "Research E.V.A."; - req_access = list(47) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, /area/rnd/eva) "eRb" = ( /obj/structure/lattice, @@ -6277,6 +6200,18 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engine_compartment) +"eVw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "eVE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning, @@ -6292,7 +6227,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "eVY" = ( /obj/effect/floor_decal/corner_wide/purple/full, @@ -6369,10 +6304,6 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/research_port) -"eXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) "eXn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -6401,15 +6332,13 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "eYl" = ( -/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/light/small/emergency, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "eYN" = ( @@ -6442,7 +6371,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark/full, -/area/janitor) +/area/horizon/custodial) "eZY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -6521,7 +6450,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "fcc" = ( /obj/structure/table/standard, /obj/item/stack/material/steel/full, @@ -6552,15 +6481,17 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "fdB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ - name = "Research E.V.A."; - req_one_access = list(29,47,73) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/white{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "fep" = ( /obj/structure/railing/mapped{ dir = 1 @@ -6568,9 +6499,6 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -6589,13 +6517,10 @@ /area/maintenance/research_port) "feD" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/light/small{ - dir = 4 + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -6628,18 +6553,23 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "fgF" = ( /obj/effect/floor_decal/corner/green{ dir = 5 }, +/obj/structure/sign/directions/all{ + dir = 1; + pixel_y = 39 + }, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "fgW" = ( @@ -6656,7 +6586,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/horizon/stairwell/central) "fhZ" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -6844,6 +6774,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled, /area/hangar/intrepid) "foN" = ( @@ -6916,7 +6847,7 @@ /obj/item/pen/red, /obj/item/stack/packageWrap, /obj/item/device/hand_labeler, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "fsf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6936,7 +6867,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/full, /area/rnd/xenoarch_atrium) "fsy" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7021,6 +6952,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) +"fwF" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "fxC" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -7038,7 +6976,7 @@ req_access = list(26) }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "fyz" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -7055,21 +6993,30 @@ /turf/simulated/floor/tiled/freezer, /area/horizon/hydroponics/lower) "fzA" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/obj/structure/railing/mapped{ dir = 1 }, +/turf/simulated/floor/plating, /area/maintenance/research_port) "fzU" = ( /obj/machinery/light/small{ @@ -7135,8 +7082,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "fBs" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -7175,6 +7124,12 @@ "fDO" = ( /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) +"fDU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "fEy" = ( /obj/structure/railing/mapped{ dir = 4 @@ -7207,15 +7162,15 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "fFf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/railing/mapped{ dir = 4 }, /obj/effect/floor_decal/corner/black{ dir = 6 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "fFj" = ( @@ -7246,9 +7201,6 @@ /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/atmos, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -7259,7 +7211,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "fHA" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7278,9 +7233,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -7310,9 +7262,6 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "fIO" = ( -/obj/machinery/door/window/eastright, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/ramp{ dir = 4 }, @@ -7333,7 +7282,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "fKt" = ( /obj/structure/railing/mapped{ @@ -7356,17 +7305,24 @@ /turf/simulated/floor/grass/alt, /area/horizon/hydroponics/lower) "fKD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "fLz" = ( @@ -7415,9 +7371,8 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) "fOV" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 }, /turf/simulated/floor/tiled/full, /area/hallway/primary/aft) @@ -7472,19 +7427,6 @@ }, /area/engineering/atmos/propulsion/starboard) "fQJ" = ( -/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-8" - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/structure/closet/emcloset, /obj/machinery/light{ dir = 4 }, @@ -7492,7 +7434,14 @@ dir = 4; pixel_x = 32 }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, +/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/corner/green/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "fQU" = ( @@ -7610,7 +7559,7 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/maintenance/operations) "fUf" = ( /obj/structure/cable/green{ @@ -7667,25 +7616,18 @@ /turf/simulated/floor/tiled/full, /area/rnd/eva) "fUG" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/hallway/primary/aft) "fUS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/maintenance/operations) "fVh" = ( /obj/item/modular_computer/console/preset/ai{ @@ -7708,12 +7650,15 @@ /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "fVD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "fWp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7807,30 +7752,18 @@ }, /area/maintenance/wing/port/deck1) "fZX" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/camera/network/command{ c_tag = "Bridge - Pilot Room"; dir = 1 }, -/obj/machinery/button/remote/blast_door{ - id = "hangarlockdown"; - name = "Hangar Lockdoor"; - pixel_y = -32 - }, /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/machinery/requests_console{ + department = "Deck 1 - Pilots' Room"; + name = "Pilots' Room Requests Console"; + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "gal" = ( @@ -7846,15 +7779,6 @@ "gaE" = ( /turf/simulated/floor/tiled, /area/hangar/auxiliary) -"gaQ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/security) "gba" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -7893,7 +7817,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/horizon/custodial) "gds" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -7951,13 +7875,8 @@ /turf/simulated/floor/tiled, /area/medical/emergency_storage) "geN" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mlw4"; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/wall/r_wall, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "gfb" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -8012,9 +7931,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(12) - }, +/obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/maintenance/research_port) "ggQ" = ( @@ -8088,7 +8005,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "ghP" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled/dark, @@ -8099,13 +8016,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 3"; dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "giJ" = ( @@ -8138,19 +8055,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"gkL" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/operations) "gkM" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/escape_pod/pod1) @@ -8167,17 +8071,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/camera/network/security{ - c_tag = "Security - First Deck Checkpoin"; - dir = 4 - }, /obj/machinery/firealarm/west, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "gnn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, @@ -8185,7 +8085,10 @@ name = "Pilot Room"; req_one_access = list(73) }, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/full, /area/hangar/control) "gnP" = ( /obj/machinery/atmospherics/binary/pump/high_power{ @@ -8204,14 +8107,8 @@ /turf/simulated/floor/tiled, /area/operations/loading) "goQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 10 }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) @@ -8223,7 +8120,7 @@ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "me3" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/engine_compartment) "gpR" = ( /obj/structure/lattice/catwalk/indoor, @@ -8306,14 +8203,21 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "grH" = ( -/turf/simulated/floor/holofloor/tiled/ramp/bottom{ +/obj/machinery/firealarm/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/area/horizon/stairwell/central) -"grP" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(12) +/obj/effect/floor_decal/corner/green{ + dir = 10 }, +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Living Quarters Lift"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) +"grP" = ( +/obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -8336,13 +8240,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/turret_protected/ai) -"gtt" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 1 - }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) "gtE" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -8379,10 +8276,12 @@ /turf/simulated/floor/tiled/full, /area/maintenance/engineering) "gua" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4 +/obj/item/modular_computer/console/preset/civilian{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/hangar/control) "gub" = ( @@ -8409,6 +8308,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "guN" = ( @@ -8449,10 +8351,9 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) "gwQ" = ( -/obj/structure/sign/electricshock{ - pixel_y = 32 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "gxl" = ( @@ -8472,12 +8373,12 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/rnd/test_range) "gxJ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/green/full, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "gxR" = ( @@ -8518,11 +8419,18 @@ /turf/simulated/floor/tiled/full, /area/hangar/intrepid/interstitial) "gyj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/table/steel, +/obj/item/storage/belt/utility, +/obj/item/clothing/head/welding, +/obj/item/device/flashlight/heavy, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "gyo" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/effect/floor_decal/industrial/warning{ @@ -8639,7 +8547,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ +/obj/effect/floor_decal/corner/blue{ dir = 9 }, /turf/simulated/floor/tiled/dark, @@ -8683,27 +8591,18 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "gEb" = ( -/obj/structure/reagent_dispensers/extinguisher, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 +/obj/item/ladder_mobile, +/obj/item/reagent_containers/extinguisher_refill/filled, +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "gEv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/effect/floor_decal/corner/mauve/diagonal, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "gFE" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ @@ -8805,9 +8704,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -8820,27 +8716,42 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "gJt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 }, -/obj/effect/floor_decal/corner/paleblue, /turf/simulated/floor/tiled/dark, /area/storage/eva) "gJN" = ( /obj/structure/table/steel, -/obj/item/ladder_mobile, -/obj/effect/floor_decal/corner/paleblue/full{ +/obj/machinery/light{ dir = 8 }, -/obj/item/reagent_containers/extinguisher_refill/filled, +/obj/machinery/firealarm/south, +/obj/effect/floor_decal/corner/blue/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/glass/reinforced{ + amount = 50 + }, +/obj/item/stack/material/glass/reinforced{ + amount = 50 + }, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/glass/full, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "gKG" = ( /obj/machinery/mineral/equipment_vendor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "gLs" = ( /obj/effect/floor_decal/corner/purple{ @@ -8866,17 +8777,21 @@ /area/maintenance/wing/port/deck1) "gMP" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 + }, +/obj/structure/railing/mapped, +/obj/effect/decal/cleanable/cobweb2{ + icon_state = "cobweb1" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -8888,24 +8803,22 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) -"gNR" = ( -/obj/effect/floor_decal/corner_wide/purple/diagonal, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) "gOa" = ( /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "gOe" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 8 +/obj/item/modular_computer/console/preset/command{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/hangar/control) "gPf" = ( @@ -8923,11 +8836,14 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) "gPv" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/structure/window/reinforced, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/storage/eva) +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "gQh" = ( /obj/machinery/light/small{ dir = 8 @@ -8998,13 +8914,13 @@ /turf/simulated/floor/bluegrid, /area/rnd/xenoarch_atrium) "gTx" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "gUl" = ( /obj/structure/cable{ @@ -9073,8 +8989,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "gWZ" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, /turf/simulated/floor/plating, /area/hangar/auxiliary) @@ -9089,12 +9005,24 @@ }, /area/hangar/intrepid) "gYN" = ( -/obj/structure/table/steel, -/obj/item/ladder_mobile, -/obj/item/ladder_mobile, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/eastleft{ + name = "Research Voidsuit Storage Rack Access"; + req_access = list(47) + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "gYQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -9116,6 +9044,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/tcommsat/mainlvl_tcomms__relay) "gZP" = ( @@ -9171,9 +9102,12 @@ }, /area/medical/morgue/lower) "hbx" = ( -/obj/machinery/door/window/westleft, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/industrial/outline, +/obj/effect/floor_decal/corner/blue{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "hbU" = ( @@ -9254,6 +9188,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "heH" = ( @@ -9397,7 +9334,6 @@ /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical, -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, @@ -9408,7 +9344,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "hjO" = ( /obj/structure/cable/green{ @@ -9424,6 +9362,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "hkW" = ( @@ -9460,9 +9401,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/window/southleft{ name = "Engineering Voidsuit"; req_access = list(11) @@ -9470,7 +9408,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "hnN" = ( /obj/machinery/door/firedoor, @@ -9480,21 +9421,28 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) +"hnS" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/obj/structure/sign/directions/custodial{ + dir = 8; + pixel_y = 9; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "hob" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/template_noop) "hot" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "hoV" = ( /obj/structure/lattice, @@ -9533,17 +9481,14 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "hqa" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) +/turf/simulated/floor/tiled, +/area/rnd/eva) "hqb" = ( /obj/machinery/mecha_part_fabricator{ dir = 8 @@ -9617,10 +9562,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "hsK" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 8 - }, +/obj/effect/floor_decal/corner/blue/full, /turf/simulated/floor/tiled, /area/rnd/eva) "htf" = ( @@ -9665,7 +9607,7 @@ name = "Maintenance Passthrough"; req_access = list(12) }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "huC" = ( /obj/machinery/atmospherics/binary/pump{ @@ -9700,9 +9642,20 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "hwy" = ( -/obj/effect/floor_decal/corner/paleblue{ +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/storage/eva) "hxg" = ( @@ -9730,12 +9683,12 @@ /turf/simulated/floor/tiled/full, /area/engineering/gravity_gen) "hxj" = ( -/obj/structure/table/steel, -/obj/item/paper_bin, -/obj/item/pen, /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/structure/table/steel, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/dark, /area/hangar/control) "hyD" = ( @@ -9767,29 +9720,28 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "hzK" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/table/steel, +/obj/item/device/camera, +/obj/item/device/camera, +/obj/item/device/camera{ + pixel_y = 4 + }, +/obj/item/device/camera{ + pixel_y = 4 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "hzY" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "researchhangar"; - name = "Research E.V.A."; - pixel_x = -25; - pixel_y = 7; - req_access = list(47) +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/rnd/eva) "hAU" = ( /obj/structure/lattice/catwalk/indoor, @@ -9818,15 +9770,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/small/emergency{ - dir = 8 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Auxiliary Hangar Emergency Supplies Closet"; - dir = 4 - }, -/obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "hBV" = ( /obj/machinery/camera/network/intrepid{ @@ -9868,6 +9815,9 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "hEh" = ( @@ -9934,10 +9884,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ +/obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/hangar/intrepid) "hHY" = ( @@ -9964,42 +9914,32 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "hIl" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "12-0" - }, -/obj/structure/sign/electricshock{ - pixel_y = 32 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "hIw" = ( +/obj/structure/closet/emcloset, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, +/obj/machinery/power/apc/super/critical{ + dir = 1; + pixel_y = 24 + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 22 - }, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "hIx" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 8 @@ -10019,21 +9959,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "hII" = ( -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/refinery) -"hIX" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/westright, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/ramp{ - dir = 8 - }, -/area/hangar/auxiliary) +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/operations) "hJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10041,8 +9974,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/blue/full, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "hLq" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced/steel, @@ -10072,12 +10006,16 @@ /turf/simulated/floor/tiled/dark/airless, /area/shuttle/mining) "hMr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/bin, -/obj/random/loot, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/operations) "hNC" = ( @@ -10101,20 +10039,32 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "hOC" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/closet/crate, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/machinery/door/airlock/engineering{ - name = "Security Substation"; - req_one_access = list(11,24) - }, -/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/maintenance/substation/security) +/area/maintenance/hangar/port) "hPn" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/ore_box, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/southleft{ + name = "Mining Voidsuit Storage Rack Access"; + req_access = list(48) + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/head/helmet/space/void/mining, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/eva) "hPB" = ( /obj/machinery/camera/network/supply{ @@ -10271,11 +10221,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"hVl" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/maintenance/hangar/port) "hVn" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled/ramp{ @@ -10378,12 +10323,12 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "iab" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "iao" = ( /obj/structure/railing/mapped{ @@ -10415,7 +10360,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "iau" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10516,13 +10461,16 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "ife" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/storage/eva) +/obj/machinery/light, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled, +/area/rnd/eva) "ifu" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -10592,11 +10540,9 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod/pod4) "ifX" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, +/obj/structure/foamedmetal, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/horizon/stairwell/central) "igj" = ( /obj/machinery/conveyor{ dir = 1; @@ -10611,17 +10557,18 @@ /turf/simulated/floor/tiled, /area/operations/loading) "ihC" = ( -/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/mapped{ dir = 8 }, /obj/effect/floor_decal/corner/black{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/green{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "iiM" = ( @@ -10695,17 +10642,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"ikP" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) "ikV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters/open{ @@ -10739,9 +10680,14 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green{ + dir = 8 }, +/obj/effect/floor_decal/corner/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "ipg" = ( @@ -10752,16 +10698,12 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "iph" = ( -/obj/structure/table/steel, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/full, -/obj/item/stack/rods{ - amount = 50 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/stack/rods{ - amount = 50 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/dark, /area/storage/eva) "ipW" = ( @@ -10785,8 +10727,17 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "iqf" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, /area/maintenance/hangar/port) "iqk" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -10822,24 +10773,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion) -"irX" = ( -/obj/structure/table/steel, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - EVA Storage 2" - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) "ity" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/outline/grey, @@ -10874,7 +10807,7 @@ /area/shuttle/mining) "ivF" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "ivW" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, @@ -10943,19 +10876,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "iAs" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hangar/auxiliary) +/turf/simulated/floor/plating, +/area/maintenance/substation/security) "iAL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -10968,14 +10899,17 @@ /area/operations/storage) "iBe" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "iBf" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -10993,17 +10927,18 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "iCb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/eva) "iCI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/bed/stool/chair/office/bridge{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/hangar/control) "iCX" = ( @@ -11086,13 +11021,13 @@ /turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "iFU" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/steel, -/obj/item/storage/box/gloves, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, /area/rnd/eva) "iGC" = ( /obj/structure/tank_wall{ @@ -11255,12 +11190,25 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/ramp/bottom, +/turf/simulated/floor/tiled/ramp, /area/maintenance/research_port) "iNi" = ( /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) +"iNV" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Maintenance Passthrough"; + req_one_access = list(12,26,31,48,67) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/full, +/area/horizon/stairwell/central) "iNW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/large_stock_marker, @@ -11282,12 +11230,18 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "iOn" = ( -/obj/structure/railing/mapped{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/ore_box, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "iOs" = ( /obj/structure/cable/green{ @@ -11297,7 +11251,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -11386,8 +11340,12 @@ dir = 4 }, /obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/industrial/outline, +/obj/effect/floor_decal/corner/blue{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "iTx" = ( @@ -11491,9 +11449,12 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green, /obj/effect/floor_decal/corner/black{ - dir = 9 + dir = 1 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "iZi" = ( @@ -11552,26 +11513,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"jbr" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - name = "Mining Voidsuit"; - req_access = list(48) - }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/stack/flag/red, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/refinery) "jbS" = ( /obj/effect/shuttle_landmark/horizon/deckone/starboard, /turf/template_noop, @@ -11581,6 +11522,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "jcZ" = ( @@ -11605,14 +11549,26 @@ }, /area/medical/morgue/lower) "jdC" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/alarm{ + pixel_x = 28; dir = 8 }, +/obj/structure/closet/secure_closet/security, +/obj/machinery/camera/network/security{ + c_tag = "Security - First Deck Checkpoin" + }, +/obj/machinery/recharger/wallcharger{ + layer = 3.3; + pixel_x = 4; + pixel_y = 24 + }, +/obj/machinery/recharger/wallcharger{ + layer = 3.3; + pixel_x = 4; + pixel_y = 33 + }, +/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "jdP" = ( @@ -11656,16 +11612,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ - dir = 4 - }, /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "jhg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11676,6 +11632,22 @@ }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) +"jhH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/auxiliary) "jiL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -11696,33 +11668,32 @@ }, /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "jjZ" = ( -/obj/machinery/firealarm/east, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, +/obj/structure/sign/directions/civ{ + desc = "A sign pointing out that a lift leads to the ship's residential deck."; + dir = 4; + name = "\improper Lifts to Residential Deck sign"; + pixel_y = -23; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "jks" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "jlo" = ( @@ -11863,18 +11834,21 @@ pixel_x = -24 }, /obj/structure/table/steel, -/obj/item/storage/toolbox/mechanical, -/obj/effect/floor_decal/corner/paleblue/full{ +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/cell_charger, +/obj/item/device/multitool, +/obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/dark, /area/storage/eva) "jqE" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "jrr" = ( /obj/structure/cable/green{ @@ -11888,6 +11862,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) "jrJ" = ( @@ -11985,6 +11960,10 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, +/obj/structure/sign/directions/custodial{ + dir = 8; + pixel_y = 39 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "jvA" = ( @@ -12012,9 +11991,13 @@ /area/engineering/atmos/air) "jvM" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, +/obj/machinery/power/apc{ + pixel_y = -24 + }, +/obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/eva) "jwo" = ( @@ -12055,18 +12038,19 @@ /turf/simulated/floor/tiled, /area/medical/emergency_storage) "jwN" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Maintenance Passthrough"; - req_one_access = list(12,26,29,31,48,67) +/obj/machinery/button/remote/blast_door{ + id = "miningbay"; + name = "Mining Bay Entrance"; + pixel_x = 25; + pixel_y = -25; + req_access = list(48); + dir = 1 }, /turf/simulated/floor/tiled, -/area/horizon/stairwell/central) +/area/outpost/mining_main/refinery) "jxj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -12172,7 +12156,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 8 }, /area/maintenance/research_port) @@ -12214,9 +12198,6 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -12231,6 +12212,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/research_port) "jCg" = ( @@ -12240,9 +12224,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/airless, /area/hangar/operations) -"jCl" = ( -/turf/simulated/floor/plating, -/area/maintenance/hangar/port) "jCK" = ( /turf/simulated/wall, /area/engineering/atmos) @@ -12411,24 +12392,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"jIY" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/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/corner/black{ - dir = 9 - }, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Hangar 4"; - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "jJb" = ( /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) @@ -12444,6 +12407,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/operations/storage) +"jKO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "jKT" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/port/deck1) @@ -12480,16 +12454,21 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "jOi" = ( -/obj/item/stack/rods/full, -/obj/item/stack/rods/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/table/steel, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/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/machinery/door/airlock/glass_research{ + name = "Expedition EVA Storage"; + req_access = list(47) + }, +/turf/simulated/floor/tiled/full, +/area/storage/eva) "jOo" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12540,15 +12519,6 @@ /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical_compartment) "jRx" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -12558,11 +12528,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/ramp{ + dir = 1 + }, /area/maintenance/research_port) "jRE" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -12758,18 +12729,19 @@ /obj/machinery/light/spot/weak{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/structure/sign/emergency/evacuation{ dir = 8; pixel_x = -32 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "kbo" = ( -/turf/simulated/wall, -/area/hallway/primary/aft) +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "kbI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -12786,27 +12758,34 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "kcg" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - Hangar 10"; + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "kcE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "12-0" }, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "kcL" = ( @@ -12842,6 +12821,11 @@ c_tag = "First Deck - Hangar 11"; dir = 1 }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "keQ" = ( @@ -12868,13 +12852,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) -"kfv" = ( -/obj/machinery/suit_cycler/engineering, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) "kho" = ( /obj/structure/railing/mapped, /obj/structure/lattice/catwalk/indoor/grate, @@ -12948,12 +12925,6 @@ /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) -"klD" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) "klR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13011,9 +12982,12 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "knl" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 28 +/obj/structure/sign/directions/civ{ + desc = "A sign pointing out that a lift leads to the ship's residential deck."; + dir = 4; + name = "\improper Lifts to Residential Deck sign"; + pixel_y = 24; + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -13068,16 +13042,13 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "koQ" = ( -/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/corner/black{ - dir = 9 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/green{ + dir = 6 }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, -/area/hangar/intrepid) +/area/hangar/auxiliary) "kpm" = ( /obj/structure/railing/mapped{ dir = 8 @@ -13099,26 +13070,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) -"kpX" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - name = "Mining Voidsuit"; - req_access = list(48) - }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/stack/flag/purple, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/refinery) "kqk" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13153,12 +13104,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "kqZ" = ( @@ -13186,10 +13137,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "ksy" = ( /obj/effect/floor_decal/corner/blue{ @@ -13202,17 +13156,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) -"ksI" = ( -/obj/machinery/power/terminal, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/camera/network/engineering{ - alarm_on = 1; - c_tag = "Engineering - Deck 1 - Security Substation" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/security) "ksR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13250,15 +13193,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "kuH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency{ dir = 8 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "kuQ" = ( @@ -13285,15 +13223,17 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "kvl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "kvq" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -13334,16 +13274,17 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "kzr" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass{ - name = "Emergency Supplies Closet" +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "kzs" = ( /turf/simulated/floor/tiled/full, @@ -13363,7 +13304,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "kzx" = ( /obj/machinery/requests_console{ department = "Machinist Workshop"; @@ -13410,6 +13351,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "kAn" = ( @@ -13438,11 +13382,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) -"kBe" = ( -/obj/structure/banner/scc, -/obj/effect/floor_decal/spline/fancy/wood/full, -/turf/simulated/floor/wood, -/area/hallway/primary/aft) "kBt" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/lattice, @@ -13460,6 +13399,9 @@ dir = 4; pixel_y = -32 }, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "kBV" = ( @@ -13529,6 +13471,9 @@ c_tag = "First Deck - Hangar 14"; dir = 8 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "kDF" = ( @@ -13624,16 +13569,16 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "kEW" = ( -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/green{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/full, -/area/hangar/control) +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "kEX" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -13650,12 +13595,17 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "kGf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/effect/decal/fake_object{ + name = "Residential Deck Stairwell Shutter"; + icon = 'icons/obj/doors/rapid_pdoor.dmi'; + icon_state = "shutter1"; + density = 1; + desc = "That looks like it doesn't open easily."; + opacity = 1 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/horizon/stairwell/central) "kHg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13699,13 +13649,17 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "kIz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/eva) +/area/hangar/auxiliary) "kJp" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 @@ -13728,9 +13682,6 @@ /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -13781,11 +13732,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "kLo" = ( /turf/simulated/floor/tiled, @@ -13841,32 +13792,24 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/engine_compartment) "kMV" = ( -/obj/structure/railing/mapped{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "kNx" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Auxiliary Hangar Center"; - dir = 1 - }, -/obj/machinery/light/spot/weak, -/turf/simulated/floor/plating, -/area/hangar/auxiliary) +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "kNN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13910,14 +13853,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "kRx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 6 - }, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "kSb" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 @@ -13963,10 +13900,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "kSH" = ( /obj/structure/tank_wall/hydrogen{ @@ -14062,10 +13999,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "kWp" = ( -/obj/machinery/suit_cycler/science, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "kWx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14191,7 +14129,7 @@ pixel_x = -28 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "leL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14209,14 +14147,23 @@ /turf/simulated/floor/plating, /area/hangar/auxiliary) "lfj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "lfw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14368,7 +14315,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "lnG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -14387,23 +14338,11 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) "loq" = ( -/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/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/firealarm/west, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/green/full, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "los" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -14425,9 +14364,12 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "lpE" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/structure/table/steel, +/obj/item/storage/bag/inflatable, +/obj/item/storage/bag/inflatable, +/obj/item/storage/bag/inflatable, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) @@ -14523,13 +14465,10 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "lvq" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/camera/network/research{ - c_tag = "Research - Eva Preparation" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "lvI" = ( /turf/simulated/floor/tiled, /area/shuttle/intrepid/crew_compartment) @@ -14548,27 +14487,33 @@ /turf/simulated/floor/plating, /area/maintenance/substation/hangar) "lyc" = ( -/obj/machinery/floodlight, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "lye" = ( /turf/simulated/floor/plating, /area/engineering/storage/lower) "lyo" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/brown/full{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "miningbay"; - name = "Mining Bay Entrance"; - pixel_x = -7; - pixel_y = -25; - req_access = list(48) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/ramp{ + dir = 4 }, -/turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "lyU" = ( /obj/structure/cable/green{ @@ -14632,17 +14577,6 @@ /obj/item/folder/purple, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"lBY" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/decal/fake_object{ - desc = "An automated turret."; - icon = 'icons/obj/turrets.dmi'; - icon_state = "cover_0"; - layer = 3.02; - name = "turret" - }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "lCv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14673,6 +14607,30 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian_west) +"lDs" = ( +/obj/effect/landmark{ + name = "JoinLateCryo" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/directions/cryo{ + pixel_y = -10 + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "lEq" = ( /obj/structure/cable{ icon_state = "2-4" @@ -14820,13 +14778,17 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "lKY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "hangarlockdown"; + name = "Hangar Lockdown" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid) "lLE" = ( /obj/structure/bed/stool/chair/shuttle{ @@ -14889,7 +14851,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "lNG" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/corner/brown{ @@ -14904,9 +14866,6 @@ /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/security, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -14917,7 +14876,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/security, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "lOi" = ( /obj/effect/floor_decal/industrial/warning{ @@ -14941,15 +14904,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/machinery/status_display{ - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "lOT" = ( @@ -14960,15 +14917,16 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) "lPF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "lPI" = ( @@ -15029,7 +14987,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -15144,28 +15105,23 @@ /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) "lUf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "lUr" = ( /turf/simulated/floor/plating, /area/engineering/atmos/air) "lUu" = ( -/obj/structure/table/steel, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/glass/reinforced{ - amount = 50 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/light, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) @@ -15193,16 +15149,14 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "lVN" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mlw1"; - opacity = 1 +/obj/structure/bed/stool/chair/padded/brown{ + dir = 4 }, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, atmos compartment" +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/floor/wood, +/area/hallway/primary/aft) "lVQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -15229,31 +15183,36 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "lWd" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/door/window/southright{ - name = "Suit Storage"; - req_access = list(18) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "lWu" = ( /obj/item/device/radio/beacon, -/obj/effect/floor_decal/corner/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "lXa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Security Substation"; - req_access = list(73) +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/camera/network/engineering{ + alarm_on = 1; + c_tag = "Engineering - Deck 1 - Security Substation"; + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/plating, -/area/hangar/control) +/area/maintenance/substation/security) "lXC" = ( /obj/machinery/camera/network/intrepid{ c_tag = "Intrepid - Engine Compartment"; @@ -15268,23 +15227,10 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engine_compartment) "lXZ" = ( -/obj/machinery/recharger/wallcharger{ - layer = 3.3; - pixel_x = 4; - pixel_y = 24 - }, -/obj/machinery/recharger/wallcharger{ - layer = 3.3; - pixel_x = 4; - pixel_y = 33 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "lYV" = ( @@ -15297,11 +15243,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "lZN" = ( -/obj/effect/floor_decal/corner_wide/purple/full{ - dir = 4 - }, +/obj/effect/floor_decal/corner/mauve/full, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "map" = ( /obj/effect/floor_decal/corner/brown{ dir = 9 @@ -15349,7 +15293,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "mdL" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -15396,13 +15343,13 @@ /turf/simulated/floor/bluegrid, /area/rnd/isolation_b) "mgK" = ( -/obj/machinery/floodlight, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "mhb" = ( /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -15424,9 +15371,6 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "mhq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -15437,9 +15381,13 @@ c_tag = "First Deck - Hangar 12"; dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) -"mhF" = ( +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) @@ -15486,26 +15434,23 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "mio" = ( -/obj/machinery/light/spot/weak{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/effect/floor_decal/corner/black{ dir = 6 }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "mjG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_access = list(12) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "mky" = ( @@ -15518,7 +15463,7 @@ req_access = list(48); req_one_access = null }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/eva) "mkW" = ( /obj/machinery/mech_recharger, @@ -15571,14 +15516,17 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "mmA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/computer/shuttle_control/lift/wall{ dir = 1; pixel_y = -32; shuttle_tag = "Robotics Lift" }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/eva) "mmG" = ( @@ -15598,11 +15546,11 @@ }, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 8; - name = "Custodial"; - sortType = "Custodial" + name = "Custodial Closet"; + sortType = "Custodial Closet" }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "mnL" = ( /obj/structure/tank_wall/hydrogen{ icon_state = "h13" @@ -15683,9 +15631,7 @@ /turf/simulated/floor/tiled, /area/operations/loading) "mqy" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -15730,6 +15676,19 @@ "msv" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) +"msF" = ( +/obj/machinery/disposal/small/north, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "msG" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 9 @@ -15750,9 +15709,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "msT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "mtp" = ( @@ -15766,17 +15729,18 @@ pixel_x = 25; tag_door = "escape_pod_2_berth_hatch" }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mwo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "mwu" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced/steel, @@ -15897,7 +15861,7 @@ name = "Hangar Lockdown" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "mBJ" = ( /obj/structure/shuttle_part{ @@ -15950,7 +15914,7 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "mFu" = ( /obj/structure/cable/green{ @@ -15965,6 +15929,9 @@ pixel_x = 25; tag_door = "escape_pod_1_berth_hatch" }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mFO" = ( @@ -16027,7 +15994,11 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/machinery/firealarm/west, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "mJQ" = ( /obj/item/reagent_containers/glass/bucket{ @@ -16082,9 +16053,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -16098,8 +16066,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -16107,7 +16075,7 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "mMR" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16153,14 +16121,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) @@ -16171,6 +16142,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "mOv" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 }, @@ -16215,6 +16189,13 @@ /obj/machinery/light/spot/weak{ dir = 4 }, +/obj/machinery/alarm{ + pixel_x = 28; + dir = 8 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mRc" = ( @@ -16245,6 +16226,9 @@ dir = 4; pixel_x = 32 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mRu" = ( @@ -16270,11 +16254,15 @@ /turf/simulated/floor/tiled, /area/medical/emergency_storage) "mSd" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/floor_decal/corner/paleblue/full, /obj/machinery/light{ dir = 8 }, +/obj/structure/table/steel, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ + pixel_y = 8 + }, +/obj/effect/floor_decal/corner/blue/full, /turf/simulated/floor/tiled/dark, /area/storage/eva) "mSf" = ( @@ -16289,11 +16277,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/rotary) "mSk" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/cryopod, +/obj/machinery/status_display{ + pixel_y = -32 }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "mSq" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16319,6 +16308,9 @@ dir = 4; pixel_x = 32 }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "mST" = ( @@ -16401,13 +16393,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -28 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "mVN" = ( @@ -16421,9 +16413,6 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -16441,6 +16430,9 @@ /area/maintenance/research_port) "mVX" = ( /obj/machinery/telecomms/relay/preset/station, +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/tcommsat/mainlvl_tcomms__relay) "mWV" = ( @@ -16477,10 +16469,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "mXG" = ( /obj/structure/cable/green{ @@ -16492,13 +16484,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "mXZ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16519,22 +16511,21 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "mYX" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/sci, -/obj/item/clothing/head/helmet/space/void/sci, -/obj/structure/window/reinforced{ +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - EVA Storage 1"; dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/southleft{ - name = "Research Voidsuit"; - req_access = list(47) +/obj/structure/table/steel, +/obj/machinery/firealarm/east, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "mYY" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -16580,18 +16571,13 @@ /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 = 10 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/effect/floor_decal/corner/black{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "ncC" = ( @@ -16641,11 +16627,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/black{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "ney" = ( @@ -16680,12 +16668,15 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "ngs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "ngD" = ( @@ -16701,11 +16692,8 @@ /turf/simulated/floor/tiled, /area/operations/loading) "nhc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/machinery/light/small/emergency{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) @@ -16734,13 +16722,7 @@ /turf/simulated/floor/airless, /area/hangar/operations) "nhw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ +/obj/effect/floor_decal/corner/blue{ dir = 9 }, /turf/simulated/floor/tiled/dark, @@ -16845,20 +16827,22 @@ /turf/simulated/wall, /area/medical/emergency_storage) "nmF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/effect/floor_decal/corner/blue/full, +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + pixel_x = -24; + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) +"nmP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "nmQ" = ( /obj/machinery/ringer{ department = "Custodial"; @@ -16875,7 +16859,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "nmV" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -16905,7 +16889,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "noz" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -16935,6 +16919,16 @@ /obj/machinery/porta_turret, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) +"nqp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/operations) "nqq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -17033,7 +17027,7 @@ req_one_access = null }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/eva) "num" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -17049,13 +17043,20 @@ /turf/simulated/floor/tiled/full, /area/rnd/eva) "nup" = ( -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/structure/table/steel, /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/clothing/head/helmet/pilot{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/head/helmet/pilot, +/obj/item/clothing/head/helmet/pilot{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "nvV" = ( @@ -17067,20 +17068,19 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(12,47) + req_one_access = list(12,47); + name = "Maintenance Passthrough" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/rnd/xenoarch_atrium) "nwp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner/white{ + dir = 5 }, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "nww" = ( /turf/simulated/floor/plating, /area/rnd/eva) @@ -17129,7 +17129,6 @@ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "mwr4" }, -/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/shuttle/intrepid/cockpit) "nyp" = ( @@ -17355,7 +17354,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /obj/random/junk, /turf/simulated/floor/plating, @@ -17367,18 +17365,22 @@ }, /area/horizon/stairwell/bridge) "nLL" = ( -/obj/effect/floor_decal/corner_wide/purple/full{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) -"nMp" = ( -/obj/machinery/suit_cycler/security, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) +"nMp" = ( +/obj/machinery/suit_cycler/security, +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "nMA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17413,7 +17415,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17421,19 +17422,20 @@ /obj/effect/floor_decal/corner/black{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "nNx" = ( -/obj/machinery/floodlight, -/obj/machinery/light{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/green{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "nNE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17461,7 +17463,7 @@ /obj/machinery/door/window/westright{ name = "Oxygen Supplies Access" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "nOi" = ( /obj/structure/railing/mapped, @@ -17486,15 +17488,6 @@ /obj/effect/shuttle_landmark/horizon/deckone/port, /turf/template_noop, /area/template_noop) -"nPa" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "nPq" = ( /obj/effect/landmark/entry_point/aft{ name = "aft, deck 1 port maintenance, port side" @@ -17511,7 +17504,9 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "nPL" = ( -/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "nPN" = ( @@ -17627,9 +17622,11 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "nTZ" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "nUc" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ @@ -17652,11 +17649,6 @@ /turf/simulated/floor/tiled, /area/operations/storage) "nUQ" = ( -/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/mapped{ dir = 8 }, @@ -17664,7 +17656,7 @@ dir = 9 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) @@ -17741,12 +17733,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/operations/storage) -"nYD" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hangar/auxiliary) "nZb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -17775,10 +17761,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /turf/space/dynamic, /area/horizon/exterior) +"oat" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/item/storage/box/gloves, +/obj/item/storage/box/gloves{ + pixel_y = 11 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "oaZ" = ( -/obj/machinery/door/window/westright, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/corner/blue{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "obc" = ( @@ -17827,7 +17830,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, @@ -17837,13 +17840,23 @@ /obj/item/modular_computer/console/preset/security{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "ocJ" = ( -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/firealarm/north, +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "ocQ" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -17855,7 +17868,7 @@ /obj/machinery/door/airlock/maintenance{ req_access = list(12) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/hangar/port) "odK" = ( /obj/machinery/light/small{ @@ -17918,7 +17931,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "ohC" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 8 @@ -18003,13 +18016,6 @@ /obj/structure/lattice, /turf/space/dynamic, /area/horizon/exterior) -"oos" = ( -/obj/machinery/door/blast/regular/open{ - id = "hangarlockdown"; - name = "Hangar Lockdown" - }, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) "opY" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 @@ -18071,10 +18077,13 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "oum" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/machinery/suit_cycler/medical, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "ouE" = ( /obj/structure/bed/stool/chair/office/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18114,13 +18123,17 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "ows" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/effect/floor_decal/corner/blue/full, -/obj/machinery/photocopier, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "owP" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/disposalpipe/segment, @@ -18227,7 +18240,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/security/checkpoint) "oCl" = ( /obj/machinery/atmospherics/binary/pump{ @@ -18237,14 +18251,18 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "oCq" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, +/obj/structure/closet/walllocker/medical{ + pixel_x = 32 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/medical, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "oCE" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) @@ -18328,7 +18346,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "oEp" = ( -/obj/effect/floor_decal/corner/blue/diagonal, +/obj/structure/bed/stool/chair/office/bridge{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "oFx" = ( @@ -18352,16 +18372,15 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload) "oFA" = ( +/obj/structure/cable/green, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/machinery/power/apc/low{ + pixel_y = -24 }, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) +/turf/simulated/floor/plating, +/area/maintenance/substation/security) "oFI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -18452,13 +18471,10 @@ /turf/simulated/wall, /area/outpost/mining_main/eva) "oOI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "oPL" = ( @@ -18468,9 +18484,16 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "oQa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/obj/structure/flora/pottedplant/random, +/obj/effect/floor_decal/spline/fancy/wood/full, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/floor/grass/alt, +/area/hallway/primary/aft) "oQZ" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; @@ -18576,15 +18599,8 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "oYC" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/table/steel, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/machinery/cell_charger, -/obj/item/device/multitool, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 1 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) @@ -18617,14 +18633,11 @@ /turf/simulated/wall/shuttle/scc, /area/shuttle/escape_pod/pod4) "oYU" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) @@ -18725,6 +18738,11 @@ }, /turf/simulated/floor/tiled, /area/operations/storage) +"pcw" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "pcB" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -18866,13 +18884,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/maintenance/operations) "piS" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -18929,19 +18944,22 @@ /turf/simulated/floor/plating, /area/shuttle/intrepid/engine_compartment) "pkE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/rnd/eva) +/area/hangar/auxiliary) "pkG" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Security" }, +/obj/structure/cable, /obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -19013,30 +19031,22 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod/pod3) "poO" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 4 +/obj/machinery/door/window/northleft{ + name = "Softsuit Storage"; + req_access = list(18) }, -/obj/item/storage/bag/inflatable, -/obj/item/storage/bag/inflatable, -/obj/item/storage/bag/inflatable, -/turf/simulated/floor/tiled/dark, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "ppj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/lattice/catwalk/indoor/grate/damaged, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "ppu" = ( /obj/effect/floor_decal/industrial/warning{ @@ -19048,15 +19058,13 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "ppA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner_wide/purple/diagonal, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "ppR" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/lattice/catwalk/indoor, @@ -19146,9 +19154,10 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "pth" = ( -/obj/effect/floor_decal/industrial/loading/yellow, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) +/obj/machinery/light, +/obj/effect/floor_decal/corner/mauve/diagonal, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "pvn" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/floor_decal/industrial/warning, @@ -19179,7 +19188,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -19224,7 +19232,29 @@ }, /obj/item/pen, /turf/simulated/floor/tiled/dark/full, -/area/janitor) +/area/horizon/custodial) +"pya" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/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/lattice/catwalk/indoor/grate, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/research_port) "pyd" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 @@ -19358,13 +19388,8 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/closet, -/obj/random/loot, -/obj/random/loot, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/maintenance/hangar/port) +/turf/simulated/wall, +/area/maintenance/substation/security) "pAP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -19388,9 +19413,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/random/junk, /turf/simulated/floor/plating, @@ -19425,16 +19447,17 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "pEl" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/effect/floor_decal/corner/white{ + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) @@ -19514,20 +19537,20 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/maintenance/operations) "pIy" = ( -/obj/structure/table/reinforced/steel, -/obj/item/paper_bin, -/obj/item/pen, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar Entrance"; dir = 1 }, -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/structure/bed/stool/chair/padded/brown{ + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/hallway/primary/aft) "pIC" = ( /obj/structure/cable/green{ @@ -19543,7 +19566,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "pJx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -19655,21 +19678,16 @@ /turf/simulated/floor/tiled/dark/full, /area/maintenance/disposal) "pNv" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 4 +/obj/machinery/door/airlock/engineering{ + name = "Security Substation"; + req_one_access = list(11,24) }, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = 10; - pixel_y = 1 - }, -/obj/machinery/papershredder{ - pixel_x = -6 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/security) "pNN" = ( /obj/turbolift_map_holder/scc_ship/research, /turf/simulated/floor/plating, @@ -19680,18 +19698,23 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "pPH" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/suspension_gen{ - dir = 1 +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/hangar/auxiliary) "pPU" = ( /obj/structure/table/steel, /obj/item/storage/box/bodybags, @@ -19788,19 +19811,13 @@ }, /area/engineering/gravity_gen) "pUa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/corner/white{ dir = 10 }, -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - EVA Storage 1"; - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "pUK" = ( @@ -19814,17 +19831,14 @@ /turf/simulated/floor/greengrid, /area/rnd/xenoarch_atrium) "pVp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/random/junk, -/obj/machinery/light/small/emergency{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/maintenance/hangar/starboard) "pVU" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -19840,16 +19854,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "pWy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/light/small/emergency, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "pWZ" = ( @@ -19896,28 +19906,19 @@ /turf/simulated/wall, /area/hangar/intrepid/interstitial) "pYu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "pYy" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -19929,23 +19930,9 @@ /turf/space/dynamic, /area/horizon/exterior) "pYW" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/full, +/area/hangar/auxiliary) "pZd" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -19985,6 +19972,15 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) "qaz" = ( +/obj/machinery/camera/network/research{ + c_tag = "Research - EVA Preparation Entrance" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/rnd/eva) "qaK" = ( @@ -20123,10 +20119,10 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "qeD" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "qeG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -20175,16 +20171,22 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "qgi" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "qgn" = ( /obj/structure/bed/stool/chair/office/bridge/pilot{ @@ -20227,12 +20229,8 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "qio" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "qiZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20250,6 +20248,20 @@ "qju" = ( /turf/simulated/wall, /area/horizon/stairwell/central) +"qjB" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "qjF" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -20278,7 +20290,7 @@ name = "Security Checkpoint Shutter" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "qks" = ( /obj/structure/railing/mapped{ @@ -20338,11 +20350,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/isolation_b) "qmE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "qnr" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -20408,20 +20419,18 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "qpA" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/sci, -/obj/item/clothing/head/helmet/space/void/sci, -/obj/structure/window/reinforced{ +/obj/machinery/light{ dir = 4 }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/northright{ - name = "Research Voidsuit"; - req_access = list(47) +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/storage/eva) "qpJ" = ( /obj/effect/map_effect/airlock{ name = "Deck 1 Starboard Aft Maintenance Airlock (1001)"; @@ -20488,13 +20497,8 @@ /turf/space/dynamic, /area/horizon/exterior) "qsq" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/decal/fake_object{ - desc = "An automated turret."; - icon = 'icons/obj/turrets.dmi'; - icon_state = "cover_0"; - layer = 3.02; - name = "turret" +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, /turf/simulated/floor/plating, /area/hangar/auxiliary) @@ -20539,7 +20543,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/ramp/bottom{ +/turf/simulated/floor/tiled/ramp{ dir = 1 }, /area/maintenance/research_port) @@ -20554,11 +20558,18 @@ }, /area/maintenance/engineering) "qvl" = ( -/obj/effect/floor_decal/industrial/warning{ +/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 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/outpost/mining_main/eva) +/area/maintenance/operations) "qvT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -20573,16 +20584,26 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "qwr" = ( -/obj/machinery/door/airlock/engineering{ - name = "Deck 2 Civilian Substation"; - req_one_access = list(11,24) +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing/mapped, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "12-0" + }, +/obj/structure/sign/electricshock{ + pixel_y = 32 + }, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/maintenance/substation/civilian_west) +/area/maintenance/hangar/starboard) "qwK" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -20685,7 +20706,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "qAI" = ( /obj/structure/bed/stool/chair/office/bridge, /obj/effect/floor_decal/corner/blue{ @@ -20744,7 +20765,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -20759,19 +20780,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "qDq" = ( -/obj/effect/floor_decal/corner_wide/purple{ +/obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -23 - }, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "qDu" = ( /obj/machinery/light/small/emergency, /obj/effect/floor_decal/industrial/warning{ @@ -20789,12 +20802,20 @@ "qDK" = ( /obj/vehicle/train/cargo/engine/pussywagon, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/horizon/custodial) "qDN" = ( -/obj/machinery/mech_recharger, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/reinforced, -/area/rnd/eva) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window/northright{ + name = "Softsuit Storage"; + req_access = list(18) + }, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "qEh" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, @@ -20834,6 +20855,18 @@ }, /turf/simulated/floor/tiled, /area/operations/storage) +"qFp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "qFy" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -20874,7 +20907,7 @@ /obj/effect/floor_decal/corner/purple/full, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "qJg" = ( /obj/machinery/light{ dir = 4 @@ -20900,7 +20933,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "qKA" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -20999,13 +21032,13 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "qPF" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "qPV" = ( /obj/effect/floor_decal/industrial/warning{ @@ -21037,9 +21070,14 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "qQn" = ( -/obj/effect/floor_decal/corner_wide/purple/full, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "qQE" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -21059,7 +21097,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "qSv" = ( /obj/structure/trash_pile, @@ -21089,16 +21131,17 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/disposal) "qTf" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/button/remote/blast_door{ dir = 8; id = "shutters_hangarseccp"; name = "Security Checkpoint Shutters"; - pixel_x = 32; - req_access = list(63) + pixel_x = 25; + req_access = list(63); + pixel_y = -7 + }, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) @@ -21274,11 +21317,8 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/stairs/north, -/turf/simulated/floor/tiled/ramp, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "qZW" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, @@ -21297,8 +21337,12 @@ /turf/simulated/floor/tiled, /area/operations/loading) "raq" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance_hatch{ + req_access = list(12) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/full, /area/maintenance/hangar/starboard) "rau" = ( /obj/structure/cable/green{ @@ -21313,16 +21357,18 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "raw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/excavation, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/obj/machinery/camera/network/research{ + c_tag = "Research - Eva Preparation"; + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/storage/eva) "rbd" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -21331,10 +21377,13 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "rbx" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "rbK" = ( /obj/structure/tank_wall/nitrous_oxide{ @@ -21397,11 +21446,6 @@ /obj/machinery/light, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"rdU" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) "ref" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -21434,12 +21478,20 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "rfJ" = ( -/obj/effect/floor_decal/corner_wide/purple/full{ - dir = 8 +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/item/hoist_kit, +/obj/item/hoist_kit, +/obj/item/ladder_mobile{ + pixel_y = 12 + }, +/obj/item/ladder_mobile{ + pixel_y = 12 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "rfR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21457,7 +21509,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "riF" = ( /obj/structure/grille/broken, /obj/item/material/shard{ @@ -21632,6 +21684,12 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) +"roX" = ( +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "rpa" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled/ramp{ @@ -21664,7 +21722,7 @@ /obj/effect/floor_decal/industrial/outline/custodial, /obj/structure/janitorialcart, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "rqf" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ @@ -21673,8 +21731,24 @@ /obj/machinery/camera/network/mining{ c_tag = "Mining - Locker Room" }, -/obj/structure/ore_box, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/southleft{ + name = "Mining Voidsuit Storage Rack Access"; + req_access = list(48) + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/head/helmet/space/void/mining, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/eva) "rqB" = ( /obj/structure/table/rack{ @@ -21685,7 +21759,6 @@ /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical, -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, @@ -21696,7 +21769,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "rrD" = ( /obj/effect/landmark/entry_point/aft{ @@ -21708,22 +21783,13 @@ /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 - }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/firealarm/north, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "rrX" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "E.V.A."; - req_access = list(18) - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -21733,11 +21799,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_command{ + name = "EVA Storage"; + req_access = list(18) + }, +/turf/simulated/floor/tiled/full, /area/storage/eva) "rsk" = ( /obj/structure/cable{ @@ -21786,6 +21854,10 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/atmos_compartment) "rtC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "rtJ" = ( @@ -21828,6 +21900,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "rxz" = ( @@ -21839,9 +21912,6 @@ /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/security, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -21852,7 +21922,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/security, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "ryA" = ( /obj/machinery/light/small{ @@ -21928,24 +22002,30 @@ /turf/simulated/floor/reinforced, /area/rnd/isolation_c) "rBI" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Research E.V.A."; - req_access = list(47) - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; + req_one_access = list(18,47) + }, +/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/full, +/area/storage/eva) "rBR" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_research{ - name = "Research E.V.A."; + name = "Expedition EVA Storage"; req_access = list(47) }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/turf/simulated/floor/tiled/full, +/area/storage/eva) "rCl" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; @@ -21976,23 +22056,21 @@ /turf/space/dynamic, /area/horizon/exterior) "rEl" = ( -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 22 - }, /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/table/rack, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/head/helmet/pilot{ - pixel_x = -4; - pixel_y = -4 +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/clothing/head/helmet/pilot, -/obj/item/clothing/head/helmet/pilot{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/papershredder{ + pixel_x = -6 + }, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/machinery/alarm{ + pixel_y = 28 }, /turf/simulated/floor/tiled/dark, /area/hangar/control) @@ -22057,14 +22135,15 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "rIS" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/light/spot/weak{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) +/obj/structure/closet/crate/trashcart, +/obj/random/loot, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/operations) "rJQ" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -22225,7 +22304,6 @@ dir = 10 }, /obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/closet/crate/bin, /obj/random/loot, @@ -22306,7 +22384,7 @@ name = "Tools Access"; req_access = list(48) }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "rRE" = ( /obj/effect/floor_decal/industrial/warning{ @@ -22342,7 +22420,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/ramp/bottom, +/turf/simulated/floor/tiled/ramp, /area/maintenance/research_port) "rSU" = ( /obj/structure/cable/green{ @@ -22372,10 +22450,9 @@ /turf/simulated/floor/plating, /area/maintenance/operations) "rTG" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/rnd/eva) "rUd" = ( @@ -22401,14 +22478,11 @@ }, /area/medical/morgue/lower) "rVm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/storage/eva) @@ -22482,6 +22556,12 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"rXW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "rZi" = ( /obj/machinery/power/terminal{ dir = 8 @@ -22576,24 +22656,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "sdT" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/westleft{ - name = "Mining Voidsuit"; - req_access = list(48) - }, -/obj/effect/floor_decal/industrial/outline, -/obj/item/stack/flag/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/ore_box, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "sdV" = ( /obj/machinery/artifact_scanpad, @@ -22740,8 +22805,11 @@ icon_state = "1-4" }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "sll" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -22823,16 +22891,15 @@ /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "soT" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Operations Hangar"; - req_access = null; - req_one_access = list(26,31,48,67) +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 }, -/obj/machinery/door/firedoor, -/obj/effect/map_effect/door_helper/unres{ - dir = 8 +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Operations Hangar" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "spL" = ( /obj/effect/floor_decal/corner/green/full{ @@ -22956,7 +23023,7 @@ /area/operations/lower/machinist) "stn" = ( /obj/machinery/door/airlock/maintenance{ - name = "Fire Closet"; + name = "Maintenance Passthrough"; req_one_access = list(12,47) }, /obj/machinery/door/firedoor, @@ -22965,7 +23032,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/rnd/xenoarch_atrium) "stN" = ( /obj/machinery/button/mass_driver{ @@ -23036,7 +23103,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/janitor) +/area/horizon/custodial) "suT" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -23064,12 +23131,11 @@ }, /area/medical/morgue/lower) "svZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/mauve{ + dir = 9 }, -/obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "swv" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -23203,18 +23269,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"sCF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) "sDJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23261,7 +23315,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "sEE" = ( /obj/machinery/atmospherics/unary/outlet_injector{ @@ -23296,26 +23350,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"sHa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) "sId" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23362,37 +23396,32 @@ /turf/simulated/floor/tiled/white, /area/operations/lower/machinist) "sJN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) -"sJR" = ( -/obj/structure/table/steel, -/obj/item/pickaxe/drill{ - pixel_y = -5 - }, -/obj/item/pickaxe/drill{ - pixel_y = -5 - }, -/obj/item/pickaxe/drill{ - pixel_y = 5 - }, -/obj/item/pickaxe/drill{ - pixel_y = 5 +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green, +/obj/effect/floor_decal/corner/black{ + dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/hangar/auxiliary) +"sJR" = ( +/obj/machinery/suit_cycler/science, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/storage/eva) "sJZ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/industrial/outline, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "sKK" = ( @@ -23438,7 +23467,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "sLL" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -23449,19 +23478,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/floor_decal/corner/black{ - dir = 6 - }, /obj/machinery/light{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "shutters_evarecharging"; - name = "E.V.A. Recharging Shutters"; - pixel_x = 25; - pixel_y = 7; - req_access = list(18) +/obj/effect/floor_decal/corner/green/full{ + dir = 1 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -23469,9 +23490,7 @@ /obj/structure/ladder/up{ pixel_y = 10 }, -/obj/structure/railing/mapped{ - dir = 8 - }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "sMm" = ( @@ -23675,14 +23694,20 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "sVd" = ( -/obj/effect/floor_decal/corner_wide/purple{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner/mauve{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "sVu" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/airless, @@ -23792,12 +23817,18 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "tbR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "tbX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -23805,12 +23836,11 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "tcV" = ( -/obj/effect/floor_decal/corner_wide/purple/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "tdy" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -23909,7 +23939,7 @@ req_access = list(26) }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "teA" = ( /obj/machinery/conveyor{ dir = 9; @@ -23923,14 +23953,22 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/refinery) "tfh" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Mining Equipment"; - req_access = list(48); - req_one_access = null +/obj/machinery/computer/cryopod/living_quarters{ + pixel_y = 32 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/outpost/mining_main/eva) +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/landmark{ + name = "JoinLate" + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "tfB" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 @@ -23982,7 +24020,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "thd" = ( /obj/effect/floor_decal/corner/green{ @@ -24055,14 +24093,14 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/door/airlock/glass_mining{ - name = "Mech Bay and Recharging Station Elevator Access"; - req_one_access = list(29,47) - }, /obj/structure/sign/crush{ pixel_y = 32 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; + req_one_access = list(18,47) + }, +/turf/simulated/floor/tiled/full, /area/rnd/eva) "tiV" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -24083,7 +24121,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "tjs" = ( /obj/effect/landmark/entry_point/port{ @@ -24251,17 +24289,9 @@ /obj/machinery/light/spot/weak{ dir = 1 }, -/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/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "tsn" = ( /obj/effect/floor_decal/industrial/warning{ @@ -24303,14 +24333,24 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "ttK" = ( -/obj/machinery/door/blast/shutters/open{ - dir = 4; - id = "shutters_hangarseccp"; - name = "Security Checkpoint Shutter" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/security/checkpoint) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,47) + }, +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "tuP" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/storage/lower) @@ -24328,7 +24368,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "twq" = ( /obj/structure/tank_wall/hydrogen{ icon_state = "h2" @@ -24382,10 +24422,11 @@ /area/hangar/intrepid) "txk" = ( /obj/machinery/light/small, -/obj/effect/floor_decal/corner/brown/full{ - dir = 4 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/maintenance/operations) "txT" = ( /obj/structure/dispenser/oxygen, @@ -24393,12 +24434,13 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "tyw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/camera/network/research{ - c_tag = "Research - EVA Preparation Entrance" +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + id = "shutters_hangarseccp"; + name = "Security Checkpoint Shutter" }, -/turf/simulated/floor/tiled, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark/full, +/area/security/checkpoint) "tzi" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 10 @@ -24437,13 +24479,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"tzp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) "tAP" = ( /obj/machinery/conveyor_switch/oneway{ id = "warehousetomail"; @@ -24513,15 +24548,21 @@ }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/outpost/mining_main/refinery) "tEr" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/table/steel, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/steel/full, +/obj/item/stack/rods/full, +/obj/item/stack/rods/full, +/obj/item/storage/toolbox/mechanical, +/obj/effect/floor_decal/corner/mauve{ + dir = 5 }, -/obj/effect/floor_decal/corner_wide/purple/diagonal, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "tET" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24540,20 +24581,14 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "tFL" = ( -/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 - }, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/alarm{ pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "tFM" = ( /obj/structure/ladder/up{ @@ -24629,6 +24664,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "tIz" = ( @@ -24702,32 +24740,24 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "tJR" = ( -/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 - }, /obj/machinery/light/spot/weak{ dir = 1 }, /obj/structure/sign/crush{ pixel_y = 32 }, -/turf/simulated/floor/tiled/ramp{ +/obj/structure/flora/pottedplant/random, +/obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/spline/fancy/wood/full, +/turf/simulated/floor/wood, /area/hangar/auxiliary) "tKi" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/dark, /area/hangar/control) "tKE" = ( @@ -24740,7 +24770,7 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "tLq" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 4 @@ -24755,12 +24785,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/engineering) -"tLM" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/aft) "tLU" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -24836,13 +24860,12 @@ }, /area/hangar/operations) "tNx" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mlw2"; - opacity = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "tPr" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -24940,7 +24963,8 @@ name = "Security Checkpoint"; req_access = list(63) }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/security/checkpoint) "tTg" = ( /obj/structure/cable/green{ @@ -24952,6 +24976,7 @@ /obj/effect/floor_decal/corner/black{ dir = 9 }, +/obj/effect/floor_decal/corner/green, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "tTl" = ( @@ -24998,14 +25023,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"tVl" = ( -/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/plating, -/area/maintenance/hangar/port) "tVI" = ( /obj/machinery/door/window/northleft{ name = "Mining Shuttle Maintenance Exterior"; @@ -25057,7 +25074,7 @@ /obj/machinery/light/spot/weak{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, @@ -25114,9 +25131,6 @@ name = "Station Intercom (General)"; pixel_y = -24 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -25234,15 +25248,10 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "ucG" = ( +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "udC" = ( @@ -25286,21 +25295,26 @@ /area/rnd/xenoarch_atrium) "ufp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/secure_closet/security, -/obj/machinery/alarm{ - pixel_y = 28 +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) -"ufy" = ( -/obj/effect/floor_decal/corner_wide/purple/full{ - dir = 1 +"ufR" = ( +/obj/machinery/light/spot/weak{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hangar/auxiliary) "uga" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25321,16 +25335,22 @@ pixel_y = 26; shuttle_tag = "Robotics Lift" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/machinery/button/remote/blast_door{ id = "shutters_deck2_portstairwellsec"; name = "Elevator Security Shutters"; pixel_y = 37; req_one_access = list(1,19) }, -/turf/simulated/floor/tiled, +/obj/structure/flora/pottedplant/random, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/spline/fancy/wood/full, +/turf/simulated/floor/wood, /area/hangar/auxiliary) "uhE" = ( /obj/machinery/light, @@ -25346,7 +25366,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "ujc" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -25359,7 +25379,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -25449,7 +25469,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "umB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -25569,7 +25589,7 @@ c_tag = "Research - Xenoarchaeology Entrance"; dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "upm" = ( /obj/machinery/atmospherics/unary/freezer{ @@ -25598,10 +25618,16 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "urv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/hangar/starboard) +/obj/machinery/door/airlock/engineering{ + name = "Deck 2 Civilian Substation"; + req_one_access = list(11,24) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/civilian_west) "urO" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -25619,26 +25645,27 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "usu" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/landmark{ + name = "JoinLateLift" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/turf/simulated/floor/tiled/ramp/bottom{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/area/maintenance/research_port) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "usF" = ( /obj/structure/table/standard, /obj/item/device/mmi/digital/posibrain{ @@ -25790,7 +25817,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/blue{ dir = 6 }, /turf/simulated/floor/tiled, @@ -25906,24 +25933,21 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "uFo" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/closet/emcloset, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/black{ - dir = 6 +/obj/effect/floor_decal/corner/green/full{ + dir = 1 }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "researchhangar"; - name = "Research E.V.A."; - pixel_x = 25; - pixel_y = 7; - req_access = list(47) +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 }, /turf/simulated/floor/tiled, -/area/hangar/intrepid) +/area/horizon/crew_quarters/cryo/living_quarters_lift) "uFv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -25957,19 +25981,23 @@ }, /area/medical/morgue/lower) "uHA" = ( -/obj/structure/table/steel, -/obj/item/hoist_kit, -/obj/item/hoist_kit, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) -"uIJ" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light{ +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/machinery/door/window/eastright{ + name = "Research Voidsuit Storage Rack Access"; + req_access = list(47) + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/dark/full, /area/storage/eva) "uIL" = ( /obj/structure/table/reinforced, @@ -26043,7 +26071,7 @@ icon_state = "me4"; item_state = null }, -/turf/simulated/floor/plating, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/atmos_compartment) "uLM" = ( /obj/machinery/recharge_station, @@ -26067,6 +26095,14 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) +"uNH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/operations) "uOH" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5 @@ -26124,8 +26160,11 @@ /obj/structure/closet/walllocker/firecloset{ pixel_x = 32 }, -/obj/effect/floor_decal/industrial/hatch/red, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "uRl" = ( /obj/item/modular_computer/console/preset/ai{ @@ -26345,17 +26384,19 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm/east, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "uZN" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/green/full, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "uZU" = ( @@ -26371,13 +26412,16 @@ name = "north bump"; pixel_y = 24 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/photocopier, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "vat" = ( @@ -26415,17 +26459,11 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) "vcp" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/machinery/requests_console{ - department = "Deck 1 - Pilots' Room"; - name = "Pilots' Room Requests Console"; - pixel_y = -32 - }, +/obj/machinery/light/small, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, /area/hangar/control) "vcF" = ( @@ -26453,17 +26491,13 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "vdn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 6 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "vdZ" = ( /obj/machinery/door/firedoor, @@ -26489,17 +26523,15 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "veU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, /obj/machinery/alarm{ - pixel_y = 28 + dir = 4; + pixel_x = -28 }, /turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/area/storage/eva) "vfc" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -26578,6 +26610,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "vif" = ( @@ -26755,18 +26790,28 @@ /area/maintenance/engineering) "vpe" = ( /obj/machinery/firealarm/south, +/obj/effect/floor_decal/corner_wide/yellow/full, /turf/simulated/floor/tiled/dark/full, /area/tcommsat/mainlvl_tcomms__relay) "vpl" = ( -/obj/machinery/light/small/emergency{ +/obj/effect/landmark{ + name = "JoinLateLift" + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "vpu" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -26784,11 +26829,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "vqx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "vqC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26873,10 +26916,10 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "vse" = ( -/obj/effect/landmark/entry_point/fore{ - name = "fore, d3 airlock" +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/turf/simulated/floor/tiled/dark/full, /area/maintenance/hangar/starboard) "vsW" = ( /obj/machinery/computer/rdconsole/robotics{ @@ -27016,12 +27059,24 @@ /area/turret_protected/ai_upload) "vCG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "researchhangar"; - name = "Research E.V.A." - }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; + req_one_access = list(18,29,47) + }, +/turf/simulated/floor/tiled/full, +/area/rnd/eva) +"vCJ" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/eva) "vCY" = ( @@ -27054,14 +27109,35 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "vEd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 4; + id = "shutters_hangarseccp"; + name = "Security Checkpoint Shutter" }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/turf/simulated/floor/tiled/dark/full, +/area/security/checkpoint) +"vET" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, -/area/storage/eva) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark{ + name = "JoinLateCryoCommand" + }, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "vFp" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled/ramp{ @@ -27134,7 +27210,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/corner/paleblue{ +/obj/effect/floor_decal/corner/blue{ dir = 9 }, /turf/simulated/floor/tiled/dark, @@ -27172,32 +27248,16 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard/deck1) "vJe" = ( -/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/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "mining_dock"; - name = "mining docking hatch controller"; - pixel_x = 8; - pixel_y = -24 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "intrepid_dock"; - name = "intrepid docking port controller"; - pixel_x = -8; - pixel_y = -24 - }, /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/machinery/light/small, +/obj/machinery/button/remote/blast_door{ + id = "hangarlockdown"; + name = "Hangar Lockdown"; + pixel_y = -25; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hangar/control) "vJy" = ( @@ -27212,7 +27272,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 24 @@ -27221,7 +27280,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "vJT" = ( /obj/structure/railing/mapped{ dir = 1 @@ -27250,21 +27309,6 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) -"vKK" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/obj/item/modular_computer/console/preset/civilian{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/control) "vKN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -27303,21 +27347,13 @@ /area/shuttle/intrepid/crew_compartment) "vMB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) -"vNU" = ( -/obj/structure/railing/mapped{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/green/full{ dir = 8 }, -/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/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hangar/intrepid) "vOf" = ( /obj/effect/floor_decal/industrial/warning{ @@ -27360,11 +27396,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) "vPu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/tiled/ramp{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, /area/maintenance/hangar/starboard) "vQs" = ( /obj/structure/cable/green{ @@ -27373,13 +27411,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 6"; dir = 4 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "vSF" = ( @@ -27434,14 +27472,24 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "vTP" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/effect/floor_decal/corner_wide/purple{ - dir = 9 +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/machinery/door/window/westright{ + req_access = list(47); + name = "Research Voidsuit Storage Rack Access" + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "vTT" = ( /obj/effect/floor_decal/corner/yellow, /obj/effect/floor_decal/corner/blue{ @@ -27573,11 +27621,17 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "vZT" = ( -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/light/spot/weak{ + dir = 8 }, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/firealarm/west, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) @@ -27594,7 +27648,7 @@ }, /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "wbO" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -27615,21 +27669,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "wce" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "wcz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/power/apc/low{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, -/obj/structure/cable, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "wcU" = ( @@ -27667,23 +27714,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 9"; dir = 1 }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) -"weU" = ( -/obj/structure/shuttle_part{ - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; - icon_state = "mwr2"; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "weY" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -27723,13 +27762,12 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "wfM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "wgc" = ( /obj/effect/landmark/entry_point/starboard{ @@ -27757,6 +27795,17 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) +"whQ" = ( +/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/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "wic" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk/indoor/grate/damaged, @@ -27782,18 +27831,17 @@ name = "Security Checkpoint Shutter" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/security/checkpoint) "wjp" = ( -/obj/machinery/door/window/eastright, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/table/steel, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/ramp{ - dir = 4 - }, -/area/hangar/auxiliary) +/turf/simulated/floor/tiled/dark, +/area/hangar/control) "wjr" = ( /obj/effect/decal/cleanable/dirt, /obj/item/material/shard{ @@ -27937,37 +27985,36 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "wnc" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/floor_decal/corner/blue, +/obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "wng" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "12-0" }, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/hangar/port) "wnz" = ( @@ -27980,24 +28027,23 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "wnQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ +/obj/machinery/door/firedoor/multi_tile{ + dir = 8 + }, +/obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass{ - name = "Hangar Access" +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8; + name = "Hangar"; + req_one_access = list(12,26) }, /obj/machinery/door/blast/regular/open{ dir = 4; id = "hangarlockdown"; name = "Hangar Lockdown" }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/hangar/intrepid) "wnV" = ( /obj/effect/floor_decal/industrial/warning{ @@ -28115,6 +28161,14 @@ }, /turf/simulated/floor/tiled/full, /area/hangar/intrepid/interstitial) +"wrX" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/ore_box, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/outpost/mining_main/refinery) "wsA" = ( /obj/machinery/light/small/emergency, /obj/structure/cable/green{ @@ -28149,13 +28203,13 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "wtl" = ( -/obj/structure/table/steel, -/obj/item/device/flashlight/heavy, -/obj/item/storage/belt/utility, -/obj/item/clothing/head/welding, -/obj/effect/floor_decal/corner/paleblue{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/storage/eva) "wtB" = ( @@ -28210,7 +28264,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "wvY" = ( /obj/machinery/atmospherics/binary/pump/high_power{ @@ -28324,11 +28378,10 @@ /turf/simulated/floor/tiled, /area/shuttle/intrepid/crew_compartment) "wHJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) +/obj/effect/landmark/entry_point/fore{ + name = "fore, d1 airlock" }, -/turf/simulated/floor/plating, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) "wHX" = ( /obj/structure/cable/green{ @@ -28338,7 +28391,7 @@ /obj/machinery/light/spot/weak{ dir = 4 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, @@ -28378,24 +28431,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "wJg" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/engineering{ - name = "Deck 2 Civilian Substation"; - req_one_access = list(11,24) - }, -/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/maintenance/substation/civilian_west) +/area/maintenance/hangar/starboard) "wJh" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/tiled/ramp, +/turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "wJv" = ( /obj/structure/sign/securearea, @@ -28439,7 +28484,7 @@ name = "Hangar Lockdown" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "wLA" = ( /obj/machinery/conveyor_switch/oneway{ @@ -28479,7 +28524,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/tiled, @@ -28492,11 +28537,16 @@ /turf/simulated/floor/tiled, /area/operations/storage) "wNS" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/hangar/auxiliary) +/obj/machinery/door/airlock/engineering{ + name = "Security Substation"; + req_one_access = list(11,24) + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/substation/security) "wOP" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 1 @@ -28517,7 +28567,7 @@ name = "Oxygen Supplies Access"; req_access = list(48) }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "wPz" = ( /obj/machinery/mineral/stacking_machine{ @@ -28623,13 +28673,20 @@ /turf/space/dynamic, /area/horizon/exterior) "wUz" = ( -/obj/effect/floor_decal/corner_wide/purple/diagonal, -/obj/machinery/door/window/westright{ - name = "Research Voidsuits Access"; - req_access = list(47) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_command{ + name = "EVA Storage"; + req_access = list(18) + }, +/turf/simulated/floor/tiled/full, +/area/storage/eva) "wUM" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -28655,13 +28712,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm/west, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 7"; dir = 4 }, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "wVB" = ( @@ -28705,12 +28762,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "wWU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/corner/mauve{ + dir = 6 }, -/obj/effect/floor_decal/corner_wide/purple, /turf/simulated/floor/tiled/white, -/area/rnd/eva) +/area/storage/eva) "wWV" = ( /obj/structure/table/reinforced, /obj/item/device/flashlight/lamp, @@ -28744,10 +28800,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"wYe" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/maintenance/operations) "wYp" = ( /obj/structure/sign/fire{ desc = "A caution sign which reads 'STARBOARD PROPULSION'."; @@ -28851,16 +28903,20 @@ icon_state = "1-2" }, /obj/machinery/firealarm/east, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "xdE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ - name = "E.V.A."; - req_access = list(18) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/suspension_gen{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "xdF" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -28881,17 +28937,13 @@ /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 - }, /obj/machinery/light/spot/weak{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hangar/auxiliary) "xdV" = ( /obj/effect/shuttle_landmark/escape_pod/start/pod3, @@ -28966,15 +29018,15 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "xgP" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/light/small{ dir = 1 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "xhE" = ( @@ -29012,13 +29064,20 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "xiq" = ( -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/alarm{ + pixel_x = 28; + dir = 8 + }, +/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/corner/green{ + dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, /turf/simulated/floor/tiled, -/area/hangar/auxiliary) +/area/hangar/intrepid) "xiH" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/turret_protected/ai_upload) @@ -29057,7 +29116,10 @@ pixel_x = -24 }, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "0-4" + }, +/obj/effect/floor_decal/corner/green{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hangar/auxiliary) @@ -29097,17 +29159,18 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "xkw" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner_wide/purple{ +/obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "xkx" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -29131,9 +29194,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/research_port) @@ -29152,12 +29212,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "xll" = ( @@ -29205,21 +29265,8 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenoarch_atrium) "xmc" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/operations) +/turf/simulated/wall/r_wall, +/area/horizon/stairwell/central) "xmg" = ( /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) @@ -29241,12 +29288,24 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "xnj" = ( -/obj/effect/floor_decal/corner_wide/purple{ - dir = 10 +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/white, -/area/rnd/eva) +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window/westleft{ + req_access = list(47); + name = "Research Voidsuit Storage Rack Access" + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "xnv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ @@ -29354,7 +29413,7 @@ }, /obj/effect/floor_decal/industrial/outline/custodial, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "xqj" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/intrepid/rotary) @@ -29376,7 +29435,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/rnd/xenoarch_atrium) "xre" = ( /obj/structure/railing/mapped{ @@ -29404,6 +29463,9 @@ dir = 1; pixel_y = 24 }, +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, /area/tcommsat/mainlvl_tcomms__relay) "xst" = ( @@ -29531,7 +29593,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/janitor) +/area/horizon/custodial) "xvP" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/door/window/northleft{ @@ -29556,14 +29618,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark/full, /area/outpost/mining_main/refinery) "xwA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Mech Bay and Recharging Station Elevator Access"; - req_one_access = list(29,47) - }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -29571,7 +29629,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass_command{ + name = "Expedition EVA Storage"; + req_one_access = list(18,47) + }, +/turf/simulated/floor/tiled/full, /area/rnd/eva) "xyG" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -29600,6 +29662,19 @@ }, /turf/simulated/floor/tiled, /area/horizon/hydroponics/lower) +"xAf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/operations) "xAr" = ( /obj/machinery/power/apc{ dir = 8; @@ -29628,22 +29703,12 @@ /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) "xBw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/tiled/full, /area/hangar/auxiliary) "xCn" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/firealarm/north, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/storage/eva) "xCD" = ( @@ -29695,14 +29760,14 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xFo" = ( -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, /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/corner/green{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "xFB" = ( @@ -29805,6 +29870,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"xIh" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/storage/eva) "xIS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29878,29 +29947,21 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) -"xLY" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, -/area/hangar/intrepid) "xMa" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/cryopod/living_quarters{ + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/floor_decal/corner/green/full{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/sign/directions/civ{ + desc = "A sign pointing out that a lift leads to the ship's residential deck."; + dir = 1; + name = "\improper Lift to Residential Deck sign"; + pixel_y = -10 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/decal/cleanable/cobweb2{ - icon_state = "cobweb1" - }, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/cryo/living_quarters_lift) "xMb" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /turf/simulated/floor/tiled/dark, @@ -29968,17 +30029,12 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "xNz" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/suspension_gen{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/rnd/eva) +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "xNR" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29986,17 +30042,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "xOb" = ( -/obj/effect/floor_decal/industrial/warning/cee{ +/obj/machinery/camera/network/first_deck{ + c_tag = "First Deck - Hangar 4"; dir = 8 }, -/turf/simulated/floor/plating, -/area/hangar/auxiliary) +/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/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hangar/intrepid) "xOs" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 8 @@ -30035,8 +30100,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "xPv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xPX" = ( @@ -30062,17 +30128,25 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "xRe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/eva) "xRv" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/corner/green, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "xRN" = ( /obj/machinery/door/blast/regular{ @@ -30107,16 +30181,23 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "xSR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/hangar/starboard) +"xTb" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/door/window/southleft{ + name = "Softsuit Storage"; + req_access = list(18) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/hangar/starboard) +/turf/simulated/floor/tiled/dark/full, +/area/storage/eva) "xTG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30172,15 +30253,12 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, -/area/janitor) +/area/horizon/custodial) "xVn" = ( /obj/structure/anomaly_container, /turf/simulated/floor/reinforced, /area/rnd/isolation_b) "xVM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/atmospherics/unary/engine{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; icon_state = "me4"; @@ -30300,6 +30378,11 @@ /area/shuttle/escape_pod/pod4) "yag" = ( /obj/machinery/firealarm/west, +/obj/structure/closet/walllocker/emerglocker/north, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/auxiliary) "yau" = ( @@ -30338,11 +30421,9 @@ icon_state = "1-2" }, /obj/machinery/firealarm/west, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled, /area/hangar/intrepid) "ydm" = ( @@ -30401,14 +30482,9 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) "yff" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch{ - req_one_access = list(12,73) + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/hangar/port) @@ -46948,8 +47024,8 @@ nuj xlb tHv hjO -tgR -wCx +qpe +jwN tEc eqk bQh @@ -47146,12 +47222,12 @@ lIu kkS lUT umB -tfh -hII -qpe -qpe -qpe -lyo +oOk +sdT +sdT +wrX +nNS +wPo dNk kKb gyx @@ -47349,11 +47425,11 @@ kkS wkO qUu oOk -sdT -jbr -kpX -nNS -wPo +dNk +dNk +dNk +dNk +dNk dNk doE soT @@ -47551,12 +47627,12 @@ qVb tmu qUu oOk -dNk -dNk -dNk -dNk -dNk -dNk +hMr +nqp +hII +aBw +hII +iNV jks gxJ htx @@ -47573,14 +47649,14 @@ xoY qZx wJh uwT -nPL -dQH -nWF +nhc lUf -urv +nWF wfM iab vPu +oOI +nmP bij kVe eSV @@ -47754,11 +47830,11 @@ oOk oOk oOk qvl -ikP -kGf xmc -okA -jwN +xmc +xmc +xmc +xmc fKD tYN qju @@ -47767,22 +47843,22 @@ qju qju qju uuZ -qwr +urv odK uUl lDd -wJg -iCZ eJG +iCZ +hIl ibH ykR uJE -mjG -xPv raq +wJg +rtC msv -rtC -rtC +xSR +xSR lnQ kVe eSV @@ -47955,17 +48031,17 @@ piI fUb vat okA -okA -okA -iBe -gkL -klD -qju +xAf +xmc +ifX +ifX +ifX +kGf lOn okw bup eIp -grH +fhF ckb qju psB @@ -47974,18 +48050,18 @@ xoY xoY xoY xoY -hIl -xSR +qwr +mjG ugW -rtC -rtC -nWF +nPL dsI +nWF +iAL epn msv -rtC -rtC vse +xSR +wHJ kVe eSV eSV @@ -48155,38 +48231,38 @@ nnw aDv fUS txk -wYe -qio -vpl -mSk -fhF -hMr +nnw +rIS +uNH +xmc ifX -qju +ifX +ifX +kGf rau aOh ivF emH -grH +fhF ckb qju fXF fkN +rXW +fkN vqC fkN uQL -iAL -pVp uaU ugW +xPv axv -rtC cir -dsI +iAL xEu msv -rtC -rtC +xSR +xSR msv kVe eSV @@ -48360,10 +48436,10 @@ wuD wuD wuD wuD -wuD -wuD -wuD -wuD +qju +qju +qju +qju qju wKW mBx @@ -48373,22 +48449,22 @@ qju qju qju nWF -wHJ +dQH nWF nWF nWF nWF nWF nWF -oOI +pVp nWF nWF nWF -nhc +epB nZb msv -rtC -rtC +xSR +xSR msv kVe eSV @@ -48564,16 +48640,16 @@ xMm feW fga xFo -koQ +xFo wMB wVd ikF -koQ +xFo kan mVJ -koQ -koQ -koQ +xFo +xFo +xFo ddL dGo dGo @@ -48966,7 +49042,7 @@ oPL usP lCX wuD -lBY +ifJ kEJ kEJ kEJ @@ -48982,14 +49058,14 @@ kEJ kEJ gYd kzH -lBY kEJ kEJ kEJ kEJ kEJ kEJ -lBY +kEJ +kEJ cLV bSM cLV @@ -49171,7 +49247,7 @@ wuD aUk iRC iRC -amw +iRC iRC iRC iRC @@ -49373,9 +49449,9 @@ aHY aUk iRC iRC -geN -tNx -lVN +xjL +xjL +xjL aEw aEw aEw @@ -50360,7 +50436,7 @@ wXF bBD ygx bEk -ygx +hnS hDI uUZ ygx @@ -50560,7 +50636,7 @@ vTT fPF nUR kzs -kzs +bOs fOV ekb sWa @@ -50971,7 +51047,7 @@ tny jvl wLL vhY -kBe +lVN pYa xtH fuL @@ -51176,7 +51252,7 @@ iyV fUG wRE wRE -dlM +dWt rrX wRE hdi @@ -51576,14 +51652,14 @@ rHK kuh bec wLL -riM -bNT -wRE +qio +qio +dWt oYC -cLv -tzp -vEd -hdi +cZw +gzQ +qDq +ahw lXZ wKh xiQ @@ -51778,14 +51854,14 @@ rHK kuh bec wLL -tLM +riM +cMq wRE -wRE -wRE -xCn -gzQ +gJt +ded +tNx lpE -hdi +tyw ufp loW hgH @@ -51981,11 +52057,11 @@ tny knl oZj jjZ +oQa wRE -uIJ -gPv -sOG -gJt +xTb +pEl +fdB poO hdi jdC @@ -51999,9 +52075,9 @@ rPN aUk iRC iRC -cbM -weU -bBA +clM +clM +clM clM clM pkw @@ -52179,33 +52255,33 @@ riL riL riL riL -riL +geN kbo dZB kbo +geN wRE -oQa aCi -sOG +nwp pUa -wRE +qDN hdi hdi tSX hdi -ttK +vEd hdi aKo wif hdi -lBY -iRC -iRC -aeA -iRC -iRC -iRC -iRC +oFN +uRt +uRt +uRt +uRt +uRt +uRt +jgf eKr iRC iRC @@ -52381,22 +52457,22 @@ uez rNv rNv nCC -riL +geN xMa usu bap -wRE -oQa -lWd -cMq -bOs -hTa -ahw -qDN +geN +pcw +kWp +tcV +qFp +nhw +tbR +nhw hJx xdE -hYy -xLY +xdE +buI mXG rbx wuD @@ -52407,7 +52483,7 @@ ctI ctI ctI wuD -lBY +oFN cnb uRt uRt @@ -52423,7 +52499,7 @@ uRt uRt uRt uRt -lBY +uRt cLV bSM cLV @@ -52583,22 +52659,22 @@ efM rIz riL jOJ -riL -pwd -lvP -mVU -wRE -ife -gPv -sCF +geN +tfh +iBe +grH +geN +lyc +oYC +cZw rVm -bzh +fbL mwo fbL fVD -aCu +gEv pth -xLY +buI mXD lWu kSq @@ -52606,15 +52682,15 @@ gOa jqE jqE kru -jqE awo +cLv wnQ ihC nUQ -vNU -jIY -vNU -pYW +esD +esD +esD +esD wPD aIC esD @@ -52785,38 +52861,38 @@ tri mxs rBf uoV -riL +geN amz -lvP -mVU -wRE -wRE -wRE +vpl +msF +geN +lvq +eFl dns -hTa -wRE -veU -qDN -lfj -aCu -pth -xLY +lWd +mYX +qjB +fwF +eVw +xNz +xNz +buI sLL -pOO +acY uAy -uFo +pOO gix xNR lQQ qCA fQJ -aWP -vht +lKY +whQ +kEW +kEW +xOb +xiq kEW -vht -aWP -aWP -sHa iOs ujB aBY @@ -52825,7 +52901,7 @@ aBY bUN bjf hHv -oFA +hHv pEi nRy mdL @@ -52987,36 +53063,36 @@ qri uOH xhL rdy -riL +geN hIw -fTy -mVU +lDs +mSk +geN +wRE +wRE +dWt +wUz +wRE +wRE wRE -gJN -wtl -nhw -iph -nTZ -xNz -gyj aPY -fQC -eFl -fQC -fQC +wRE +wRE +wRE +wRE vCG vCG fQC fQC fQC -oos +qGG kuQ aWP aWP -cjr -dGR -tbP -ows +vht +vht +vht +aWP aWP bCi bCi @@ -53189,41 +53265,41 @@ rCl qKj brk jOJ -riL -pwd -fTy -als -wRE +geN +uFo +vET +bBA +geN gEb -cZw -gzQ +gyj +nhw lUu -nTZ +gJN +wRE ocJ -ocJ -lfj -nTZ -gYN -uHA -nTZ +wtl +veU +hzK +eQH +wRE +eQI hsK -hsK -hzY -oum +fQC +erd fQC vMB fox aWP acp gOe -oCE -rdU +wjp +tbP nmF bHV wcz kuH yff -tVl +ucG ucG byS kcE @@ -53391,40 +53467,40 @@ kHo nwI riL qep -riL -pwd -fTy -fzA -aaZ -sOG +geN +geN +ttK +geN +geN +dYF +cZw cZw gzQ -cPm +qDq +bvv +oYC +gzQ +cZw +cZw +qDq +rBI +rTG +ife fQC -nTZ -nTZ -eQI +erd fQC -rfJ -qQn -nTZ -qaz -qaz -cfg -pPH -fQC -lKY +xgP cBF aWP vai -dxv +oEp oCE oEp vJe aWP -htq +dxv hOC -htq +mqy gwQ goQ mqy @@ -53595,27 +53671,27 @@ tns hDd ldI gMP -lvP -jRx +lyo +fzA wRE -irX -acY +hmn +roX +xCn +iph +qDq bvv -kfv -fQC -kWp +oYC nLL -gEv -vTP +dsG doM xkw -fQC -rTG +rBI +vCJ iCb -kIz -pkE -fdB -nPa +fQC +erd +fQC +kNx qgi gnn pYu @@ -53624,10 +53700,10 @@ oYU tKi fZX aWP -dVs -gaQ htq -iqf +htq +pNv +htq cnV bZn pWy @@ -53798,38 +53874,38 @@ mRk sxT iMY lvP -mVU -wRE -hmn +jRx +aaZ +oYC cZw -ded +cZw +fDU hwy -rBI -nLL -tbR +wRE +cfg ppA -sJR -gNR -xnj -rBI +dIS +rfJ +oat +hTa qaz -xRe -mgK -lyc +hqa +fQC +erd fQC xgP weO aWP rEl iCI -oEp -oEp +ekT +iCI vcp aWP -ksI +vyD pkG +oFA htq -hVl wng lPF awr @@ -54000,41 +54076,41 @@ jOJ riL xkJ lvP -mVU +pya wRE fHn -cZw -pEl -hwy -rBI -ufy -cWQ -svZ +als +xIh +nTZ +dlM +wRE +hTa +hTa jOi -gNR -xnj -rBI -qaz +hTa +hTa +hTa +hzY xRe -nNx -lyc +fQC +erd fQC jcT kBF aWP nup gua -oEp -gtt +hxj +ttc bGM -lXa +aWP feD -vyD -htq +lXa +iAs pAD sMe msT -jCl +gwQ nRy snA pdL @@ -54205,18 +54281,18 @@ lvP aNR wRE nMp -hzK -hzK -dsG -fQC -lvq -ckL +dns +dns +dns +oum +wRE +sJR svZ +sVd +gYN +uHA +hTa iFU -tcV -qDq -fQC -tyw jvM fQC fQC @@ -54225,17 +54301,17 @@ qGG kuQ aWP aWP -vKK -hxj -ttc -pNv +vht +vht +vht aWP +aWP +wNS +htq +htq +htq bCi -bCi -bCi -bCi -bCi -ocT +iqf bCi nRy nRy @@ -54408,16 +54484,16 @@ mVU wRE ryj oaZ +nhw hbx hjt -fQC -oum -ufy +wRE +tEr kRx kvl -wWU +svZ lZN -nTZ +hTa cIj mmA fQC @@ -54425,20 +54501,20 @@ yag xjQ ngs mOd -gaE -aWP -vht -vht -vht -aWP -aWP +bzc +ufR +kzJ +kzJ +kzJ +kcg +vZT +mdH dJJ dJJ dJJ -lPW dtN -gaE -yag +ows +loq nCG nCG nCG @@ -54609,30 +54685,26 @@ lvP mVU wRE ryj -erd +sOG +cZw sJZ hjt -fQC -mYX -wUz -buI -sVd -nwp +wRE +ckL +kRx +qQn +wWU raw -fQC +wRE tiM xwA fQC ugY -gaE +kMV lnF asC vgw mio -vgw -vgw -vgw -ekT mio vgw vgw @@ -54640,6 +54712,10 @@ vgw vgw vgw vgw +vgw +vgw +mio +mio keh wYU awX @@ -54811,22 +54887,22 @@ fTy mVU wRE lNJ -erd +wnc +dns iTq rqB -fQC -eQH -tEr +wRE +aCu qpA bNW -dIS -raw -fQC +vTP +xnj +wRE nww nww fUC -wce -aCn +pYy +gaE qmE ndN qsq @@ -55013,24 +55089,24 @@ fTy mVU wRE wRE +wRE aaZ wRE wRE -fQC -fQC -fQC -fQC +wRE +wRE +wRE rBR -fQC -fQC -fQC +wRE +wRE +wRE uwf nww num pYy -kzJ -mdH -nGZ +gaE +qmE +jhH adX bJa bJa @@ -55214,9 +55290,9 @@ pwd lvP fep baq +baq fIg bgR -wnc jCf sFd bOv @@ -55226,13 +55302,13 @@ xqE tjl sFd lPW -lPW -lPW +cJJ +cJJ lPW tJR -iAs +aCn cEv -mSq +iOn adX bJa bJa @@ -55429,12 +55505,12 @@ pqO stn mJN hBn -mJN +hBn kzr bGQ -iAs -cEv -mSq +aXh +jKO +nGZ adX bJa bJa @@ -55632,10 +55708,10 @@ sFd aVU uQU oCq -lPW -fBi -xiq -mhF +koQ +gPv +dYf +nNx mSq adX bJa @@ -55836,13 +55912,13 @@ xtK xtK xtK tFL -xiq -mhF +wce +hot mSq -xRv -tGr -tGr -wNS +adX +bJa +bJa +bJa bJa bJa bJa @@ -56037,14 +56113,14 @@ xmb qxn nDy xtK -fBi -vqx -eXm +pYW +pYW +hot nNh gWZ -hIX -cfF -qsq +bJa +bJa +bJa tGr tGr tGr @@ -56240,8 +56316,8 @@ fOL mJQ xtK bfs -iOn -mhF +vqx +hot eOR ygC eDV @@ -56249,13 +56325,13 @@ eDV ygC ygC ygC -ygC -ygC -hqa -cJJ +pPH ygC ygC ygC +ygC +eDV +eDV sJN wYU hAZ @@ -56442,22 +56518,22 @@ vcf wTM xtK trW -iOn -mhF +vqx +hot bAq +mgK +mgK +mgK +mgK +mgK +mgK +pkE bAM -bAM -bAM -bAM -bAM -bAM -bAM -bAM -kNx -aXh -rIS -qQS -qQS +agI +agI +agI +agI +agI skS nCG nCG @@ -56643,9 +56719,9 @@ wwN wwN wwN xtK -vdn -vZT -kMV +ppj +xBw +hot dHW xjq mOv @@ -56654,12 +56730,12 @@ xjq xjq xjq xjq -xjq fFf -dYf xjq xjq xjq +mOv +mOv mhq wYU hAZ @@ -56848,11 +56924,11 @@ xtK ppj xBw hot -loq -xOb -wjp +mSq +bJa fIO -qsq +fIO +bJa moI moI moI @@ -57050,11 +57126,11 @@ xtK xtK xtK rrR -loq -kcg -moI -moI -nYD +mSq +adX +bJa +bJa +bJa bJa dTk bJa @@ -57251,8 +57327,8 @@ pbY xvP jeq xtK -fBi -loq +kIz +mSq adX bJa bJa @@ -57454,7 +57530,7 @@ vys fIp xtK xdK -loq +mSq adX bJa bJa @@ -57655,8 +57731,8 @@ aoD kAG shb xtK -fBi -loq +hot +mSq adX bJa bJa @@ -57857,8 +57933,8 @@ aTv xtK xtK xtK -fBi -loq +hot +mSq adX bJa bJa @@ -58059,9 +58135,9 @@ hUC xtK fZu lPW -fBi -loq -qsq +hot +mSq +bJa tGr tGr tGr @@ -58261,9 +58337,11 @@ nCa xtK aVg lPW -fBi +lfj nax ggS +eDV +eDV ygC ygC ygC @@ -58272,11 +58350,9 @@ ygC ygC ygC ygC -ygC -ygC -ygC -ygC -ygC +eDV +eDV +xRv nCG hbU nCG @@ -58467,17 +58543,17 @@ fBi cpU kDE mSQ -uZm +qQS mtp -uZm +qQS cPT uZm mFu -agI +vdn mRt -agI +vdn mQB -agI +vdn xbH wYU ybm diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index fbe828a0596..cb58055927e 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -182,8 +182,8 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics) "adw" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -272,7 +272,7 @@ c_tag = "Service - Deck 2 - Bar Backroom" }, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "ahm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -492,7 +492,10 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "amI" = ( /obj/structure/cable/green{ @@ -785,12 +788,15 @@ /turf/simulated/wall, /area/maintenance/wing/port/far) "asr" = ( -/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{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) "asB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -910,7 +916,7 @@ /obj/machinery/door/airlock/service{ name = "Chapel" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/chapel/main) "auL" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1154,21 +1160,25 @@ /turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) "ayv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 9 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24; + pixel_y = 23 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark{ - name = "JoinLateLift" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "ayA" = ( /obj/machinery/firealarm/south, /obj/machinery/alarm{ @@ -1229,7 +1239,7 @@ }, /obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "ayY" = ( /obj/machinery/power/apc{ dir = 4; @@ -1442,7 +1452,11 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "aDY" = ( /obj/machinery/light, @@ -1792,6 +1806,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -2919,11 +2936,20 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "bpC" = ( -/obj/machinery/door/airlock/freezer{ - id_tag = "central_unit_1"; - name = "Unit 1" +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "bpF" = ( /obj/machinery/vending/hydronutrients, @@ -4401,8 +4427,15 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "bZj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4681,7 +4714,7 @@ "chf" = ( /obj/machinery/vending/snack, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_two/fore) "chj" = ( /obj/structure/closet/secure_closet/security, @@ -5355,15 +5388,17 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "cEk" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 8 +/obj/effect/floor_decal/corner/green{ + dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/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/horizon/hallway/deck_two/fore) "cGd" = ( @@ -5454,23 +5489,16 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "cJI" = ( -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Living Quarters Lift"; - dir = 1 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 - }, -/obj/structure/closet/emcloset, -/obj/item/storage/toolbox/emergency, -/obj/item/crowbar/red, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/structure/closet/secure_closet/custodial, +/obj/effect/floor_decal/industrial/outline/custodial, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "cJU" = ( /obj/structure/table/rack, /obj/item/storage/box/monkeycubes, @@ -5536,11 +5564,8 @@ /area/engineering/smes/tesla) "cKJ" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "cKP" = ( @@ -5644,15 +5669,6 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "cNz" = ( -/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/structure/disposalpipe/segment{ dir = 4 }, @@ -5660,7 +5676,12 @@ dir = 8 }, /obj/machinery/light/small/emergency, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "cNU" = ( @@ -5691,7 +5712,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "cOp" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -5911,21 +5932,15 @@ /turf/simulated/floor/carpet, /area/horizon/crew_quarters/lounge/bar) "cUZ" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, +/obj/structure/disposalpipe/junction/yjunction, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -6011,13 +6026,14 @@ /turf/simulated/floor/carpet, /area/medical/psych) "cWP" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) "cXh" = ( @@ -6424,7 +6440,7 @@ "din" = ( /obj/machinery/vending/cola, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_two/fore) "dit" = ( /obj/machinery/door/firedoor, @@ -7225,17 +7241,26 @@ /turf/simulated/floor/reinforced, /area/storage/secure) "dCa" = ( -/obj/machinery/firealarm/south, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/small/west, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/purple/full{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/machinery/alarm{ + pixel_x = 28; + dir = 8 + }, +/obj/structure/table/steel, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/reagent_dispensers/peppertank/spacecleaner{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "dCK" = ( /obj/machinery/light{ dir = 1 @@ -7416,11 +7441,25 @@ /turf/simulated/floor/tiled/full, /area/engineering/storage_hard) "dHV" = ( -/obj/structure/bed/stool/chair/padded/brown{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + req_access = list(12); + name = "Deck 2 Central Washroom Maintenance" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/washroom/central) "dIk" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 @@ -7557,12 +7596,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) -"dKH" = ( -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "dKR" = ( /turf/simulated/wall, /area/medical/exam) @@ -7984,8 +8017,11 @@ req_access = list(25) }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, -/area/horizon/bar) +/area/horizon/bar/backroom) "dWZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8214,11 +8250,6 @@ "ecV" = ( /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_monitoring/tesla) -"edY" = ( -/obj/machinery/vending/zora, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) "eew" = ( /obj/machinery/power/apc/low{ dir = 4; @@ -8646,12 +8677,18 @@ /turf/simulated/floor/tiled/dark, /area/chapel/office) "eqv" = ( -/obj/machinery/light, +/obj/structure/railing/mapped, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -8792,14 +8829,9 @@ /turf/simulated/floor/plating, /area/engineering/storage/tech) "evi" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) "evl" = ( @@ -8917,7 +8949,7 @@ /area/maintenance/wing/starboard/far) "exx" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "exC" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -9513,16 +9545,11 @@ /turf/simulated/floor/carpet, /area/horizon/crew_quarters/lounge/bar) "ePC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Deck 2 Communal Area" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "ePO" = ( /obj/structure/ship_weapon_dummy, @@ -9555,12 +9582,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/lobby) -"eQs" = ( -/obj/effect/floor_decal/corner/green{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "eQv" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -9670,16 +9691,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"eUH" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/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/horizon/hallway/deck_two/fore) "eUT" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 4 @@ -9918,13 +9929,10 @@ /turf/simulated/floor/carpet/rubber, /area/server) "eZG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "eZI" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -9954,20 +9962,23 @@ /turf/simulated/floor/tiled/white, /area/medical/or2) "fak" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/obj/structure/closet/emcloset, -/obj/item/storage/toolbox/emergency, -/obj/item/crowbar/red, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 10 }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/structure/table/steel, +/obj/machinery/camera/network/service{ + c_tag = "Service - Auxiliary Custodial Closet"; + dir = 1 + }, +/obj/item/storage/box/lights/mixed, +/obj/machinery/requests_console{ + department = "Custodial"; + departmentType = 1; + name = "\improper Custodial Requests Console"; + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "fan" = ( /obj/effect/floor_decal/corner/mauve/full, /obj/structure/railing/mapped, @@ -10102,7 +10113,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "fdZ" = ( /obj/machinery/door/blast/shutters/open{ @@ -10146,20 +10157,26 @@ /area/maintenance/wing/starboard) "feo" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_two/fore/starboard) "fer" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -10365,7 +10382,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "fjX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10559,7 +10579,12 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/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/hallway/primary/central_two) "fqL" = ( /obj/structure/cable{ @@ -10829,16 +10854,15 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard) "fyi" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/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" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fyx" = ( /obj/effect/floor_decal/corner/green{ @@ -10850,14 +10874,10 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "fyH" = ( -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 10 }, -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Medical Entrance"; - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fyU" = ( /obj/effect/floor_decal/corner/yellow/full, @@ -11311,7 +11331,10 @@ pixel_x = 32; pixel_y = -3 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "fKk" = ( /obj/structure/cable/green{ @@ -11952,8 +11975,7 @@ /obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "fYW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12274,7 +12296,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "gfI" = ( /obj/effect/floor_decal/corner/green{ @@ -12394,13 +12419,19 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "ghX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "gil" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -12478,8 +12509,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/spline/fancy{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -12713,20 +12744,13 @@ dir = 4 }, /obj/machinery/firealarm/south, +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) -"gov" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "goC" = ( /obj/machinery/button/remote/blast_door{ id = "cannon_view"; @@ -12962,14 +12986,23 @@ /turf/simulated/floor/tiled/dark, /area/security/armory) "gtw" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/purple{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/horizon/stairwell/central) "gud" = ( /obj/machinery/camera/network/security{ c_tag = "Security - Armory Fore"; @@ -14006,8 +14039,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/spline/fancy{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -14791,17 +14824,19 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "hmX" = ( -/obj/structure/railing/mapped, /obj/structure/lattice, /obj/structure/cable/green{ - icon_state = "11-8" + icon_state = "11-2" }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/down/supply, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/horizon/maintenance/deck_two/fore/port) "hne" = ( @@ -14816,15 +14851,14 @@ /turf/simulated/floor/tiled, /area/operations/office) "hnf" = ( -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Dinner Entrance 1"; - dir = 4 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/obj/structure/sign/emergency/evacuation{ - dir = 8; - pixel_x = -32 +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "hnC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15228,14 +15262,10 @@ /turf/simulated/open/airless, /area/horizon/exterior) "hww" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/green{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "hwH" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -15248,10 +15278,15 @@ /area/hallway/engineering/tesla) "hwI" = ( /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass{ name = "Deck 2 Communal Area" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "hwM" = ( /obj/machinery/light{ @@ -15443,7 +15478,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "hBN" = ( /obj/structure/lattice/catwalk/indoor, @@ -15495,7 +15530,7 @@ }, /mob/living/carbon/human/monkey/punpun, /turf/simulated/floor/carpet, -/area/horizon/bar) +/area/horizon/bar/backroom) "hCF" = ( /obj/effect/floor_decal/spline/plain/corner{ dir = 1 @@ -15590,7 +15625,8 @@ dir = 10 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "hEs" = ( /obj/effect/floor_decal/corner/mauve{ @@ -15661,14 +15697,14 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "hFM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Dinner Entrance 2"; dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "hFU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -15694,15 +15730,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "hGC" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/green/full{ + dir = 8 }, -/obj/machinery/door/airlock{ - name = "Central Washroom" +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Dinner Entrance 1"; + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "hGJ" = ( /obj/structure/railing/mapped{ dir = 1 @@ -15790,16 +15826,11 @@ /turf/simulated/floor/grass/alt, /area/rnd/hallway) "hIq" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_two/fore) "hIT" = ( @@ -15920,7 +15951,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "hNO" = ( /obj/effect/floor_decal/spline/plain{ @@ -15981,21 +16015,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"hPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "hQa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -16095,7 +16114,7 @@ /obj/item/wrench, /obj/effect/floor_decal/corner/grey/full, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "hSU" = ( /obj/structure/table/standard, /obj/effect/floor_decal/spline/plain{ @@ -17056,20 +17075,33 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/smes/tesla) "iwC" = ( -/obj/machinery/cryopod/living_quarters{ - pixel_y = 8 - }, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/purple/full{ dir = 8 }, -/obj/structure/sign/directions/civ{ - desc = "A sign pointing out that a lift leads to the ship's living quarters."; - dir = 1; - name = "\improper To Living Quarters sign"; - pixel_y = -10 +/obj/structure/table/steel, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 7 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/item/pen{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/device/hand_labeler, +/obj/machinery/ringer{ + department = "Auxiliary Custodial"; + id = "ringers_custodialaux"; + name = "\improper Auxiliary Custodial Ringer Terminal"; + req_access = list(26); + pixel_y = 5; + pixel_x = -27 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "iwF" = ( /obj/structure/railing/mapped{ dir = 8 @@ -17188,7 +17220,7 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "iBC" = ( /obj/machinery/alarm{ @@ -17613,18 +17645,28 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "iKF" = ( -/obj/item/device/radio/beacon, -/obj/machinery/computer/cryopod/living_quarters{ - pixel_y = 32 +/obj/structure/bed/stool/chair/office/dark{ + dir = 1 }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck2_auxcustdesk"; + name = "Auxiliary Custodial Closet Desk Shutter"; + pixel_x = -25; + pixel_y = 25; + req_access = list(26) }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck2_auxcustwindow"; + name = "Auxiliary Custodial Closet Window Shutter"; + pixel_x = -36; + pixel_y = 25; + req_access = list(26) + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "iKU" = ( /obj/machinery/ammunition_loader/grauwolf{ weapon_id = "Grauwolf Flak Battery" @@ -17742,14 +17784,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/spline/fancy{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -17906,9 +17949,9 @@ /turf/simulated/floor/tiled/white, /area/medical/icu) "iSi" = ( -/obj/structure/reagent_dispensers/extinguisher, +/obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/warning{ - dir = 10 + dir = 9 }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) @@ -18029,21 +18072,6 @@ }, /turf/simulated/floor/wood, /area/hallway/primary/central_one) -"iWc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "iWj" = ( /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled, @@ -18408,12 +18436,6 @@ }, /turf/simulated/floor/tiled, /area/security/prison) -"jgb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) "jgj" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/structure/window/reinforced{ @@ -19262,15 +19284,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"jxz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) "jyd" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -19399,18 +19412,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "jCL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "jCY" = ( /obj/structure/lattice, /turf/simulated/open/airless, @@ -19800,7 +19809,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "jMO" = ( /obj/machinery/door/airlock/glass_security{ @@ -19970,10 +19982,9 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "jRO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/zora, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_two/fore) "jSP" = ( /obj/structure/table/standard, @@ -20045,19 +20056,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/medical/cryo) -"jUu" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/spline/fancy{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "jUx" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -20417,11 +20415,17 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "kdK" = ( -/obj/machinery/light{ +/obj/structure/railing/mapped{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -20759,7 +20763,8 @@ dir = 5 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "krk" = ( /obj/machinery/light{ @@ -20831,16 +20836,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "kta" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/floor_decal/corner/green{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ktC" = ( /obj/machinery/door/firedoor, @@ -21222,15 +21224,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/telesci) "kEK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "kEL" = ( @@ -21902,7 +21900,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "kXY" = ( /obj/effect/floor_decal/industrial/warning{ @@ -22143,7 +22141,7 @@ /obj/structure/sign/emergency/evacuation{ pixel_y = -32 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ldk" = ( /obj/structure/cable/green{ @@ -22749,13 +22747,17 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "luo" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/recharge_station, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_two) "luT" = ( /obj/structure/railing/mapped{ dir = 4 @@ -23233,17 +23235,11 @@ /turf/simulated/floor/lino/grey, /area/horizon/crew_quarters/lounge/bar) "lJi" = ( -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 5 }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "lJp" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -23277,19 +23273,20 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; name = "Chapel Office"; sortType = "Chapel Office" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /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/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) @@ -23301,7 +23298,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "lKH" = ( /obj/structure/cable/green{ @@ -23530,19 +23527,15 @@ /turf/simulated/floor/tiled/dark, /area/rnd/conference) "lPn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/green{ + dir = 5 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "lPO" = ( /obj/effect/floor_decal/corner/green{ @@ -23817,8 +23810,18 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "lWg" = ( -/turf/simulated/wall, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/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/firealarm/south, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_two) "lWB" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -24093,7 +24096,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "mdR" = ( /obj/machinery/door/airlock{ @@ -24437,17 +24443,14 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "mnc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /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/spline/fancy{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -24559,19 +24562,21 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/engineering/engine_room) "mqN" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/mirror{ + pixel_y = 36 }, -/obj/machinery/button/remote/airlock{ - dir = 4; - id = "central_unit_1"; - name = "Door Bolt Control"; - pixel_x = -24; - specialfunctions = 4 +/obj/structure/sink{ + pixel_y = 28 }, /obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/alarm{ + pixel_x = -28; + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "mqR" = ( /obj/structure/flora/pottedplant/random, @@ -25020,6 +25025,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hor) +"mDa" = ( +/obj/machinery/door/airlock/service{ + name = "Auxiliary Custodial Closet"; + req_access = list(26) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/horizon/custodial/auxiliary) "mDh" = ( /obj/machinery/computer/ship/navigation, /turf/simulated/floor/reinforced, @@ -25225,7 +25238,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "mHh" = ( /obj/structure/disposalpipe/segment, @@ -25283,8 +25296,7 @@ /turf/simulated/floor/tiled, /area/turret_protected/ai_upload) "mHO" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "mIh" = ( /obj/effect/floor_decal/industrial/warning{ @@ -25871,7 +25883,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mWY" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -26131,7 +26143,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "ndn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -26203,14 +26218,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/smes) "neZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "nfs" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -26445,7 +26462,13 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "nio" = ( /obj/effect/floor_decal/spline/plain{ @@ -26585,7 +26608,7 @@ /obj/structure/disposalpipe/junction{ dir = 2 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "nkF" = ( /obj/structure/cable/green{ @@ -26702,12 +26725,16 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/tesla) "nmG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner/green{ - dir = 5 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/sunnybush, +/turf/simulated/floor/grass/alt, +/area/horizon/hallway/deck_two/fore) "nnm" = ( /obj/machinery/door/window/southleft, /obj/machinery/light/small{ @@ -26756,7 +26783,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "nox" = ( /turf/simulated/floor/tiled/dark, @@ -26992,8 +27019,11 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "nyw" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -27437,8 +27467,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "nJQ" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -27962,24 +27993,15 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/tesla) "obi" = ( -/obj/machinery/door/airlock/glass{ - name = "Living Quarters Lift" +/obj/structure/mirror{ + pixel_y = 36 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/sink{ + pixel_y = 28 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "obr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28218,7 +28240,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "oia" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -28350,8 +28372,15 @@ /area/security/checkpoint2) "ojY" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, +/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{ + name = "Deck 2 Communal Area" + }, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "okk" = ( /obj/machinery/light/small{ @@ -28743,7 +28772,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ovu" = ( /obj/effect/floor_decal/industrial/warning, @@ -28923,15 +28952,14 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "ozz" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters{ + id = "shutters_deck2_auxcustwindow"; + name = "Window Shutter"; dir = 4 }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/custodial/auxiliary) "ozE" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -29293,15 +29321,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "oHX" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Deck 2 Central Washroom" }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/washroom/central) "oIG" = ( /obj/machinery/light{ dir = 8 @@ -29401,26 +29426,19 @@ /turf/simulated/floor/wood, /area/chapel/office) "oKH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ +/obj/effect/floor_decal/corner/purple{ dir = 6 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/closet/crate/trashcart, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/effect/landmark{ - name = "JoinLateLift" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "oKL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -29572,25 +29590,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "oPM" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "oPQ" = ( @@ -29823,11 +29825,21 @@ /turf/simulated/floor/wood, /area/operations/qm) "oWm" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 8 +/obj/structure/table/reinforced/steel, +/obj/machinery/door/window/southleft{ + name = "Auxiliary Custodial Closet Desk Interior"; + req_access = list(26) }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/obj/machinery/door/window/northleft{ + name = "Auxiliary Custodial Closet Desk Exterior" + }, +/obj/machinery/door/blast/shutters{ + id = "shutters_deck2_auxcustdesk"; + name = "Desk Shutter" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/custodial/auxiliary) "oWu" = ( /obj/structure/foamedmetal, /obj/effect/landmark/entry_point/aft{ @@ -30049,11 +30061,22 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "pac" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/firealarm/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "paf" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 8 @@ -30392,20 +30415,29 @@ /turf/simulated/floor/tiled/dark/full, /area/hallway/engineering) "piE" = ( -/obj/machinery/cryopod/living_quarters{ - pixel_y = 8 - }, -/obj/effect/floor_decal/corner/green/full{ +/obj/effect/floor_decal/corner/purple/full{ dir = 1 }, -/obj/structure/sign/directions/civ{ - desc = "A sign pointing out that a lift leads to the ship's living quarters."; - dir = 1; - name = "\improper To Living Quarters sign"; - pixel_y = -10 +/obj/machinery/light_switch{ + pixel_x = -9; + pixel_y = 24 }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/obj/structure/janitorialcart/full{ + dir = 4 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/structure/sink{ + dir = 1; + pixel_y = 26; + pixel_x = 8 + }, +/obj/effect/floor_decal/industrial/outline/custodial, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/firealarm/east, +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "piY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -30432,16 +30464,11 @@ /turf/simulated/floor/carpet, /area/medical/psych) "pjQ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 12 +/obj/machinery/door/airlock{ + name = "Stall 1"; + id_tag = "central_stall_1" }, -/obj/structure/mirror{ - pixel_x = 24; - pixel_y = 3 - }, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/washroom/central) "pkf" = ( /obj/machinery/chem_master, @@ -31331,12 +31358,9 @@ /turf/simulated/floor/reinforced, /area/assembly/chargebay) "pIE" = ( -/obj/machinery/light{ +/obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "pIV" = ( @@ -31512,7 +31536,7 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "pMR" = ( /obj/machinery/atmospherics/unary/vent_pump{ @@ -32119,14 +32143,9 @@ /turf/simulated/floor/tiled, /area/turret_protected/ai_upload_foyer) "qcs" = ( -/obj/machinery/disposal/small/east, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hallway/deck_two/fore) "qdq" = ( /obj/machinery/light{ @@ -32233,13 +32252,14 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "qfC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/corner/green{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "qgf" = ( /obj/structure/closet/crate/freezer{ @@ -32299,10 +32319,9 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard/far) "qhf" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light, +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "qhz" = ( /obj/structure/cable/green{ @@ -32480,15 +32499,24 @@ /turf/simulated/floor/tiled, /area/security/security_office) "qlX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/light/small, /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/firealarm/south, +/obj/structure/toilet{ + dir = 1; + pixel_y = -1 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "central_stall_1"; + name = "Stall Door Lock"; + pixel_x = -24; + specialfunctions = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/bed/handrail{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "qmy" = ( @@ -32520,17 +32548,18 @@ /turf/simulated/floor/tiled, /area/security/brig) "qnl" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) @@ -32701,7 +32730,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "qtY" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -32796,16 +32825,11 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "qvd" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/obj/machinery/door/airlock{ + name = "Stall 2"; + id_tag = "central_stall_2" }, -/obj/structure/mirror{ - pixel_x = -24; - pixel_y = 3 - }, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/washroom/central) "qvl" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -32963,11 +32987,18 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry) "qyA" = ( -/obj/machinery/door/airlock/freezer{ - id_tag = "central_unit_2"; - name = "Unit 2" +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "qzF" = ( /obj/machinery/light{ @@ -33125,7 +33156,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "qDU" = ( /obj/machinery/light{ @@ -34162,19 +34193,10 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "rca" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "central_unit_2"; - name = "Door Bolt Control"; - pixel_x = 24; - specialfunctions = 4 - }, /obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/disposal/small/south, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "rck" = ( /obj/machinery/door/airlock/maintenance{ @@ -34979,7 +35001,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "rvT" = ( -/obj/random/junk, /obj/structure/railing/mapped{ dir = 4 }, @@ -34989,6 +35010,7 @@ /obj/machinery/alarm{ pixel_y = 28 }, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "rwe" = ( @@ -35621,13 +35643,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "rNs" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, @@ -36135,14 +36151,23 @@ /turf/simulated/floor/tiled/dark, /area/engineering/storage/tech) "rYM" = ( -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ +/obj/effect/floor_decal/corner/purple/full, +/obj/structure/closet/l3closet/janitor, +/obj/effect/floor_decal/industrial/outline/custodial, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -24; dir = 1 }, -/obj/machinery/disposal/small/east, -/obj/effect/floor_decal/corner/green/full, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/turf/simulated/floor/tiled, +/area/horizon/custodial/auxiliary) "rYW" = ( /obj/effect/floor_decal/corner/lime{ dir = 9 @@ -36207,7 +36232,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "sbK" = ( /obj/structure/bed/stool/padded/red, @@ -36681,7 +36709,7 @@ pixel_y = -24 }, /obj/structure/cable/green, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "soK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -37067,7 +37095,11 @@ /turf/simulated/wall, /area/maintenance/aux_atmospherics/deck_2/starboard) "sBy" = ( -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "sBE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -37461,15 +37493,27 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/railing/mapped{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Auxiliary Custodial Closet"; + sortType = "Auxiliary Custodial Closet"; + icon_state = "pipe-j1s" + }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) "sNT" = ( @@ -37500,6 +37544,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/lino/grey, /area/horizon/bar) "sOu" = ( @@ -37513,6 +37560,9 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/lino/grey, /area/horizon/bar) "sPK" = ( @@ -37751,6 +37801,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/random/junk, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "sXc" = ( @@ -37851,9 +37902,15 @@ /turf/simulated/floor/tiled, /area/security/prison) "sZj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "sZT" = ( @@ -37862,7 +37919,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "tab" = ( /obj/machinery/door/window/westright, @@ -39328,7 +39385,7 @@ /obj/effect/floor_decal/corner/green{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "tKG" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -39598,7 +39655,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "tRz" = ( /obj/machinery/button/remote/blast_door{ @@ -40067,7 +40125,7 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ueF" = ( /obj/structure/cable/green{ @@ -40196,8 +40254,11 @@ pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, -/area/horizon/bar) +/area/horizon/bar/backroom) "uhE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -40364,7 +40425,17 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Medical Entrance"; + dir = 1 + }, +/obj/machinery/ringer_button{ + id = "ringers_custodialaux"; + name = "\improper Auxiliary Custodial Ringer"; + pixel_x = 8; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ulp" = ( /obj/structure/table/stone/marble, @@ -40728,10 +40799,9 @@ "urP" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "usd" = ( @@ -40930,7 +41000,8 @@ /obj/effect/floor_decal/corner/green{ dir = 9 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "uwi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -41576,7 +41647,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "uLC" = ( /obj/effect/floor_decal/industrial/warning, @@ -42274,12 +42345,12 @@ dir = 6 }, /obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "veu" = ( /obj/structure/lattice/catwalk/indoor, @@ -42390,17 +42461,10 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "vhu" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/random/junk, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "vhI" = ( @@ -42818,18 +42882,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) -"vvt" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) "vvS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Living Quarters Lift" +/obj/machinery/door/airlock/service{ + name = "Auxiliary Custodial Closet"; + req_access = list(26) }, -/turf/simulated/floor/tiled/dark, -/area/horizon/crew_quarters/cryo/living_quarters_lift) +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/horizon/custodial/auxiliary) "vwc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -42925,11 +42997,14 @@ /turf/simulated/floor/tiled/dark, /area/rnd/conference) "vyg" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "vyk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -42998,11 +43073,20 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "vAD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/random/junk, +/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/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "vBn" = ( @@ -43146,12 +43230,6 @@ }, /turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) -"vDq" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) "vDT" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 1 @@ -43555,16 +43633,8 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "vNQ" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/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/dark, -/area/hallway/primary/central_two) +/turf/simulated/wall, +/area/horizon/bar/backroom) "vNX" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 1 @@ -43904,21 +43974,10 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "vTN" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/lattice, -/obj/structure/railing/mapped, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "vTP" = ( /obj/structure/lattice, @@ -44053,17 +44112,24 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "vWX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/green/diagonal, +/obj/structure/toilet{ + dir = 1; + pixel_y = -1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "central_stall_2"; + name = "Stall Door Lock"; + pixel_x = 24; + specialfunctions = 4 + }, +/obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/machinery/light/small, -/obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "vXn" = ( @@ -44340,12 +44406,15 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard) "wbE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/disposal/small/east, /obj/effect/floor_decal/corner/green{ - dir = 5 + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "wbL" = ( /obj/machinery/light/small{ dir = 8 @@ -44625,10 +44694,15 @@ /turf/space/dynamic, /area/template_noop) "whr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "whs" = ( @@ -45451,19 +45525,16 @@ /area/tcommsat/mainlvl_tcomms__relay/second) "wCm" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/spline/fancy{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -45587,14 +45658,15 @@ /turf/simulated/floor/wood, /area/horizon/library) "wDG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/power/apc{ + pixel_y = -24 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "wDJ" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/plain, @@ -46070,20 +46142,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "wMP" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/crew_quarters/cryo/living_quarters_lift) -"wNk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/turf/simulated/wall, +/area/horizon/custodial/auxiliary) "wNI" = ( /turf/simulated/floor/lino/grey, /area/horizon/bar) @@ -46305,7 +46365,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "wTD" = ( /obj/structure/cable/orange{ @@ -46360,18 +46420,12 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/tesla) "wVT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/effect/floor_decal/corner/green{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "wWh" = ( @@ -47576,7 +47630,8 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "xDA" = ( /obj/machinery/light/small/red{ @@ -47801,7 +47856,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "xIH" = ( /obj/structure/table/standard, @@ -48185,21 +48240,6 @@ /obj/machinery/disposal/small/south, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"xSq" = ( -/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" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/hallway/deck_two/fore) "xSs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -48454,11 +48494,6 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "xYK" = ( -/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/corner/green/full{ dir = 8 }, @@ -48781,22 +48816,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"yei" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/washroom/central) "yej" = ( /obj/effect/floor_decal/corner_wide/lime{ dir = 6 @@ -66399,7 +66418,7 @@ qFR aIo mCC wEc -dKH +hEF wTh soA gVn @@ -66601,9 +66620,9 @@ nMu lbW xeR wEc -dKH +hEF uLz -fqr +vXs pef kyO kyO @@ -66805,7 +66824,7 @@ mrq seZ tKC hBL -fqr +vXs pef oMC oMC @@ -67005,7 +67024,7 @@ pVz akl miu vIY -dKH +hEF fjI qtR fYC @@ -67014,7 +67033,7 @@ sNJ vMl jRA oTK -pQj +feo pQj lJX hUC @@ -67209,20 +67228,20 @@ ufG wdw iBw mdp -fqr +vXs mHO cxc -iRM +gtw iRM gos gVn vAD iSi vhu -nxI -nxI -nxI -nxI +vNQ +vNQ +vNQ +vNQ nxI gDO nxI @@ -67409,22 +67428,22 @@ fOp fOp fOp jrH -dKH -jxz -lcy +hEF lWg +lcy +wMP wMP vvS wMP -lWg +wMP +bGH +dHV bGH bGH -bGH -feo -nxI +vNQ agU hST -nxI +vNQ kfZ bzn iLD @@ -67611,22 +67630,22 @@ nOu fOp eCI vIY -dKH +hEF jMp uln -lWg +wMP iwC ayv rYM -lWg +wMP mqN bpC qvd vWX -nxI +vNQ bYY nJy -nxI +vNQ feu aNL wSE @@ -67813,19 +67832,19 @@ gDq fOp sxt uyd -wbE +lIH sbI -fqr -lWg +vXs +oWm iKF -ozz +jCL cJI -lWg +wMP +obi +pac bGH bGH -luo -yei -nxI +vNQ uhw nxW dWH @@ -68015,22 +68034,22 @@ gDq fOp njl uyd -dKH -ghX +hEF +luo fyH -lWg +mDa lJi jCL fak -lWg +wMP rca qyA pjQ qlX -nxI +vNQ hCo ayT -nxI +vNQ ePg fln wNI @@ -68220,19 +68239,19 @@ xjC kra aDR hEo -lWg +wMP piE oKH dCa -lWg +wMP +vyg +wDG bGH bGH -bGH -hGC -nxI -nxI -nxI -nxI +vNQ +vNQ +vNQ +vNQ kiW exU bKX @@ -68419,22 +68438,22 @@ gDq fOp njl uyd -dKH -ghX -gtw -lWg +hEF +luo +uGv wMP -obi wMP -lWg -dHV +ozz +wMP +wMP +bGH oHX -edY +bGH jRO qcs chf din -nxI +vNQ due bsQ swH @@ -68621,20 +68640,20 @@ gDq fOp pHJ uyd -nmG +dRk hNC -fqr +vXs piY -sBy -xSq +hGC +tre qfC hnf sBy sBy -sBy -vDq -wDG -pac +wbE +tre +tre +tre qhf srq xJx @@ -68824,25 +68843,25 @@ cle gmX xjC uej -ghX -fqr -vvt -sBy -gov -rNs -oWm -oWm -pIE -oWm -oWm -cEk +luo +vXs +ePC +dTI adw -lPn +rNs +pIE +pIE +pIE +pIE +pIE +uCX +adw +hww ePC xYK wVT -wNk -hPM +tre +tre uwe tre tre @@ -69025,25 +69044,25 @@ mWs cDV cDV cDV -eQs +lZX ghX fqr ojY -sBy -iWc +lPn +sZj eqv hIq cWP -cWP -cWP +nmG +asr evi kdK whr fyi hwI -dTI +cEk sZj -uCX +kEK kEK tQQ iYu @@ -69229,9 +69248,9 @@ sZT sZT sZT neZ -vNQ -eUH -asr +vXs +ePC +dTI oPM cUZ gjM @@ -69240,9 +69259,9 @@ wCm gRh iNu mnc -jUu +oPM hww -hwI +ePC gKC ogu iEi @@ -69425,24 +69444,24 @@ xhg nkF mCE xWr -vyg +kta pMN -vyg -vyg -vyg +kta +kta +kta kta eZG piY amF -jgb +iEi ncN -sBy +iEi fKj nhS -sBy +iEi gfB -sBy -sBy +iEi +iEi hFM srq fuX diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index f64ac4ffcf1..6555f719829 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -560,12 +560,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/horizon/crew_quarters/fitness/showers) -"awE" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/bridge) "awM" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/table/reinforced/wood, @@ -1036,14 +1030,6 @@ }, /turf/simulated/floor/wood, /area/lawoffice/consular) -"aPi" = ( -/obj/machinery/cryopod, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "aPq" = ( /obj/structure/railing/mapped{ dir = 1 @@ -1391,15 +1377,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) -"bbk" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "bbm" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/engineering_ladder) @@ -2652,15 +2629,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/maintenance/bridge) -"cjQ" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "ckA" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, @@ -3051,50 +3019,12 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/dormitories) -"cIK" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/obj/machinery/door/window/southleft{ - name = "Cryogenics Maintenance"; - req_one_access = list(12,26) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/nosmoking_1{ - pixel_x = -32 - }, -/turf/simulated/floor, -/area/horizon/crew_quarters/cryo) "cJm" = ( -/obj/structure/cryofeed, -/obj/machinery/door/window/southright{ - name = "Cryogenics Maintenance"; - req_one_access = list(12,26) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/light{ +/obj/machinery/light/small/emergency{ dir = 4 }, -/obj/structure/sign/nosmoking_1{ - pixel_x = 32 - }, /turf/simulated/floor, -/area/horizon/crew_quarters/cryo) +/area/maintenance/bridge) "cJn" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -3805,19 +3735,6 @@ /obj/effect/map_effect/window_spawner/full/reinforced, /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/hop/xo) -"doR" = ( -/obj/machinery/power/apc/critical{ - pixel_y = -24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "dpE" = ( /obj/structure/table/reinforced/wood, /obj/machinery/chemical_dispenser/bar_alc/full, @@ -4028,7 +3945,7 @@ req_one_access = list(12,26) }, /turf/simulated/floor/tiled, -/area/horizon/crew_quarters/cryo) +/area/maintenance/bridge) "dCR" = ( /obj/structure/table/steel, /obj/item/stock_parts/subspace/amplifier, @@ -5667,20 +5584,19 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "eUd" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Cryogenic Storage" +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance{ + name = "Cryogenics Maintenance"; + req_access = list(12) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/horizon/crew_quarters/cryo) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/full, +/area/horizon/crew_quarters/cryo/dormitories) "eUj" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5749,16 +5665,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) -"eVU" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/landmark{ - name = "JoinLate" - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "eWn" = ( /obj/structure/bed/stool/chair/sofa/right/brown{ dir = 4 @@ -5841,12 +5747,9 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "eYC" = ( -/obj/effect/landmark{ - name = "JoinLateCryoCommand" - }, -/obj/effect/floor_decal/corner/green/diagonal, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/bridge) "eYD" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -8429,27 +8332,19 @@ /turf/simulated/floor/grass/alt, /area/horizon/hallway/deck_three/primary/central) "gUN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/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/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor, +/area/maintenance/bridge) "gUY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8745,14 +8640,6 @@ "hfB" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/tcommsat/entrance) -"hfJ" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/green/full, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "hhb" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 8 @@ -9961,15 +9848,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) -"icZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance{ - name = "Cryogenics Maintenance"; - req_access = list(12) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/horizon/crew_quarters/cryo) "idI" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) @@ -11742,6 +11620,9 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/dormitories) "jEj" = ( @@ -14385,11 +14266,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/crew_quarters/fitness/hallway) -"lAp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance_hatch, -/turf/simulated/floor, -/area/maintenance/bridge) "lAD" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -16705,22 +16581,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) -"nwY" = ( -/obj/structure/cryofeed{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_x = -32 - }, -/turf/simulated/floor, -/area/horizon/crew_quarters/cryo) "nxm" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -18691,11 +18551,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner/green/full, -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/item/device/radio/intercom{ dir = 1; name = "Station Intercom (General)"; @@ -18707,8 +18562,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) +/turf/simulated/floor, +/area/maintenance/bridge) "oUQ" = ( /obj/effect/floor_decal/corner/green/diagonal{ dir = 8 @@ -18882,9 +18737,6 @@ "pbx" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/security/vacantoffice2) -"pby" = ( -/turf/simulated/floor/tiled, -/area/horizon/crew_quarters/cryo) "pbJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19199,13 +19051,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) -"pra" = ( -/obj/machinery/cryopod, -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "psa" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -20114,10 +19959,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/alarm{ dir = 1; pixel_y = -28 @@ -20128,8 +19969,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) +/turf/simulated/floor, +/area/maintenance/bridge) "qjr" = ( /obj/structure/table/wood, /obj/machinery/button/switch/windowtint{ @@ -21095,12 +20936,12 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/gym) "raC" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/rack, /obj/random/loot, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/bridge) "raP" = ( @@ -22378,17 +22219,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) -"rYm" = ( -/obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/landmark{ - name = "JoinLateCryo" - }, -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "rYn" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ @@ -24311,20 +24141,6 @@ }, /turf/simulated/floor/tiled/full, /area/security/forensics_morgue) -"tuA" = ( -/obj/structure/cryofeed, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, -/turf/simulated/floor, -/area/horizon/crew_quarters/cryo) "tuB" = ( /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) @@ -24599,22 +24415,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) -"tHb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/green/full{ - dir = 4 - }, -/obj/machinery/computer/cryopod{ - pixel_y = -33 - }, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Cryogenic Storage"; - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "tHh" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ @@ -29781,7 +29581,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/horizon/crew_quarters/cryo) +/area/maintenance/bridge) "xzr" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/button/remote/blast_door{ @@ -29889,9 +29689,6 @@ /obj/effect/floor_decal/corner/blue/full, /turf/simulated/floor/tiled/dark, /area/security/investigations) -"xEP" = ( -/turf/simulated/wall, -/area/horizon/crew_quarters/cryo) "xEZ" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -30484,17 +30281,6 @@ }, /turf/simulated/floor/wood, /area/journalistoffice) -"ygm" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/landmark{ - name = "JoinLateCryo" - }, -/turf/simulated/floor/tiled/white, -/area/horizon/crew_quarters/cryo) "ygn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -47701,10 +47487,10 @@ vaL vaL vaL vaL -lAp -xEP -xEP -xEP +vaL +vaL +vaL +vaL xyE ggF iMl @@ -47904,9 +47690,9 @@ rfq raC uYD aoA -xEP -nwY -cIK +aoA +aqc +aoA qjm ggF eLI @@ -48106,9 +47892,9 @@ aqc aqc aqc aoA -xEP -cjQ -hfJ +aqc +eYC +aqc oUF ggF ggF @@ -48308,9 +48094,9 @@ waj eqr vxF waj -icZ -ygm -eVU +waj +waj +waj gUN eUd vbS @@ -48510,11 +48296,11 @@ wPV nOF aGp aqc -xEP -rYm +aoA +aqc eYC -bbk -pby +aoA +agp jDM vlS vlS @@ -48712,11 +48498,11 @@ nzb uWs aqc enn -xEP -pra -aPi -tHb -xEP +aqc +aoA +aoA +aoA +agp lKs dnk eVa @@ -48911,14 +48697,14 @@ mfV avK vaL dmS -awE +aoA aoA aqc -xEP -tuA +aoA +aoA cJm -doR -xEP +aoA +agp miA nSJ naY @@ -49114,11 +48900,11 @@ oBE vaL vaL vaL -lAp vaL -xEP -xEP -xEP +vaL +vaL +vaL +vaL dCk ydF ydF