diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 16564efe830..f963fdc5032 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -486,6 +486,22 @@ /obj/structure/window/shuttle/skrell ) +/obj/structure/window/shuttle/placeholder + name = "placeholder window" + desc = "It looks extremely strong. Might take many good hits to crack it." + icon = 'icons/obj/smooth/placeholder_window.dmi' + icon_state = "placeholder_window" + health = 500 + maxhealth = 500 + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list( + /obj/structure/window/shuttle/placeholder, + /turf/simulated/wall/shuttle/placeholder + ) + +/obj/structure/window/shuttle/placeholder/cardinal + smooth = SMOOTH_MORE + /obj/structure/window/shuttle/crescent desc = "It looks rather strong." diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm index 47361abf1b6..d2441fd32ef 100644 --- a/code/game/turfs/simulated/shuttle_turfs.dm +++ b/code/game/turfs/simulated/shuttle_turfs.dm @@ -121,6 +121,14 @@ icon = 'icons/turf/smooth/placeholder.dmi' canSmoothWith = null +/turf/simulated/wall/placeholder_standard + name = "placeholder wall" + smooth = SMOOTH_MORE + canSmoothWith = list( + /turf/simulated/wall/placeholder_standard, + /turf/simulated/wall/shuttle/placeholder + ) + /turf/simulated/wall/shuttle/placeholder/cardinal smooth = SMOOTH_MORE canSmoothWith = list( diff --git a/icons/obj/smooth/placeholder_window.dmi b/icons/obj/smooth/placeholder_window.dmi new file mode 100644 index 00000000000..1df74eebb76 Binary files /dev/null and b/icons/obj/smooth/placeholder_window.dmi differ diff --git a/maps/placeholder/placeholder-1_deck_1.dmm b/maps/placeholder/placeholder-1_deck_1.dmm index d4c047fded6..30ca1b300fc 100644 --- a/maps/placeholder/placeholder-1_deck_1.dmm +++ b/maps/placeholder/placeholder-1_deck_1.dmm @@ -60,9 +60,10 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "ar" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/engineering/atmos) "as" = ( /turf/simulated/floor/tiled/ramp{ @@ -589,13 +590,10 @@ /turf/simulated/floor/reinforced, /area/engineering/atmos/air) "bR" = ( -/obj/machinery/door/airlock/lift, -/obj/item/tape/engineering{ - icon_state = "engineering_door"; - layer = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/template_noop) +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "bS" = ( /obj/machinery/sparker{ pixel_x = -16 @@ -841,9 +839,10 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "cP" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/engineering/atmos) "cR" = ( /obj/machinery/atmospherics/binary/pump/high_power{ @@ -994,8 +993,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "dq" = ( -/turf/simulated/wall/elevator, -/area/template_noop) +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/turbolift) "dr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1052,7 +1054,7 @@ }, /area/shuttle/escape_pod) "dz" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/loading) "dA" = ( /turf/simulated/wall/shuttle/unique/burglar{ @@ -1060,8 +1062,9 @@ }, /area/shuttle/escape_pod) "dB" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plating, /area/hallway/engineering) "dD" = ( @@ -1189,7 +1192,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "dU" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/morgue/lower) "dV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ @@ -1294,7 +1297,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/air) "em" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/gravity_gen) "en" = ( /obj/structure/shuttle_part/placeholder{ @@ -1460,7 +1463,7 @@ /obj/machinery/computer/general_air_control/large_tank_control/wall{ pixel_y = -3 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/atmos) "eK" = ( /obj/structure/shuttle_part/placeholder{ @@ -1854,7 +1857,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "fV" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/emergency_storage) "fW" = ( /obj/machinery/light/spot/weak{ @@ -1899,9 +1902,10 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "ga" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/engineering/atmos) "gb" = ( /obj/machinery/light{ @@ -2770,7 +2774,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "iD" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/storage) "iE" = ( /obj/machinery/pipedispenser/disposal, @@ -2861,7 +2865,7 @@ /turf/simulated/floor/tiled/dark, /area/medical/morgue/lower) "iR" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/outpost/mining_main/eva) "iS" = ( /obj/machinery/door/window/northleft, @@ -3275,13 +3279,9 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "kp" = ( -/obj/machinery/door/blast/shutters/open{ - dir = 2; - icon = 'icons/obj/doors/doorlift.dmi'; - icon_state = "door_open" - }, +/obj/structure/stairs/south, /turf/simulated/floor/tiled/dark, -/area/template_noop) +/area/turbolift) "kq" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -3374,7 +3374,7 @@ /turf/simulated/floor/tiled, /area/medical/morgue/lower) "kA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/eva) "kB" = ( /obj/machinery/door/airlock/freezer_maint, @@ -3521,8 +3521,13 @@ }, /area/shuttle/escape_pod) "kZ" = ( +/obj/machinery/door/airlock/lift, +/obj/item/tape/engineering{ + icon_state = "engineering_door"; + layer = 4 + }, /turf/simulated/floor/tiled/dark, -/area/template_noop) +/area/turbolift) "la" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -3982,7 +3987,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "mA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hangar/briefing) "mD" = ( /obj/effect/floor_decal/industrial/warning{ @@ -4018,7 +4023,7 @@ }, /area/shuttle/escape_pod) "mJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/supply) "mL" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, @@ -4500,7 +4505,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) "ox" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/atmos) "oz" = ( /obj/structure/cable{ @@ -5100,7 +5105,7 @@ /turf/simulated/floor/tiled/dark, /area/turbolift) "qC" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/outpost/mining_main/refinery) "qD" = ( /obj/machinery/air_sensor, @@ -5131,12 +5136,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) -"qJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/template_noop) "qK" = ( /obj/structure/shuttle_part/placeholder{ icon = 'icons/turf/shuttles_unique/NCV_Intrepid.dmi'; @@ -5254,12 +5253,6 @@ temperature = 278 }, /area/crew_quarters/kitchen/freezer) -"qY" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/template_noop) "qZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5313,7 +5306,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "rg" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "rh" = ( /obj/machinery/power/terminal, @@ -6306,7 +6299,7 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "uz" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/drone_fabrication) "uA" = ( /obj/structure/cable/green{ @@ -6509,7 +6502,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) "ve" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hangar/cargo) "vf" = ( /obj/structure/shuttle_part/placeholder{ @@ -6546,7 +6539,7 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "vm" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/primary/aft) "vn" = ( /obj/effect/floor_decal/corner_wide/purple{ @@ -6628,10 +6621,10 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "vB" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/atmos/air) "vE" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/research_sublevel) "vG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -6805,7 +6798,7 @@ /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) "wi" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/storage/lower) "wj" = ( /obj/effect/floor_decal/industrial/warning{ @@ -6928,10 +6921,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"wK" = ( -/obj/machinery/door/airlock/lift, -/turf/simulated/floor/tiled/dark, -/area/template_noop) "wL" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -7173,10 +7162,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) -"xz" = ( -/obj/structure/stairs/south, -/turf/simulated/floor/tiled/dark, -/area/template_noop) "xA" = ( /obj/machinery/atmospherics/omni/mixer{ active_power_usage = 7500; @@ -7999,7 +7984,7 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "Ab" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenoarch_atrium) "Ac" = ( /obj/machinery/light/small{ @@ -8631,7 +8616,8 @@ }, /area/shuttle/escape_pod) "CC" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/maintenance/vault) "CE" = ( @@ -8711,7 +8697,7 @@ /obj/machinery/computer/general_air_control/large_tank_control/wall{ pixel_y = -3 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/atmos/air) "CS" = ( /obj/structure/shuttle_part/placeholder{ @@ -9020,7 +9006,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "DO" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/civilian_west) "DP" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -9042,7 +9028,7 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "DS" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/ai_monitored/storage/eva) "DU" = ( /obj/structure/cable/green{ @@ -9468,7 +9454,8 @@ /turf/simulated/floor/plating, /area/shuttle/escape_pod) "EZ" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/crew_quarters/kitchen/freezer) "Fa" = ( @@ -9750,7 +9737,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "FY" = ( /obj/machinery/conveyor{ @@ -9898,7 +9885,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "GA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/security) "GB" = ( /obj/structure/shuttle_part/placeholder{ @@ -10084,7 +10071,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "Hi" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/hangar) "Hj" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -10164,7 +10151,7 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "Hy" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hangar/control) "Hz" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -10374,7 +10361,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "HZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hangar/intrepid) "Ia" = ( /obj/structure/cable/green{ @@ -11119,12 +11106,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/escape_pod) -"Kw" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/template_noop) "Kx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11931,9 +11912,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/vault) -"ML" = ( -/turf/simulated/wall/r_wall, -/area/template_noop) "MM" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -12041,8 +12019,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) "Nc" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/engineering/atmos) "Ne" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -13801,7 +13780,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "Sx" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hangar/auxiliary) "SB" = ( /obj/machinery/power/apc{ @@ -14378,7 +14357,7 @@ /obj/structure/sign/securearea{ icon_state = "radiation" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/gravity_gen) "Uq" = ( /obj/structure/cable{ @@ -15219,7 +15198,7 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "Xe" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/engineering/lower) "Xf" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -15634,7 +15613,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape_pod) "Yu" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/janitor) "Yv" = ( /turf/simulated/wall/shuttle/unique/merchant{ @@ -34172,7 +34151,7 @@ aa aa aa aa -xv +bR Kg dQ UW @@ -34374,7 +34353,7 @@ aa aa aa aa -xv +bR bJ ub NG @@ -34780,9 +34759,9 @@ aa aj kg kg -xv -xv -xv +bR +bR +bR kg kg kg @@ -37022,9 +37001,9 @@ Wg MG yr mq -yr -NV +kp NV +kZ px Xy Ky @@ -37223,10 +37202,10 @@ NI Wg MG yr -yr -yr -NV +dq +dq NV +kZ px Xy cj @@ -37427,8 +37406,8 @@ MG yr Ac yr -NV -NV +ph +ph px Xy px @@ -43477,12 +43456,12 @@ aa aa aa aa -dq -dq -dq -dq -dq -ML +aa +aa +aa +aa +aa +aa aa aa aa @@ -43679,12 +43658,12 @@ aa aa aa aa -dq -kZ -qJ -xz -wK -bR +aa +aa +aa +aa +aa +aa aa aa aa @@ -43881,12 +43860,12 @@ aa aa aa aa -dq -kZ -qY -qY -wK -bR +aa +aa +aa +aa +aa +aa aa aa aa @@ -44083,12 +44062,12 @@ aa aa aa aa -dq -kZ -Kw -kZ -kp -kp +aa +aa +aa +aa +aa +aa aa aa aa @@ -44285,12 +44264,12 @@ aa aa aa aa -dq -dq -dq -dq -dq -ML +aa +aa +aa +aa +aa +aa aa aa aa diff --git a/maps/placeholder/placeholder-2_deck_2.dmm b/maps/placeholder/placeholder-2_deck_2.dmm index 20e5e92054c..2091abe8307 100644 --- a/maps/placeholder/placeholder-2_deck_2.dmm +++ b/maps/placeholder/placeholder-2_deck_2.dmm @@ -87,14 +87,15 @@ /turf/simulated/floor/wood, /area/library) "afA" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/crew_quarters/kitchen) "agG" = ( /obj/structure/shuttle_part/placeholder{ icon_state = "d2-1-f" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "agY" = ( /obj/structure/table/standard, @@ -261,7 +262,7 @@ /turf/simulated/floor/tiled, /area/chapel/office) "aoD" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology) "aoE" = ( /obj/machinery/power/apc/low{ @@ -283,12 +284,6 @@ /obj/structure/lattice/catwalk, /turf/simulated/open, /area/maintenance/vault) -"apz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/crew_quarters/kitchen) "apP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -345,7 +340,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-4" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "atQ" = ( /obj/machinery/botany/editor, @@ -403,7 +398,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "ayF" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/primary/central_two) "ayM" = ( /obj/structure/table/standard, @@ -462,7 +457,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-1" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/storage/primary) "aCS" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, @@ -473,7 +468,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "aDI" = ( /obj/effect/floor_decal/corner_wide/yellow{ @@ -490,7 +485,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-2" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "aEN" = ( /obj/structure/shuttle_part/ccia{ @@ -1067,17 +1062,12 @@ /turf/simulated/floor/tiled/dark, /area/hallway/engineering) "bph" = ( -/obj/structure/bed/chair/comfy/black, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/bar) "bpC" = ( /obj/machinery/seed_extractor, @@ -1294,7 +1284,7 @@ /turf/simulated/open, /area/maintenance/vault) "bDo" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/lobby) "bDv" = ( /obj/structure/cable/green{ @@ -1627,9 +1617,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) -"bVk" = ( -/turf/simulated/floor/reinforced, -/area/crew_quarters/kitchen) "bVl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1763,6 +1750,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "cei" = ( @@ -1835,7 +1823,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "ciP" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/storage) "cjB" = ( /obj/structure/cable/green{ @@ -1976,6 +1964,11 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"cwO" = ( +/obj/structure/grille/diagonal, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/reinforced, +/area/crew_quarters/kitchen) "cxu" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable/green{ @@ -2009,8 +2002,18 @@ "czL" = ( /turf/simulated/wall/shuttle/placeholder/cardinal, /area/security/brig) +"czP" = ( +/obj/structure/grille/diagonal{ + dir = 1 + }, +/obj/structure/window/shuttle/placeholder{ + density = 0; + layer = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "czU" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/brig/processing) "cAb" = ( /obj/structure/cable{ @@ -2118,7 +2121,7 @@ /area/hallway/medical) "cIN" = ( /obj/structure/table/wood, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "cKa" = ( /obj/structure/window/phoronreinforced{ @@ -2204,7 +2207,7 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "cNU" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/research) "cNX" = ( /obj/machinery/biogenerator{ @@ -2664,7 +2667,7 @@ /turf/simulated/floor/tiled, /area/security/prison) "dkR" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "dlQ" = ( /obj/machinery/door/airlock/glass_mining, @@ -2809,7 +2812,7 @@ /turf/simulated/floor/tiled, /area/engineering/storage_hard) "dvw" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hydroponics) "dvy" = ( /obj/structure/cable/green{ @@ -2972,7 +2975,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-2" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/storage/primary) "dHd" = ( /obj/structure/reagent_dispensers/fueltank, @@ -3008,7 +3011,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "dIZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/or2) "dJo" = ( /obj/structure/reagent_dispensers/peppertank, @@ -3055,7 +3058,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room/tesla) "dKR" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/ward) "dLe" = ( /obj/structure/table/steel, @@ -3106,16 +3109,12 @@ /turf/simulated/floor/plating, /area/engineering/storage/tech) "dOi" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/conference) "dOn" = ( /obj/machinery/light/spot/weak, /turf/simulated/open/airless, /area/hallway/engineering/tesla) -"dOt" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, -/area/hallway/engineering/tesla) "dOC" = ( /obj/item/stool/padded, /turf/simulated/floor/tiled, @@ -3363,6 +3362,9 @@ /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "eew" = ( @@ -3383,7 +3385,7 @@ /obj/machinery/door_timer{ pixel_x = 2 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/prison) "efA" = ( /turf/simulated/wall/r_wall, @@ -3412,8 +3414,9 @@ /turf/simulated/floor/tiled, /area/medical/first_responder) "ehU" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/crew_quarters/cafeteria) "ehX" = ( /obj/structure/table/steel{ @@ -4358,7 +4361,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "fnn" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/atmos/storage) "fnB" = ( /obj/structure/bed/chair/comfy/black{ @@ -4374,7 +4377,7 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "fol" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/chapel/office) "fpj" = ( /obj/structure/bed/chair{ @@ -4534,7 +4537,7 @@ }, /area/chapel/main) "fzh" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/storage/primary) "fzI" = ( /obj/structure/cable/green{ @@ -4611,6 +4614,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/blast/shutters/open{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "fFx" = ( @@ -5231,7 +5237,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-5" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "gjI" = ( /obj/structure/cable/green{ @@ -5445,7 +5451,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "gyO" = ( /obj/structure/shuttle_part/ccia{ @@ -6114,10 +6120,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/quartermaster/break_room) -"hmp" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/crew_quarters/bar) "hmC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6423,12 +6425,8 @@ /obj/machinery/atm{ pixel_y = -4 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/lobby) -"hCD" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/crew_quarters/kitchen) "hCW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -6596,7 +6594,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "hOU" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/psych) "hPb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6748,6 +6746,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/library) +"iav" = ( +/obj/structure/grille/diagonal{ + dir = 4 + }, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/reinforced, +/area/crew_quarters/bar) "iaW" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -6804,8 +6809,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "idX" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/hydroponics) "idZ" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -6842,7 +6848,7 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "ifU" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/main) "ihe" = ( /turf/simulated/floor/carpet/rubber, @@ -6992,7 +6998,8 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "inD" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/hallway/engineering/tesla) "ioe" = ( @@ -7083,17 +7090,11 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"itL" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/reinforced, -/area/crew_quarters/bar) "itX" = ( /turf/simulated/floor/wood, /area/chapel/main) "iuP" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/mail_room) "iuY" = ( /obj/machinery/iv_drip, @@ -7127,10 +7128,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/icu) -"iyR" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/chapel/office) "iAB" = ( /obj/structure/shuttle_part/placeholder{ icon_state = "d3-6-f" @@ -7430,7 +7427,7 @@ /area/rnd/research) "iLD" = ( /obj/structure/weapon_rack/double, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/bar) "iLR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7600,7 +7597,7 @@ /turf/simulated/wall/shuttle/placeholder/cardinal, /area/turret_protected/ai) "iXO" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/gen_treatment) "iYn" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -7951,7 +7948,7 @@ /turf/simulated/floor/reinforced, /area/turret_protected/ai) "jvV" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/storage_eva) "jvW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8195,7 +8192,7 @@ /turf/simulated/floor/tiled, /area/security/lobby) "jNk" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/chapel/main) "jNA" = ( /obj/machinery/porta_turret, @@ -8327,8 +8324,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "jUx" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/security/prison) "jUG" = ( /obj/structure/window/reinforced{ @@ -8374,10 +8372,12 @@ /turf/simulated/open, /area/maintenance/vault) "jWh" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 1 +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 2 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/bar) "jWj" = ( /obj/structure/bed/chair/office/dark{ @@ -8418,7 +8418,7 @@ /turf/simulated/floor/plating, /area/engineering/smes/tesla) "jWV" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/checkpoint) "jYg" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8565,7 +8565,7 @@ dir = 8 }, /turf/simulated/floor/reinforced, -/area/chapel/office) +/area/template_noop) "kgK" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, /obj/structure/disposalpipe/segment, @@ -8606,7 +8606,7 @@ /turf/simulated/floor/tiled, /area/security/warden) "kmc" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/qm) "kmr" = ( /turf/simulated/floor/wood, @@ -8752,8 +8752,9 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "kvd" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/crew_quarters/bar) "kvG" = ( /obj/effect/floor_decal/industrial/warning{ @@ -9050,10 +9051,11 @@ /turf/simulated/floor/wood, /area/chapel/office) "kPA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology/xenoflora) "kQS" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) "kQY" = ( @@ -9226,7 +9228,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "laB" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/locker_room) "laF" = ( /obj/machinery/door/airlock/medical, @@ -9253,7 +9255,7 @@ /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "lcs" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/misc_lab) "ldu" = ( /obj/structure/cable/green{ @@ -9608,8 +9610,9 @@ /turf/simulated/open/airless, /area/template_noop) "lCF" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, /area/chapel/office) "lCV" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -9669,7 +9672,7 @@ /area/maintenance/substation/engineering) "lHs" = ( /obj/structure/reagent_dispensers/acid, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/assembly/robotics/workshop) "lHx" = ( /obj/structure/bed/chair/office/dark{ @@ -10006,6 +10009,11 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) +"lYV" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "lYZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -10134,7 +10142,7 @@ /area/engineering/engine_room) "meq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "meG" = ( /obj/structure/cable/green{ @@ -10162,8 +10170,9 @@ /turf/space/dynamic, /area/security/main) "mfV" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/security/brig) "mgg" = ( /obj/structure/table/standard, @@ -10248,7 +10257,7 @@ /area/medical/reception) "miM" = ( /obj/machinery/vending/boozeomat, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/bar) "miP" = ( /obj/structure/disposalpipe/segment, @@ -10418,7 +10427,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-4" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology/xenoflora) "muy" = ( /obj/structure/cable/green{ @@ -10714,12 +10723,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) -"mJe" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/hydroponics) "mKs" = ( /obj/machinery/vending/snack{ anchored = 0 @@ -10839,11 +10842,9 @@ /turf/simulated/floor/tiled/white, /area/medical/icu) "mPE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/reinforced, -/area/crew_quarters/kitchen) +/area/template_noop) "mQy" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -10973,7 +10974,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical) "mWi" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/turbolift) "mWs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11029,7 +11030,7 @@ /area/hallway/primary/central_two) "mYL" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology/xenoflora) "mZI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11144,7 +11145,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-1" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "nhF" = ( /obj/structure/bed/chair/comfy/black, @@ -11260,7 +11261,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "nmF" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -11536,7 +11537,7 @@ /turf/simulated/wall/shuttle/placeholder/cardinal, /area/crew_quarters/cafeteria) "nFf" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/prison) "nFm" = ( /obj/structure/cable/green{ @@ -11599,7 +11600,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "nIi" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/medical) "nKe" = ( /obj/structure/cable/green{ @@ -11638,12 +11639,9 @@ /turf/simulated/floor/tiled, /area/hallway/engineering/tesla) "nMY" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/item/tape/engineering{ - icon_state = "engineering_door"; - layer = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, /area/crew_quarters/bar) "nNe" = ( /obj/structure/lattice, @@ -11653,7 +11651,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-5-f" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "nOk" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -11677,7 +11675,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "nQm" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/medical) "nQG" = ( /obj/structure/table/stone/marble, @@ -11805,12 +11803,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/misc_lab) -"nYl" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/crew_quarters/bar) "nZj" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/yellow, @@ -11970,7 +11962,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-4-f" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "oiW" = ( /obj/structure/flora/pottedplant/random, @@ -12040,10 +12032,6 @@ /obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/medical/first_responder) -"okN" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/hallway/primary/central_two) "okV" = ( /turf/simulated/floor/tiled, /area/rnd/misc_lab) @@ -12051,7 +12039,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d3-5" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology/xenoflora) "omf" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, @@ -12074,7 +12062,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "ool" = ( /obj/structure/lattice, @@ -12564,7 +12552,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "oUt" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/first_responder) "oUu" = ( /obj/structure/cable/green{ @@ -12618,7 +12606,8 @@ /turf/simulated/floor/carpet, /area/chapel/office) "oXd" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced_phoron, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, @@ -12635,6 +12624,7 @@ "oXu" = ( /obj/machinery/appliance/cooker/oven, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "oXw" = ( @@ -12918,7 +12908,7 @@ /area/rnd/research) "pof" = ( /obj/machinery/smartfridge/secure/extract, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/xenobiology) "pon" = ( /obj/machinery/light{ @@ -13102,7 +13092,7 @@ /area/maintenance/substation/research) "pBh" = ( /obj/machinery/door_timer, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/prison) "pBj" = ( /obj/structure/window/shuttle/unique/ccia{ @@ -13117,7 +13107,7 @@ /turf/simulated/floor/tiled, /area/security/prison) "pCo" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/engineering/tesla) "pDq" = ( /obj/structure/shuttle_part/ccia{ @@ -13141,7 +13131,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "pED" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/kitchen) "pER" = ( /obj/structure/cable/yellow{ @@ -13421,7 +13411,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "pWj" = ( /obj/structure/cable/green{ @@ -13436,7 +13426,7 @@ /turf/simulated/floor/tiled, /area/security/brig) "pWx" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/library) "pWB" = ( /obj/structure/cable{ @@ -13502,7 +13492,7 @@ /turf/simulated/open/airless, /area/template_noop) "qav" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/assembly/chargebay) "qaw" = ( /obj/machinery/door/airlock/glass_security, @@ -13625,7 +13615,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "qiS" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/exam) "qja" = ( /turf/simulated/floor/carpet/rubber, @@ -13929,7 +13919,7 @@ pixel_y = 25 }, /turf/simulated/floor/reinforced, -/area/crew_quarters/bar) +/area/template_noop) "qzR" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled, @@ -14021,7 +14011,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qEQ" = ( /turf/simulated/open, @@ -14140,7 +14130,7 @@ /turf/simulated/floor/tiled, /area/security/brig) "qMd" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/assembly/robotics/workshop) "qNm" = ( /obj/structure/cable/green{ @@ -14176,7 +14166,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "qPs" = ( /obj/machinery/light, @@ -14426,7 +14416,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/engineering) "rcA" = ( /obj/machinery/door/airlock/maintenance, @@ -14785,7 +14775,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "rqA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/break_room) "rqG" = ( /obj/structure/table/standard, @@ -14816,7 +14806,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "rro" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/warden) "rrq" = ( /obj/structure/cable/green{ @@ -14899,7 +14889,7 @@ /turf/simulated/floor/tiled/white, /area/medical/icu) "ruV" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/main_storage) "rvC" = ( /obj/machinery/door/airlock/atmos, @@ -15039,7 +15029,7 @@ name = "SCC Shuttle" }) "rCR" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/lobby) "rDh" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -15118,6 +15108,17 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood, /area/library) +"rHj" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/grille/diagonal{ + dir = 8 + }, +/obj/structure/window/shuttle/placeholder{ + density = 0; + layer = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "rIK" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -15297,7 +15298,7 @@ /turf/simulated/floor/tiled/white, /area/medical/icu) "rRA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/assembly/robotics) "rSv" = ( /obj/structure/cable{ @@ -15405,7 +15406,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "rVg" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/quartermaster/office) "rVv" = ( /obj/effect/floor_decal/industrial/warning{ @@ -15586,7 +15587,7 @@ /turf/simulated/floor/wood, /area/medical/psych) "seZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/pharmacy) "sgQ" = ( /obj/structure/lattice, @@ -15743,11 +15744,6 @@ }, /turf/simulated/floor/tiled, /area/security/checkpoint) -"snZ" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/iv_drip, -/turf/simulated/floor/tiled/white, -/area/medical/icu) "soc" = ( /obj/structure/particle_accelerator/power_box{ dir = 1 @@ -15804,12 +15800,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "ssh" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/item/tape/engineering{ - icon_state = "engineering_door"; - layer = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, /area/crew_quarters/kitchen) "ssK" = ( /obj/structure/cable, @@ -15858,7 +15851,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-2-f" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "svh" = ( /obj/structure/railing/mapped, @@ -15872,8 +15865,13 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "svY" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/reinforced, +/obj/structure/table/stone/marble, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 2 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "swe" = ( /obj/structure/particle_accelerator/particle_emitter/center{ @@ -16006,7 +16004,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "sGm" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/brig) "sGn" = ( /turf/simulated/open, @@ -16115,7 +16113,7 @@ /turf/simulated/floor/tiled, /area/security/main) "sKJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/bar) "sKP" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -16379,10 +16377,10 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "sYc" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/substation/research) "sYl" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/engineering/lobby) "sYY" = ( /obj/structure/closet/emcloset, @@ -16774,7 +16772,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/smes/tesla) "txq" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/cafeteria) "txy" = ( /obj/machinery/door/airlock/lift, @@ -16830,7 +16828,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "tBB" = ( -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "tBS" = ( /obj/structure/bed/chair/office/dark, @@ -16847,9 +16845,6 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/storage/primary) -"tCJ" = ( -/turf/simulated/floor/reinforced, -/area/hydroponics) "tDc" = ( /obj/machinery/autolathe, /turf/simulated/floor/tiled/dark, @@ -16958,7 +16953,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "tMO" = ( /obj/structure/cable/green{ @@ -17158,7 +17153,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "tXR" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/security_office) "tYa" = ( /obj/structure/table/steel, @@ -17255,8 +17250,9 @@ /turf/simulated/floor/tiled, /area/hydroponics) "udR" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor/tiled, +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, /area/hallway/primary/central_two) "ufe" = ( /obj/machinery/door/firedoor, @@ -17352,6 +17348,12 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) +"ull" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "uln" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -17368,7 +17370,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "ulS" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -17406,7 +17408,7 @@ /turf/simulated/floor/tiled, /area/security/brig/processing) "uoj" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/engineering) "uon" = ( /obj/effect/floor_decal/corner/mauve/diagonal, @@ -17522,7 +17524,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/engineering/tesla) "usq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17714,10 +17716,9 @@ /turf/simulated/floor/wood, /area/chapel/office) "uGo" = ( -/obj/machinery/disposal, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/bar) "uGp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17870,7 +17871,7 @@ /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) "uNK" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/investigations) "uOj" = ( /obj/effect/floor_decal/industrial/loading/yellow{ @@ -18487,7 +18488,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/smes/tesla) "vGy" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/telesci) "vHp" = ( /obj/structure/table/standard, @@ -19048,19 +19049,10 @@ /obj/structure/table/stone/marble, /turf/simulated/floor/carpet/rubber, /area/crew_quarters/bar) -"wmu" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/crew_quarters/cafeteria) "wmT" = ( /obj/structure/lattice, /turf/simulated/open, /area/quartermaster/storage) -"wnf" = ( -/obj/machinery/iv_drip, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/white, -/area/medical/icu) "wnj" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -19229,7 +19221,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/lobby) "wxr" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/or1) "wyb" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -19266,7 +19258,7 @@ dir = 1 }, /turf/simulated/floor/reinforced, -/area/hydroponics) +/area/template_noop) "wzD" = ( /obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled, @@ -19838,7 +19830,7 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "xjC" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/reception) "xjH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20047,7 +20039,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical) "xuv" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/chemistry) "xva" = ( /obj/structure/window/reinforced, @@ -20093,7 +20085,7 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "xxy" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/rnd/hallway) "xzd" = ( /obj/effect/floor_decal/industrial/warning, @@ -20229,10 +20221,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/chapel/office) -"xJQ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/security/brig) "xKU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -20314,7 +20302,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) "xOo" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hydroponics/garden) "xOA" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -20453,13 +20441,6 @@ }, /turf/simulated/floor/tiled, /area/storage/primary) -"xTB" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/security/prison) -"xTM" = ( -/turf/simulated/floor/reinforced, -/area/crew_quarters/bar) "xUK" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled, @@ -20475,7 +20456,7 @@ /obj/structure/shuttle_part/placeholder{ icon_state = "d2-2-f" }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/main) "xWa" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -33872,7 +33853,7 @@ bCv rVV gOH udR -okN +xer qgN qgN saY @@ -34074,7 +34055,7 @@ bCv ihG oSN udR -okN +xer qgN bpF gAo @@ -34276,7 +34257,7 @@ bCv ghX eqv udR -okN +xer qgN pDq pBj @@ -34478,7 +34459,7 @@ ojV veP gOH udR -okN +xer qgN gJW rCJ @@ -34680,7 +34661,7 @@ saJ sXT gOH udR -okN +xer qgN gJW fhJ @@ -34882,7 +34863,7 @@ ljF sXT gOH udR -okN +xer qgN myy kXN @@ -35892,7 +35873,7 @@ bGI hwM spn lCF -iyR +xer qgN vtD aFJ @@ -36094,7 +36075,7 @@ mOS kOW eyu lCF -iyR +xer qgN dpO pim @@ -36296,7 +36277,7 @@ eTf eTf oWC lCF -iyR +xer qgN qgN qgN @@ -36498,7 +36479,7 @@ eTf bCD vKF lCF -iyR +xer qgN qgN qgN @@ -36700,7 +36681,7 @@ oKE jpf vYI lCF -iyR +xer qgN qgN qgN @@ -36902,7 +36883,7 @@ vWX wLp wLp lCF -iyR +xer qgN qgN qgN @@ -37104,7 +37085,7 @@ xLh pgi aoC lCF -iyR +xer qgN qgN qgN @@ -37306,7 +37287,7 @@ aCS axL aCS lNQ -iyR +xer qgN qgN qgN @@ -37509,21 +37490,21 @@ tWF aMa axL kgp -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -nYl -itL -qgN +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +mLU +eTQ qgN qgN qgN @@ -37711,8 +37692,8 @@ fol fol lNQ qzH -xTM -xTM +hUK +hUK eeQ kvd kvd @@ -37721,12 +37702,12 @@ kvd kvd kvd eeQ -xTM -xTM -xTM -xTM -itL -qgN +hUK +hUK +hUK +hUK +kgp +eTQ qgN qgN qgN @@ -37884,7 +37865,7 @@ ufe mRr fpF xDR -snZ +xqE stW xqE kHn @@ -37927,9 +37908,9 @@ kvd kvd kvd nMY -kvd -itL -qgN +iav +kgp +eTQ qgN qgN qgN @@ -38128,10 +38109,10 @@ sKJ tBB gxa tBB -kvd -nMY -kvd -itL +czP +lYV +iav +xer qgN qgN qgN @@ -38328,12 +38309,12 @@ muy jHp hjC ulp -qPo +tBB qPo tBB -kvd +czP nMY -hmp +xer qgN qgN qgN @@ -38529,13 +38510,13 @@ rqg sRB uhi sKJ -bph +onm +uGo cIN -cIN -jWh +ull tBB kvd -hmp +xer qgN qgN qgN @@ -38692,7 +38673,7 @@ nbd abA rpu iyl -wnf +xqE pUI bCl iIf @@ -38732,12 +38713,12 @@ sRB uhi sKJ onm -nmD +tBB nmD tBB tKB kvd -hmp +xer qgN qgN qgN @@ -38939,7 +38920,7 @@ meq meq pVT kvd -hmp +xer qgN qgN qgN @@ -39141,7 +39122,7 @@ sKJ tux sKJ eeQ -hmp +xer qgN qgN qgN @@ -39331,7 +39312,7 @@ wmp fei nVf xPY -crK +jWh oSp cOk wNI @@ -39343,7 +39324,7 @@ whs wNI vGe ehU -wmu +xer qgN qgN qgN @@ -39533,7 +39514,7 @@ oXw wmc gBS gBS -crK +jWh oSp cOk mIS @@ -39545,7 +39526,7 @@ iEM wNI gAP ehU -wmu +xer qgN qgN qgN @@ -39735,7 +39716,7 @@ crK rca gBS gBS -crK +jWh oSp jes exU @@ -39747,7 +39728,7 @@ iEM wNI qDU ehU -wmu +xer qgN qgN qgN @@ -39937,7 +39918,7 @@ crK qtj gBS gBS -crK +jWh oSp cOk wNI @@ -39949,7 +39930,7 @@ bTz wNI etU nEC -wmu +xer qgN qgN qgN @@ -40136,10 +40117,10 @@ din sKJ due bsQ -crK -crK -crK -crK +bph +bph +bph +jWh oSp cOk wNI @@ -40151,7 +40132,7 @@ wNI mIS vGe ehU -wmu +xer qgN qgN qgN @@ -40353,7 +40334,7 @@ qFQ exU gAP ehU -wmu +xer qgN qgN qgN @@ -40555,7 +40536,7 @@ mDD wNI qDU ehU -wmu +xer qgN qgN qgN @@ -40757,7 +40738,7 @@ usD mZI iIv nEC -wmu +xer qgN qgN qgN @@ -40959,7 +40940,7 @@ lSo dOC dOC ehU -wmu +xer qgN qgN qgN @@ -41161,7 +41142,7 @@ vhu hhx hhx ehU -wmu +xer qgN qgN qgN @@ -41357,13 +41338,13 @@ pGL fFq edq edq -edq +svY oSp wyU dOC dOC ehU -wmu +xer qgN qgN qgN @@ -41559,13 +41540,13 @@ gnc idz ffR ffR -edq +svY oSp hVj wqC etU nEC -wmu +xer qgN qgN qgN @@ -41761,13 +41742,13 @@ sZs idz cgq ffR -edq +svY oSp wyU dOC dOC ehU -wmu +xer qgN qgN qgN @@ -41895,7 +41876,7 @@ hBN hBN hBN uph -dOt +inD lnv gci xPv @@ -41963,13 +41944,13 @@ lRu idz cgq ffR -edq +svY oSp wyU hhx hhx ehU -wmu +xer qgN qgN qgN @@ -42165,13 +42146,13 @@ bbx idz cgq ffR -edq +svY oSp wyU dOC dOC ehU -wmu +xer qgN qgN qgN @@ -42373,7 +42354,7 @@ cdR pED pED mPl -hCD +xer qgN qgN qgN @@ -42575,7 +42556,7 @@ wrZ ieR mpo afA -hCD +xer qgN qgN qgN @@ -42777,7 +42758,7 @@ wrZ ffR vSS afA -hCD +xer qgN qgN qgN @@ -42979,7 +42960,7 @@ woN ctO wgJ afA -hCD +xer qgN qgN qgN @@ -43181,7 +43162,7 @@ hNe dxS ffR afA -hCD +xer qgN qgN qgN @@ -43383,7 +43364,7 @@ smy rSN ffR afA -hCD +xer qgN qgN qgN @@ -43585,7 +43566,7 @@ ffR ffR vkw mPl -hCD +xer qgN qgN qgN @@ -43784,10 +43765,10 @@ pED gvd ffR ffR -uGo -afA +ffR +rHj ssh -hCD +xer qgN qgN qgN @@ -43986,10 +43967,10 @@ pED bVL uwX cKi -afA +rHj ssh -afA -mPE +cwO +xer qgN qgN qgN @@ -44189,9 +44170,9 @@ afA afA mPl ssh -afA +cwO mPE -qgN +uhP qgN qgN qgN @@ -44376,23 +44357,23 @@ xjN dkR hyS lBS -tCJ -tCJ -tCJ -tCJ -tCJ -bVk -bVk -bVk -bVk -bVk -bVk -bVk -bVk -bVk -svY +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK +hUK mPE -qgN +uhP qgN qgN qgN @@ -44579,21 +44560,21 @@ sGm sGm czL wzs -mJe -mJe -mJe -mJe -apz -apz -apz -apz -apz -apz -apz -apz -apz -mPE -qgN +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +rVv +uhP qgN qgN qgN @@ -44780,7 +44761,7 @@ ogR rfi rBL mfV -xJQ +xer qgN qgN qgN @@ -44982,7 +44963,7 @@ vXy aOz aOz czL -xJQ +xer qgN qgN qgN @@ -45184,7 +45165,7 @@ aOz aOz aOz mfV -xJQ +xer qgN qgN qgN @@ -45386,7 +45367,7 @@ pBh bFU nFf pSv -xTB +xer qgN qgN qgN @@ -45588,7 +45569,7 @@ tuH ddH pvS pSv -xTB +xer qgN qgN qgN @@ -45790,7 +45771,7 @@ aya pNG qlU pSv -xTB +xer qgN qgN qgN @@ -45992,7 +45973,7 @@ nFf uTn nFf pSv -xTB +xer qgN qgN qgN @@ -46194,7 +46175,7 @@ pJE mbh ygb pSv -xTB +xer qgN qgN qgN @@ -47002,7 +46983,7 @@ pBA pJE pJE pSv -xTB +xer qgN qgN qgN @@ -47810,7 +47791,7 @@ lVZ nFf nFf pSv -xTB +xer qgN qgN qgN @@ -48012,7 +47993,7 @@ rKJ nFf ggA pSv -xTB +xer qgN qgN qgN @@ -48214,7 +48195,7 @@ oQZ lVZ rKJ pSv -xTB +xer qgN qgN qgN @@ -48416,7 +48397,7 @@ nFf nFf nFf pSv -xTB +xer qgN qgN qgN diff --git a/maps/placeholder/placeholder-3_deck_3.dmm b/maps/placeholder/placeholder-3_deck_3.dmm index 301ee68b774..2874dccf3da 100644 --- a/maps/placeholder/placeholder-3_deck_3.dmm +++ b/maps/placeholder/placeholder-3_deck_3.dmm @@ -53,10 +53,6 @@ }, /turf/simulated/floor, /area/maintenance/vault) -"aj" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/reinforced, -/area/crew_quarters/captain) "al" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -209,7 +205,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "aE" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/janitor) "aF" = ( /obj/effect/floor_decal/corner_wide/red/full{ @@ -1563,10 +1559,12 @@ }, /area/crew_quarters/fitness) "eR" = ( -/turf/simulated/wall/shuttle/placeholder/cardinal, +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder/cardinal, +/turf/simulated/floor/plating, /area/medical/smoking) "eX" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/ward/isolation) "fc" = ( /turf/simulated/wall/r_wall, @@ -1615,7 +1613,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "fq" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/cafeteria) "fr" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -1759,7 +1757,7 @@ /turf/simulated/floor/tiled, /area/security/investigations_storage) "ga" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/toilet) "gc" = ( /obj/structure/cable/green{ @@ -2014,8 +2012,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "hR" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/bridge/minibar) "hS" = ( /obj/structure/cable/green{ @@ -2258,10 +2257,6 @@ /obj/item/stock_parts/subspace/amplifier, /turf/simulated/floor, /area/tcommsat/entrance) -"iR" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/plating, -/area/medical/washroom) "iS" = ( /obj/machinery/light{ dir = 1 @@ -2389,7 +2384,7 @@ /area/crew_quarters/theatre) "jF" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "jG" = ( /obj/machinery/door/airlock/medical, @@ -2767,9 +2762,12 @@ /turf/simulated/floor/tiled, /area/security/investigations) "lC" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/bridge/minibar) +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille/diagonal{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/crew_quarters/heads/cmo) "lD" = ( /obj/structure/railing/mapped{ dir = 8 @@ -2790,7 +2788,7 @@ /turf/simulated/floor/wood, /area/hallway/primary/starboard) "lK" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/primary/aft) "lL" = ( /obj/structure/lattice, @@ -3115,7 +3113,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "nf" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/vacantoffice2) "ng" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -3235,7 +3233,7 @@ /turf/simulated/floor, /area/crew_quarters/theatre) "nH" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/captain) "nL" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -3255,7 +3253,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "nP" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "nU" = ( /obj/structure/cable/green{ @@ -3458,7 +3456,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pf" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/bridge/aibunker) "pg" = ( /obj/machinery/optable{ @@ -3838,7 +3836,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "rs" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/journalistoffice) "ru" = ( /obj/structure/cable/green{ @@ -3989,15 +3987,17 @@ /turf/simulated/floor, /area/maintenance/vault) "su" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/security/forensics_office) "sw" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/medical/washroom) "sA" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/equipment) "sB" = ( /obj/structure/table/wood, @@ -4040,6 +4040,11 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/hop) +"sR" = ( +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/crew_quarters/theatre) "sV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4204,15 +4209,15 @@ pixel_x = 1; pixel_y = -4 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/ward/isolation) "tH" = ( -/obj/machinery/light{ +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille/diagonal{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/bridge) +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "tJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4351,8 +4356,9 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "uu" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/reinforced, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/bridge) "uw" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -4386,6 +4392,10 @@ }, /turf/simulated/floor, /area/maintenance/vault) +"uD" = ( +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "uG" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 9 @@ -4408,7 +4418,8 @@ /turf/simulated/floor, /area/maintenance/vault) "uP" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/medical/equipment) "uR" = ( @@ -4499,7 +4510,7 @@ /turf/simulated/floor/tiled, /area/bridge) "vx" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/heads/hop) "vz" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -4536,8 +4547,9 @@ }, /area/crew_quarters/fitness) "vI" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/security/forensics_morgue) "vK" = ( /turf/simulated/wall/shuttle/placeholder/cardinal, @@ -4613,7 +4625,7 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/heads/cmo) "wq" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/detectives_office) "ws" = ( /obj/structure/disposalpipe/segment{ @@ -4658,7 +4670,7 @@ pixel_x = 32; pixel_y = -2 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/cafeteria) "wB" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/polarized, @@ -4766,9 +4778,12 @@ /turf/simulated/floor, /area/crew_quarters/theatre) "xc" = ( -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille/diagonal{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/bridge/minibar) "xd" = ( /obj/machinery/door/airlock, /obj/structure/cable/green{ @@ -4830,7 +4845,7 @@ /turf/simulated/floor, /area/crew_quarters/sleep/cryo) "xs" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/primary/starboard) "xv" = ( /obj/machinery/door/airlock/highsecurity, @@ -5047,10 +5062,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/command) -"yy" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/turf/simulated/floor, -/area/medical/smoking) "yz" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/beach/water/pool, @@ -5135,7 +5146,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "yX" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/washroom) "yZ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -5360,7 +5371,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "AC" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/hallway/medical/upper) "AG" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/crescent, @@ -5593,7 +5604,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "Cf" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/sleep/cryo) "Ch" = ( /obj/machinery/power/apc/low{ @@ -5696,7 +5707,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/maintenance/vault) "CQ" = ( /obj/structure/cryofeed{ @@ -5715,9 +5726,12 @@ /turf/simulated/floor/carpet, /area/janitor) "CS" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille/diagonal{ + dir = 4 + }, /turf/simulated/floor/reinforced, -/area/bridge) +/area/crew_quarters/captain) "CW" = ( /obj/structure/table/wood, /obj/item/clothing/suit/storage/hazardvest/white{ @@ -5745,7 +5759,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "Dg" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/bridge/meeting_room) "Dh" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -5853,6 +5867,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/washroom) +"DN" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/bridge/minibar) "DQ" = ( /turf/simulated/open, /area/maintenance/vault) @@ -5868,7 +5886,7 @@ /turf/simulated/floor/tiled, /area/bridge) "Ed" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/forensics_morgue) "Ef" = ( /obj/structure/sink{ @@ -6055,7 +6073,7 @@ /turf/simulated/floor/reinforced, /area/tcommsat/chamber) "Fj" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/investigations_storage) "Fm" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, @@ -6065,7 +6083,7 @@ /turf/simulated/floor/tiled, /area/bridge/aibunker) "Fo" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/investigations) "Fs" = ( /obj/structure/bed/chair/office/bridge{ @@ -6189,11 +6207,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"Gg" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/turf/simulated/floor, -/area/crew_quarters/heads/cmo) "Go" = ( /obj/machinery/door/window/northleft, /obj/effect/floor_decal/spline/plain{ @@ -6229,7 +6242,8 @@ /turf/simulated/floor/tiled, /area/bridge) "Gy" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) "GF" = ( @@ -6366,7 +6380,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "Hz" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/theatre) "HA" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -6392,7 +6406,7 @@ /area/hallway/medical/upper) "HI" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/medical/ward/isolation) "HS" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/crescent, @@ -6514,8 +6528,9 @@ /turf/simulated/wall/shuttle/placeholder/cardinal, /area/maintenance/vault) "Jc" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/crew_quarters/fitness) "Jf" = ( /obj/structure/closet/secure_closet/personal, @@ -6578,7 +6593,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/toilet) "JH" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/security/forensics_office) "JI" = ( /obj/structure/cable/green{ @@ -6623,7 +6638,7 @@ /turf/simulated/floor/tiled, /area/bridge/meeting_room) "JQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/bridge) "JS" = ( /obj/structure/closet/wardrobe/grey, @@ -6694,6 +6709,11 @@ "Ky" = ( /turf/simulated/wall/shuttle/placeholder/cardinal, /area/crew_quarters/fitness/pool) +"Kz" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, +/area/medical/washroom) "KC" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -6893,8 +6913,9 @@ /turf/simulated/floor/carpet, /area/crew_quarters/captain) "LZ" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, /area/crew_quarters/fitness/pool) "Ma" = ( /obj/structure/cable/green{ @@ -7361,6 +7382,11 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"Ps" = ( +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille/diagonal, +/turf/simulated/floor/reinforced, +/area/bridge/minibar) "Pt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7668,10 +7694,10 @@ /turf/simulated/floor/tiled/dark, /area/medical/smoking) "Rr" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/locker) "Rs" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/bridge/minibar) "Rv" = ( /obj/structure/cable/green{ @@ -7902,7 +7928,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "SX" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/security/vacantoffice2) "SY" = ( @@ -8249,6 +8276,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"Vi" = ( +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) "Vm" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor/tiled, @@ -8317,7 +8349,7 @@ /turf/simulated/open, /area/turret_protected/ai) "VC" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/lawoffice/representative) "VD" = ( /obj/structure/cable{ @@ -8445,8 +8477,9 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "WH" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, -/turf/simulated/floor/tiled, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor, /area/crew_quarters/captain) "WJ" = ( /turf/simulated/floor/tiled, @@ -8609,7 +8642,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/hop) "Yg" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/lawoffice/consular) "Yh" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/crescent, @@ -8759,10 +8792,11 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "YX" = ( -/turf/simulated/wall, +/turf/simulated/wall/placeholder_standard, /area/crew_quarters/fitness) "YY" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, /turf/simulated/floor/plating, /area/medical/smoking) "Za" = ( @@ -8775,6 +8809,11 @@ /obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"Zc" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder/cardinal, +/turf/simulated/floor/plating, +/area/bridge) "Zd" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 @@ -8799,6 +8838,11 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) +"Zj" = ( +/obj/structure/window/shuttle/placeholder, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/bridge/meeting_room) "Zl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8816,6 +8860,11 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) +"Zq" = ( +/obj/structure/grille, +/obj/structure/window/shuttle/placeholder, +/turf/simulated/floor/plating, +/area/medical/equipment) "Zs" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -21537,9 +21586,9 @@ at at at QL -os +sR tL -os +sR QL at at @@ -21726,28 +21775,28 @@ nX uP uP uP -uP -uP +Zq +Zq DK sw sw sw +Kz sw -sw -sw +Kz DK -iR -iR +sw +sw DK Iu EN Iu eN eN -Nl -Nl -Nl -Nl +sR +sR +sR +sR eN eN at @@ -21920,7 +21969,7 @@ at at at at -yy +YY Sl BF BC @@ -22122,7 +22171,7 @@ at at at at -yy +YY ei mn wn @@ -22153,7 +22202,7 @@ EW EW ZM KJ -Nl +sR at at fh @@ -22324,7 +22373,7 @@ at at at at -yy +YY ID bn Rq @@ -22355,7 +22404,7 @@ Xh Xh rS KJ -Nl +sR at at fh @@ -22523,7 +22572,7 @@ at at at at -Gg +lC Gy uA uA @@ -22557,7 +22606,7 @@ kM kM ZM KJ -Nl +sR at at fh @@ -22725,7 +22774,7 @@ at at at at -vh +Gy Gt xB aq @@ -22927,7 +22976,7 @@ at at at at -vh +Gy YS Mf ax @@ -23129,7 +23178,7 @@ at at at at -vh +Gy AL Wp az @@ -23164,7 +23213,7 @@ yp EW KJ EW -Nl +sR at fh aa @@ -23366,7 +23415,7 @@ QG ZM KJ Xh -Nl +sR at VM KN @@ -23568,7 +23617,7 @@ CO KJ KJ kM -os +sR at at at @@ -23972,7 +24021,7 @@ KJ KJ KJ EW -Nl +sR at fh aa @@ -24174,7 +24223,7 @@ QG ZM KJ Xh -Nl +sR at fh aa @@ -24376,7 +24425,7 @@ yp kM KJ kM -Nl +sR at fh aa @@ -24780,7 +24829,7 @@ KJ KJ KJ QG -Nl +sR at fh aa @@ -24982,7 +25031,7 @@ hp KJ KJ Xh -Nl +sR at fh aa @@ -25184,7 +25233,7 @@ KJ KJ KJ QG -Nl +sR at fh aa @@ -25606,7 +25655,7 @@ aa aa aa aa -Wm +aa Wm Wm Wm @@ -25774,7 +25823,7 @@ nP HU HU HU -nP +HU HU HU zE @@ -25809,7 +25858,7 @@ KN KN KN Mo -Wm +aa Wm Wm Wm @@ -26012,7 +26061,7 @@ at at VM Mo -Wm +aa Wm Wm Wm @@ -26206,12 +26255,12 @@ md WH WH md -aj -aj -aj -aj -aj -at +WH +WH +WH +WH +WH +CS at VM Mo @@ -26412,9 +26461,9 @@ mC mC mC mC -aj -aj -at +tH +WH +CS at fh Wm @@ -26615,9 +26664,9 @@ gk Ka mC mC -aj -aj -at +tH +WH +CS fh Wm Wm @@ -26818,10 +26867,10 @@ kB mC mC mC -aj -aj -fh -Wm +tH +WH +VM +Mo Wm Wm Wm @@ -27020,10 +27069,10 @@ kB mC mC mC -xc -aj -VM -Mo +mC +WH +at +fh Wm Wm Wm @@ -27222,8 +27271,8 @@ kB mC mC mC -mC -aj +uD +WH at fh Wm @@ -27425,7 +27474,7 @@ ob mC mC mC -aj +WH at fh Wm @@ -27628,8 +27677,8 @@ JQ Sa CK CK -uu -CS +Zc +fh Wm Wm Wm @@ -27831,7 +27880,7 @@ iA iA iA uu -CS +fh Wm Wm Wm @@ -28033,7 +28082,7 @@ iA iA iA uu -CS +fh Wm Wm Wm @@ -28235,7 +28284,7 @@ iA iA iA uu -CS +fh Wm Wm Wm @@ -28437,7 +28486,7 @@ iA OG hu CK -tH +fh Wm Wm Wm @@ -28639,7 +28688,7 @@ di OG PQ uu -CS +fh Wm Wm Wm @@ -28841,7 +28890,7 @@ iA OG PQ uu -CS +fh Wm Wm Wm @@ -29043,7 +29092,7 @@ di OG PQ uu -CS +fh Wm Wm Wm @@ -29245,7 +29294,7 @@ iA OG PQ uu -CS +fh Wm Wm Wm @@ -29447,7 +29496,7 @@ di OG PQ uu -CS +fh Wm Wm Wm @@ -29649,7 +29698,7 @@ iA OG jf CK -tH +fh Wm Wm Wm @@ -29851,7 +29900,7 @@ Pq iA iA uu -CS +fh Wm Wm Wm @@ -30053,7 +30102,7 @@ wJ iA iA uu -CS +fh Wm Wm Wm @@ -30255,7 +30304,7 @@ wJ iA iA uu -CS +fh Wm Wm Wm @@ -30456,8 +30505,8 @@ JQ PZ CK CK -uu -CS +Zc +fh Wm Wm Wm @@ -30858,7 +30907,7 @@ hP SR SR Rx -RC +DN hR at fh @@ -31060,7 +31109,7 @@ NO RC RC RC -lC +RC hR at fh @@ -31264,8 +31313,8 @@ RC RC RC hR -Rh -PF +at +fh Wm Wm Wm @@ -31464,10 +31513,10 @@ Rx RC RC RC +xc hR -hR -fh -Wm +Rh +PF Wm Wm Wm @@ -31665,9 +31714,9 @@ RC RC RC RC +xc hR -hR -at +Ps fh Wm Wm @@ -31866,9 +31915,9 @@ RC RC fo RC +xc hR -hR -at +Ps at fh Wm @@ -32069,7 +32118,7 @@ hR hR hR hR -at +Ps at Rh PF @@ -32251,20 +32300,20 @@ RD Rk xx xx -HS -HS -HS +Zj +Zj +Zj xx -HS -HS -HS +Zj +Zj +Zj xx CK -ZP +uu CK -ZP +uu CK -ZP +uu CK Tr Tr @@ -32274,7 +32323,7 @@ Tr Tr Tr PF -Wm +aa Wm Wm Wm @@ -32475,7 +32524,7 @@ aa aa aa aa -Wm +aa Wm Wm Wm @@ -32653,7 +32702,7 @@ Dd Dd lm bg -nu +Vi at at at @@ -32676,7 +32725,7 @@ aa aa aa aa -Wm +aa Wm Wm Wm @@ -32855,7 +32904,7 @@ Dd Dd Dd Dd -nu +Vi at at at @@ -33057,7 +33106,7 @@ vx Dd Dd Cc -nu +Vi at at at @@ -33259,7 +33308,7 @@ vx RD RD RD -nu +Vi at at at @@ -34043,7 +34092,7 @@ HU HU HU HU -nP +HU HU HU HU