From 6000ea67e9b69853c4558b7ca5117a66e2574b68 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Wed, 17 Aug 2022 18:51:14 +0200 Subject: [PATCH] Decal Mapping Tweaks (#14592) --- .../crates_lockers/closets/utility_closets.dm | 4 +- .../crates_lockers/closets/walllocker.dm | 4 +- code/game/turfs/flooring/flooring_decals.dm | 4 + html/changelogs/emergency_locker_outlines.yml | 7 + maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 35 +- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 1020 ++++++++--------- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 81 +- 7 files changed, 554 insertions(+), 601 deletions(-) create mode 100644 html/changelogs/emergency_locker_outlines.yml diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 943b83078f8..b72032a73e5 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -97,8 +97,8 @@ * Fire Closet */ /obj/structure/closet/firecloset - name = "fire-safety closet" - desc = "It's a storage unit for fire-fighting supplies." + name = "firefighting closet" + desc = "It's a storage unit for firefighting supplies." icon_state = "fire" /obj/structure/closet/firecloset/fill() diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index cbd49d13f4a..54c27e73612 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -46,8 +46,8 @@ dir = EAST /obj/structure/closet/walllocker/firecloset //wall mounted fire closet - name = "fire-safety closet" - desc = "It's a storage unit for fire-fighting supplies." + name = "firefighting closet" + desc = "It's a storage unit for firefighting supplies." icon_state = "hydrant" /obj/structure/closet/walllocker/firecloset/fill() diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 88b181b7034..e175fd7283a 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -514,6 +514,10 @@ name = "blue emergency closet outline" color = "#618FBA" +/obj/effect/floor_decal/industrial/outline/firefighting_closet + name = "red firefighting closet outline" + color = "#C82D2D" + /obj/effect/floor_decal/industrial/loading name = "loading area" icon_state = "loadingarea" diff --git a/html/changelogs/emergency_locker_outlines.yml b/html/changelogs/emergency_locker_outlines.yml new file mode 100644 index 00000000000..f8555c0ae60 --- /dev/null +++ b/html/changelogs/emergency_locker_outlines.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Replaces old outlines around emergency lockers and firefighting closets with their dedicated variant." + - maptweak: "Adds decals around the elevators and tweaks the central ring on deck 2." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 90dcc1cdc34..95a25e4beb3 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -966,7 +966,7 @@ icon_state = "1-2" }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/operations) "aOD" = ( @@ -1368,6 +1368,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"bec" = ( +/obj/effect/floor_decal/corner/white{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "bek" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -2394,7 +2400,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "bOR" = ( @@ -3935,7 +3941,7 @@ dir = 8 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/operations) "dgl" = ( @@ -7376,6 +7382,7 @@ dir = 4; pixel_x = 32 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "fQU" = ( @@ -17968,7 +17975,7 @@ /area/engineering/atmos/air) "oCq" = ( /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "oCT" = ( @@ -18067,7 +18074,7 @@ dir = 6 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "oFI" = ( @@ -19121,7 +19128,7 @@ dir = 6 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "pEl" = ( @@ -22419,6 +22426,7 @@ icon_state = "1-4" }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) "sll" = ( @@ -22788,8 +22796,8 @@ /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/escape_pod/pod2) "syS" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/crew_compartment) "szM" = ( @@ -22965,6 +22973,7 @@ dir = 6 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hangar/intrepid) "sId" = ( @@ -23667,11 +23676,11 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "tkS" = ( @@ -26020,6 +26029,7 @@ /area/rnd/eva) "vfc" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) "vfk" = ( @@ -28412,6 +28422,7 @@ dir = 4 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) "xiQ" = ( @@ -50727,7 +50738,7 @@ gQh rHK rHK kuh -fgF +bec wLL gux pIy @@ -50929,7 +50940,7 @@ rHK rHK rHK kuh -fgF +bec wLL riM bNT @@ -51131,7 +51142,7 @@ qMY rHK rHK kuh -fgF +bec wLL tLM wRE diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index b70da3d4d17..429e0a589f8 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -378,7 +378,7 @@ name = "Engineering Hallway"; req_one_access = null }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/engineering/lobby) "ajO" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -460,14 +460,12 @@ /turf/simulated/floor/plating, /area/engineering/engine_waste) "amz" = ( -/obj/structure/railing/mapped{ - dir = 4 +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/open, -/area/hallway/primary/central_two) +/turf/simulated/floor/tiled/dark, +/area/rnd/hallway) "amE" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/outline/yellow, @@ -517,15 +515,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/reinforced, /area/engineering/storage/tech) -"ann" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "anJ" = ( /obj/structure/railing/mapped{ dir = 1 @@ -664,8 +653,8 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/operations/office) "aqZ" = ( @@ -927,6 +916,15 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room) +"avz" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "avM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_atmos{ @@ -1299,12 +1297,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/hallway/engineering) -"aDL" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "aDR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1336,8 +1328,7 @@ /area/security/checkpoint2) "aFd" = ( /obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "aFm" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1423,16 +1414,17 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "aIj" = ( -/obj/effect/floor_decal/corner/green{ - dir = 9 +/obj/machinery/camera/network/second_deck{ + c_tag = "Second Deck - Hallway 2" + }, +/obj/machinery/firealarm/north, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 }, /obj/effect/floor_decal/industrial/loading/yellow{ dir = 4 }, -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Hallway 2" - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "aIo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1507,7 +1499,7 @@ /area/maintenance/wing/starboard/far) "aKr" = ( /obj/effect/floor_decal/corner/mauve, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "aKv" = ( /obj/structure/bed/stool/chair/wood{ @@ -1519,8 +1511,8 @@ /turf/simulated/floor/wood, /area/chapel/main) "aKL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hallway/engineering) "aKO" = ( @@ -1617,10 +1609,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "aNp" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "aNL" = ( /obj/structure/disposalpipe/segment{ @@ -2233,16 +2226,16 @@ /turf/simulated/floor/tiled, /area/medical/first_responder) "ban" = ( -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 1 }, /obj/effect/floor_decal/spline/fancy{ dir = 10 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "baq" = ( /turf/simulated/floor/tiled, @@ -2698,7 +2691,7 @@ /obj/machinery/computer/guestpass{ pixel_x = -32 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "boE" = ( /obj/structure/closet/crate, @@ -3591,11 +3584,6 @@ /obj/machinery/atmospherics/unary/cryo_cell, /turf/simulated/floor/tiled, /area/medical/gen_treatment) -"bOa" = ( -/obj/effect/floor_decal/corner/mauve, -/obj/effect/floor_decal/spline/plain/corner, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "bOe" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "Weaponry (En. Carbine)" @@ -3648,10 +3636,10 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "bOR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "bOV" = ( /obj/structure/cable/green{ @@ -3937,14 +3925,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "bVf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "bVl" = ( /obj/structure/cable/yellow{ @@ -4255,8 +4242,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ceD" = ( /obj/machinery/optable, @@ -5031,7 +5017,10 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "cIz" = ( /obj/effect/floor_decal/corner_wide/green{ @@ -5077,6 +5066,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/cryo/living_quarters_lift) "cJU" = ( @@ -5214,15 +5204,15 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/central_two) +"cMs" = ( +/obj/effect/floor_decal/spline/fancy/wood/full, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/grass/alt, +/area/hallway/primary/central_two) "cMF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -5363,12 +5353,10 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "cQE" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "cQS" = ( @@ -5450,8 +5438,8 @@ /turf/simulated/wall, /area/rnd/xenobiology/xenoflora_hazard) "cTn" = ( -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/dark, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "cUi" = ( /obj/item/modular_computer/console/preset/engineering{ @@ -5817,19 +5805,16 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical) "dex" = ( +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/structure/bed/stool/chair/padded/black{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/hallway/primary/central_two) "deH" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -6225,10 +6210,11 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "doW" = ( /obj/machinery/door/blast/shutters/open{ @@ -6249,6 +6235,15 @@ }, /turf/simulated/open/airless, /area/template_noop) +"dpv" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "dpE" = ( /obj/structure/cable{ icon_state = "1-8" @@ -6579,7 +6574,19 @@ }, /area/hallway/primary/central_two) "dza" = ( -/obj/structure/table/standard, +/obj/structure/closet/walllocker/medical{ + pixel_y = -32 + }, +/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, +/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/ointment, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/bruise_pack, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "dzc" = ( @@ -7144,7 +7151,9 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "dPz" = ( -/obj/structure/bed/stool/chair/padded/black, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "dPE" = ( @@ -7698,15 +7707,16 @@ /turf/simulated/floor/tiled, /area/security/lobby) "ejU" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, /obj/item/device/radio/intercom{ dir = 8; name = "Station Intercom (General)"; pixel_x = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "eks" = ( /obj/structure/disposalpipe/segment, @@ -7742,8 +7752,7 @@ /area/rnd/hallway) "ekM" = ( /obj/effect/floor_decal/corner/mauve{ - dir = 10; - req_access = list(55) + dir = 10 }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) @@ -7884,11 +7893,10 @@ /area/operations/lobby) "ept" = ( /obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/mauve{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "epw" = ( /obj/structure/table/standard, @@ -7995,7 +8003,10 @@ /area/maintenance/wing/port) "eqX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "erh" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -8662,8 +8673,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "eNv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9154,6 +9164,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/cryo/living_quarters_lift) "fan" = ( @@ -9532,8 +9543,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "fkr" = ( /obj/structure/disposalpipe/segment{ @@ -9930,8 +9940,11 @@ /turf/simulated/floor/wood, /area/horizon/hydroponics/garden) "fwK" = ( -/obj/structure/bed/stool/chair/padded/black{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) @@ -10183,9 +10196,10 @@ /turf/simulated/floor/tiled, /area/teleporter) "fEQ" = ( -/obj/structure/railing/mapped, -/obj/structure/window/reinforced, -/turf/simulated/open, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fEY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -10254,7 +10268,8 @@ "fHo" = ( /obj/effect/floor_decal/corner/green/full, /obj/machinery/vending/cola, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fHq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10444,6 +10459,7 @@ /area/maintenance/wing/starboard/far) "fKZ" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/engineering/lobby) "fLi" = ( @@ -10757,12 +10773,12 @@ /turf/simulated/floor/plating, /area/tcommsat/mainlvl_tcomms__relay/second) "fSg" = ( -/obj/effect/floor_decal/corner/white, /obj/effect/floor_decal/spline/plain/corner, /obj/effect/floor_decal/spline/fancy{ dir = 9 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "fSm" = ( /obj/structure/girder, @@ -10975,10 +10991,10 @@ "fWU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/blue{ +/obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "fYi" = ( /obj/effect/floor_decal/corner/mauve{ @@ -11514,15 +11530,15 @@ /turf/simulated/floor/tiled/dark/full, /area/security/checkpoint2) "gkM" = ( -/obj/effect/floor_decal/corner/white{ - dir = 10 - }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/fancy{ dir = 1 }, /obj/structure/railing/mapped, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "glt" = ( /obj/structure/grille/broken, @@ -11825,6 +11841,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard) "gsh" = ( @@ -12063,16 +12080,16 @@ /turf/simulated/floor/tiled/dark/full, /area/turret_protected/ai_upload) "gyn" = ( -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 8 }, /obj/effect/floor_decal/spline/fancy{ dir = 5 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "gyu" = ( /obj/effect/floor_decal/corner/yellow{ @@ -12118,10 +12135,10 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "gzF" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/effect/floor_decal/corner/mauve{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gzU" = ( /obj/machinery/computer/operating{ @@ -12209,6 +12226,9 @@ /obj/machinery/newscaster{ pixel_y = 30 }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "gBp" = ( @@ -12218,6 +12238,10 @@ /turf/simulated/floor/reinforced, /area/horizon/crew_quarters/lounge/bar) "gBE" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "gBH" = ( @@ -12303,9 +12327,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "gDc" = ( -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -12315,7 +12336,10 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "gDq" = ( /obj/effect/floor_decal/corner_wide/lime{ @@ -12324,16 +12348,8 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "gDw" = ( -/obj/structure/railing/mapped, -/obj/structure/window/reinforced{ - layer = 5; - name = "adjusted reinforced window" - }, -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gDM" = ( /obj/structure/cable/green{ @@ -12514,7 +12530,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "gGJ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -12959,19 +12975,14 @@ name = "Research Hallway"; req_one_access = null }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, /obj/machinery/door/firedoor/multi_tile{ dir = 2 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/rnd/hallway) "gUB" = ( /obj/structure/cable/green{ @@ -13209,8 +13220,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "hcT" = ( /obj/effect/floor_decal/corner/black/diagonal, @@ -13494,10 +13504,7 @@ /area/security/armory) "hjG" = ( /obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/bluegrid{ - name = "cooled mainframe floor"; - temperature = 278 - }, +/turf/simulated/floor/bluegrid, /area/hallway/primary/central_two) "hjI" = ( /obj/machinery/door/firedoor, @@ -13636,9 +13643,6 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "hnY" = ( -/obj/effect/floor_decal/corner/white{ - dir = 9 - }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -13648,7 +13652,10 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "hoa" = ( /obj/machinery/mech_recharger, @@ -13930,9 +13937,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "hvu" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "hvH" = ( /obj/effect/floor_decal/corner/brown{ @@ -14247,7 +14254,8 @@ dir = 8 }, /obj/machinery/vending/snack, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "hDg" = ( /obj/structure/disposalpipe/segment{ @@ -14886,7 +14894,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "hXN" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -14970,9 +14978,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/white{ - dir = 6 - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -14982,7 +14987,10 @@ /obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "ibx" = ( /obj/structure/table/rack, @@ -15138,8 +15146,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ifU" = ( /turf/simulated/wall, @@ -15642,10 +15649,14 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "ixR" = ( -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/structure/railing/mapped{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/stool/chair/padded/black{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/hallway/primary/central_two) "ixU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15801,19 +15812,13 @@ /turf/simulated/floor/tiled, /area/security/brig) "iDB" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 9 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "iDE" = ( /obj/structure/disposalpipe/junction{ @@ -16110,7 +16115,7 @@ dir = 8 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "iKg" = ( @@ -16542,13 +16547,17 @@ /turf/simulated/floor/tiled, /area/engineering/storage_eva) "iVQ" = ( -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 +/obj/structure/table/wood, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, /obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/wood, /area/hallway/primary/central_two) "iWc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -16636,6 +16645,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/locker_room) +"iWV" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "iXI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16900,9 +16918,6 @@ }, /area/maintenance/wing/starboard/far) "jgz" = ( -/obj/effect/floor_decal/corner/white{ - dir = 5 - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -16910,7 +16925,10 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "jgZ" = ( /obj/machinery/door/window/brigdoor/eastleft{ @@ -17542,9 +17560,6 @@ /obj/effect/landmark{ name = "Observer-Start" }, -/obj/effect/floor_decal/corner/white{ - dir = 5 - }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -17552,7 +17567,10 @@ /obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "jvL" = ( /obj/structure/cable/green{ @@ -17926,7 +17944,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "jGa" = ( /obj/structure/bed/stool/padded/red, @@ -17944,16 +17962,16 @@ /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "jHi" = ( -/obj/effect/floor_decal/corner/white{ - dir = 1 - }, /obj/effect/floor_decal/spline/plain/corner{ dir = 4 }, /obj/effect/floor_decal/spline/fancy{ dir = 6 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "jHp" = ( /obj/structure/railing/mapped, @@ -17976,8 +17994,8 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics) "jHX" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) @@ -18132,7 +18150,7 @@ name = "Security Lobby" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/security/lobby) "jNk" = ( /turf/simulated/wall, @@ -18487,13 +18505,10 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve{ +/obj/effect/floor_decal/corner/green{ dir = 9 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "jWI" = ( /obj/structure/cable{ @@ -19343,7 +19358,7 @@ "kAJ" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/green/diagonal, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/checkpoint2) "kAM" = ( @@ -19610,15 +19625,6 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) -"kJN" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "kJQ" = ( /obj/machinery/door/airlock/research{ name = "Research storage"; @@ -20318,15 +20324,6 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "lcL" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/machinery/button/remote/blast_door{ desc = "It controls the Mech Bay's shutters."; dir = 8; @@ -20336,7 +20333,11 @@ pixel_y = 7; req_one_access = list(29,47) }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/brown{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ldk" = ( /obj/structure/cable/green{ @@ -20396,10 +20397,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "len" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "leU" = ( /obj/structure/cable/green{ @@ -20570,8 +20572,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ljF" = ( /obj/effect/floor_decal/corner/green{ @@ -20674,8 +20675,7 @@ "lng" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "lno" = ( /obj/machinery/door/firedoor, @@ -20929,7 +20929,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "lwD" = ( /turf/simulated/floor/carpet, @@ -21089,10 +21089,6 @@ /turf/simulated/floor/plating, /area/chapel/office) "lCI" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10; - req_access = list(55) - }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; dir = 1; @@ -21112,6 +21108,9 @@ req_access = list(55); specialfunctions = 4 }, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "lCV" = ( @@ -21130,7 +21129,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "lDs" = ( /obj/structure/railing/mapped{ @@ -21186,12 +21185,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_waste) -"lES" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "lFn" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 6 @@ -21814,17 +21807,6 @@ }, /turf/simulated/floor/tiled, /area/security/armory) -"lUm" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/ramp{ - dir = 1 - }, -/area/hallway/primary/central_two) "lUA" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-4" @@ -22019,7 +22001,7 @@ dir = 8 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "lZQ" = ( @@ -22713,7 +22695,7 @@ /obj/machinery/door/airlock/glass_service{ name = "Library" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/library) "muO" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, @@ -22780,8 +22762,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "mwv" = ( /obj/structure/window/borosilicate/reinforced{ @@ -22979,7 +22960,7 @@ /area/medical/pharmacy) "mCE" = ( /obj/effect/floor_decal/corner/green, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mCV" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -23064,7 +23045,7 @@ dir = 9 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "mFz" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -23100,7 +23081,10 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mFX" = ( /obj/effect/floor_decal/corner_wide/yellow, @@ -23718,14 +23702,11 @@ /area/hallway/engineering) "mUC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/mauve{ +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green{ dir = 4 }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mUW" = ( /obj/structure/cable/green{ @@ -23786,7 +23767,10 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mVR" = ( /obj/machinery/power/smes/buildable{ @@ -23865,13 +23849,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 32 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "mYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24459,18 +24443,8 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) -"nks" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/open, -/area/hallway/primary/central_two) "nkF" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "nkK" = ( /obj/structure/stairs/west, @@ -24765,19 +24739,6 @@ /obj/structure/railing/mapped, /turf/simulated/open, /area/horizon/hydroponics) -"ntN" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/hallway/primary/central_two) "ntV" = ( /obj/machinery/alarm{ dir = 8; @@ -25262,7 +25223,7 @@ "nJq" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "nJs" = ( /obj/machinery/biogenerator{ @@ -25947,8 +25908,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ohc" = ( /obj/effect/floor_decal/corner/brown{ @@ -26186,8 +26146,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "ool" = ( /obj/machinery/light{ @@ -26201,23 +26160,21 @@ }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) -"ooA" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "opb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "opp" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/railing/mapped{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "opt" = ( @@ -26734,10 +26691,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "oBe" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10; - req_access = list(55) - }, /obj/effect/floor_decal/corner/white{ dir = 5 }, @@ -26751,6 +26704,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "oBl" = ( @@ -28093,12 +28049,6 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/open, /area/hallway/primary/central_two) "plA" = ( @@ -29209,16 +29159,10 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "pQm" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy/wood/full, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/palebush, +/turf/simulated/floor/grass/alt, /area/hallway/primary/central_two) "pQq" = ( /obj/machinery/mech_recharger, @@ -29448,10 +29392,8 @@ /area/maintenance/substation/engineering) "pWR" = ( /obj/machinery/vending/coffee, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/spline/plain{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -29787,8 +29729,8 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/operations/office) "qgN" = ( @@ -30116,9 +30058,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "qsj" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10 - }, /obj/machinery/camera/network/research{ c_tag = "Research - Corridor Camera 1"; dir = 1 @@ -30128,6 +30067,10 @@ name = "\improper MECH BAY AND RECHARGING STATION sign"; pixel_y = -32 }, +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "qsw" = ( @@ -30907,7 +30850,7 @@ dir = 10 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "qMd" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -31262,11 +31205,10 @@ /turf/simulated/floor/tiled, /area/security/prison) "qVu" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "qVw" = ( /obj/structure/disposalpipe/segment, @@ -31482,22 +31424,8 @@ /turf/simulated/floor/plating, /area/teleporter) "rbe" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 10 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "rbf" = ( /obj/structure/railing/mapped{ @@ -31661,7 +31589,7 @@ dir = 9 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/brig) "rfG" = ( @@ -31679,11 +31607,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/maintenance/wing/port) -"rfQ" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_two) "rgc" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/spline/fancy/wood{ @@ -32264,12 +32187,9 @@ /area/medical/main_storage) "rvf" = ( /obj/effect/floor_decal/corner/mauve{ - dir = 9 + dir = 5 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/rnd/hallway) "rvC" = ( /obj/structure/cable/green{ @@ -32377,7 +32297,7 @@ }, /obj/machinery/firealarm/south, /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "ryq" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -33264,13 +33184,13 @@ /turf/simulated/floor/tiled, /area/storage/primary) "rUT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Engineering Entrance" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "rUZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -33698,10 +33618,6 @@ /area/security/brig) "siL" = ( /obj/structure/railing/mapped, -/obj/structure/window/reinforced{ - layer = 5; - name = "adjusted reinforced window" - }, /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/central_two) @@ -34072,7 +33988,7 @@ c_tag = "Second Deck - Hallway 3"; dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "stW" = ( /obj/structure/cable/green{ @@ -34347,9 +34263,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/white{ - dir = 9 - }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -34359,7 +34272,10 @@ /obj/structure/railing/mapped{ dir = 8 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner_wide/white{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "sFk" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -34995,6 +34911,7 @@ /area/turret_protected/ai) "sYY" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/prison) "sZj" = ( @@ -35032,6 +34949,7 @@ /obj/effect/floor_decal/corner/mauve{ dir = 9 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "tag" = ( @@ -35200,12 +35118,6 @@ /obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/security/brig/processing_secondary) -"tdM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/mauve, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "tdO" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment{ @@ -36200,7 +36112,10 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "tHk" = ( -/obj/structure/bed/stool/padded/brown, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "tHl" = ( @@ -36506,15 +36421,7 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "tOW" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, +/obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "tPq" = ( @@ -36801,11 +36708,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) -"tXM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/central_two) "tXR" = ( /turf/simulated/wall, /area/security/security_office) @@ -37281,8 +37183,7 @@ /area/horizon/kitchen) "ukp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "uky" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -38155,7 +38056,11 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "uFk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -38499,7 +38404,6 @@ /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "uMM" = ( -/obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/door/airlock/glass_medical{ name = "First Responder Quarters"; req_access = list(67) @@ -38513,7 +38417,7 @@ name = "MedBay Lockdown Shutters"; opacity = 0 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/medical/first_responder) "uNl" = ( /obj/effect/floor_decal/corner/blue{ @@ -38633,7 +38537,10 @@ "uRe" = ( /obj/machinery/disposal/small/south, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "uRo" = ( /obj/effect/floor_decal/corner/purple{ @@ -38861,13 +38768,10 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/effect/floor_decal/corner/mauve{ +/obj/effect/floor_decal/corner/green{ dir = 5 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "uXV" = ( /obj/structure/cable/green{ @@ -39031,11 +38935,10 @@ /turf/simulated/floor/plating, /area/security/checkpoint2) "vcv" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner/white{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vcH" = ( /turf/simulated/wall, @@ -39429,10 +39332,6 @@ /turf/simulated/floor/tiled/full, /area/medical/exam) "vrd" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Hallway 1"; dir = 8 @@ -39442,7 +39341,11 @@ name = "\improper MECH BAY AND RECHARGING STATION sign"; pixel_x = 32 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vrf" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -39527,10 +39430,11 @@ /turf/simulated/floor/tiled, /area/security/brig) "vtM" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/corner/brown{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/mauve, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vua" = ( /obj/effect/floor_decal/corner/brown{ @@ -39946,11 +39850,6 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "vFz" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 10; - req_access = list(55) - }, -/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -39963,6 +39862,10 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/mauve{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "vFN" = ( @@ -40050,17 +39953,11 @@ /area/rnd/xenobiology/xenoflora) "vIt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve{ +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vIz" = ( /obj/structure/disposalpipe/segment{ @@ -40101,12 +39998,13 @@ "vJv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "vJw" = ( @@ -40331,7 +40229,7 @@ pixel_x = -28 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/brig) "vOS" = ( @@ -40401,6 +40299,7 @@ dir = 8 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/armory) "vQd" = ( @@ -41090,10 +40989,6 @@ dir = 4 }, /obj/structure/railing/mapped, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, /turf/simulated/open, /area/hallway/primary/central_two) "wdw" = ( @@ -41254,13 +41149,13 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/newscaster{ pixel_x = 29 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "whe" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -41407,13 +41302,6 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - layer = 5; - name = "adjusted reinforced window" - }, /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/central_two) @@ -41796,7 +41684,7 @@ /obj/effect/floor_decal/corner/green{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "wtC" = ( /obj/machinery/power/breakerbox/activated{ @@ -42666,7 +42554,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "wPJ" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -42803,10 +42691,8 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard/far) "wTb" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/hallway/primary/central_two) "wTd" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -42854,16 +42740,6 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/tiled/dark, /area/maintenance/research_port) -"wUT" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/hallway/primary/central_two) "wUU" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -43808,7 +43684,6 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) "xxa" = ( -/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -43819,6 +43694,8 @@ icon_state = "2-4" }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/security/armory) "xxc" = ( @@ -44077,7 +43954,7 @@ /obj/machinery/door/airlock/glass_service{ name = "Library" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/horizon/library) "xFR" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -44728,7 +44605,7 @@ "xWr" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "xWz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44847,12 +44724,10 @@ /area/security/prison) "xZw" = ( /obj/machinery/vending/cigarette, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "xZy" = ( @@ -45120,7 +44995,8 @@ "yea" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green, +/turf/simulated/floor/tiled, /area/hallway/primary/central_two) "yef" = ( /obj/structure/cable/green{ @@ -65283,17 +65159,17 @@ qja amE ayF wTb -nks +pyc mHG bto mHG -fEQ +nEx hDd fHo -ntN -gDw +bJp +siL wPF -cDV +fEQ bnQ mFs mWs @@ -65484,20 +65360,20 @@ ryy qja ego ayF -aDL -nks +wTb +pyc mHG xQj mHG -fEQ -dKH -fqr -wUT +nEx +hEF +vXs +bJp siL -dKH -gOH -gOH -rfQ +hEF +nkF +nkF +xWr noi ouK sZT @@ -65686,18 +65562,18 @@ qja qja ego ayF -cDV +wTb pyc mHG xQj mHG nEx -dKH -fqr -wUT +hEF +vXs +bJp siL -dKH -gOH +hEF +nkF mCE xWr vyg @@ -65891,15 +65767,15 @@ ayF hvu plf hfq -amz +vbk hfq wdk lvH -fqr +vXs cMn wlg -dKH -gOH +hEF +nkF stI pWx pWx @@ -66086,21 +65962,21 @@ iVp iVp nUN rUT -gzF +gDw pyc bto ayF aIj -cDV -cDV -cDV -cDV -cDV -eQs +fEQ +fEQ +fEQ +fEQ +fEQ +lZX wtj -cDV -cDV -eQs +fEQ +fEQ +lZX bVc jFS pWx @@ -66288,11 +66164,11 @@ iVp iVp nUN vcv -bOR +vXs bJp mHG -ayF cTn +hEF nkF nkF nkF @@ -66489,18 +66365,18 @@ iVp iVp iVp nUN -qVu -bOR +vcv +vXs luT vbk ayF uRe aFd yea -tXM -tXM -tXM -tdM +vIt +vIt +vIt +vIt vIt vIt vIt @@ -66691,22 +66567,22 @@ iVp iVp iVp nUN -qVu -bOR -gBE -gBE +vcv +wtj +fEQ +gDw nJq -gBE +hEF nkF -bOa +vXs dex -tOW -tOW -rbe -lUm iVQ ixR -uXq +rbe +dex +iVQ +ixR +hEF ifP lDb xFQ @@ -66894,23 +66770,23 @@ iVp iVp nUN wgL -ooA -gBE +tcE +tcE cIr -gBE -gBE +nkF +hEF nkF ept -pQm +cMs fwK -gBE -gBE -gBE -gBE -kJN +qVu +qVu +qVu +cQE +pQm uXq eNj -fqr +vXs pWx jUG aFK @@ -67112,7 +66988,7 @@ ban gBE uXq eNj -fqr +vXs rQh ruv xQD @@ -67302,7 +67178,7 @@ qJr rCd dRN fjc -gBE +gzF nkF ept tHk @@ -67311,10 +67187,10 @@ hjG meM hjG jgz -gBE +tOW uXq eNj -fqr +vXs rQh rHd hYt @@ -67504,17 +67380,17 @@ fVX qyh dki fjc -gBE +gzF nkF -ept +vXs dPz gkM oFp lTn ygu jvI -gBE -uXq +tOW +hEF eNj hWE pWx @@ -67715,7 +67591,7 @@ hjG aST hjG jgz -gBE +tOW uXq ljv fWU @@ -67917,10 +67793,10 @@ hnY sFf hnY jHi -gBE +tOW uXq eNj -mFQ +vXs bDo bDo bDo @@ -68110,13 +67986,13 @@ maP rFF wGN ulB -gBE +gzF hcF ept ayF gBk -gBE -gBE +jHX +jHX jHX dza ayF @@ -68312,9 +68188,9 @@ wKS clb iCz nRx -gBE +gzF hcF -ann +wtj jWF jWF jWF @@ -68322,9 +68198,9 @@ iDB jWF jWF jWF -cQE +lZX eNj -mFQ +bOR acz tIQ ukV @@ -68514,7 +68390,7 @@ pib nvv fEa ulB -gzF +dpv mvZ ukp ukp @@ -68526,7 +68402,7 @@ opb opb fjX cev -mFQ +bOR jMO kqM rzm @@ -68716,7 +68592,7 @@ roX rlp qTB rUh -bOR +avz aKr doI ejU @@ -68727,7 +68603,7 @@ vtM vtM lcL mXJ -lES +tcE mFQ acz rIK @@ -68918,7 +68794,7 @@ aBr gPM lFE ulB -ooA +iWV aNp qav qav @@ -69323,7 +69199,7 @@ oBl vpk ulB tPq -rnA +amz hME xlK kGl @@ -69727,7 +69603,7 @@ soW rZU cNU byv -rnA +amz hME tlX kGl diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index cd4510fcb2b..010a1742771 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -1077,6 +1077,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "cc" = ( @@ -1386,7 +1389,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/paleblue/full, +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "cF" = ( @@ -4639,6 +4644,7 @@ layer = 4; pixel_y = 32 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/bridge) "iy" = ( @@ -8032,6 +8038,7 @@ dir = 1 }, /obj/machinery/firealarm/south, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "oE" = ( @@ -8250,7 +8257,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "pc" = ( @@ -8324,6 +8331,7 @@ dir = 5 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "pk" = ( @@ -13988,6 +13996,18 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/hallway/deck_three/primary/starboard/docks) +"zM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "zN" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -14199,6 +14219,10 @@ /area/engineering/break_room) "Aj" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "Ak" = ( @@ -15844,6 +15868,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/paleblue, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "Dz" = ( @@ -16153,6 +16178,10 @@ dir = 8 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "Ej" = ( @@ -17983,6 +18012,7 @@ layer = 4; pixel_y = 32 }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/security/investigations) "Hx" = ( @@ -18948,6 +18978,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/washroom) +"Jg" = ( +/obj/effect/floor_decal/corner/white{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "Jh" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -19189,7 +19225,7 @@ dir = 4 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/hallway) "JE" = ( @@ -20730,7 +20766,7 @@ dir = 5 }, /obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/bridge/controlroom) "Mr" = ( @@ -24271,6 +24307,12 @@ }, /turf/simulated/floor/carpet/rubber, /area/horizon/crew_quarters/fitness/gym) +"SG" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "SH" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -25426,6 +25468,18 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"UQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_three/primary/starboard) "UR" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -25508,6 +25562,7 @@ dir = 1 }, /obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Vc" = ( @@ -26686,7 +26741,7 @@ dir = 5 }, /obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, /turf/simulated/floor/tiled, /area/bridge/controlroom) "Xp" = ( @@ -48973,7 +49028,7 @@ fJ fJ fJ Uc -uk +SG cE Vm Ie @@ -49175,10 +49230,10 @@ fJ fJ fJ Uc -uk +Jg cb -JS -gl +uL +zM ag AG UV @@ -49377,7 +49432,7 @@ fJ fJ fJ Uc -uk +Jg hY kF tR @@ -49579,10 +49634,10 @@ fJ fJ fJ Uc -uk +Jg Dy -JS -gl +aP +UQ iY AG UV