From 68fb77a19a19b259d184dd2ea1d27d86c8b60c15 Mon Sep 17 00:00:00 2001 From: Ahzpy <88119260+Ahzpy@users.noreply.github.com> Date: Wed, 22 Apr 2026 07:49:30 -0700 Subject: [PATCH] Wallening 2: Return of the attack of the girders [MDB IGNORE][IDB IGNORE] (#30609) * WE HAVE LIFTOFF * Reinforced wall + fixes * (Reinforced) windows * Adds nameless plasmaglass sprites * Plasma windows * Unnamed cult walls * Add window edges back * Wooden walls * Plasma walls + THANK YOU CHAP * Oops * Wooden names * Cult walls * Plasma walls * Uranium walls * Golden walls * Silver walls * False wall basics * All false walls * Remove old walls * Fixes * First girders * Build steps * New floors and decalized floor tiles. * satisfy linter * Add command decals, remove old "blue tile" decal * update script number * have ATMs put their decals on last * add engineering decals * update spritesheets * lots of tile coloring fixes * more engi tile fixes * more tile fixes * linters * fixes conflict? * conflict fixes * fix layering issue * cult, necropolis, plastitanium, rocks, backrooms walls * survival pod walls, prepare for titanium, plastitanium fwall fix removes diagonal smoothing and the nodiagonal subtype from titanium walls as survival pod walls are a subtype of titanium * linters * linters again * linters number 1 million and counting * titanium walls * brass walls, floors, windows * titanium window, plastitanium window * brass window smooths with wood and brass walls * linters number 1 million and one * all walls smooth with airlocks in preparation for airlock sprites in a separate PR * now all walls smooth with airlocks * windows smooth with airlocks * separate wallbumps, partially add apc * tinted window * survival pod windows * oops i reverted apc.dm * mapping fixes * more mapping sprites * more mapping stuff, fix my ungodly smooth rocks * linters * apc fix * air alarm, apc, fire alarm offset preparations * fire alarm implementation + rock fixes + firelock smoothing * airlocks + supposed map fixes * engi/atmos airlocks + overlays * the rest of the doors lol * linters + freezer fix * fixes * shuttle airlock + misc fixes * firelocks * fix * oops * i need to stop pushing fixes early * shuttle airlock quickfix * external airlocks + hatches + fixes * centcom doors * highsec airlocks * vault airlock, double airlocks * yaya deconflictsies * lotsa fixes * light fixes + blastdoor fixes * firelock gap fix * light construction fix + rcd fix --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL Co-authored-by: Alexios Co-authored-by: warriorstar-orion --- .../LavaRuins/lavaland_surface_golem_ship.dmm | 39 ++- .../lavaland_surface_shuttlecrash.dmm | 23 +- .../RandomRuins/SpaceRuins/clownmime.dmm | 4 +- .../RandomRuins/SpaceRuins/derelict4.dmm | 41 ++- _maps/map_files/RandomRuins/SpaceRuins/dj.dmm | 6 +- .../SpaceRuins/engineering_vessel.dmm | 4 +- .../RandomRuins/SpaceRuins/freighter.dmm | 7 +- .../RandomRuins/SpaceRuins/listeningpost.dmm | 10 +- .../RandomRuins/SpaceRuins/mechtransport.dmm | 7 +- .../SpaceRuins/submaps/rocky_motel_submap.dmm | 21 +- .../SpaceRuins/submaps/sieged_lab_submaps.dmm | 2 +- .../submaps/telecomns_returns_submap.dmm | 4 +- .../SpaceRuins/submaps/whiteship_submaps.dmm | 9 +- .../SpaceRuins/syndie_space_base.dmm | 84 ++--- .../RandomRuins/SpaceRuins/syndiedepot.dmm | 24 +- .../SpaceRuins/telecoms_shuttle.dmm | 6 +- .../SpaceRuins/turretedoutpost.dmm | 4 +- .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 82 ++--- .../RandomRuins/SpaceRuins/ussp_tele.dmm | 31 +- .../RandomRuins/SpaceRuins/whiteship.dmm | 9 +- .../RandomRuins/SpaceRuins/wizardcrash.dmm | 115 ++++--- .../SpaceRuins/wreckedcargoship.dmm | 23 +- _maps/map_files/generic/centcomm.dmm | 58 ++-- _maps/map_files/shuttles/admin_admin.dmm | 21 +- _maps/map_files/shuttles/admin_armory.dmm | 25 +- _maps/map_files/shuttles/admin_hospital.dmm | 23 +- _maps/map_files/shuttles/admin_skipjack.dmm | 4 +- _maps/map_files/shuttles/cargo_base.dmm | 11 +- _maps/map_files/shuttles/emergency_bar.dmm | 179 +++++------ .../shuttles/emergency_cherenkov.dmm | 119 ++++--- _maps/map_files/shuttles/emergency_clown.dmm | 4 +- .../map_files/shuttles/emergency_cramped.dmm | 39 ++- _maps/map_files/shuttles/emergency_lance.dmm | 303 +++++++++--------- _maps/map_files/shuttles/emergency_old.dmm | 7 +- _maps/map_files/shuttles/emergency_raven.dmm | 251 +++++++-------- _maps/map_files/shuttles/emergency_shadow.dmm | 31 +- .../shuttles/trader/trader_glint.dmm | 2 +- .../shuttles/trader/trader_guild.dmm | 111 ++++--- .../map_files/shuttles/trader/trader_skip.dmm | 21 +- .../shuttles/trader/trader_skrell.dmm | 71 ++-- .../map_files/shuttles/trader/trader_sol.dmm | 2 +- .../shuttles/trader/trader_stead.dmm | 103 +++--- .../shuttles/trader/trader_syndicate.dmm | 127 ++++---- .../shuttles/trader/trader_synth.dmm | 27 +- .../map_files/shuttles/trader/trader_ussp.dmm | 103 +++--- _maps/map_files/stations/boxstation.dmm | 6 +- _maps/map_files/stations/cerestation.dmm | 8 +- _maps/map_files/stations/deltastation.dmm | 6 +- _maps/map_files/stations/emeraldstation.dmm | 4 +- _maps/map_files/stations/metastation.dmm | 8 +- code/__DEFINES/icon_smoothing_defines.dm | 6 +- .../gamemodes/malfunction/Malf_Modules.dm | 2 +- code/game/machinery/doors/airlock.dm | 2 + code/game/machinery/doors/door.dm | 26 ++ code/game/machinery/doors/firedoor.dm | 10 + code/game/machinery/doors/poddoor.dm | 65 ++++ code/game/machinery/firealarm.dm | 20 +- .../effects/spawners/depot_spawners.dm | 4 +- code/game/objects/items/RCD.dm | 6 +- .../items/mountable_frames/air_alarm_frame.dm | 2 +- .../items/mountable_frames/fire_alarm.dm | 2 +- code/game/objects/structures/door_assembly.dm | 27 ++ code/game/objects/structures/false_walls.dm | 90 +++--- code/game/objects/structures/grille.dm | 2 +- code/game/objects/structures/window.dm | 41 +-- code/game/turfs/simulated/minerals.dm | 2 +- code/game/turfs/simulated/walls.dm | 4 +- .../turfs/simulated/walls_indestructible.dm | 97 +++--- code/game/turfs/simulated/walls_mineral.dm | 73 ++--- code/game/turfs/simulated/walls_misc.dm | 14 +- code/game/turfs/simulated/walls_reinforced.dm | 6 +- .../atmospherics/machinery/airalarm.dm | 16 +- .../mission_code/ruins/sieged_lab.dm | 7 - code/modules/mining/equipment/survival_pod.dm | 3 +- .../basic/hostile/demons/demon_powers.dm | 2 +- .../hostile/megafauna/bubblegum.dm | 2 +- code/modules/power/apc/apc.dm | 29 +- code/modules/power/lights.dm | 59 ++++ icons/effects/clockwork_effects.dmi | Bin 114637 -> 140082 bytes icons/obj/doors/airlocks/centcom/centcom.dmi | Bin 2261 -> 6089 bytes icons/obj/doors/airlocks/centcom/overlays.dmi | Bin 3505 -> 6347 bytes .../obj/doors/airlocks/external/external.dmi | Bin 3946 -> 4174 bytes .../obj/doors/airlocks/external/overlays.dmi | Bin 2745 -> 21392 bytes .../airlocks/glass_large/glass_large.dmi | Bin 12539 -> 10345 bytes .../doors/airlocks/glass_large/overlays.dmi | Bin 93024 -> 27800 bytes icons/obj/doors/airlocks/hatch/centcom.dmi | Bin 1982 -> 6797 bytes .../obj/doors/airlocks/hatch/maintenance.dmi | Bin 1979 -> 6408 bytes icons/obj/doors/airlocks/hatch/overlays.dmi | Bin 4198 -> 7650 bytes icons/obj/doors/airlocks/highsec/highsec.dmi | Bin 2371 -> 6230 bytes icons/obj/doors/airlocks/highsec/overlays.dmi | Bin 3098 -> 6347 bytes icons/obj/doors/airlocks/shuttle/overlays.dmi | Bin 3626 -> 17406 bytes icons/obj/doors/airlocks/shuttle/shuttle.dmi | Bin 2803 -> 4870 bytes icons/obj/doors/airlocks/station/atmos.dmi | Bin 1986 -> 6628 bytes icons/obj/doors/airlocks/station/bananium.dmi | Bin 1756 -> 20901 bytes .../doors/airlocks/station/bluemedical.dmi | Bin 1906 -> 20984 bytes icons/obj/doors/airlocks/station/command.dmi | Bin 1970 -> 20912 bytes icons/obj/doors/airlocks/station/diamond.dmi | Bin 1751 -> 19419 bytes .../doors/airlocks/station/engineering.dmi | Bin 1973 -> 20992 bytes icons/obj/doors/airlocks/station/freezer.dmi | Bin 1502 -> 6775 bytes icons/obj/doors/airlocks/station/gold.dmi | Bin 1751 -> 19031 bytes .../doors/airlocks/station/maintenance.dmi | Bin 1952 -> 20835 bytes .../airlocks/station/maintenanceexternal.dmi | Bin 2209 -> 20908 bytes icons/obj/doors/airlocks/station/medical.dmi | Bin 1906 -> 20984 bytes icons/obj/doors/airlocks/station/mining.dmi | Bin 2035 -> 20570 bytes icons/obj/doors/airlocks/station/overlays.dmi | Bin 4737 -> 21263 bytes icons/obj/doors/airlocks/station/plasma.dmi | Bin 2107 -> 19241 bytes icons/obj/doors/airlocks/station/public.dmi | Bin 7700 -> 20858 bytes icons/obj/doors/airlocks/station/research.dmi | Bin 1906 -> 21011 bytes .../obj/doors/airlocks/station/sandstone.dmi | Bin 1755 -> 18680 bytes icons/obj/doors/airlocks/station/science.dmi | Bin 1897 -> 21011 bytes icons/obj/doors/airlocks/station/security.dmi | Bin 1969 -> 20881 bytes icons/obj/doors/airlocks/station/silver.dmi | Bin 1751 -> 18793 bytes icons/obj/doors/airlocks/station/uranium.dmi | Bin 1752 -> 19139 bytes icons/obj/doors/airlocks/station/virology.dmi | Bin 1906 -> 21005 bytes icons/obj/doors/airlocks/station/wood.dmi | Bin 1566 -> 18928 bytes icons/obj/doors/airlocks/station2/glass.dmi | Bin 2069 -> 4644 bytes .../obj/doors/airlocks/station2/overlays.dmi | Bin 8804 -> 17513 bytes icons/obj/doors/airlocks/vault/overlays.dmi | Bin 2524 -> 6347 bytes icons/obj/doors/airlocks/vault/vault.dmi | Bin 1727 -> 6230 bytes icons/obj/doors/doorfire.dmi | Bin 5619 -> 4901 bytes icons/obj/doors/doorfireglass.dmi | Bin 3652 -> 10889 bytes icons/obj/monitors.dmi | Bin 37411 -> 22201 bytes .../windows/32x40clockwork_window.dmi | Bin 0 -> 10138 bytes .../windows/32x40plasma_window.dmi | Bin 0 -> 9788 bytes .../windows/32x40plastitanium_window.dmi | Bin 0 -> 5540 bytes .../windows/32x40pod_window.dmi | Bin 0 -> 4624 bytes .../windows/32x40reinforced_window.dmi | Bin 0 -> 14348 bytes .../windows/32x40rplasma_window.dmi | Bin 0 -> 13623 bytes .../windows/32x40shuttle_window.dmi | Bin 0 -> 4827 bytes .../windows/32x40tinted_window.dmi | Bin 0 -> 7660 bytes .../smooth_structures/windows/32x40window.dmi | Bin 0 -> 9609 bytes .../windows/clockwork_window_edges.dmi | Bin 0 -> 4059 bytes .../windows/plastitanium_window_edges.dmi | Bin 0 -> 8882 bytes .../windows/pod_window_edges.dmi | Bin 0 -> 9062 bytes .../windows/reinforced_window_edges.dmi | Bin 1585 -> 2147 bytes .../windows/shuttle_window_edges.dmi | Bin 0 -> 8019 bytes .../windows/window_edges.dmi | Bin 727 -> 1104 bytes icons/obj/structures.dmi | Bin 27506 -> 27173 bytes icons/obj/wallbumps/alarm.dmi | Bin 0 -> 3477 bytes icons/obj/wallbumps/apc.dmi | Bin 0 -> 5588 bytes icons/obj/wallbumps/firealarm.dmi | Bin 0 -> 12178 bytes icons/turf/walls/32x40abductor_wall.dmi | Bin 0 -> 22776 bytes icons/turf/walls/32x40backrooms_wall.dmi | Bin 0 -> 28313 bytes icons/turf/walls/32x40bananium_wall.dmi | Bin 0 -> 11332 bytes icons/turf/walls/32x40boss_wall.dmi | Bin 0 -> 11728 bytes icons/turf/walls/32x40clockwork_wall.dmi | Bin 0 -> 23877 bytes icons/turf/walls/32x40cult_wall.dmi | Bin 0 -> 25759 bytes icons/turf/walls/32x40diamond_wall.dmi | Bin 0 -> 11345 bytes icons/turf/walls/32x40gold_wall.dmi | Bin 0 -> 11853 bytes icons/turf/walls/32x40iron_wall.dmi | Bin 0 -> 11069 bytes icons/turf/walls/32x40plasma_wall.dmi | Bin 0 -> 11505 bytes icons/turf/walls/32x40plastinum_wall.dmi | Bin 0 -> 22403 bytes icons/turf/walls/32x40plastitanium_wall.dmi | Bin 0 -> 25357 bytes icons/turf/walls/32x40reinforced_wall.dmi | Bin 0 -> 12616 bytes icons/turf/walls/32x40sandstone_wall.dmi | Bin 0 -> 12173 bytes icons/turf/walls/32x40silver_wall.dmi | Bin 0 -> 11714 bytes icons/turf/walls/32x40smoothrocks.dmi | Bin 0 -> 38539 bytes icons/turf/walls/32x40survival_pod_walls.dmi | Bin 0 -> 22108 bytes icons/turf/walls/32x40uranium_wall.dmi | Bin 0 -> 11199 bytes icons/turf/walls/32x40wall.dmi | Bin 0 -> 8684 bytes icons/turf/walls/32x40wood_wall.dmi | Bin 0 -> 27339 bytes icons/turf/walls/abductor_wall.dmi | Bin 3962 -> 0 bytes icons/turf/walls/backrooms_wall.dmi | Bin 6664 -> 0 bytes icons/turf/walls/bananium_wall.dmi | Bin 2167 -> 0 bytes icons/turf/walls/boss_wall.dmi | Bin 3847 -> 0 bytes icons/turf/walls/clockwork_wall.dmi | Bin 2820 -> 0 bytes icons/turf/walls/cult_wall.dmi | Bin 2662 -> 0 bytes icons/turf/walls/diamond_wall.dmi | Bin 2169 -> 0 bytes icons/turf/walls/gold_wall.dmi | Bin 2157 -> 0 bytes icons/turf/walls/iron_wall.dmi | Bin 2157 -> 0 bytes icons/turf/walls/plasma_wall.dmi | Bin 8147 -> 0 bytes icons/turf/walls/plastinum_wall.dmi | Bin 3504 -> 0 bytes icons/turf/walls/plastitanium_wall.dmi | Bin 4619 -> 0 bytes icons/turf/walls/reinforced_wall.dmi | Bin 2369 -> 0 bytes icons/turf/walls/sandstone_wall.dmi | Bin 2165 -> 0 bytes icons/turf/walls/silver_wall.dmi | Bin 2159 -> 0 bytes icons/turf/walls/smoothrocks.dmi | Bin 9096 -> 0 bytes icons/turf/walls/survival_pod_walls.dmi | Bin 5038 -> 0 bytes icons/turf/walls/uranium_wall.dmi | Bin 19239 -> 0 bytes icons/turf/walls/wall.dmi | Bin 1747 -> 0 bytes icons/turf/walls/wood_wall.dmi | Bin 2301 -> 0 bytes 181 files changed, 1465 insertions(+), 1383 deletions(-) create mode 100644 icons/obj/smooth_structures/windows/32x40clockwork_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40plasma_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40plastitanium_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40pod_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40reinforced_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40rplasma_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40shuttle_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40tinted_window.dmi create mode 100644 icons/obj/smooth_structures/windows/32x40window.dmi create mode 100644 icons/obj/smooth_structures/windows/clockwork_window_edges.dmi create mode 100644 icons/obj/smooth_structures/windows/plastitanium_window_edges.dmi create mode 100644 icons/obj/smooth_structures/windows/pod_window_edges.dmi create mode 100644 icons/obj/smooth_structures/windows/shuttle_window_edges.dmi create mode 100644 icons/obj/wallbumps/alarm.dmi create mode 100644 icons/obj/wallbumps/apc.dmi create mode 100644 icons/obj/wallbumps/firealarm.dmi create mode 100644 icons/turf/walls/32x40abductor_wall.dmi create mode 100644 icons/turf/walls/32x40backrooms_wall.dmi create mode 100644 icons/turf/walls/32x40bananium_wall.dmi create mode 100644 icons/turf/walls/32x40boss_wall.dmi create mode 100644 icons/turf/walls/32x40clockwork_wall.dmi create mode 100644 icons/turf/walls/32x40cult_wall.dmi create mode 100644 icons/turf/walls/32x40diamond_wall.dmi create mode 100644 icons/turf/walls/32x40gold_wall.dmi create mode 100644 icons/turf/walls/32x40iron_wall.dmi create mode 100644 icons/turf/walls/32x40plasma_wall.dmi create mode 100644 icons/turf/walls/32x40plastinum_wall.dmi create mode 100644 icons/turf/walls/32x40plastitanium_wall.dmi create mode 100644 icons/turf/walls/32x40reinforced_wall.dmi create mode 100644 icons/turf/walls/32x40sandstone_wall.dmi create mode 100644 icons/turf/walls/32x40silver_wall.dmi create mode 100644 icons/turf/walls/32x40smoothrocks.dmi create mode 100644 icons/turf/walls/32x40survival_pod_walls.dmi create mode 100644 icons/turf/walls/32x40uranium_wall.dmi create mode 100644 icons/turf/walls/32x40wall.dmi create mode 100644 icons/turf/walls/32x40wood_wall.dmi delete mode 100644 icons/turf/walls/abductor_wall.dmi delete mode 100644 icons/turf/walls/backrooms_wall.dmi delete mode 100644 icons/turf/walls/bananium_wall.dmi delete mode 100644 icons/turf/walls/boss_wall.dmi delete mode 100644 icons/turf/walls/clockwork_wall.dmi delete mode 100644 icons/turf/walls/cult_wall.dmi delete mode 100644 icons/turf/walls/diamond_wall.dmi delete mode 100644 icons/turf/walls/gold_wall.dmi delete mode 100644 icons/turf/walls/iron_wall.dmi delete mode 100644 icons/turf/walls/plasma_wall.dmi delete mode 100644 icons/turf/walls/plastinum_wall.dmi delete mode 100644 icons/turf/walls/plastitanium_wall.dmi delete mode 100644 icons/turf/walls/reinforced_wall.dmi delete mode 100644 icons/turf/walls/sandstone_wall.dmi delete mode 100644 icons/turf/walls/silver_wall.dmi delete mode 100644 icons/turf/walls/smoothrocks.dmi delete mode 100644 icons/turf/walls/survival_pod_walls.dmi delete mode 100644 icons/turf/walls/uranium_wall.dmi delete mode 100644 icons/turf/walls/wall.dmi delete mode 100644 icons/turf/walls/wood_wall.dmi diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 05fc3ddb125..bd6e36b4250 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -100,9 +100,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/freegolem) -"hL" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/freegolem) "iq" = ( /obj/effect/turf_decal/loading_area, /obj/machinery/light{ @@ -539,10 +536,10 @@ bq WF WF bq -hL +bq rr uT -hL +bq WF WF WF @@ -590,7 +587,7 @@ oD oD tz jD -hL +bq bq bq EE @@ -670,13 +667,13 @@ HE oD oD FQ -hL +bq bq bq Ob bq bq -hL +bq yn hg YZ @@ -698,13 +695,13 @@ JF AT qT EB -hL bq bq -hL bq bq -hL +bq +bq +bq EE "} (11,1,1) = {" @@ -767,10 +764,10 @@ oD oD oD FQ -hL bq bq -hL +bq +bq EE "} (14,1,1) = {" @@ -797,9 +794,9 @@ EE "} (15,1,1) = {" EE -hL bq -hL +bq +bq HE oD oD @@ -848,10 +845,10 @@ Rr BU BU jr -hL +bq bQ bQ -hL +bq HE oD oD @@ -889,7 +886,7 @@ EE EE bq bq -hL +bq wp wp bq @@ -898,7 +895,7 @@ xj bq wp wp -hL +bq bq bq EE @@ -914,10 +911,10 @@ EE bq cg cg -hL +bq nX MD -hL +bq cg cg bq diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm index 979b3dcce3c..7d30de5cc6a 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm @@ -514,9 +514,6 @@ "NG" = ( /turf/simulated/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) -"Oe" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/ruin/unpowered/misc_lavaruin) "Oq" = ( /obj/effect/mapping_helpers/turfs/burn, /obj/structure/reagent_dispensers/fueltank, @@ -1362,7 +1359,7 @@ NG dD dD Aj -Oe +It It It It @@ -1374,7 +1371,7 @@ vA It It It -Oe +It dD NG "} @@ -1383,7 +1380,7 @@ NG dD dD Gt -Oe +It tH tH It @@ -1395,7 +1392,7 @@ oD It tH tH -Oe +It dD NG "} @@ -1407,13 +1404,13 @@ Gt Aj ma ma -Oe -Oe It It It -Oe -Oe +It +It +It +It ma Aj Yf @@ -1428,13 +1425,13 @@ dD SH Aj Aj -Oe +It tH tH tH tH tH -Oe +It Aj SH SH diff --git a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm index 65e3cdecf22..d44b3c35f05 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm @@ -231,7 +231,7 @@ /turf/simulated/floor/plating, /area/ruin/space/clown_mime_ruin) "nX" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/clown_mime_ruin) "ok" = ( /obj/effect/turf_decal/stripes/corner{ @@ -836,7 +836,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/clown_mime_ruin) "Xq" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/powered) "Xu" = ( /obj/effect/mob_spawn/human/corpse/mime, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm index 64975929bcf..c86c0b8005c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm @@ -185,9 +185,6 @@ }, /turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/space/unpowered) -"S" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/ruin/space/unpowered) "T" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/food_trash, @@ -926,7 +923,7 @@ n L U u -S +e b b d @@ -960,13 +957,13 @@ b b b c -S -S -S +e +e +e X -S -S -S +e +e +e c b b @@ -1158,7 +1155,7 @@ b b b d -S +e o o o @@ -1168,7 +1165,7 @@ h o o M -S +e E c a @@ -1238,7 +1235,7 @@ b b b d -S +e o o o @@ -1318,17 +1315,17 @@ a b b c -S +e F F F -S -S -S +e +e +e F F F -S +e c c Z @@ -1358,17 +1355,17 @@ a b b b -S +e l l l -S +e c -S +e l l l -S +e c a a diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm index 87d4cff7e3a..7cc06409206 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm @@ -15,7 +15,7 @@ /area/space/nearstation) "af" = ( /obj/effect/spawner/airlock, -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/djstation) "ag" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -203,7 +203,7 @@ /area/ruin/space/djstation) "aH" = ( /obj/effect/spawner/airlock/s_to_n, -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/djstation) "aJ" = ( /obj/item/clothing/head/ushanka, @@ -277,7 +277,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/djstation) "aS" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/djstation) "aT" = ( /obj/structure/lattice/catwalk, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/engineering_vessel.dmm b/_maps/map_files/RandomRuins/SpaceRuins/engineering_vessel.dmm index b254a3a73d5..ddd1a88d01e 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/engineering_vessel.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/engineering_vessel.dmm @@ -162,7 +162,7 @@ /turf/simulated/floor/wood, /area/ruin/space/unpowered) "F" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/unpowered) "H" = ( /turf/simulated/floor/plasteel/dark, @@ -177,7 +177,7 @@ /area/ruin/space/unpowered) "J" = ( /obj/effect/spawner/airlock/e_to_w, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/unpowered) "K" = ( /obj/structure/shuttle/engine/heater{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm index 0b29a767fd4..3d75ac127aa 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm @@ -6,9 +6,6 @@ /obj/item/reagent_containers/spray/cleaner/advanced, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered) -"dC" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/space/powered) "dN" = ( /obj/effect/mapping_helpers/turfs/damage, /obj/machinery/disco, @@ -1053,7 +1050,7 @@ Je LW LW LW -dC +LW uk zL LW @@ -1083,7 +1080,7 @@ Kh LW LW LW -dC +LW xJ xJ La diff --git a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm index 4f8e4b6a6fd..d3424a8fbd0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm @@ -112,7 +112,7 @@ /turf/simulated/floor/plating, /area/ruin/space/syndicate_listening_station) "kJ" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/syndicate_listening_station) "le" = ( /turf/simulated/floor/plasteel/dark, @@ -176,7 +176,7 @@ /area/ruin/space/syndicate_listening_station/asteroid) "se" = ( /obj/effect/spawner/airlock/w_to_e, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/syndicate_listening_station) "sf" = ( /obj/structure/cable/yellow{ @@ -587,7 +587,7 @@ /obj/item/gps/ruin{ gpstag = "Encrypted Signal" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/syndicate_listening_station) "UC" = ( /obj/effect/spawner/random/cobweb/right/rare, @@ -628,13 +628,13 @@ /area/ruin/space/syndicate_listening_station) "Wc" = ( /obj/effect/spawner/airlock/e_to_w, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/syndicate_listening_station) "Wf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/syndicate_listening_station) "WN" = ( /obj/structure/cable/yellow{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm index c01cba21dca..df40c9ba88e 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm @@ -400,9 +400,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/mech_transport) -"CK" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/space/mech_transport) "CL" = ( /obj/item/stack/sheet/metal, /turf/template_noop, @@ -1088,7 +1085,7 @@ Uf sH kI di -CK +vo vo vo vo @@ -1238,7 +1235,7 @@ VS VS VS di -CK +vo jd vo vo diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm index 1660658874b..45560da8973 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm @@ -155,7 +155,7 @@ /area/template_noop) "pp" = ( /obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/rocky_motel, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/template_noop) "pJ" = ( /obj/structure/closet/cabinet, @@ -260,9 +260,6 @@ /obj/item/stack/sheet/metal, /turf/simulated/floor/plating, /area/template_noop) -"zj" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/template_noop) "An" = ( /obj/structure/girder, /turf/simulated/floor/plating/burnt, @@ -1099,7 +1096,7 @@ DF DF DF DF -zj +fZ fZ fZ fZ @@ -1115,7 +1112,7 @@ DF DF DF DF -zj +fZ fZ fZ fZ @@ -1149,7 +1146,7 @@ DF "} (37,1,1) = {" DF -zj +fZ fZ fZ fZ @@ -1282,9 +1279,9 @@ DF "} (44,1,1) = {" DF -zj fZ -zj +fZ +fZ DF VT fZ @@ -1296,7 +1293,7 @@ fZ fZ fZ fZ -zj +fZ gK "} (45,1,1) = {" @@ -1322,9 +1319,9 @@ DF DF DF DF -zj +fZ DF -zj +fZ DF iy kT diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm index 7815631b744..b25a4c508dc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/sieged_lab_submaps.dmm @@ -838,7 +838,7 @@ /turf/simulated/floor/plasteel/white, /area/template_noop) "sC" = ( -/obj/machinery/door/airlock/bloody, +/obj/machinery/door/airlock/public, /turf/template_noop, /area/template_noop) "sF" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm index 3c3b29cc425..33464ae6534 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/telecomns_returns_submap.dmm @@ -26,7 +26,7 @@ /turf/simulated/floor/engine, /area/template_noop) "da" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/template_noop) "dD" = ( /mob/living/basic/alien/sentinel, @@ -313,7 +313,7 @@ /area/template_noop) "DH" = ( /obj/effect/map_effect/marker/mapmanip/submap/extract/space_ruin/dvorak/vendor_room, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/template_noop) "Ep" = ( /obj/effect/spawner/random/barrier/obstruction, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm index 26ae558c1bd..d2724f27c0e 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/whiteship_submaps.dmm @@ -21,9 +21,6 @@ /obj/effect/turf_decal/delivery/red/hollow/right, /turf/simulated/floor/plasteel/dark, /area/template_noop) -"bl" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/template_noop) "cl" = ( /obj/item/stack/ore/iron, /turf/simulated/floor/plating/airless, @@ -1484,7 +1481,7 @@ qr ja zY AX -bl +fM qr qr qr @@ -1862,7 +1859,7 @@ qr Py zY ha -bl +fM qr qr qr @@ -1911,7 +1908,7 @@ Gh Ow EA IL -bl +fM qr qr qr diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 86ae719c6ce..b26557a2db6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -43,7 +43,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_space_base/storage) "ai" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/medbay) "am" = ( /turf/simulated/floor/plasteel/dark, @@ -91,7 +91,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "az" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/dormitories) "aA" = ( /obj/structure/disposalpipe/segment{ @@ -521,7 +521,7 @@ /turf/template_noop, /area/ruin/unpowered/syndicate_space_base/inner) "dD" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/telecomms) "dG" = ( /obj/structure/cable/green{ @@ -572,7 +572,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/dormitories) "dP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -777,7 +777,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "eW" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/testlab) "fb" = ( /turf/simulated/floor/wood, @@ -971,7 +971,7 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "fX" = ( /obj/structure/sign/science/genetics, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/genetics) "fY" = ( /obj/machinery/cooking/deepfryer, @@ -1227,7 +1227,7 @@ /area/ruin/unpowered/syndicate_space_base/testlab) "hs" = ( /obj/structure/sign/science/toxins, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "hx" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -1448,7 +1448,7 @@ desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "iF" = ( /obj/structure/cable/yellow{ @@ -2108,7 +2108,7 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "nj" = ( /obj/structure/sign/engineering, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/engineering) "nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2277,7 +2277,7 @@ /turf/simulated/floor/engine, /area/ruin/unpowered/syndicate_space_base/toxtest) "nV" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/inner) "nW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2451,7 +2451,7 @@ /area/ruin/unpowered/syndicate_space_base/service) "oW" = ( /obj/structure/sign/command/vault, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/storage) "pe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2554,7 +2554,7 @@ name = "Test Lab Monitor"; network = list("SyndicateTestLab") }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/testlab) "pD" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2791,7 +2791,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "rd" = ( /obj/structure/sign/electricshock, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/main) "rg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2991,7 +2991,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "sH" = ( /obj/structure/sign/public/cryo, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/dormitories) "sR" = ( /obj/machinery/light{ @@ -3124,7 +3124,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/dormitories) "tG" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/engineering) "tJ" = ( /obj/machinery/door/poddoor/shutters{ @@ -3143,7 +3143,7 @@ /area/ruin/unpowered/syndicate_space_base/service) "tN" = ( /obj/structure/sign/medical/virology, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/virology) "tP" = ( /obj/machinery/light{ @@ -3678,7 +3678,7 @@ id = "SSBtestchamber"; name = "Blast Door Control" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/testlab) "wu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3816,7 +3816,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/arrivals) "xn" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/arrivals) "xo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3854,7 +3854,7 @@ /area/ruin/unpowered/syndicate_space_base/service) "xB" = ( /obj/structure/sign/security/armory, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/storage) "xD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3889,7 +3889,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/main) "xW" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxtest) "xZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4240,7 +4240,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/dormitories) "Ai" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/control) "Aj" = ( /obj/machinery/light, @@ -4628,7 +4628,7 @@ /area/ruin/unpowered/syndicate_space_base/dormitories) "CQ" = ( /obj/structure/sign/service/kitchen, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/service) "CR" = ( /obj/machinery/alarm/syndicate/directional/north, @@ -4711,7 +4711,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/control) "Dy" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/service) "DG" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -4755,11 +4755,11 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/virology) "DX" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/genetics) "DY" = ( /obj/structure/sign/medical, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/medbay) "DZ" = ( /turf/simulated/floor/plasteel/dark, @@ -4846,7 +4846,7 @@ /area/ruin/unpowered/syndicate_space_base/chemistry) "EB" = ( /obj/structure/sign/service/library, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/arrivals) "EC" = ( /obj/effect/mob_spawn/human/alive/spacebase_syndicate, @@ -5195,7 +5195,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/virology) "Gg" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/atmos) "Gh" = ( /obj/machinery/door/airlock/hatch/syndicate, @@ -5601,7 +5601,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_space_base/atmos) "IJ" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/chemistry) "IL" = ( /obj/machinery/light, @@ -5632,7 +5632,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/arrivals) "IX" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "IY" = ( /obj/machinery/tcomms/relay/ruskie{ @@ -5869,7 +5869,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "Kh" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxtest) "Km" = ( /obj/machinery/autolathe/syndicate, @@ -6028,7 +6028,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "LC" = ( /obj/structure/sign/public/arcade, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/arrivals) "LD" = ( /obj/machinery/light{ @@ -6082,7 +6082,7 @@ /area/ruin/unpowered/syndicate_space_base/main) "LQ" = ( /obj/structure/sign/engineering/power, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/engineering) "LR" = ( /obj/machinery/light{ @@ -6306,7 +6306,7 @@ /area/ruin/unpowered/syndicate_space_base/toxtest) "NH" = ( /obj/structure/sign/science/chemistry_sci, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/chemistry) "NI" = ( /obj/structure/reagent_dispensers/spacecleanertank{ @@ -6320,7 +6320,7 @@ /area/ruin/unpowered/syndicate_space_base/arrivals) "NN" = ( /obj/structure/sign/science/cans_sci, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/toxlaunch) "NS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6415,7 +6415,7 @@ /area/ruin/unpowered/syndicate_space_base/testlab) "Oq" = ( /obj/structure/sign/science/toxins, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/atmos) "Ox" = ( /turf/simulated/mineral/ancient/outer, @@ -6456,7 +6456,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/engineering) "OR" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/storage) "OS" = ( /obj/machinery/door/firedoor, @@ -6560,7 +6560,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/chemistry) "PL" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/virology) "PM" = ( /obj/machinery/conveyor/east{ @@ -6868,7 +6868,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_space_base/main) "RX" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/main) "RZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7497,7 +7497,7 @@ /area/ruin/unpowered/syndicate_space_base/main) "VT" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/genetics) "VU" = ( /obj/structure/table/glass, @@ -7582,7 +7582,7 @@ /area/ruin/unpowered/syndicate_space_base/virology) "Ww" = ( /obj/structure/sign/service/custodian, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/arrivals) "Wz" = ( /obj/machinery/door/airlock/hatch/syndicate, @@ -7890,7 +7890,7 @@ /area/ruin/unpowered/syndicate_space_base/atmos) "Ym" = ( /obj/structure/sign/service/bar, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/service) "Yo" = ( /obj/structure/window/plasmareinforced{ @@ -8084,7 +8084,7 @@ desc = "A warning sign which reads 'CHEMICAL TESTING ZONsE"; name = "CHEMICAL TESTING ZONE" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/unpowered/syndicate_space_base/testlab) "ZI" = ( /obj/structure/rack{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm index 78f68be1d1f..f37230a3736 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm @@ -80,7 +80,7 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_depot/outer) "at" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "au" = ( /obj/machinery/light{ @@ -267,7 +267,7 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_depot/core) "bf" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/outer) "bh" = ( /obj/machinery/light{ @@ -493,14 +493,14 @@ dir = 6; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "bY" = ( /obj/effect/landmark{ dir = 4; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "bZ" = ( /obj/effect/spawner/random/syndicate/wallvault, @@ -516,14 +516,14 @@ dir = 4; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cc" = ( /obj/effect/landmark{ dir = 10; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cd" = ( /obj/effect/spawner/random/syndicate/mob, @@ -543,7 +543,7 @@ name = "mysterious button"; power_state = 0 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/outer) "cg" = ( /obj/structure/falsewall, @@ -565,7 +565,7 @@ /obj/effect/landmark{ name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "ck" = ( /obj/machinery/turretid/syndicate{ @@ -692,7 +692,7 @@ /obj/effect/landmark{ name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cD" = ( /obj/machinery/atmospherics/unary/passive_vent/high_volume{ @@ -753,21 +753,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cP" = ( /obj/effect/landmark{ dir = 5; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cR" = ( /obj/effect/landmark{ dir = 9; name = "syndi_depot_shield" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/syndicate_depot/core) "cS" = ( /mob/living/silicon/decoy/syndicate/depot, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecoms_shuttle.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecoms_shuttle.dmm index aa3b56ee32c..0c663995f97 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecoms_shuttle.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecoms_shuttle.dmm @@ -84,7 +84,7 @@ /obj/structure/sign/electricshock{ pixel_x = -32 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/unpowered) "q" = ( /obj/machinery/computer/nonfunctional{ @@ -162,7 +162,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/unpowered) "B" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/unpowered) "C" = ( /obj/structure/railing{ @@ -233,7 +233,7 @@ /area/ruin/space/unpowered) "L" = ( /obj/machinery/porta_turret, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/unpowered) "M" = ( /obj/machinery/suit_storage_unit/cmo/sec_storage/secure, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm index 515b1843c55..d8c7a5a915c 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -85,7 +85,7 @@ /area/ruin/space/turreted_outpost/vault) "iq" = ( /obj/effect/spawner/airlock/w_to_e/long/square, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/turreted_outpost) "ju" = ( /obj/structure/bed, @@ -155,7 +155,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/turreted_outpost) "qa" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/turreted_outpost) "qy" = ( /obj/structure/cable/yellow{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index b747f03ac30..b92092f1403 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -51,7 +51,7 @@ /turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "am" = ( -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "an" = ( /obj/effect/spawner/window/shuttle, @@ -65,12 +65,12 @@ /area/ruin/space/derelict/bridge) "ao" = ( /obj/effect/mapping_helpers/turfs/damage, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "ap" = ( /obj/effect/mapping_helpers/turfs/damage, /obj/effect/mapping_helpers/turfs/burn, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "aq" = ( /obj/effect/mapping_helpers/turfs/burn, @@ -211,7 +211,7 @@ /area/ruin/space/derelict/bridge) "aE" = ( /obj/structure/sign/nuke, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "aF" = ( /obj/item/kirbyplants/large, @@ -462,10 +462,10 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/bridge) "bm" = ( -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "bn" = ( -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "bo" = ( /obj/structure/cable{ @@ -1015,7 +1015,7 @@ /area/ruin/space/derelict/crew_quarters) "cL" = ( /obj/structure/sign/mech, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "cN" = ( /obj/machinery/door/airlock/hatch{ @@ -1480,7 +1480,7 @@ /area/ruin/space/derelict/hallway/primary) "dX" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "dY" = ( /obj/structure/cable{ @@ -1540,7 +1540,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/space/derelict/arrival) "eg" = ( -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "eh" = ( /obj/machinery/light/spot{ @@ -1650,7 +1650,7 @@ /area/ruin/space/derelict/hallway/primary) "et" = ( /obj/structure/sign/science, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "eu" = ( /turf/simulated/floor/plasteel/fakestairs, @@ -1703,7 +1703,7 @@ /area/ruin/space/derelict/hallway/primary) "ez" = ( /obj/structure/noticeboard, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "eA" = ( /obj/machinery/atmospherics/unary/passive_vent, @@ -2200,7 +2200,7 @@ /area/ruin/space/derelict/hallway/primary) "fL" = ( /obj/structure/sign/nosmoking, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "fM" = ( /obj/effect/decal/cleanable/dirt, @@ -2341,7 +2341,7 @@ /area/ruin/space/derelict/hallway/primary) "ge" = ( /obj/structure/sign/service/bar, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "gf" = ( /obj/structure/chair/wood{ @@ -2480,7 +2480,7 @@ /area/ruin/space/derelict/hallway/primary) "gy" = ( /obj/effect/mapping_helpers/turfs/burn, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "gz" = ( /obj/machinery/recharge_station, @@ -2745,7 +2745,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "hi" = ( /obj/effect/mapping_helpers/turfs/burn, @@ -2821,7 +2821,7 @@ /area/ruin/space/derelict/solar_control) "ht" = ( /obj/structure/sign/security, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "hu" = ( /obj/machinery/door/airlock/security/glass{ @@ -2862,7 +2862,7 @@ /area/ruin/space/derelict/hallway/primary) "hz" = ( /obj/effect/mapping_helpers/turfs/damage, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "hA" = ( /obj/structure/table/reinforced, @@ -4106,7 +4106,7 @@ /area/ruin/space/derelict/crew_quarters) "kG" = ( /obj/structure/sign/vacuum, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "kH" = ( /obj/structure/cable{ @@ -4448,7 +4448,7 @@ /area/ruin/space/derelict/arrival) "lz" = ( /obj/structure/sign/service/botany, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "lA" = ( /obj/machinery/door/airlock/glass{ @@ -5081,7 +5081,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "nA" = ( /obj/machinery/hydroponics, @@ -5777,7 +5777,7 @@ /area/ruin/space/derelict/arrival) "pJ" = ( /obj/effect/mapping_helpers/turfs/damage, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "pK" = ( /obj/structure/window/reinforced, @@ -5942,7 +5942,7 @@ /area/ruin/space/derelict/arrival) "qh" = ( /obj/structure/sign/medical/examroom, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "qi" = ( /obj/machinery/computer/arcade, @@ -5988,7 +5988,7 @@ /area/ruin/space/derelict/crew_quarters) "qp" = ( /obj/effect/mapping_helpers/turfs/burn, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "qr" = ( /obj/structure/cable{ @@ -6000,7 +6000,7 @@ /area/ruin/space/derelict/arrival) "qs" = ( /obj/structure/sign/nosmoking/alt, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "qt" = ( /obj/effect/turf_decal/tiles/department/security/side{ @@ -6328,7 +6328,7 @@ /area/ruin/space/derelict/crew_quarters) "ro" = ( /obj/structure/sign/medical, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "rp" = ( /obj/structure/table, @@ -6661,7 +6661,7 @@ /area/ruin/space/derelict/arrival) "rZ" = ( /obj/structure/sign/vacuum, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "sc" = ( /obj/structure/cable{ @@ -6810,11 +6810,11 @@ /obj/item/gps/ruin{ gpstag = "Soviet Distress Signal" }, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "tc" = ( /obj/structure/sign/security/armory, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "vm" = ( /obj/effect/decal/cleanable/dirt, @@ -6826,7 +6826,7 @@ /area/ruin/space/derelict/arrival) "xi" = ( /obj/effect/spawner/random/fungus/frequent, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "Ae" = ( /mob/living/basic/giant_spider/hunter, @@ -6857,43 +6857,43 @@ /area/ruin/space/derelict/crew_quarters) "El" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "HM" = ( /obj/structure/sign/engineering, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "KH" = ( /obj/structure/sign/command, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "Lb" = ( /obj/structure/sign/public/laundry, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "Ld" = ( /obj/structure/sign/service/chapel, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "Lk" = ( /obj/structure/sign/cargo/dock, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "Mh" = ( /obj/structure/sign/service/kitchen, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "Mi" = ( /obj/effect/spawner/random/fungus/frequent, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "Nv" = ( /obj/effect/spawner/airlock, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/arrival) "Oh" = ( /obj/effect/spawner/airlock/w_to_e, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/crew_quarters) "PR" = ( /mob/living/basic/pirate, @@ -6913,7 +6913,7 @@ /area/ruin/space/derelict/arrival) "UY" = ( /obj/structure/sign/command/conference, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/bridge) "Xb" = ( /obj/structure/sign/cargo/dock{ @@ -6931,7 +6931,7 @@ /area/ruin/space/derelict/crew_quarters) "Ye" = ( /obj/effect/spawner/random/fungus/frequent, -/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal, +/turf/simulated/wall/indestructible/titanium/soviet, /area/ruin/space/derelict/hallway/primary) "Yi" = ( /obj/structure/cable{ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm index 4f899fd7b34..4e2c09e94c4 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm @@ -16,9 +16,6 @@ /obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"ds" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/ruin/space/derelict/teleporter) "dJ" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -91,7 +88,7 @@ /area/ruin/space/derelict/teleporter) "iS" = ( /obj/effect/spawner/airlock/w_to_e, -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/derelict/teleporter) "kg" = ( /obj/machinery/power/apc/worn_out/directional/north, @@ -323,7 +320,7 @@ /area/ruin/space/derelict/teleporter) "Io" = ( /obj/structure/sign/vacuum, -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/ruin/space/derelict/teleporter) "NU" = ( /obj/effect/turf_decal/stripes/line{ @@ -456,11 +453,11 @@ qQ qQ qQ PS -ds +PS We iQ gr -ds +PS PS qQ "} @@ -475,13 +472,13 @@ FQ Wu Zl PS -ds +PS eR vX mq sY vr -ds +PS qQ "} (5,1,1) = {" @@ -495,7 +492,7 @@ HL ZN mY ic -ds +PS bh wd bk @@ -535,7 +532,7 @@ ZM Av ZN pZ -ds +PS kX wd Vc @@ -555,13 +552,13 @@ vx FQ Wu PS -ds +PS kg Aj NU vG dJ -ds +PS qQ "} (9,1,1) = {" @@ -576,11 +573,11 @@ qQ qQ qQ PS -ds +PS oK DX uD -ds +PS PS qQ "} @@ -637,9 +634,9 @@ qQ qQ qQ qQ -ds +PS tF -ds +PS qQ qQ qQ diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index 93b182f227b..4d550abd3a0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -66,9 +66,6 @@ "lp" = ( /turf/simulated/floor/plating/airless, /area/shuttle/abandoned) -"qm" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/abandoned) "qK" = ( /obj/structure/table/reinforced, /obj/item/whiteship_port_generator, @@ -454,7 +451,7 @@ zO zO zO zO -qm +zO zM "} (13,1,1) = {" @@ -575,10 +572,10 @@ zM zM zM zM -qm +zO yC ux -qm +zO zM zM zM diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index 1db8cf4092b..f1a70cbe8c7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -16,9 +16,6 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/ruin/space/powered) -"ae" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, -/area/ruin/space/powered) "af" = ( /obj/structure/computerframe, /obj/effect/mapping_helpers/turfs/damage, @@ -551,14 +548,14 @@ aa aa aa bH -ae -ae -ae -ae -ae -ae -ae -ae +bH +bH +bH +bH +bH +bH +bH +bH bH aa aa @@ -581,17 +578,17 @@ aa aa aa bH -ae +bH aY EZ bl bq -ae +bH bw bA bD -ae -ae +bH +bH aa "} (4,1,1) = {" @@ -605,19 +602,19 @@ ac ac ac bH -ae -al -ae -ae +bH al bH -ae -ae +bH +al +bH +bH +bH bc aS aS bg -ae +bH bx bJ bx @@ -635,7 +632,7 @@ ac ac ac ac -ae +bH am au aC @@ -648,7 +645,7 @@ aZ aS aZ aS -ae +bH bB bK bM @@ -679,7 +676,7 @@ aZ bf aS aS -ae +bH bx bL bx @@ -696,8 +693,8 @@ ac ac ac ac -ae -ae +bH +bH ao aw aC @@ -710,12 +707,12 @@ aU be aU aU -ae +bH aS aS aS -ae -ae +bH +bH aa "} (8,1,1) = {" @@ -741,7 +738,7 @@ aC aC bm aC -ae +bH by bJ bx @@ -788,7 +785,7 @@ ac ac ac ac -ae +bH ag ak aC @@ -803,7 +800,7 @@ aC aC aC aC -ae +bH by bL bx @@ -820,8 +817,8 @@ ac ac ac ac -ae -ae +bH +bH ar ag aC @@ -834,12 +831,12 @@ aU bh aU aU -ae +bH aS aS aS -ae -ae +bH +bH aa "} (12,1,1) = {" @@ -865,7 +862,7 @@ ba bi bn bi -ae +bH bx bJ bx @@ -883,7 +880,7 @@ ac ac ac ac -ae +bH at aB aD @@ -896,7 +893,7 @@ bb bj bo bs -ae +bH bB bK bM @@ -915,19 +912,19 @@ ac ac ac bH -ae +bH al -ae -ae +bH +bH aM bH -ae -ae +bH +bH bd bE bn bt -ae +bH bx bL bx @@ -953,17 +950,17 @@ aa aa aa bH -ae +bH bC bk bp bu -ae +bH bz bP bN -ae -ae +bH +bH aa "} (16,1,1) = {" @@ -985,14 +982,14 @@ aa aa aa bH -ae -ae -ae -ae -ae -ae -ae -ae +bH +bH +bH +bH +bH +bH +bH +bH bH aa aa diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index cff3b0aa729..a0081688051 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -385,9 +385,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/ruin/space/wreck_cargoship) -"ny" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/ruin/space/wreck_cargoship) "nB" = ( /obj/effect/turf_decal/delivery/white/partial{ dir = 1 @@ -516,7 +513,7 @@ name = "interior warehouse shutters"; id = "cargoshipblastdoor2" }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/ruin/space/wreck_cargoship) "ru" = ( /obj/effect/spawner/window/plastitanium, @@ -1416,11 +1413,11 @@ ea ea ea gE -ny +gE NR NR Yk -ny +gE gE ea ea @@ -1709,7 +1706,7 @@ gE NR NR gE -ny +gE ah jN Wx @@ -1818,7 +1815,7 @@ Uq Mx zm kf -ny +gE gE gE gE @@ -1902,7 +1899,7 @@ Aa tn kO PB -ny +gE gE Mc gE @@ -1918,7 +1915,7 @@ ea ea DY gE -ny +gE pD sL sL @@ -1926,7 +1923,7 @@ ca AP KJ nG -ny +gE gE ea ea @@ -2002,7 +1999,7 @@ ea ea ea gE -ny +gE ES Zc eC @@ -2010,7 +2007,7 @@ eV JK VF TS -ny +gE gE ea ea diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 2a7d47458cd..9f2dca8c89a 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1027,7 +1027,7 @@ /area/ghost_bar) "ex" = ( /obj/structure/sign/public/cryo, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "eA" = ( /obj/structure/chair/stool{ @@ -1422,7 +1422,7 @@ /turf/simulated/floor/wood, /area/ninja/holding) "gh" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/centcom) "gi" = ( /obj/item/storage/firstaid/fire, @@ -1549,7 +1549,7 @@ layer = 1; name = "Blocker" }, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/centcom) "gG" = ( /obj/effect/decal/remains/human, @@ -1939,7 +1939,7 @@ /area/centcom) "hM" = ( /obj/structure/sign/public/restroom, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "hN" = ( /obj/machinery/door_control/no_emag{ @@ -2185,7 +2185,7 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "iy" = ( /obj/machinery/door/airlock/hatch/syndicate/command, @@ -2413,7 +2413,7 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "jh" = ( /obj/structure/chair/office/dark{ @@ -2426,7 +2426,7 @@ id_tag = "commandcenter"; name = "Privacy Shutters" }, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "jk" = ( /obj/effect/landmark/spawner/syndicate_infiltrator, @@ -2997,7 +2997,7 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "lg" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership/jail) "lh" = ( /obj/machinery/door/poddoor/multi_tile/impassable{ @@ -3061,7 +3061,7 @@ /turf/simulated/floor/wood, /area/ghost_bar) "lq" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/supply) "lr" = ( /turf/simulated/floor/mineral/titanium, @@ -3144,7 +3144,7 @@ /turf/simulated/floor/plating, /area/centcom) "lH" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/admin) "lI" = ( /obj/structure/rack, @@ -5457,7 +5457,7 @@ /turf/simulated/floor/plating/airless, /area/syndicate_mothership) "tf" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/syndicate) "tg" = ( /obj/machinery/porta_turret/syndicate/pod/nuke_ship_interior, @@ -6888,7 +6888,7 @@ /area/ghost_bar) "yn" = ( /obj/structure/sign/medical, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "yp" = ( /obj/item/radio/intercom/syndicate{ @@ -7204,7 +7204,7 @@ /area/ghost_bar) "zJ" = ( /obj/structure/sign/service/kitchen, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "zK" = ( /obj/machinery/door_control/no_emag/no_cyborg{ @@ -7538,7 +7538,7 @@ /obj/effect/turf_decal{ dir = 8 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/supply) "AV" = ( /obj/item/kirbyplants/large, @@ -7808,7 +7808,7 @@ /turf/simulated/floor/plasteel, /area/syndicate_mothership) "BZ" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "Ca" = ( /obj/machinery/computer/security/telescreen/entertainment{ @@ -9311,7 +9311,7 @@ /area/holodeck/source_knightarena) "HK" = ( /obj/structure/sign/public/drop, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/syndicate_mothership) "HM" = ( /obj/machinery/economy/vending/boozeomat, @@ -10414,7 +10414,7 @@ /area/ninja/outpost) "Md" = ( /obj/structure/sign/public/arcade, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "Me" = ( /turf/simulated/wall/indestructible/riveted, @@ -10873,7 +10873,7 @@ }, /area/ghost_bar) "NJ" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/ghost_bar) "NK" = ( /obj/machinery/computer/shuttle/admin{ @@ -10962,7 +10962,7 @@ /obj/effect/turf_decal{ dir = 4 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/supply) "Oi" = ( /obj/structure/flora/ausbushes/grassybush, @@ -11240,7 +11240,7 @@ /area/centcom/specops) "Pc" = ( /obj/structure/sign/public/arcade, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "Pd" = ( /obj/machinery/status_display, @@ -11408,7 +11408,7 @@ /area/centcom/control) "PK" = ( /obj/structure/sign/service/bar, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "PL" = ( /obj/machinery/economy/vending/cigarette/free, @@ -11887,7 +11887,7 @@ /turf/simulated/floor/wood, /area/wizard_station) "Rv" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) "Rw" = ( /obj/machinery/door/airlock/external{ @@ -12104,7 +12104,7 @@ /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership/jail) "Sd" = ( -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/syndicate_mothership) "Se" = ( /obj/item/storage/fancy/crayons, @@ -12339,7 +12339,7 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar) "Td" = ( -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "Te" = ( /turf/simulated/wall/indestructible/riveted, @@ -12793,7 +12793,7 @@ /turf/simulated/floor/plasteel/dark, /area/ghost_bar) "UO" = ( -/turf/simulated/wall/indestructible/opsglass/limited_smooth, +/turf/simulated/wall/indestructible/fakeglass/plastitanium/limited_smooth, /area/syndicate_mothership) "UQ" = ( /obj/structure/table, @@ -12851,7 +12851,7 @@ /area/holodeck/source_picnicarea) "Vd" = ( /obj/structure/sign/service/library, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "Ve" = ( /obj/structure/mirror{ @@ -13146,7 +13146,7 @@ /area/centcom/evac) "Wm" = ( /obj/structure/sign/public/drop, -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/syndicate_mothership) "Wp" = ( /obj/structure/table/wood, @@ -13653,7 +13653,7 @@ /area/centcom/specops) "Ya" = ( /obj/structure/sign/service/custodian, -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/ghost_bar) "Yb" = ( /obj/structure/table, @@ -13951,7 +13951,7 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Zk" = ( -/turf/simulated/wall/indestructible/syndicate/no_diagonal, +/turf/simulated/wall/indestructible/syndicate, /area/syndicate_mothership/jail) "Zl" = ( /obj/item/kirbyplants/large, diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index ba713017cd0..350c9cac370 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -2,9 +2,6 @@ "aa" = ( /turf/space, /area/space) -"ac" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/administration) "ad" = ( /obj/effect/mapping_helpers/airlock/access/all/centcomm/general, /obj/machinery/door/airlock/external{ @@ -521,15 +518,15 @@ aa aa aa vg -ac -aD -aD -ac vg -ac aD aD -ac +vg +vg +vg +aD +aD +vg vg aa aa @@ -638,7 +635,7 @@ aa aa "} (8,1,1) = {" -ac +vg vg vg vg @@ -698,7 +695,7 @@ aa aa "} (11,1,1) = {" -ac +vg vg vg aB @@ -791,7 +788,7 @@ vg bk bq bv -ac +vg vg aa aa diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index 11723a62194..17e859bdf19 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -236,10 +236,6 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/security/brig, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/administration) -"rA" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/administration) "sq" = ( /obj/structure/table/reinforced, /obj/item/kitchen/knife/combat{ @@ -622,9 +618,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) -"Iv" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/administration) "Jt" = ( /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/mineral/plastitanium/red, @@ -1014,7 +1007,7 @@ vk xH NQ NQ -rA +kf "} (6,1,1) = {" vk @@ -1258,22 +1251,22 @@ vk "} (18,1,1) = {" vk -Iv +vk uW uW -Iv vk vk -Iv -uW -uW -Iv vk vk -Iv uW uW -Iv +vk +vk +vk +vk +uW +uW +vk vk "} (19,1,1) = {" diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 3adb87f4e98..d49a379929b 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -664,9 +664,6 @@ }, /turf/simulated/floor/mineral/titanium, /area/shuttle/administration) -"Dw" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/administration) "Jz" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ @@ -798,7 +795,7 @@ aw aw aw aw -Dw +ab ab bD zD @@ -838,7 +835,7 @@ aP aT aP bb -Dw +ab MI aw aw @@ -1052,22 +1049,22 @@ ab "} (18,1,1) = {" ab -Dw +ab aL aL -Dw ab ab -Dw -aL -aL -Dw ab ab -Dw aL aL -Dw +ab +ab +ab +ab +aL +aL +ab ab "} (19,1,1) = {" diff --git a/_maps/map_files/shuttles/admin_skipjack.dmm b/_maps/map_files/shuttles/admin_skipjack.dmm index d45bd0013d2..92313a916a8 100644 --- a/_maps/map_files/shuttles/admin_skipjack.dmm +++ b/_maps/map_files/shuttles/admin_skipjack.dmm @@ -287,7 +287,7 @@ autolink_id = "voxwest_btn_int"; req_access = list(152) }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) "ci" = ( /obj/effect/spawner/window/plastitanium, @@ -326,7 +326,7 @@ autolink_id = "voxeast_btn_int"; req_access = list(152) }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/administration) "co" = ( /obj/effect/mapping_helpers/airlock/access/all/shuttles/vox, diff --git a/_maps/map_files/shuttles/cargo_base.dmm b/_maps/map_files/shuttles/cargo_base.dmm index 18412be1f08..6b092338ab4 100644 --- a/_maps/map_files/shuttles/cargo_base.dmm +++ b/_maps/map_files/shuttles/cargo_base.dmm @@ -83,7 +83,7 @@ /obj/effect/turf_decal{ dir = 4 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/supply) "t" = ( /obj/structure/window/reinforced{ @@ -115,7 +115,7 @@ /obj/effect/turf_decal{ dir = 8 }, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/supply) "I" = ( /obj/effect/turf_decal{ @@ -135,9 +135,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/supply) -"U" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/supply) (1,1,1) = {" a @@ -164,7 +161,7 @@ i i I r -U +a w "} (3,1,1) = {" @@ -220,7 +217,7 @@ e e R H -U +a y "} (7,1,1) = {" diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm index 4077f7ddd4c..ed52c63ac2c 100644 --- a/_maps/map_files/shuttles/emergency_bar.dmm +++ b/_maps/map_files/shuttles/emergency_bar.dmm @@ -392,9 +392,6 @@ icon_state = "freezerfloor" }, /area/shuttle/escape) -"bC" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/escape) "bD" = ( /obj/machinery/computer/station_alert{ dir = 4 @@ -548,7 +545,7 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "qr" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "rr" = ( /obj/machinery/computer/crew{ @@ -1120,29 +1117,29 @@ ah ah ah ab -bC -bC +ab +ab ac ac -bC -bC +ab +ab TE -bC +ab CF -bC +ab ac ac ac -bC +ab Rv -bC +ab aI -bC +ab ac ac -bC -bC -bC +ab +ab +ab ab ah "} @@ -1154,8 +1151,8 @@ ah ah ab ac -bC -bC +ab +ab bp wC wC @@ -1172,12 +1169,12 @@ aT aA TG aA -bC +ab NQ bo bt ao -bC +ab qr qr "} @@ -1187,10 +1184,10 @@ ah ah ab ac -bC +ab bD zM -bC +ab pT aF aF @@ -1207,12 +1204,12 @@ Dy aA aA aA -bC +ab NQ bo -bC -bC -bC +ab +ab +ab bJ bL "} @@ -1220,12 +1217,12 @@ bL ah ah ab -bC +ab JE ec xd Ul -bC +ab NC aF aF @@ -1247,20 +1244,20 @@ bo bo bv ao -bC +ab bJ bL "} (5,1,1) = {" ah ab -bC +ab LD Pf nM an ak -bC +ab NC aF aF @@ -1277,32 +1274,32 @@ aH aA aA aA -bC +ab JC bA -bC -bC -bC +ab +ab +ab bJ bL "} (6,1,1) = {" ab -bC +ab aq an an an an an -bC -bC +ab +ab aG aG -bC -bC -bC -bC +ab +ab +ab +ab Bf as XS @@ -1312,12 +1309,12 @@ LV aA aA IJ -bC +ab bo bo bw wk -bC +ab qr qr "} @@ -1347,12 +1344,12 @@ aA aA aA rE -bC +ab SW NH -bC +ab bB -bC +ab bJ bL "} @@ -1382,12 +1379,12 @@ aA aA aA dn -bC -bC -bC -bC -bC -bC +ab +ab +ab +ab +ab +ab bJ bL "} @@ -1417,30 +1414,30 @@ aA aA aA rE -bC +ab bx RQ aO bx -bC +ab bJ bL "} (10,1,1) = {" ab -bC +ab aq an an an an an -bC -bC +ab +ab AQ AQ -bC -bC +ab +ab Bf aA Jz @@ -1452,30 +1449,30 @@ Jz Jz aA ss -bC +ab MZ bn bn PS -bC +ab qr qr "} (11,1,1) = {" ah ab -bC +ab Rh bd Uv an ak -bC +ab aa nk nk ZH -bC +ab ug JQ Di @@ -1492,7 +1489,7 @@ bn bn bn by -bC +ab bJ bL "} @@ -1500,17 +1497,17 @@ bL ah ah ab -bC +ab rr Tb cE pC -bC +ab HV nk nk ff -bC +ab aB Zz bq @@ -1527,7 +1524,7 @@ bn bn bn by -bC +ab bJ bL "} @@ -1537,15 +1534,15 @@ ah ah ab ac -bC +ab aw MX -bC +ab aC nk nk zZ -bC +ab lG Zz aP @@ -1562,7 +1559,7 @@ wF bn bn ol -bC +ab bJ bL "} @@ -1574,13 +1571,13 @@ ah ah ab ac -bC -bC +ab +ab aK bz bz aK -bC +ab Na hO Zz @@ -1592,12 +1589,12 @@ cF Qp bf az -bC +ab uO YQ af Ej -bC +ab qr qr "} @@ -1610,29 +1607,29 @@ ah ah ah ab -bC -bC +ab +ab ax ax -bC -bC +ab +ab ac -bC +ab ac -bC +ab ac ac ac -bC +ab ac -bC +ab ac -bC +ab ac ac -bC -bC -bC +ab +ab +ab ab ah "} diff --git a/_maps/map_files/shuttles/emergency_cherenkov.dmm b/_maps/map_files/shuttles/emergency_cherenkov.dmm index 12ad66cfb4c..bfbdd64e973 100644 --- a/_maps/map_files/shuttles/emergency_cherenkov.dmm +++ b/_maps/map_files/shuttles/emergency_cherenkov.dmm @@ -47,7 +47,7 @@ /area/shuttle/escape) "bf" = ( /obj/machinery/status_display, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "bw" = ( /obj/structure/chair/comfy/shuttle{ @@ -370,9 +370,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating/airless, /area/shuttle/escape) -"lB" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/escape) "lH" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/pod/dark, @@ -951,7 +948,7 @@ /area/shuttle/escape) "DA" = ( /obj/structure/sign/radiation, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "DF" = ( /obj/structure/reflector/single{ @@ -1654,16 +1651,16 @@ cw cw cw Wf -lB -lB +Wf +Wf Fz -lB +Wf Dd -lB +Wf aI aI aI -lB +Wf Ji DA Ji @@ -1692,15 +1689,15 @@ cw cw cw Wf -lB +Wf aI aI aI -lB +Wf Ks hJ fR -lB +Wf qF XM Kb @@ -1711,7 +1708,7 @@ NO YP NO nf -lB +Wf cw cw cw @@ -1734,7 +1731,7 @@ cw cw cw cw -lB +Wf Wy Ks Ks @@ -1777,7 +1774,7 @@ cw cw cw cw -lB +Wf Wy FE FE @@ -1789,7 +1786,7 @@ FE aI Kb fi -lB +Wf Qk Kb aI @@ -1820,7 +1817,7 @@ cw cw cw Wf -lB +Wf dl FE FE @@ -1835,7 +1832,7 @@ fi Td jU Kb -lB +Wf Mu Ir Mu @@ -1862,8 +1859,8 @@ cw Wf aI aI -lB -lB +Wf +Wf PV ce FE @@ -1872,16 +1869,16 @@ ce Gx ce Ya -lB +Wf IE fi Td aw qZ -lB -lB -lB -lB +Wf +Wf +Wf +Wf DA Wf cw @@ -1901,13 +1898,13 @@ cw "} (7,1,1) = {" Wf -lB -lB +Wf +Wf dj cJ ab -lB -lB +Wf +Wf aI TR aI @@ -1915,14 +1912,14 @@ aI bf aI aI -lB +Wf Bz fi -lB +Wf Xd Kb Kp -lB +Wf Wf cw ib @@ -2159,13 +2156,13 @@ cw "} (13,1,1) = {" Wf -lB -lB +Wf +Wf Cw eH Fy -lB -lB +Wf +Wf ov LO ov @@ -2173,14 +2170,14 @@ aI bf aI aI -lB +Wf Bz fi -lB +Wf Xd Kb Kp -lB +Wf Wf cw bM @@ -2206,8 +2203,8 @@ cw Wf aI aI -lB -lB +Wf +Wf Jh rG rG @@ -2216,16 +2213,16 @@ oU iO Hi sw -lB +Wf IE fi Td cN qZ -lB -lB -lB -lB +Wf +Wf +Wf +Wf DA Wf cw @@ -2250,7 +2247,7 @@ cw cw cw Wf -lB +Wf ju rG rG @@ -2265,7 +2262,7 @@ fi Td ej Kb -lB +Wf Mu GB Mu @@ -2293,7 +2290,7 @@ cw cw cw cw -lB +Wf KY rG rG @@ -2305,7 +2302,7 @@ rG Xs Kb fi -lB +Wf Qk Kb aI @@ -2336,7 +2333,7 @@ cw cw cw cw -lB +Wf Jh rG zx @@ -2380,15 +2377,15 @@ cw cw cw Wf -lB +Wf aI aI aI -lB +Wf wY CP Hi -lB +Wf Kb JK Kb @@ -2399,7 +2396,7 @@ jQ fS jQ ZZ -lB +Wf cw cw cw @@ -2428,16 +2425,16 @@ cw cw cw Wf -lB -lB +Wf +Wf aI -lB +Wf aI -lB +Wf aI aI aI -lB +Wf ag DA ag diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm index 6af9d0d6af9..b13bd5bb98d 100644 --- a/_maps/map_files/shuttles/emergency_clown.dmm +++ b/_maps/map_files/shuttles/emergency_clown.dmm @@ -337,13 +337,13 @@ /turf/simulated/floor/plating/airless, /area/shuttle/escape) "tH" = ( -/turf/simulated/wall/indestructible/opsglass, +/turf/simulated/wall/indestructible/fakeglass/plastitanium, /area/shuttle/escape) "Dr" = ( /turf/simulated/wall/indestructible/syndicate, /area/shuttle/escape) "MA" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/escape) "Uo" = ( /obj/structure/chair/comfy/shuttle{ diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm index 6561e87bf94..d3bbd2a157f 100644 --- a/_maps/map_files/shuttles/emergency_cramped.dmm +++ b/_maps/map_files/shuttles/emergency_cramped.dmm @@ -182,9 +182,6 @@ /obj/structure/closet/walllocker/emerglocker/directional/west, /turf/simulated/floor/plating, /area/shuttle/escape) -"G" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/escape) "I" = ( /obj/item/storage/firstaid/regular{ pixel_x = -5 @@ -222,27 +219,27 @@ (1,1,1) = {" h b -G -G +b +b i -G +b D -G +b c c c -G +b i -G +b i -G -G +b +b b h "} (2,1,1) = {" b -G +b I P m @@ -284,7 +281,7 @@ C "} (4,1,1) = {" b -G +b l x k @@ -306,21 +303,21 @@ C (5,1,1) = {" h b -G -G +b +b c -G +b c -G +b c c c -G +b c -G +b c -G -G +b +b b h "} diff --git a/_maps/map_files/shuttles/emergency_lance.dmm b/_maps/map_files/shuttles/emergency_lance.dmm index 1c0bd67fa82..bcd7e0fdb04 100644 --- a/_maps/map_files/shuttles/emergency_lance.dmm +++ b/_maps/map_files/shuttles/emergency_lance.dmm @@ -12,9 +12,6 @@ /obj/effect/turf_decal/tiles/department/command, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) -"av" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/escape) "bm" = ( /obj/structure/shuttle/engine/propulsion/burst/left, /turf/simulated/floor/plating/airless, @@ -144,7 +141,7 @@ /area/shuttle/escape) "gs" = ( /obj/structure/sign/lifestar, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "gN" = ( /obj/machinery/economy/vending/wallmed/directional/north, @@ -1167,20 +1164,20 @@ iJ iJ iJ jK -av +fE Vf Vf Vf Vf -av +fE jK iJ iJ iJ fE hv -av -av +fE +fE iJ iJ iJ @@ -1218,14 +1215,14 @@ iJ iJ iJ iJ -av +fE DD ut jZ yM uW DD -av +fE ul qk ul @@ -1329,15 +1326,15 @@ UY UY Cl fR -av -av -av -av -av +fE +fE +fE +fE +fE gS -av -av -av +fE +fE +fE jK iJ iJ @@ -1381,16 +1378,16 @@ lH lH iY DZ -av +fE jn -av +fE fH IJ lH IJ wS -av -av +fE +fE iJ iJ iJ @@ -1414,35 +1411,35 @@ iJ iJ iJ jK -av -av +fE +fE gZ -av -av -av +fE +fE +fE gZ -av +fE jK iJ iJ iJ -av -av +fE +fE ae -av +fE xv wx vk -av +fE Qh -av +fE Tc WU WU WU yg nP -av +fE iJ iJ iJ @@ -1458,43 +1455,43 @@ iJ iJ iJ jK -av -av -av -av -av -av +fE +fE +fE +fE +fE +fE hv -av -av +fE +fE eP UY eL -av +fE tW UY eL -av -av +fE +fE gZ -av -av +fE +fE eP WU -av -av +fE +fE Vf -av -av +fE +fE ii -av +fE bA Wk WU WU WU Jb -av +fE dP iJ iJ @@ -1504,49 +1501,49 @@ iJ iJ iJ jK -av -av -av +fE +fE +fE gZ -av -av -av +fE +fE +fE SQ wu wF XB -av +fE sT Bn -av +fE Id UY rp -av +fE Id UY rp -av +fE fL WJ fL -av +fE eP WU fL fL fL fL -av +fE VM -av +fE KQ VM Wk WU kr xI -av +fE Zg dP iJ @@ -1555,22 +1552,22 @@ iJ jK gZ hv -av -av +fE +fE ww qS fL mS fG -av +fE lH lH lH lH -av +fE gS -av -av +fE +fE HK WU lH @@ -1578,11 +1575,11 @@ eh lH WU nP -av +fE Oq WU WU -av +fE Nc WU lH @@ -1598,8 +1595,8 @@ Iu Iu Wk Rc -av -av +fE +fE IN dP "} @@ -1651,7 +1648,7 @@ Wk WU ob KL -av +fE IN dP "} @@ -1659,22 +1656,22 @@ dP jK gZ hv -av -av +fE +fE KB mS ku gX sE -av -av +fE +fE gS -av +fE Iu Iu Iu Iu -av +fE gN WU Iu @@ -1682,11 +1679,11 @@ EV Iu WU rX -av +fE CL WU KY -av +fE eP WU Nt @@ -1702,8 +1699,8 @@ lH lH YC Rc -av -av +fE +fE IN dP "} @@ -1712,49 +1709,49 @@ iJ iJ iJ jK -av -av -av +fE +fE +fE gZ -av -av -av +fE +fE +fE Bn Ky -av +fE rg Bi QM sx -av +fE bo UY ew -av +fE bo UY ew -av +fE ku WJ ku -av +fE eP WU -av +fE gZ -av +fE wz -av +fE gZ -av +fE Rh WU WU yg jp xI -av +fE qb dP iJ @@ -1770,43 +1767,43 @@ iJ iJ iJ jK -av -av +fE +fE hv -av -av -av -av -av -av +fE +fE +fE +fE +fE +fE eP UY Ek -av +fE eP UY eL -av -av +fE +fE gZ -av -av +fE +fE eP WU -av +fE nX DU DU DU Xz -av +fE gU WU WU WU yg Jb -av +fE dP iJ iJ @@ -1830,35 +1827,35 @@ iJ iJ iJ jK -av -av +fE +fE gZ -av -av -av +fE +fE +fE gZ -av +fE jK iJ iJ iJ -av -av +fE +fE ek -av +fE nX DU DU DU Xz -av +fE bQ WU WU WU Jd rX -av +fE iJ iJ iJ @@ -1897,20 +1894,20 @@ bO kO ok Yi -av +fE Hk it it it HE -av +fE kZ of of Iu Nd -av -av +fE +fE iJ iJ iJ @@ -1949,19 +1946,19 @@ lj kO XO hs -av -av -av -av -av -av -av -av -av +fE +fE +fE +fE +fE +fE +fE +fE +fE gZ FP -av -av +fE +fE jK iJ iJ @@ -2050,14 +2047,14 @@ iJ iJ iJ iJ -av +fE Mb PK AS Nu -av +fE IF -av +fE ul qk ul @@ -2103,12 +2100,12 @@ iJ iJ iJ jK -av +fE gZ gZ -av -av -av +fE +fE +fE jK iJ iJ diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm index fb4a575aa40..41504ffa5ea 100644 --- a/_maps/map_files/shuttles/emergency_old.dmm +++ b/_maps/map_files/shuttles/emergency_old.dmm @@ -315,7 +315,7 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "nt" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/escape) "rj" = ( /obj/machinery/economy/vending/wallmed/directional/east, @@ -333,9 +333,6 @@ "DZ" = ( /turf/simulated/floor/mineral/titanium/yellow, /area/shuttle/escape) -"Jw" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/escape) (1,1,1) = {" aa @@ -356,7 +353,7 @@ ac ac ab aW -Jw +ab aW ac ab diff --git a/_maps/map_files/shuttles/emergency_raven.dmm b/_maps/map_files/shuttles/emergency_raven.dmm index 4339f88b8c7..f6449c91f5b 100644 --- a/_maps/map_files/shuttles/emergency_raven.dmm +++ b/_maps/map_files/shuttles/emergency_raven.dmm @@ -99,7 +99,7 @@ /area/shuttle/escape) "ax" = ( /obj/structure/sign/electricshock, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "ay" = ( /obj/machinery/computer/crew{ @@ -424,7 +424,7 @@ /area/shuttle/escape) "bN" = ( /obj/structure/sign/security, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "bO" = ( /obj/structure/closet/firecloset, @@ -437,7 +437,7 @@ /area/shuttle/escape) "bS" = ( /obj/structure/sign/lifestar, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "bT" = ( /obj/machinery/door/airlock/medical/glass{ @@ -500,7 +500,7 @@ /area/shuttle/escape) "cg" = ( /obj/structure/sign/vacuum/external, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "ch" = ( /obj/effect/turf_decal/stripes/white/corner{ @@ -520,10 +520,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/shuttle/escape) -"co" = ( -/obj/machinery/porta_turret/ai_turret, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/escape) "cr" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -608,9 +604,6 @@ /obj/effect/turf_decal/stripes/white/line, /turf/simulated/floor/plasteel/dark, /area/shuttle/escape) -"cP" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/escape) "cR" = ( /obj/effect/turf_decal/delivery/white, /obj/machinery/door/poddoor/shutters/preopen{ @@ -897,7 +890,7 @@ /area/shuttle/escape) "dB" = ( /obj/structure/sign/engineering, -/turf/simulated/wall/mineral/plastitanium/nodiagonal, +/turf/simulated/wall/mineral/plastitanium, /area/shuttle/escape) "dE" = ( /turf/simulated/floor/plating, @@ -1502,19 +1495,19 @@ aa aa aa aO -cP +aO cd -co +aN eo -cP +aO aO aa aO -cP +aO cd -co +aN cd -cP +aO aO aa aa @@ -1534,23 +1527,23 @@ aa aa aN br -cP -cP +aO +aO bU ce cu cx cE -cP +aO br -cP +aO cT ce df cx bU -cP -cP +aO +aO br aN aa @@ -1565,28 +1558,28 @@ aa aa aa aO -cP -cP +aO +aO wr -cP -cP +aO +aO bV cf cv en -cP -cP +aO +aO Px -cP -cP +aO +aO ep cv cD du -cP -cP +aO +aO dS -cP +aO aO aa aa @@ -1598,30 +1591,30 @@ aa aa aa aN -cP +aO aW bi bt bC -cP -cP +aO +aO cg ct -cP -cP +aO +aO hu ak hu -cP -cP +aO +aO ct cg -cP -cP +aO +aO dH dE nK -cP +aO aN aa "} @@ -1631,7 +1624,7 @@ aa aa aa aa -cP +aO aP bu aY @@ -1651,11 +1644,11 @@ aC dg AO dv -cP +aO dI dE Mm -cP +aO So JM "} @@ -1664,8 +1657,8 @@ aa ab ab ab -cP -cP +aO +aO aQ aY aY @@ -1699,7 +1692,7 @@ ab Px gL ay -cP +aO aR aX aY @@ -1733,12 +1726,12 @@ zV yY aq uM -cP -cP +aO +aO ba bj bw -cP +aO bN el ak @@ -1747,12 +1740,12 @@ ak ak ak bb -cP -cP -cP -cP +aO +aO +aO +aO ly -cP +aO ax xH dT @@ -1768,11 +1761,11 @@ al ak aA aI -cP -cP +aO +aO bk -cP -cP +aO +aO bO ak Jx @@ -1781,12 +1774,12 @@ Jx Jx Jx Ux -cP +aO cW db dj ak -cP +aO jZ dE dE @@ -1820,12 +1813,12 @@ cY ac dk ak -cP +aO wi dE dE -cP -cP +aO +aO So So "} @@ -1836,10 +1829,10 @@ al bW Ng zR -cP +aO bc ZA -cP +aO An ak ak @@ -1854,13 +1847,13 @@ ak ak ak Pa -cP +aO ZM Sa Sa ed -cP -cP +aO +aO aa "} (12,1,1) = {" @@ -1888,12 +1881,12 @@ dl ak cX ak -cP +aO lB dE dE -cP -cP +aO +aO So JM "} @@ -1904,11 +1897,11 @@ al ak aE aM -cP -cP +aO +aO bo -cP -cP +aO +aO bR ak Rw @@ -1917,12 +1910,12 @@ Rw Rw Rw HB -cP +aO cZ dd dm ac -cP +aO zo dE dE @@ -1937,12 +1930,12 @@ ai lC av op -cP -cP +aO +aO GL Kd by -cP +aO bS el ak @@ -1951,12 +1944,12 @@ ak ak ak bb -cP -cP -cP -cP +aO +aO +aO +aO ly -cP +aO ax xH dE @@ -1971,7 +1964,7 @@ ab wr aw aG -cP +aO aT be bf @@ -2004,8 +1997,8 @@ aa ab ab ab -cP -cP +aO +aO aU bf bf @@ -2039,7 +2032,7 @@ aa aa aa aa -cP +aO aV HN bf @@ -2059,11 +2052,11 @@ aC do qa dy -cP +aO dQ dT qC -cP +aO So So "} @@ -2074,30 +2067,30 @@ aa aa aa aN -cP +aO By bh jL bM -cP -cP +aO +aO cg ct -cP -cP +aO +aO Na ak BD -cP -cP +aO +aO ct cg -cP -cP +aO +aO dR dE Ls -cP +aO aN aa "} @@ -2109,28 +2102,28 @@ aa aa aa aO -cP -cP +aO +aO Px -cP -cP +aO +aO cb cm cu JO -cP -cP +aO +aO wr -cP -cP +aO +aO ky cu cx dz -cP -cP +aO +aO dV -cP +aO aO aa aa @@ -2146,23 +2139,23 @@ aa aa aN br -cP -cP +aO +aO cc cf cv cD cE -cP +aO br -cP +aO cE cf cv cy cc -cP -cP +aO +aO br aN aa @@ -2182,19 +2175,19 @@ aa aa aa aO -cP +aO cd -co +aN cd -cP +aO aO aa aO -cP +aO cd -co +aN cd -cP +aO aO aa aa diff --git a/_maps/map_files/shuttles/emergency_shadow.dmm b/_maps/map_files/shuttles/emergency_shadow.dmm index 5246daca430..34ee3018629 100644 --- a/_maps/map_files/shuttles/emergency_shadow.dmm +++ b/_maps/map_files/shuttles/emergency_shadow.dmm @@ -1146,9 +1146,6 @@ }, /turf/simulated/floor/engine/airless, /area/shuttle/escape) -"XA" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/escape) "XW" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -1278,7 +1275,7 @@ Cw (4,1,1) = {" Cw vU -XA +vU MT vw vw @@ -1286,7 +1283,7 @@ LA vw vw fb -XA +vU vU Cw "} @@ -1322,7 +1319,7 @@ Cw "} (7,1,1) = {" vU -XA +vU Hh bh gs @@ -1332,7 +1329,7 @@ WW cX wF aK -XA +vU vU "} (8,1,1) = {" @@ -1429,13 +1426,13 @@ US vU GK Rk -XA +vU US US US US US -XA +vU AS lD vU @@ -1519,13 +1516,13 @@ US US Qj Rk -XA +vU US US NO US US -XA +vU AS lD vU @@ -1579,13 +1576,13 @@ US US OX Rk -XA +vU US US ee US US -XA +vU AS lD vU @@ -1669,13 +1666,13 @@ US vU GK Rk -XA +vU US US US US US -XA +vU AS lD vU @@ -1758,7 +1755,7 @@ Cw (36,1,1) = {" Cw vU -XA +vU TW kU kU @@ -1766,7 +1763,7 @@ Nd kU kU Yc -XA +vU vU Cw "} diff --git a/_maps/map_files/shuttles/trader/trader_glint.dmm b/_maps/map_files/shuttles/trader/trader_glint.dmm index 39fbf1349f7..a348c678709 100644 --- a/_maps/map_files/shuttles/trader/trader_glint.dmm +++ b/_maps/map_files/shuttles/trader/trader_glint.dmm @@ -422,7 +422,7 @@ /turf/simulated/floor/pod/dark, /area/shuttle/trade/sol) "Ze" = ( -/turf/simulated/wall/mineral/titanium/survival/nodiagonal, +/turf/simulated/wall/mineral/titanium/survival, /area/shuttle/trade/sol) "Zm" = ( /obj/structure/fans/tiny, diff --git a/_maps/map_files/shuttles/trader/trader_guild.dmm b/_maps/map_files/shuttles/trader/trader_guild.dmm index 9cacd958d00..0435024db57 100644 --- a/_maps/map_files/shuttles/trader/trader_guild.dmm +++ b/_maps/map_files/shuttles/trader/trader_guild.dmm @@ -616,9 +616,6 @@ /obj/effect/mapping_helpers/airlock/access/all/centcomm/traders, /turf/simulated/floor/wood, /area/shuttle/trade/sol) -"Pl" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "Pm" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -762,28 +759,28 @@ sI sI sI bl -Pl +bl nR nR nR -Pl -Pl -Pl +bl +bl +bl sI "} (2,1,1) = {" bl Tk Tk -Pl +bl nR nR nR -Pl -Pl -Pl -Pl -Pl +bl +bl +bl +bl +bl gA pF pF @@ -797,11 +794,11 @@ sI Tk WP sd -Pl +bl Yd DN VE -Pl +bl si Cq JH @@ -823,7 +820,7 @@ Oi Hi ab Tf -Pl +bl pK Hi Hi @@ -841,45 +838,45 @@ sI Tk jC Xd -Pl +bl Hi Hi GG -Pl +bl nR mT nR -Pl +bl mT -Pl -Pl -Pl +bl +bl +bl xv -Pl -Pl +bl +bl bl "} (6,1,1) = {" bl Tk Tk -Pl +bl Hi Hi xi -Pl +bl SR Hi qd wg Hi kN -Pl +bl Ks Hi rc fN -Pl +bl "} (7,1,1) = {" sI @@ -901,7 +898,7 @@ rt YD hV zE -Pl +bl "} (8,1,1) = {" sI @@ -911,7 +908,7 @@ nR Dk at TC -Pl +bl Dy jO ME @@ -933,7 +930,7 @@ nR FR at TC -Pl +bl Gi jO aH @@ -967,50 +964,50 @@ rt dh DR sq -Pl +bl "} (11,1,1) = {" bl Tk Tk -Pl +bl Hi Hi xi -Pl +bl EI Hi XD IH Hi eN -Pl +bl Ks Hi PM HV -Pl +bl "} (12,1,1) = {" Tk rr TE -Pl +bl Hi Hi dC -Pl +bl nR mT nR -Pl +bl mT -Pl -Pl -Pl +bl +bl +bl CA -Pl -Pl +bl +bl bl "} (13,1,1) = {" @@ -1021,7 +1018,7 @@ Oi Hi ab Tf -Pl +bl pK Hi Hi @@ -1039,11 +1036,11 @@ sI Tk Wx hd -Pl +bl Yd aZ es -Pl +bl si oC yX @@ -1061,15 +1058,15 @@ sI bl Tk Tk -Pl +bl nR nR nR -Pl -Pl -Pl -Pl -Pl +bl +bl +bl +bl +bl Zo xH xH @@ -1092,12 +1089,12 @@ sI sI sI bl -Pl +bl nR nR nR -Pl -Pl -Pl +bl +bl +bl sI "} diff --git a/_maps/map_files/shuttles/trader/trader_skip.dmm b/_maps/map_files/shuttles/trader/trader_skip.dmm index c37497f4237..8fe14e56d2f 100644 --- a/_maps/map_files/shuttles/trader/trader_skip.dmm +++ b/_maps/map_files/shuttles/trader/trader_skip.dmm @@ -268,9 +268,6 @@ }, /turf/simulated/floor/pod/dark, /area/shuttle/trade/sol) -"Cg" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "CH" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 1 @@ -363,7 +360,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/shuttle/trade/sol) "Le" = ( -/turf/simulated/wall/mineral/titanium/survival/nodiagonal, +/turf/simulated/wall/mineral/titanium/survival, /area/shuttle/trade/sol) "Lk" = ( /obj/effect/turf_decal/siding{ @@ -479,12 +476,12 @@ zQ zQ zQ aE -Cg -Cg -Cg -Cg -Cg -Cg +aE +aE +aE +aE +aE +aE aE zQ PY @@ -536,8 +533,8 @@ ZI (4,1,1) = {" zQ aE -Cg -Cg +aE +aE ze bX bX diff --git a/_maps/map_files/shuttles/trader/trader_skrell.dmm b/_maps/map_files/shuttles/trader/trader_skrell.dmm index 6f186a3d0fe..9cfa4b57bd3 100644 --- a/_maps/map_files/shuttles/trader/trader_skrell.dmm +++ b/_maps/map_files/shuttles/trader/trader_skrell.dmm @@ -90,9 +90,6 @@ }, /turf/simulated/floor/wood, /area/shuttle/trade/sol) -"li" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "nQ" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/grass/jungle/no_creep, @@ -450,8 +447,8 @@ rF rF rF rF -li -li +xx +xx xx Ln Ln @@ -475,11 +472,11 @@ Tm Kd Tm GY -li +xx rF rF rF -li +xx sV Ot Ln @@ -542,9 +539,9 @@ hI rF rF rF -li -li -li +xx +xx +xx ki Os Os @@ -565,18 +562,18 @@ rF rF Ln Ln -li +xx Hh wf Os Os vQ -li -li -li +xx +xx +xx Tx -li -li +xx +xx xx "} (7,1,1) = {" @@ -588,19 +585,19 @@ rF Ln Ln xx -li +xx Dr Os Os Os Os vR -li +xx Km Os KT se -li +xx "} (8,1,1) = {" Ln @@ -623,7 +620,7 @@ Wa Os Os Wa -li +xx "} (9,1,1) = {" Ln @@ -692,7 +689,7 @@ Wa Os Os Wa -li +xx "} (12,1,1) = {" rF @@ -703,19 +700,19 @@ rF Ln Ln xx -li +xx Vm Os Os Os Os cc -li +xx XG Os DG se -li +xx "} (13,1,1) = {" rF @@ -726,18 +723,18 @@ rF rF Ln Ln -li +xx VR YQ Os Os vQ -li -li -li +xx +xx +xx wg -li -li +xx +xx xx "} (14,1,1) = {" @@ -749,9 +746,9 @@ Kd rF rF rF -li -li -li +xx +xx +xx FL Os Os @@ -820,11 +817,11 @@ xA JD Kd Tm -li +xx rF rF rF -li +xx Ue Ot Ln @@ -841,8 +838,8 @@ rF rF rF rF -li -li +xx +xx xx Ln Ln diff --git a/_maps/map_files/shuttles/trader/trader_sol.dmm b/_maps/map_files/shuttles/trader/trader_sol.dmm index a779d6d93b2..b67f31f6bf4 100644 --- a/_maps/map_files/shuttles/trader/trader_sol.dmm +++ b/_maps/map_files/shuttles/trader/trader_sol.dmm @@ -226,7 +226,7 @@ /turf/simulated/floor/plasteel/dark, /area/shuttle/trade/sol) "Fb" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/shuttle/trade/sol) "Fe" = ( /obj/structure/bed, diff --git a/_maps/map_files/shuttles/trader/trader_stead.dmm b/_maps/map_files/shuttles/trader/trader_stead.dmm index 44114d4080c..fbcd4892032 100644 --- a/_maps/map_files/shuttles/trader/trader_stead.dmm +++ b/_maps/map_files/shuttles/trader/trader_stead.dmm @@ -39,9 +39,6 @@ /obj/effect/spawner/random/traders/engineering, /turf/simulated/floor/mineral/titanium, /area/shuttle/trade/sol) -"gs" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "hE" = ( /obj/item/flag/species/vulp, /turf/simulated/floor/mineral/titanium, @@ -460,7 +457,7 @@ iV iV iV Aj -gs +Aj Aj iV iV @@ -478,7 +475,7 @@ iV iV iV Aj -gs +Aj Jn lw iV @@ -494,9 +491,9 @@ iV iV iV Aj -gs -gs -gs +Aj +Aj +Aj Nd rb ut @@ -505,14 +502,14 @@ iV "} (4,1,1) = {" iV -gs +Aj MG Rt -gs -gs -gs -gs -gs +Aj +Aj +Aj +Aj +Aj MK Ro Ht @@ -524,41 +521,41 @@ iV "} (5,1,1) = {" iV -gs +Aj zT MK -gs +Aj Yq wS YC Ch MK RI -gs -gs +Aj +Aj KM -gs -gs +Aj +Aj Aj "} (6,1,1) = {" Aj -gs -gs +Aj +Aj GO -gs +Aj hE MK MK MK MK Hp -gs +Aj rB Na IP -gs -gs +Aj +Aj "} (7,1,1) = {" Dq @@ -577,14 +574,14 @@ bT Na Na TW -gs +Aj "} (8,1,1) = {" Dq Nt Fx kM -gs +Aj eM MK Lg @@ -603,7 +600,7 @@ Dq fA Fx kM -gs +Aj mF MK JD @@ -634,56 +631,56 @@ bT Na Na pp -gs +Aj "} (11,1,1) = {" Aj -gs -gs +Aj +Aj GO -gs +Aj hE MK MK MK MK nx -gs +Aj UG Na QR -gs -gs +Aj +Aj "} (12,1,1) = {" iV -gs +Aj LU MK -gs +Aj Sq BS fI GF MK RI -gs -gs +Aj +Aj xt -gs -gs +Aj +Aj Aj "} (13,1,1) = {" iV -gs +Aj jg dy -gs -gs -gs -gs -gs +Aj +Aj +Aj +Aj +Aj MK bP Ht @@ -703,9 +700,9 @@ iV iV iV Aj -gs -gs -gs +Aj +Aj +Aj xk rb ut @@ -725,7 +722,7 @@ iV iV iV Aj -gs +Aj ju lw iV @@ -745,7 +742,7 @@ iV iV iV Aj -gs +Aj Aj iV iV diff --git a/_maps/map_files/shuttles/trader/trader_syndicate.dmm b/_maps/map_files/shuttles/trader/trader_syndicate.dmm index 2539d8cb42a..c6211f5ccdb 100644 --- a/_maps/map_files/shuttles/trader/trader_syndicate.dmm +++ b/_maps/map_files/shuttles/trader/trader_syndicate.dmm @@ -405,9 +405,6 @@ /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/plating/airless, /area/shuttle/trade/sol) -"JI" = ( -/turf/simulated/wall/mineral/plastitanium/nodiagonal, -/area/shuttle/trade/sol) "KA" = ( /obj/machinery/flasher_button{ id = "trader_flash"; @@ -557,12 +554,12 @@ bZ bZ bZ LQ -JI -JI -JI -JI -JI -JI +LQ +LQ +LQ +LQ +LQ +LQ bZ "} (2,1,1) = {" @@ -579,9 +576,9 @@ bZ bZ bZ LQ -JI +LQ VQ -JI +LQ kx tH nc @@ -604,7 +601,7 @@ bZ LQ gD xz -JI +LQ hn HA nc @@ -612,43 +609,43 @@ Jn bZ "} (4,1,1) = {" -JI -JI +LQ +LQ TU -JI -JI -JI +LQ +LQ +LQ ip CP -JI +LQ LQ bZ LQ LQ TK eK -JI +LQ kc sH -JI -JI -JI +LQ +LQ +LQ "} (5,1,1) = {" -JI +LQ zm kc CU -JI +LQ gI kc kc Xj -JI -JI -JI -JI -JI +LQ +LQ +LQ +LQ +LQ Fd LQ kc @@ -658,7 +655,7 @@ nc Jn "} (6,1,1) = {" -JI +LQ Ia kc sA @@ -669,7 +666,7 @@ kc zY ID du -JI +LQ lk sz kc @@ -700,8 +697,8 @@ kc kc xR kE -JI -JI +LQ +LQ "} (8,1,1) = {" uK @@ -723,11 +720,11 @@ kc kc vM kE -JI -JI +LQ +LQ "} (9,1,1) = {" -JI +LQ wq kc sA @@ -738,7 +735,7 @@ kc Hn PN ps -JI +LQ jd gl kc @@ -750,20 +747,20 @@ nc Jn "} (10,1,1) = {" -JI +LQ fN kc nY -JI +LQ KA kc kc tl -JI -JI -JI -JI -JI +LQ +LQ +LQ +LQ +LQ Fd LQ kc @@ -773,27 +770,27 @@ nc Jn "} (11,1,1) = {" -JI -JI +LQ +LQ Gr -JI -JI -JI +LQ +LQ +LQ ip WV -JI +LQ LQ bZ LQ -JI +LQ TK eK -JI +LQ kc sH -JI -JI -JI +LQ +LQ +LQ "} (12,1,1) = {" LQ @@ -808,10 +805,10 @@ LQ bZ bZ bZ -JI +LQ gD xz -JI +LQ km km nc @@ -832,9 +829,9 @@ bZ bZ bZ LQ -JI +LQ av -JI +LQ za Qk nc @@ -856,11 +853,11 @@ bZ bZ bZ LQ -JI -JI -JI -JI -JI -JI +LQ +LQ +LQ +LQ +LQ +LQ bZ "} diff --git a/_maps/map_files/shuttles/trader/trader_synth.dmm b/_maps/map_files/shuttles/trader/trader_synth.dmm index 5b3cdacd4af..28e1f41cb00 100644 --- a/_maps/map_files/shuttles/trader/trader_synth.dmm +++ b/_maps/map_files/shuttles/trader/trader_synth.dmm @@ -118,9 +118,6 @@ }, /turf/simulated/floor/mineral/titanium, /area/shuttle/trade/sol) -"r" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "s" = ( /obj/machinery/door/airlock/titanium/glass{ id_tag = "trader_starboard"; @@ -386,7 +383,7 @@ E i z U -r +a a "} (3,1,1) = {" @@ -405,17 +402,17 @@ H "} (4,1,1) = {" a -r +a j -r -r +a +a M E v m n -r -r +a +a "} (5,1,1) = {" a @@ -475,17 +472,17 @@ H "} (9,1,1) = {" a -r +a s -r -r +a +a L E C Z A -r -r +a +a "} (10,1,1) = {" W @@ -512,7 +509,7 @@ E q J g -r +a a "} (12,1,1) = {" diff --git a/_maps/map_files/shuttles/trader/trader_ussp.dmm b/_maps/map_files/shuttles/trader/trader_ussp.dmm index 6633cd31316..0fd66c39eb0 100644 --- a/_maps/map_files/shuttles/trader/trader_ussp.dmm +++ b/_maps/map_files/shuttles/trader/trader_ussp.dmm @@ -585,9 +585,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) -"Tv" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, -/area/shuttle/trade/sol) "Ty" = ( /obj/machinery/computer/shuttle/trade/sol, /obj/effect/decal/cleanable/dirt, @@ -627,10 +624,10 @@ EK EK EK hc -Tv +hc Go Go -Tv +hc hc EK EK @@ -645,14 +642,14 @@ EK EK EK hc -Tv -Tv -Tv +hc +hc +hc JE vU UT JY -Tv +hc hc EK EK @@ -674,34 +671,34 @@ ah ah ah ew -Tv -Tv -Tv -Tv -Tv -Tv +hc +hc +hc +hc +hc +hc hc EK "} (4,1,1) = {" hc -Tv -Tv +hc +hc ON -Tv -Tv +hc +hc gv uM ah ah QV -Tv +hc bw rw lv rw HZ -Tv +hc hc "} (5,1,1) = {" @@ -710,7 +707,7 @@ wu fz ah Qs -Tv +hc jb kd xC @@ -726,7 +723,7 @@ Mv oM "} (6,1,1) = {" -Tv +hc Xl ah ah @@ -737,10 +734,10 @@ ah RG xC Ek -Tv -Tv +hc +hc xe -Tv +hc gK KF Mv @@ -758,10 +755,10 @@ BC ah xC vu -Tv +hc ut Fw -Tv +hc kV uY Mv @@ -779,17 +776,17 @@ BC ah xC Ma -Tv +hc wQ Pq -Tv +hc Ty uY Mv oM "} (9,1,1) = {" -Tv +hc fv ah ah @@ -800,10 +797,10 @@ ah SC xC fO -Tv -Tv +hc +hc xe -Tv +hc gK uB Mv @@ -815,7 +812,7 @@ ml Bt ah PX -Tv +hc fg jo xC @@ -832,23 +829,23 @@ oM "} (11,1,1) = {" hc -Tv -Tv +hc +hc Nl -Tv -Tv +hc +hc Oj rw ah ah QV -Tv +hc zJ uM uo uM DW -Tv +hc hc "} (12,1,1) = {" @@ -863,12 +860,12 @@ ah ah ah ya -Tv -Tv -Tv -Tv -Tv -Tv +hc +hc +hc +hc +hc +hc hc EK "} @@ -876,14 +873,14 @@ EK EK EK hc -Tv -Tv -Tv +hc +hc +hc yg Cr qS uk -Tv +hc hc EK EK @@ -900,10 +897,10 @@ EK EK EK hc -Tv +hc Go Go -Tv +hc hc EK EK diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index dcd822b4b00..c6fc7ad0420 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -12908,7 +12908,7 @@ /turf/simulated/floor/indestructible/titanium/blue, /area/shuttle/arrival/station) "aVY" = ( -/turf/simulated/wall/indestructible/opsglass/titanium_window, +/turf/simulated/wall/indestructible/fakeglass/titanium_window, /area/shuttle/arrival/station) "aWb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31602,7 +31602,7 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "cqY" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "cra" = ( /obj/structure/extinguisher_cabinet{ @@ -68407,7 +68407,7 @@ /obj/machinery/status_display{ layer = 4 }, -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "oqF" = ( /obj/machinery/door/firedoor, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 1043b494cc1..2ce86ee209d 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -3456,7 +3456,7 @@ /area/space/nearstation) "aBe" = ( /obj/machinery/ai_status_display, -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "aBj" = ( /obj/machinery/newscaster/security_unit/directional/east, @@ -16921,7 +16921,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "cFY" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "cFZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59780,7 +59780,7 @@ /area/station/service/clown/secret) "lHH" = ( /obj/machinery/status_display, -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "lHI" = ( /obj/structure/sign/directions/medical{ @@ -75223,7 +75223,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "pkt" = ( -/turf/simulated/wall/indestructible/opsglass/titanium_window, +/turf/simulated/wall/indestructible/fakeglass/titanium_window, /area/shuttle/arrival/station) "pku" = ( /obj/structure/cable{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index a02db374a66..7cf3de34c90 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -889,13 +889,13 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "agD" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +/turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "agE" = ( /turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "agF" = ( -/turf/simulated/wall/indestructible/opsglass/titanium_window, +/turf/simulated/wall/indestructible/fakeglass/titanium_window, /area/shuttle/arrival/station) "agH" = ( /obj/effect/turf_decal/tiles/department/cargo/side{ @@ -74742,7 +74742,7 @@ }, /area/station/public/sleep) "oHy" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "oHR" = ( /turf/simulated/floor/plating/airless, diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 621a20add1f..51f0436abb8 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -13626,7 +13626,7 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/incinerator) "cJq" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "cJx" = ( /obj/item/shard, @@ -112525,7 +112525,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) "wAh" = ( -/turf/simulated/wall/indestructible/opsglass/titanium_window, +/turf/simulated/wall/indestructible/fakeglass/titanium_window, /area/shuttle/arrival/station) "wAu" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 80f4273132b..f4cc218ceff 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -9043,7 +9043,7 @@ /turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "biq" = ( -/turf/simulated/wall/indestructible/opsglass/titanium_window, +/turf/simulated/wall/indestructible/fakeglass/titanium_window, /area/shuttle/arrival/station) "biu" = ( /obj/effect/decal/cleanable/dirt, @@ -69935,7 +69935,7 @@ /area/station/public/dorms) "qTT" = ( /obj/machinery/ai_status_display, -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "qTX" = ( /obj/machinery/atmospherics/refill_station/oxygen, @@ -75417,7 +75417,7 @@ /area/station/security/permabrig) "sOi" = ( /obj/machinery/status_display, -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "sOy" = ( /obj/machinery/ai_status_display{ @@ -76786,7 +76786,7 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "tnO" = ( -/turf/simulated/wall/indestructible/titanium/nodiagonal, +/turf/simulated/wall/indestructible/titanium, /area/shuttle/arrival/station) "tnP" = ( /obj/structure/cable{ diff --git a/code/__DEFINES/icon_smoothing_defines.dm b/code/__DEFINES/icon_smoothing_defines.dm index a9a51b83f93..c1f3feb3b33 100644 --- a/code/__DEFINES/icon_smoothing_defines.dm +++ b/code/__DEFINES/icon_smoothing_defines.dm @@ -106,12 +106,12 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/simulated/indestructible/fakeglass, /obj/structure/window/full/basic, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /obj/structure/window/full/reinforced #define SMOOTH_GROUP_WINDOW_FULLTILE_BRASS S_OBJ(22) ///obj/structure/window/brass/fulltile -#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/simulated/indestructible/opsglass, /obj/structure/window/plasma/reinforced/plastitanium +#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/simulated/indestructible/fakeglass/plastitanium, /obj/structure/window/plasma/reinforced/plastitanium #define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle #define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice -#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock +#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock, /obj/machinery/door/poddoor, /obj/machinery/door/poddoor/shutters, /obj/machinery/door/firedoor #define SMOOTH_GROUP_TABLES S_OBJ(50) ///obj/structure/table #define SMOOTH_GROUP_WOOD_TABLES S_OBJ(51) ///obj/structure/table/wood @@ -129,7 +129,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_SECURITY_BARRICADE S_OBJ(63) ///obj/structure/barricade/security #define SMOOTH_GROUP_SANDBAGS S_OBJ(64) ///obj/structure/barricade/sandbags -#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/simulated/indestructible/opsglass, /obj/structure/shuttle +#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/simulated/indestructible/fakeglass/plastitanium, /obj/structure/shuttle #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5092c6ffae0..7daeb40c17f 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -122,7 +122,7 @@ /datum/spell/ai_spell/return_to_core name = "Return to Main Core" desc = "Leave the APC you are shunted to, and return to your core." - action_icon = 'icons/obj/power.dmi' + action_icon = 'icons/obj/wallbumps/apc.dmi' action_icon_state = "apcemag" auto_use_uses = FALSE // Here just to prevent the "You have X uses remaining" from popping up. diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ccae8956d5c..dc2f346e537 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -160,6 +160,8 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R + var/direction = get_current_direction() + dir = direction ? direction : NORTH update_icon() prepare_huds() for(var/hud_key, hud in GLOB.huds) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 475e9dae1b1..7756570c98b 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -77,6 +77,10 @@ real_explosion_block = explosion_block explosion_block = EXPLOSION_BLOCK_PROC + for(var/d in GLOB.cardinal) + var/turf/T = get_step(src, d) + if(iswallturf(T) || locate(/obj/structure/window/full) in T) + QUEUE_SMOOTH(T) update_icon() recalculate_atmos_connectivity() @@ -109,6 +113,10 @@ update_freelook_sight() GLOB.airlocks -= src QDEL_NULL(spark_system) + for(var/d in GLOB.cardinal) + var/turf/T = get_step(src, d) + if(iswallturf(T) || locate(/obj/structure/window/full) in T) + QUEUE_SMOOTH(T) return ..() /obj/machinery/door/Bumped(atom/AM) @@ -433,6 +441,9 @@ return SEND_SIGNAL(src, COMSIG_DOOR_OPEN) operating = DOOR_OPENING + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() recalculate_atmos_connectivity() do_animate("opening") set_opacity(FALSE) @@ -483,6 +494,9 @@ if(width > 1) set_fillers_opacity(TRUE) operating = NONE + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() recalculate_atmos_connectivity() update_freelook_sight() if(safe) @@ -491,6 +505,18 @@ crush() return TRUE +/obj/machinery/door/proc/get_current_direction() + // Prioritize walls to avoid adjacent airlock shenanigans + for(var/direction in GLOB.cardinal) + if(iswallturf(get_step(src, direction))) + return direction + for(var/direction in GLOB.cardinal) + if((locate(/obj/structure/window/full) in get_step(src, direction))) + return direction + for(var/direction in GLOB.cardinal) + if((locate(/obj/machinery/door) in get_step(src, direction))) + return direction + /obj/machinery/door/proc/get_airlock_turfs() var/list/airlock_turfs = list(get_turf(src)) if(width > 1) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 7cf74b76657..b72409a5cce 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -24,6 +24,7 @@ armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 100, FIRE = 95, ACID = 70) superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT cares_about_temperature = TRUE + smoothing_groups = list(SMOOTH_GROUP_AIRLOCK) /// How long does opening by hand take, in deciseconds. var/manual_open_time = 5 SECONDS var/can_crush = TRUE @@ -37,6 +38,9 @@ /obj/machinery/door/firedoor/Initialize(mapload) . = ..() CalculateAffectingAreas() + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() /obj/machinery/door/firedoor/examine(mob/user) . = ..() @@ -252,6 +256,9 @@ update_icon() /obj/machinery/door/firedoor/open() + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() if(welded) return . = ..() @@ -261,6 +268,9 @@ /obj/machinery/door/firedoor/close() . = ..() + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() latetoggle() /obj/machinery/door/firedoor/autoclose() diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 656c26014f2..704e437dfe6 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -15,6 +15,71 @@ var/id_tag = 1.0 var/protected = 1 +/obj/machinery/door/poddoor/open() // Redefined to prevent wall resprite direction change jank + if(!density) + return TRUE + if(operating) + return + SEND_SIGNAL(src, COMSIG_DOOR_OPEN) + operating = DOOR_OPENING + recalculate_atmos_connectivity() + do_animate("opening") + set_opacity(FALSE) + if(width > 1) + set_fillers_opacity(0) + sleep(5) + density = FALSE + if(width > 1) + set_fillers_density(FALSE) + sleep(5) + layer = initial(layer) + update_icon() + set_opacity(FALSE) + if(width > 1) + set_fillers_opacity(0) + operating = NONE + update_freelook_sight() + if(autoclose) + autoclose_in(normalspeed ? auto_close_time : auto_close_time_dangerous) + return TRUE + +/obj/machinery/door/poddoor/close() // Redefined to prevent wall resprite direction change jank + if(density) + return TRUE + if(operating || welded) + return + if(safe) + for(var/turf/turf in locs) + for(var/atom/movable/M in turf) + if(M.density && M != src) //something is blocking the door + if(autoclose) + autoclose_in(60) + return + + SEND_SIGNAL(src, COMSIG_DOOR_CLOSE) + operating = DOOR_CLOSING + + do_animate("closing") + layer = closingLayer + sleep(5) + density = TRUE + if(width > 1) + set_fillers_density(TRUE) + sleep(5) + update_icon() + if(!glass || polarized_on) + set_opacity(TRUE) + if(width > 1) + set_fillers_opacity(TRUE) + operating = NONE + recalculate_atmos_connectivity() + update_freelook_sight() + if(safe) + check_for_mobs() + else + crush() + return TRUE + /obj/machinery/door/poddoor/preopen icon_state = "open" density = FALSE diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index ffe3b384a7c..6d7189aa603 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -9,8 +9,8 @@ FIRE ALARM /obj/machinery/firealarm name = "fire alarm" desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." - icon = 'icons/obj/monitors.dmi' - icon_state = "firealarm_on" + icon = 'icons/obj/wallbumps/firealarm.dmi' + icon_state = "firealarm_off" /// Whether or not the fire alarm will sound the alarm if its temperature rises above 200C var/detecting = TRUE var/working = TRUE @@ -74,16 +74,11 @@ FIRE ALARM if(stat & NOPOWER) icon_state = "firealarm_off" return - - var/area/area = get_area(src) - if(area.fire) - icon_state = "firealarm_alarming" - return if(!detecting) icon_state = "firealarm_detect" return else - icon_state = "firealarm_on" + icon_state = "firealarm_off" /obj/machinery/firealarm/update_overlays() . = ..() @@ -97,7 +92,12 @@ FIRE ALARM underlays += emissive_appearance(icon, "firealarm_overlay_lightmask") if(!wiresexposed) - underlays += emissive_appearance(icon, "firealarm_lightmask") + underlays += emissive_appearance(icon, "firealarm_detect") + + var/area/area = get_area(src) + if(area.fire) + . += "firealarm_alarming" + return /obj/machinery/firealarm/emag_act(mob/user) if(!emagged) @@ -342,7 +342,7 @@ FIRE ALARM LAZYREMOVE(our_area.firealarms, src) return ..() -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 32, 32) /* FIRE ALARM CIRCUIT diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index b350db76ecd..8ca1ce56e39 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -82,7 +82,7 @@ icon_state = "walldoor" loot = list( /obj/machinery/door/airlock/hatch/syndicate = 6, - /turf/simulated/wall/mineral/plastitanium/nodiagonal = 2, + /turf/simulated/wall/mineral/plastitanium = 2, /obj/structure/falsewall/plastitanium = 2, ) @@ -91,5 +91,5 @@ icon_state = "wallvault" loot = list( /obj/machinery/door/airlock/hatch/syndicate/vault = 4, - /turf/simulated/wall/mineral/plastitanium/nodiagonal = 1, + /turf/simulated/wall/mineral/plastitanium = 1, ) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 79b8fa3a594..20b65a2d9dd 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -378,12 +378,12 @@ */ /obj/item/rcd/proc/get_airlock_image(airlock_type) var/obj/machinery/door/airlock/airlock = airlock_type - var/icon/base = icon(initial(airlock.icon), "closed") + var/icon/base = icon(initial(airlock.icon), "closed", dir = WEST) if(initial(airlock.glass)) - var/icon/glass_fill = icon(initial(airlock.overlays_file), "glass_closed") + var/icon/glass_fill = icon(initial(airlock.overlays_file), "glass_closed", dir = WEST) base.Blend(glass_fill, ICON_OVERLAY) else - var/icon/solid_fill = icon(initial(airlock.icon), "fill_closed") + var/icon/solid_fill = icon(initial(airlock.icon), "fill_closed", dir = WEST) base.Blend(solid_fill, ICON_OVERLAY) return "[icon2base64(base)]" diff --git a/code/game/objects/items/mountable_frames/air_alarm_frame.dm b/code/game/objects/items/mountable_frames/air_alarm_frame.dm index 201e9cb4948..37a50429194 100644 --- a/code/game/objects/items/mountable_frames/air_alarm_frame.dm +++ b/code/game/objects/items/mountable_frames/air_alarm_frame.dm @@ -2,7 +2,7 @@ /obj/item/mounted/frame/alarm_frame name = "air alarm frame" desc = "Used for building Air Alarms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/wallbumps/alarm.dmi' icon_state = "alarm_bitem" materials = list(MAT_METAL=2000) diff --git a/code/game/objects/items/mountable_frames/fire_alarm.dm b/code/game/objects/items/mountable_frames/fire_alarm.dm index f7f31f37c1a..85e1fcfb803 100644 --- a/code/game/objects/items/mountable_frames/fire_alarm.dm +++ b/code/game/objects/items/mountable_frames/fire_alarm.dm @@ -1,7 +1,7 @@ /obj/item/mounted/frame/firealarm name = "fire alarm frame" desc = "Used for building Fire Alarms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/wallbumps/firealarm.dmi' icon_state = "firealarm_frame" mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index a82d58f298d..6a7c8d34072 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -28,13 +28,29 @@ /obj/structure/door_assembly/Initialize(mapload) . = ..() update_appearance(UPDATE_NAME | UPDATE_OVERLAYS) + var/direction = get_current_direction() + dir = direction ? direction : NORTH + update_icon() /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) return ..() +/obj/structure/door_assembly/proc/get_current_direction() + for(var/direction in GLOB.cardinal) + if(iswallturf(get_step(src, direction))) + return direction + for(var/direction in GLOB.cardinal) + if((locate(/obj/structure/window/full) in get_step(src, direction))) + return direction + for(var/direction in GLOB.cardinal) + if((locate(/obj/machinery/door) in get_step(src, direction))) + return direction + /obj/structure/door_assembly/examine(mob/user) . = ..() + if(!anchored) + . += SPAN_NOTICE("You can Alt-Click [src] to rotate it.") var/doorname = "" if(created_name) doorname = ", written on it is '[created_name]'" @@ -55,6 +71,17 @@ else . += SPAN_NOTICE("There is a small paper placard on the assembly[doorname].") +/obj/structure/door_assembly/AltClick(mob/user) + if(src.anchored) + return + if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || is_ventcrawling(user)) + return + + rotate() + +/obj/structure/door_assembly/proc/rotate() + setDir(turn(dir, 90)) + /obj/structure/door_assembly/item_interaction(mob/living/user, obj/item/W, list/modifiers) . = ITEM_INTERACT_COMPLETE if(is_pen(W)) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index fc5a3473567..9f666388d5c 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -10,7 +10,7 @@ name = "wall" desc = "A huge chunk of metal used to separate rooms." anchored = TRUE - icon = 'icons/turf/walls/wall.dmi' + icon = 'icons/turf/walls/32x40wall.dmi' icon_state = "wall-0" base_icon_state = "wall" flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 @@ -32,7 +32,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) /obj/structure/falsewall/Initialize(mapload) . = ..() @@ -71,6 +71,8 @@ if(opening) return opening = TRUE + var/direction = get_current_direction() + dir = direction ? direction : NORTH if(density) flick("fwall_opening", src) density = FALSE @@ -175,6 +177,11 @@ return return ..() +/obj/structure/falsewall/proc/get_current_direction() + for(var/direction in GLOB.cardinal) + if(iswallturf(get_step(src, direction))) + return direction + /* * False R-Walls */ @@ -182,13 +189,13 @@ /obj/structure/falsewall/reinforced name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'icons/turf/walls/32x40reinforced_wall.dmi' icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" walltype = /turf/simulated/wall/r_wall mineral = /obj/item/stack/sheet/plasteel smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) /obj/structure/falsewall/reinforced/examine_status(mob/user) . = ..() @@ -208,7 +215,7 @@ /obj/structure/falsewall/uranium name = "uranium wall" desc = "A wall with uranium plating. This is probably a bad idea." - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'icons/turf/walls/32x40uranium_wall.dmi' icon_state = "uranium_wall-0" base_icon_state = "uranium_wall" mineral = /obj/item/stack/sheet/mineral/uranium @@ -216,7 +223,7 @@ var/active = FALSE var/last_event = 0 smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_URANIUM_WALLS) /obj/structure/falsewall/uranium/Initialize(mapload) . = ..() @@ -229,48 +236,48 @@ /obj/structure/falsewall/gold name = "gold wall" desc = "A wall with gold plating. Swag!" - icon = 'icons/turf/walls/gold_wall.dmi' + icon = 'icons/turf/walls/32x40gold_wall.dmi' icon_state = "gold_wall-0" base_icon_state = "gold_wall" mineral = /obj/item/stack/sheet/mineral/gold walltype = /turf/simulated/wall/mineral/gold smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_GOLD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_GOLD_WALLS) /obj/structure/falsewall/silver name = "silver wall" desc = "A wall with silver plating. Shiny." - icon = 'icons/turf/walls/silver_wall.dmi' + icon = 'icons/turf/walls/32x40silver_wall.dmi' icon_state = "silver_wall-0" base_icon_state = "silver_wall" mineral = /obj/item/stack/sheet/mineral/silver walltype = /turf/simulated/wall/mineral/silver smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS) - canSmoothWith = list(SMOOTH_GROUP_SILVER_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SILVER_WALLS) /obj/structure/falsewall/diamond name = "diamond wall" desc = "A wall with diamond plating. You monster." - icon = 'icons/turf/walls/diamond_wall.dmi' + icon = 'icons/turf/walls/32x40diamond_wall.dmi' icon_state = "diamond_wall-0" base_icon_state = "diamond_wall" mineral = /obj/item/stack/sheet/mineral/diamond walltype = /turf/simulated/wall/mineral/diamond smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS) - canSmoothWith = list(SMOOTH_GROUP_DIAMOND_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_DIAMOND_WALLS) max_integrity = 800 /obj/structure/falsewall/plasma name = "plasma wall" desc = "A wall with plasma plating. This is definitely a bad idea." - icon = 'icons/turf/walls/plasma_wall.dmi' + icon = 'icons/turf/walls/32x40plasma_wall.dmi' icon_state = "plasma_wall-0" base_icon_state = "plasma_wall" mineral = /obj/item/stack/sheet/mineral/plasma walltype = /turf/simulated/wall/mineral/plasma smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS) - canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASMA_WALLS) cares_about_temperature = TRUE /obj/structure/falsewall/plasma/item_interaction(mob/living/user, obj/item/used, list/modifiers) @@ -296,109 +303,120 @@ /obj/structure/falsewall/alien name = "alien wall" desc = "A strange-looking alien wall." - icon = 'icons/turf/walls/abductor_wall.dmi' + icon = 'icons/turf/walls/32x40abductor_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" mineral = /obj/item/stack/sheet/mineral/abductor walltype = /turf/simulated/wall/mineral/abductor smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) /obj/structure/falsewall/bananium name = "bananium wall" desc = "A wall with bananium plating. Honk!" - icon = 'icons/turf/walls/bananium_wall.dmi' + icon = 'icons/turf/walls/32x40bananium_wall.dmi' icon_state = "bananium_wall-0" base_icon_state = "bananium_wall" mineral = /obj/item/stack/sheet/mineral/bananium walltype = /turf/simulated/wall/mineral/bananium smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BANANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BANANIUM_WALLS) /obj/structure/falsewall/sandstone name = "sandstone wall" desc = "A wall with sandstone plating." - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'icons/turf/walls/32x40sandstone_wall.dmi' icon_state = "sandstone_wall-0" base_icon_state = "sandstone_wall" mineral = /obj/item/stack/sheet/mineral/sandstone walltype = /turf/simulated/wall/mineral/sandstone smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS) - canSmoothWith = list(SMOOTH_GROUP_SANDSTONE_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SANDSTONE_WALLS) /obj/structure/falsewall/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'icons/turf/walls/32x40wood_wall.dmi' icon_state = "wood_wall-0" base_icon_state = "wood_wall" mineral = /obj/item/stack/sheet/wood walltype = /turf/simulated/wall/mineral/wood smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) /obj/structure/falsewall/iron name = "rough metal wall" desc = "A wall with rough metal plating." - icon = 'icons/turf/walls/iron_wall.dmi' + icon = 'icons/turf/walls/32x40iron_wall.dmi' icon_state = "iron_wall-0" base_icon_state = "iron_wall" mineral = /obj/item/stack/rods mineral_amount = 5 walltype = /turf/simulated/wall/mineral/iron smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_IRON_WALLS) - canSmoothWith = list(SMOOTH_GROUP_IRON_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_IRON_WALLS) /obj/structure/falsewall/abductor name = "alien wall" desc = "A wall with alien alloy plating." - icon = 'icons/turf/walls/abductor_wall.dmi' + icon = 'icons/turf/walls/32x40abductor_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" mineral = /obj/item/stack/sheet/mineral/abductor walltype = /turf/simulated/wall/mineral/abductor smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) /obj/structure/falsewall/titanium desc = "A light-weight titanium wall used in shuttles." - icon = 'icons/turf/walls/plastinum_wall.dmi' + icon = 'icons/turf/walls/32x40plastinum_wall.dmi' icon_state = "plastinum_wall-0" base_icon_state = "plastinum_wall" mineral = /obj/item/stack/sheet/mineral/titanium walltype = /turf/simulated/wall/mineral/titanium smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) + +/obj/structure/falsewall/survival + name = "pod wall" + desc = "An easily-compressable wall used for temporary shelter." + icon = 'icons/turf/walls/32x40survival_pod_walls.dmi' + icon_state = "survival_pod_walls-0" + base_icon_state = "survival_pod_walls" + mineral = /obj/item/stack/sheet/mineral/titanium + walltype = /turf/simulated/wall/mineral/titanium + smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) /obj/structure/falsewall/plastitanium desc = "An evil wall of plasma and titanium." - icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon = 'icons/turf/walls/32x40plastitanium_wall.dmi' icon_state = "plastitanium_wall-0" base_icon_state = "plastitanium_wall" mineral = /obj/item/stack/sheet/mineral/plastitanium walltype = /turf/simulated/wall/mineral/plastitanium smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) /obj/structure/falsewall/backrooms desc = "A strange wall that looks like cheap wallpaper and drywall." - icon = 'icons/turf/walls/backrooms_wall.dmi' + icon = 'icons/turf/walls/32x40backrooms_wall.dmi' icon_state = "backrooms_wall-0" base_icon_state = "backrooms_wall" smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BACKROOMS_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BACKROOMS_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BACKROOMS_WALLS) /obj/structure/falsewall/brass name = "clockwork wall" desc = "A huge chunk of warm metal. The clanging of machinery emanates from within." - icon = 'icons/turf/walls/clockwork_wall.dmi' + icon = 'icons/turf/walls/32x40clockwork_wall.dmi' icon_state = "clockwork_wall-0" base_icon_state = "clockwork_wall" resistance_flags = FIRE_PROOF | ACID_PROOF mineral_amount = 1 smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) - canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BRASS_WALL) girder_type = /obj/structure/clockwork/wall_gear/displaced walltype = /turf/simulated/wall/clockwork mineral = /obj/item/stack/tile/brass @@ -412,12 +430,12 @@ /obj/structure/falsewall/rock_ancient name = "ancient rock" desc = "A rare asteroid rock that appears to be resistant to all mining tools except pickaxes!" - icon = 'icons/turf/walls/smoothrocks.dmi' + icon = 'icons/turf/walls/32x40smoothrocks.dmi' icon_state = "smoothrocks-0" base_icon_state = "smoothrocks" color = COLOR_ANCIENT_ROCK smoothing_groups = list(SMOOTH_GROUP_ASTEROID_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ASTEROID_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ASTEROID_WALLS) mineral = /obj/item/stack/ore/glass/basalt/ancient walltype = /turf/simulated/mineral/ancient diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index d4a7ac8f2a8..b2a80b1709d 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -7,7 +7,7 @@ flags = CONDUCT flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 pressure_resistance = 5*ONE_ATMOSPHERE - layer = BELOW_OBJ_LAYER + layer = MAP_EDITOR_TURF_LAYER - 0.1 level = 3 armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 0, ACID = 0) max_integrity = 50 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f72722844ef..37c2216a2c0 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -712,7 +712,6 @@ decon_speed = 3 SECONDS armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100) rad_insulation_beta = RAD_NO_INSULATION - rad_insulation_gamma = RAD_GAMMA_WINDOW superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT rad_conversion_amount = 2 @@ -767,7 +766,7 @@ flags = PREVENT_CLICK_UNDER smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) //they are not walls but this lets walls smooth with them - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS) /obj/structure/window/full/screwdriver_act(mob/user, obj/item/I) if(barricaded) @@ -784,8 +783,8 @@ return ..() /obj/structure/window/full/basic - desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it. Has very light protection from radiation" - icon = 'icons/obj/smooth_structures/windows/window.dmi' + desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it." + icon = 'icons/obj/smooth_structures/windows/32x40window.dmi' icon_state = "window-0" base_icon_state = "window" max_integrity = 50 @@ -793,8 +792,8 @@ /obj/structure/window/full/plasmabasic name = "plasma window" - desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through. When hit with Gamma particles it will become charged and start emitting Beta particles" - icon = 'icons/obj/smooth_structures/windows/plasma_window.dmi' + desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through." + icon = 'icons/obj/smooth_structures/windows/32x40plasma_window.dmi' icon_state = "plasma_window-0" base_icon_state = "plasma_window" glass_decal = /obj/effect/decal/cleanable/glass/plasma @@ -802,10 +801,12 @@ glass_type = /obj/item/stack/sheet/plasmaglass heat_resistance = 32000 max_integrity = 300 + edge_overlay_file = 'icons/obj/smooth_structures/windows/window_edges.dmi' explosion_block = 1 decon_speed = 3 SECONDS armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100) - edge_overlay_file = 'icons/obj/smooth_structures/windows/window_edges.dmi' + rad_insulation_beta = RAD_NO_INSULATION + rad_insulation_gamma = RAD_GAMMA_WINDOW env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT rad_insulation_beta = RAD_NO_INSULATION @@ -814,8 +815,8 @@ /obj/structure/window/full/plasmareinforced name = "reinforced plasma window" - desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof. When hit with Gamma particles it will become charged and start emitting Beta particles" - icon = 'icons/obj/smooth_structures/windows/rplasma_window.dmi' + desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." + icon = 'icons/obj/smooth_structures/windows/32x40rplasma_window.dmi' icon_state = "rplasma_window-0" base_icon_state = "rplasma_window" glass_decal = /obj/effect/decal/cleanable/glass/plasma @@ -839,8 +840,8 @@ /obj/structure/window/full/reinforced name = "reinforced window" - desc = "It looks rather strong. Might take a few good hits to shatter it. Offers superior protection from radiation" - icon = 'icons/obj/smooth_structures/windows/reinforced_window.dmi' + desc = "It looks rather strong. Might take a few good hits to shatter it." + icon = 'icons/obj/smooth_structures/windows/32x40reinforced_window.dmi' icon_state = "reinforced_window-0" base_icon_state = "reinforced_window" max_integrity = 100 @@ -861,7 +862,7 @@ /obj/structure/window/full/reinforced/tinted name = "tinted window" desc = "It looks rather strong and opaque. Might take a few good hits to shatter it." - icon = 'icons/obj/smooth_structures/windows/tinted_window.dmi' + icon = 'icons/obj/smooth_structures/windows/32x40tinted_window.dmi' icon_state = "tinted_window-0" base_icon_state = "tinted_window" opacity = TRUE @@ -869,7 +870,7 @@ /obj/structure/window/full/shuttle name = "shuttle window" desc = "A reinforced, air-locked pod window." - icon = 'icons/obj/smooth_structures/windows/shuttle_window.dmi' + icon = 'icons/obj/smooth_structures/windows/32x40shuttle_window.dmi' icon_state = "shuttle_window-0" base_icon_state = "shuttle_window" max_integrity = 200 @@ -878,8 +879,9 @@ explosion_block = 3 decon_speed = 6 SECONDS armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, RAD = 100, FIRE = 80, ACID = 100) + edge_overlay_file = 'icons/obj/smooth_structures/windows/shuttle_window_edges.dmi' smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS) glass_type = /obj/item/stack/sheet/titaniumglass env_smash_level = ENVIRONMENT_SMASH_RWALLS // shuttle windows should probably be a bit stronger, too // Mostly for the mining shuttle. @@ -894,7 +896,7 @@ /obj/structure/window/full/plastitanium name = "plastitanium window" desc = "An evil looking window of plasma and titanium. When hit with Gamma particles it will become charged and start emitting Beta particles" - icon = 'icons/obj/smooth_structures/windows/plastitanium_window.dmi' + icon = 'icons/obj/smooth_structures/windows/32x40plastitanium_window.dmi' icon_state = "plastitanium_window-0" base_icon_state = "plastitanium_window" max_integrity = 1200 @@ -902,10 +904,11 @@ heat_resistance = 32000 decon_speed = 7 SECONDS armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100) + edge_overlay_file = 'icons/obj/smooth_structures/windows/plastitanium_window_edges.dmi' explosion_block = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS) env_smash_level = ENVIRONMENT_SMASH_RWALLS //used in shuttles, same reason as above superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT rad_insulation_beta = RAD_NO_INSULATION @@ -955,14 +958,16 @@ animate(src, color = previouscolor, time = 8) /obj/structure/window/reinforced/clockwork/fulltile + icon = 'icons/obj/smooth_structures/windows/32x40clockwork_window.dmi' icon_state = "clockwork_window-0" base_icon_state = "clockwork_window" smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) + smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) fulltile = TRUE flags = PREVENT_CLICK_UNDER dir = FULLTILE_WINDOW_DIR max_integrity = 120 + edge_overlay_file = 'icons/obj/smooth_structures/windows/clockwork_window_edges.dmi' level = 3 glass_amount = 2 diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index d14166475e0..dcb17c7477d 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -3,7 +3,7 @@ /// wall piece /turf/simulated/mineral name = "rock" - icon = 'icons/turf/walls/smoothrocks.dmi' + icon = 'icons/turf/walls/32x40smoothrocks.dmi' icon_state = "smoothrocks-0" base_icon_state = "smoothrocks" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 23de07a1fbe..6efa670c9ad 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -3,12 +3,12 @@ /turf/simulated/wall name = "wall" desc = "A huge chunk of metal used to separate rooms." - icon = 'icons/turf/walls/wall.dmi' + icon = 'icons/turf/walls/32x40wall.dmi' icon_state = "wall-0" base_icon_state = "wall" smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) var/rotting = FALSE diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index 18fc2ec1ebf..7edc955f606 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -64,11 +64,11 @@ /turf/simulated/wall/indestructible/boss name = "necropolis wall" desc = "A thick, seemingly indestructible stone wall." - icon = 'icons/turf/walls/boss_wall.dmi' + icon = 'icons/turf/walls/32x40boss_wall.dmi' icon_state = "boss_wall-0" base_icon_state = "boss_wall" smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BOSS_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BOSS_WALLS) baseturf = /turf/simulated/floor/plating/asteroid/basalt /turf/simulated/wall/indestructible/boss/see_through @@ -99,7 +99,7 @@ addtimer(CALLBACK(src, PROC_REF(collapse)), 10 SECONDS) /turf/simulated/wall/indestructible/sandstone - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'icons/turf/walls/32x40sandstone_wall.dmi' icon_state = "sandstone_wall-0" base_icon_state = "sandstone_wall" @@ -127,35 +127,33 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) return ..() /turf/simulated/wall/indestructible/uranium - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'icons/turf/walls/32x40uranium_wall.dmi' icon_state = "uranium_wall-0" base_icon_state = "uranium_wall" - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) /turf/simulated/wall/indestructible/wood - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'icons/turf/walls/32x40wood_wall.dmi' icon_state = "wood_wall-0" base_icon_state = "wood_wall" smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) /turf/simulated/wall/indestructible/alien name = "alien wall" desc = "A wall with alien alloy plating." - icon = 'icons/turf/walls/abductor_wall.dmi' + icon = 'icons/turf/walls/32x40abductor_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) /turf/simulated/wall/indestructible/abductor - icon = 'icons/turf/walls/abductor_wall.dmi' + icon = 'icons/turf/walls/32x40abductor_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) /turf/simulated/wall/indestructible/fakedoor name = "CentCom Access" @@ -167,12 +165,12 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) /turf/simulated/wall/indestructible/fakeglass name = "window" - icon = 'icons/obj/smooth_structures/windows/reinforced_window.dmi' + icon = 'icons/obj/smooth_structures/windows/32x40reinforced_window.dmi' icon_state = "fake_window" base_icon_state = "reinforced_window" opacity = FALSE smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) //they are not walls but this lets walls smooth with them - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS) /// Used to define what file the edging sprite is contained within var/edge_overlay_file = 'icons/obj/smooth_structures/windows/reinforced_window_edges.dmi' /// Tracks the edging appearence sprite @@ -201,49 +199,48 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) return list(edge_overlay) /turf/simulated/wall/indestructible/fakeglass/brass - icon = 'icons/obj/smooth_structures/windows/clockwork_window.dmi' - icon_state = "clockwork_window-0" + icon = 'icons/obj/smooth_structures/windows/32x40clockwork_window.dmi' base_icon_state = "clockwork_window" - smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS) - edge_overlay_file = null + smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_BRASS, SMOOTH_GROUP_BRASS_WALL, SMOOTH_GROUP_WOOD_WALLS) + edge_overlay_file = 'icons/obj/smooth_structures/windows/clockwork_window_edges.dmi' -/turf/simulated/wall/indestructible/opsglass - name = "window" - icon = 'icons/obj/smooth_structures/windows/plastitanium_window.dmi' - icon_state = "plastitanium_window-0" +/turf/simulated/wall/indestructible/fakeglass/plastitanium + name = "plastitanium window" + icon = 'icons/obj/smooth_structures/windows/32x40plastitanium_window.dmi' base_icon_state = "plastitanium_window" - opacity = FALSE smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS) + edge_overlay_file = 'icons/obj/smooth_structures/windows/plastitanium_window_edges.dmi' -/turf/simulated/wall/indestructible/opsglass/Initialize(mapload) +/turf/simulated/wall/indestructible/fakeglass/plastitanium/Initialize(mapload) . = ..() icon_state = null underlays += mutable_appearance('icons/obj/structures.dmi', "grille") underlays += mutable_appearance('icons/turf/floors.dmi', "plating") -/turf/simulated/wall/indestructible/opsglass/limited_smooth +/turf/simulated/wall/indestructible/fakeglass/plastitanium/limited_smooth smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM) - canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM) -/turf/simulated/wall/indestructible/opsglass/titanium_window +/turf/simulated/wall/indestructible/fakeglass/titanium_window name = "shuttle window" - icon = 'icons/turf/floors/titaniumglass.dmi' - icon_state = "titaniumglass-0" - base_icon_state = "titaniumglass" + icon = 'icons/obj/smooth_structures/windows/32x40shuttle_window.dmi' + icon_state = "shuttle_window-0" + base_icon_state = "shuttle_window" smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_TITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_TITANIUM_WALLS) + edge_overlay_file = 'icons/obj/smooth_structures/windows/shuttle_window_edges.dmi' /turf/simulated/wall/indestructible/rock name = "dense rock" desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this." - icon = 'icons/turf/walls/smoothrocks.dmi' + icon = 'icons/turf/walls/32x40smoothrocks.dmi' icon_state = "smoothrocks-0" base_icon_state = "smoothrocks" smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_MINERAL_WALLS) - canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_MINERAL_WALLS) color = COLOR_ROCK /turf/simulated/wall/indestructible/rock/snow @@ -256,24 +253,19 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) canSmoothWith = null /turf/simulated/wall/indestructible/riveted - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'icons/turf/walls/32x40reinforced_wall.dmi' icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) /turf/simulated/wall/indestructible/titanium - icon = 'icons/turf/walls/plastinum_wall.dmi' + icon = 'icons/turf/walls/32x40plastinum_wall.dmi' icon_state = "plastinum_wall-0" base_icon_state = "plastinum_wall" flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) - canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) - -/turf/simulated/wall/indestructible/titanium/nodiagonal - icon_state = "map-shuttle_nd" - smoothing_flags = SMOOTH_BITMASK + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) /turf/simulated/wall/indestructible/titanium/nosmooth icon_state = "plastinum_wall" @@ -287,24 +279,17 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) desc = "Like regular titanium, but able to deflect capitalist aggressors!" /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal - icon_state = "map-shuttle_nd" - smoothing_flags = SMOOTH_BITMASK /turf/simulated/wall/indestructible/titanium/soviet/nosmooth icon_state = "plastinum_wall" smoothing_flags = NONE /turf/simulated/wall/indestructible/syndicate - icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon = 'icons/turf/walls/32x40plastitanium_wall.dmi' icon_state = "plastitanium_wall-0" base_icon_state = "plastitanium_wall" - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SYNDICATE_WALLS) - canSmoothWith = list(SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) - -/turf/simulated/wall/indestructible/syndicate/no_diagonal - icon_state = "map-shuttle_nd" - smoothing_flags = SMOOTH_BITMASK + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) /turf/simulated/wall/mineral/plastitanium/no_smooth icon = 'icons/turf/shuttle.dmi' @@ -313,9 +298,9 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen) /turf/simulated/wall/indestructible/backrooms desc = "A strange wall that looks like cheap wallpaper and drywall." - icon = 'icons/turf/walls/backrooms_wall.dmi' + icon = 'icons/turf/walls/32x40backrooms_wall.dmi' icon_state = "backrooms_wall-0" base_icon_state = "backrooms_wall" explosion_block = 4 smoothing_groups = list(SMOOTH_GROUP_BACKROOMS_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BACKROOMS_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BACKROOMS_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 0e95155db96..ebb7ad61837 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -12,66 +12,66 @@ /turf/simulated/wall/mineral/gold name = "gold wall" desc = "A wall with gold plating. Swag!" - icon = 'icons/turf/walls/gold_wall.dmi' + icon = 'icons/turf/walls/32x40gold_wall.dmi' icon_state = "gold_wall-0" base_icon_state = "gold_wall" sheet_type = /obj/item/stack/sheet/mineral/gold explosion_block = 0 //gold is a soft metal you dingus. smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_GOLD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_GOLD_WALLS) /turf/simulated/wall/mineral/silver name = "silver wall" desc = "A wall with silver plating. Shiny!" - icon = 'icons/turf/walls/silver_wall.dmi' + icon = 'icons/turf/walls/32x40silver_wall.dmi' icon_state = "silver_wall-0" base_icon_state = "silver_wall" sheet_type = /obj/item/stack/sheet/mineral/silver smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS) - canSmoothWith = list(SMOOTH_GROUP_SILVER_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SILVER_WALLS) /turf/simulated/wall/mineral/diamond name = "diamond wall" desc = "A wall with diamond plating. You monster." - icon = 'icons/turf/walls/diamond_wall.dmi' + icon = 'icons/turf/walls/32x40diamond_wall.dmi' icon_state = "diamond_wall-0" base_icon_state = "diamond_wall" sheet_type = /obj/item/stack/sheet/mineral/diamond explosion_block = 3 smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS) - canSmoothWith = list(SMOOTH_GROUP_DIAMOND_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_DIAMOND_WALLS) rust_resistance = RUST_RESISTANCE_REINFORCED /turf/simulated/wall/mineral/bananium name = "bananium wall" desc = "A wall with bananium plating. Honk!" - icon = 'icons/turf/walls/bananium_wall.dmi' + icon = 'icons/turf/walls/32x40bananium_wall.dmi' icon_state = "bananium_wall-0" base_icon_state = "bananium_wall" sheet_type = /obj/item/stack/sheet/mineral/bananium smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BANANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BANANIUM_WALLS) /turf/simulated/wall/mineral/sandstone name = "sandstone wall" desc = "A wall with sandstone plating." - icon = 'icons/turf/walls/sandstone_wall.dmi' + icon = 'icons/turf/walls/32x40sandstone_wall.dmi' icon_state = "sandstone_wall-0" base_icon_state = "sandstone_wall" sheet_type = /obj/item/stack/sheet/mineral/sandstone explosion_block = 0 smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS) - canSmoothWith = list(SMOOTH_GROUP_SANDSTONE_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SANDSTONE_WALLS) /turf/simulated/wall/mineral/uranium name = "uranium wall" desc = "A wall with uranium plating. This is probably a bad idea." - icon = 'icons/turf/walls/uranium_wall.dmi' + icon = 'icons/turf/walls/32x40uranium_wall.dmi' icon_state = "uranium_wall-0" base_icon_state = "uranium_wall" sheet_type = /obj/item/stack/sheet/mineral/uranium smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_URANIUM_WALLS) rust_resistance = RUST_RESISTANCE_REINFORCED /turf/simulated/wall/mineral/uranium/Initialize(mapload) @@ -82,13 +82,13 @@ /turf/simulated/wall/mineral/plasma name = "plasma wall" desc = "A wall with plasma plating. This is definitely a bad idea." - icon = 'icons/turf/walls/plasma_wall.dmi' + icon = 'icons/turf/walls/32x40plasma_wall.dmi' icon_state = "plasma_wall-0" base_icon_state = "plasma_wall" sheet_type = /obj/item/stack/sheet/mineral/plasma thermal_conductivity = 0.04 smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS) - canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASMA_WALLS) /turf/simulated/wall/mineral/plasma/attack_by(obj/item/attacking, mob/user, params) if(..()) @@ -133,25 +133,24 @@ /turf/simulated/wall/mineral/alien name = "alien wall" desc = "A strange-looking alien wall." - icon = 'icons/turf/walls/plasma_wall.dmi' + icon = 'icons/turf/walls/32x40plasma_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" sheet_type = /obj/item/stack/sheet/mineral/abductor - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) /turf/simulated/wall/mineral/wood name = "wooden wall" desc = "A wall with wooden plating. Stiff." - icon = 'icons/turf/walls/wood_wall.dmi' + icon = 'icons/turf/walls/32x40wood_wall.dmi' icon_state = "wood_wall-0" base_icon_state = "wood_wall" sheet_type = /obj/item/stack/sheet/wood hardness = 70 explosion_block = 0 smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WOOD_WALLS) /turf/simulated/wall/mineral/wood/attack_by(obj/item/attacking, mob/user, params) if(..()) @@ -170,30 +169,29 @@ desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal." girder_type = /obj/structure/barricade/wooden hardness = 50 - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS) /turf/simulated/wall/mineral/iron name = "rough metal wall" desc = "A wall with rough metal plating." - icon = 'icons/turf/walls/iron_wall.dmi' + icon = 'icons/turf/walls/32x40iron_wall.dmi' icon_state = "iron_wall-0" base_icon_state = "iron_wall" sheet_type = /obj/item/stack/rods sheet_amount = 5 smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_IRON_WALLS) - canSmoothWith = list(SMOOTH_GROUP_IRON_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_IRON_WALLS) /turf/simulated/wall/mineral/abductor name = "alien wall" desc = "A wall with alien alloy plating." - icon = 'icons/turf/walls/abductor_wall.dmi' + icon = 'icons/turf/walls/32x40abductor_wall.dmi' icon_state = "abductor_wall-0" base_icon_state = "abductor_wall" sheet_type = /obj/item/stack/sheet/mineral/abductor explosion_block = 3 - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS) - canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_ABDUCTOR_WALLS) rust_resistance = RUST_RESISTANCE_ORGANIC /////////////////////Titanium walls///////////////////// @@ -202,15 +200,14 @@ /turf/simulated/wall/mineral/titanium name = "wall" desc = "A light-weight titanium wall used in shuttles." - icon = 'icons/turf/walls/plastinum_wall.dmi' + icon = 'icons/turf/walls/32x40plastinum_wall.dmi' icon_state = "plastinum_wall-0" base_icon_state = "plastinum_wall" explosion_block = 3 flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD sheet_type = /obj/item/stack/sheet/mineral/titanium - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) - canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE) rust_resistance = RUST_RESISTANCE_TITANIUM /turf/simulated/wall/mineral/titanium/magic_rust_turf() @@ -224,10 +221,6 @@ . = ..() T.transform = transform -/turf/simulated/wall/mineral/titanium/nodiagonal - icon_state = "map-shuttle_nd" - smoothing_flags = SMOOTH_BITMASK - /turf/simulated/wall/mineral/titanium/nosmooth smoothing_flags = NONE @@ -241,14 +234,13 @@ /turf/simulated/wall/mineral/titanium/survival name = "pod wall" desc = "An easily-compressable wall used for temporary shelter." - icon = 'icons/turf/walls/survival_pod_walls.dmi' + icon = 'icons/turf/walls/32x40survival_pod_walls.dmi' icon_state = "survival_pod_walls-0" base_icon_state = "survival_pod_walls" - smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD) /turf/simulated/wall/mineral/titanium/survival/nodiagonal - smoothing_flags = SMOOTH_BITMASK /turf/simulated/wall/mineral/titanium/survival/pod @@ -257,14 +249,13 @@ /turf/simulated/wall/mineral/plastitanium name = "wall" desc = "An evil wall of plasma and titanium." - icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon = 'icons/turf/walls/32x40plastitanium_wall.dmi' icon_state = "plastitanium_wall-0" base_icon_state = "plastitanium_wall" explosion_block = 4 sheet_type = /obj/item/stack/sheet/mineral/plastitanium - smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS) - canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_SHUTTLE_PARTS) rust_resistance = RUST_RESISTANCE_TITANIUM /turf/simulated/wall/mineral/plastitanium/magic_rust_turf() @@ -278,10 +269,6 @@ . = ..() T.transform = transform -/turf/simulated/wall/mineral/plastitanium/nodiagonal - icon_state = "map-shuttle_nd" - smoothing_flags = SMOOTH_BITMASK - /turf/simulated/wall/mineral/plastitanium/nosmooth icon = 'icons/turf/shuttle.dmi' icon_state = "wall" diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index ec9a61a994f..7f7108637d0 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -1,11 +1,11 @@ /turf/simulated/wall/cult name = "runed metal wall" desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound." - icon = 'icons/turf/walls/cult_wall.dmi' + icon = 'icons/turf/walls/32x40cult_wall.dmi' icon_state = "cult_wall-0" base_icon_state = "cult_wall" smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CULT_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) sheet_type = /obj/item/stack/sheet/runed_metal sheet_amount = 1 girder_type = /obj/structure/girder/cult @@ -41,7 +41,7 @@ /turf/simulated/wall/clockwork name = "clockwork wall" desc = "A huge chunk of warm metal. The clanging of machinery emanates from within." - icon = 'icons/turf/walls/clockwork_wall.dmi' + icon = 'icons/turf/walls/32x40clockwork_wall.dmi' icon_state = "clockwork_wall-0" base_icon_state = "clockwork_wall" explosion_block = 2 @@ -51,16 +51,14 @@ girder_type = /obj/structure/clockwork/wall_gear var/heated smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL) - canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BRASS_WALL) /turf/simulated/wall/clockwork/Initialize(mapload) . = ..() - new /obj/effect/temp_visual/ratvar/wall(src) new /obj/effect/temp_visual/ratvar/beam(src) /turf/simulated/wall/clockwork/bullet_act(obj/projectile/Proj) . = ..() - new /obj/effect/temp_visual/ratvar/wall(get_turf(src)) new /obj/effect/temp_visual/ratvar/beam(get_turf(src)) /turf/simulated/wall/clockwork/narsie_act() @@ -95,7 +93,7 @@ /turf/simulated/wall/boss name = "ancient wall" desc = "A thick metal wall, it look very old." - icon = 'icons/turf/walls/boss_wall.dmi' + icon = 'icons/turf/walls/32x40boss_wall.dmi' icon_state = "boss_wall-0" base_icon_state = "boss_wall" baseturf = /turf/simulated/floor/lava/mapping_lava @@ -105,7 +103,7 @@ heat_resistance = 20000 can_dismantle_with_welder = FALSE smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BOSS_WALLS) - canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_BOSS_WALLS) sheet_type = /obj/item/stack/sheet/runed_metal sheet_amount = 1 girder_type = /obj/structure/girder/cult diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index d212da1d125..b26150ea38d 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -1,7 +1,7 @@ /turf/simulated/wall/r_wall name = "reinforced wall" desc = "A huge chunk of reinforced metal used to separate rooms." - icon = 'icons/turf/walls/reinforced_wall.dmi' + icon = 'icons/turf/walls/32x40reinforced_wall.dmi' icon_state = "reinforced_wall-0" base_icon_state = "reinforced_wall" explosion_block = 2 @@ -13,7 +13,7 @@ girder_type = /obj/structure/girder/reinforced can_dismantle_with_welder = FALSE smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) - canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) + canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) heat_resistance = 20000 // Ain't getting through this soon rust_resistance = RUST_RESISTANCE_REINFORCED @@ -222,7 +222,7 @@ /turf/simulated/wall/r_wall/update_icon_state() if(d_state) - icon_state = "r_wall-[d_state]" + icon_state = "r_wall_[d_state]" smoothing_flags = NONE else smoothing_flags = SMOOTH_BITMASK | SMOOTH_OBJ diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index ceafdd64d75..4b17269260a 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(aalarm_modes, list( /obj/machinery/alarm name = "air alarm" desc = "A wall-mounted device used to control atmospheric equipment. It looks a little cheaply made..." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/obj/wallbumps/alarm.dmi' icon_state = "alarm0" anchored = TRUE idle_power_consumption = 4 @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(aalarm_modes, list( buildstage = AIR_ALARM_FRAME wiresexposed = TRUE - set_pixel_offsets_from_dir(24, -24, 24, -24) + set_pixel_offsets_from_dir(32, -32, 32, -32) GLOB.air_alarms += src alarm_area.air_alarms += src @@ -1221,12 +1221,12 @@ GLOBAL_LIST_INIT(aalarm_modes, list( req_access = null req_one_access = null -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/all_access, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/engine, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/monitor, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/server, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/syndicate, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/all_access, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/engine, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/monitor, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/server, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/alarm/syndicate, 32, 32) /* AIR ALARM CIRCUIT diff --git a/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm b/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm index eeea5b50585..d98d31ba614 100644 --- a/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm +++ b/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm @@ -154,13 +154,6 @@ GLOBAL_LIST_INIT(ruin_sieged_lab_research_loot, list( /obj/item/paper/sieged_lab_research_paper ) -/obj/machinery/door/airlock/bloody - icon_state = "closed_bloody" - closed_icon_state = "closed_bloody" - opening_icon_state = "opening_bloody" - closing_icon_state = "closing_bloody" - airlock_material = "_" // sentinel value so we don't try adding fillers of any kind - /obj/effect/spawner/random/mine name = "50pc landmine" icon_state = "mine" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index ff510592c2f..ed56d7d5f99 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -101,9 +101,10 @@ //Window /obj/structure/window/full/shuttle/survival_pod name = "pod window" - icon = 'icons/obj/smooth_structures/windows/pod_window.dmi' + icon = 'icons/obj/smooth_structures/windows/32x40pod_window.dmi' icon_state = "pod_window-0" base_icon_state = "pod_window" + edge_overlay_file = 'icons/obj/smooth_structures/windows/pod_window_edges.dmi' smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD) canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TIANIUM_POD) diff --git a/code/modules/mob/living/basic/hostile/demons/demon_powers.dm b/code/modules/mob/living/basic/hostile/demons/demon_powers.dm index 96e0134355e..5deefd962c7 100644 --- a/code/modules/mob/living/basic/hostile/demons/demon_powers.dm +++ b/code/modules/mob/living/basic/hostile/demons/demon_powers.dm @@ -542,7 +542,7 @@ level_max = 0 base_cooldown = 0 var/static/list/upgrade_icons = list( - PD_UPGRADE_HIJACK_SPEED = image(icon = 'icons/obj/power.dmi', icon_state = "apcemag"), + PD_UPGRADE_HIJACK_SPEED = image(icon = 'icons/obj/wallbumps/apc.dmi', icon_state = "apcemag"), PD_UPGRADE_DRAIN_SPEED = image(icon = 'icons/obj/power.dmi', icon_state = "ccharger"), PD_UPGRADE_MAX_HEALTH = image(icon = 'icons/obj/stock_parts.dmi', icon_state = "bluespace_matter_bin"), PD_UPGRADE_HEALTH_REGEN = image(icon = 'icons/obj/stock_parts.dmi', icon_state = "femto_mani"), diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 862df8a0e07..d866231b9e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -111,7 +111,7 @@ Difficulty: Hard /datum/action/innate/megafauna_attack/hallucination_surround name = "Surround Target" - button_icon = 'icons/turf/walls/wall.dmi' + button_icon = 'icons/turf/walls/32x40wall.dmi' button_icon_state = "wall-0" chosen_message = SPAN_COLOSSUS("You are now surrounding the target you click on with hallucinations.") chosen_attack_num = 3 diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm index 3e1c1627d14..6606b5b4444 100644 --- a/code/modules/power/apc/apc.dm +++ b/code/modules/power/apc/apc.dm @@ -10,6 +10,7 @@ /obj/machinery/power/apc name = "area power controller" desc = "A control terminal for the area electrical systems." + icon = 'icons/obj/wallbumps/apc.dmi' icon_state = "apc0" integrity_failure = 50 resistance_flags = FIRE_PROOF @@ -176,9 +177,9 @@ name = "\improper [get_area_name(apc_area, TRUE)] APC" if(building) - // Offset 24 pixels in direction of dir. This allows the APC to be embedded in a wall, yet still inside an area + // Offset 32 pixels in direction of dir. This allows the APC to be embedded in a wall, yet still inside an area setDir(direction) // This is only used for pixel offsets, and later terminal placement. APC dir doesn't affect its sprite since it only has one orientation. - set_pixel_offsets_from_dir(24, -24, 24, -24) + set_pixel_offsets_from_dir(32, -32, 32, -32) opened = APC_OPENED operating = FALSE @@ -1168,18 +1169,18 @@ /obj/machinery/power/apc/get_internal_wires() return wires -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/important, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/critical, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station/empty_charge, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/important, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/critical, 24, 24) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/unbuilt, 24, 24) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/important, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/critical, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station/empty_charge, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/important, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/reinforced/critical, 32, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/unbuilt, 32, 32) /obj/item/apc_electronics diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm index ccfecdb4911..2a9842f4bab 100644 --- a/code/modules/power/lights.dm +++ b/code/modules/power/lights.dm @@ -38,8 +38,37 @@ /obj/machinery/light_construct/Initialize(mapload, ndir, building) . = ..() + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = 20 + if(SOUTH) + pixel_x = 0 + pixel_y = 0 + if(EAST) + pixel_x = 8 + pixel_y = 4 + if(WEST) + pixel_x = -8 + pixel_y = 4 update_icon(UPDATE_ICON_STATE) +/obj/machinery/light_construct/setDir(newdir) + . = ..() + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = 20 + if(SOUTH) + pixel_x = 0 + pixel_y = 0 + if(EAST) + pixel_x = 8 + pixel_y = 4 + if(WEST) + pixel_x = -8 + pixel_y = 4 + /obj/machinery/light_construct/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) @@ -379,6 +408,20 @@ if(A && !A.requires_power) on = TRUE + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = 20 + if(SOUTH) + pixel_x = 0 + pixel_y = 0 + if(EAST) + pixel_x = 8 + pixel_y = 4 + if(WEST) + pixel_x = -8 + pixel_y = 4 + switch(base_state) if("tube") brightness_range = 8 @@ -1000,6 +1043,22 @@ AddElement(/datum/element/connect_loc, loc_connections) update() +/obj/machinery/light/setDir(newdir) + . = ..() + switch(dir) + if(NORTH) + pixel_x = 0 + pixel_y = 20 + if(SOUTH) + pixel_x = 0 + pixel_y = 0 + if(EAST) + pixel_x = 8 + pixel_y = 4 + if(WEST) + pixel_x = -8 + pixel_y = 4 + /obj/item/light/proc/on_atom_entered(datum/source, atom/movable/entered) var/mob/living/living_entered = entered if(istype(living_entered) && has_gravity(loc)) diff --git a/icons/effects/clockwork_effects.dmi b/icons/effects/clockwork_effects.dmi index 3a95cfbcfb98a2192c2f8617711292833f4a23da..dfac0bfcf05b32c81d9758708b8def2aaa36658e 100644 GIT binary patch literal 140082 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