From 877cfc4d7d765f95041552220241020f00b1c82e Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 4 Apr 2019 22:01:25 +0200 Subject: [PATCH] Refactor catwalks to not be floors, update chasms and fix Lavaboat --- _maps/map_files/Delta/delta.dmm | 188 +++++++++--------- .../MetaStation/MetaStation.v41A.II.dmm | 128 ++++++------ _maps/map_files/MetaStation/z4.dmm | 46 ++--- .../lavaland_surface_syndicate_base1.dmm | 2 +- .../RandomRuins/SpaceRuins/oldstation.dmm | 24 +-- _maps/map_files/RandomZLevels/centcomAway.dmm | 10 +- _maps/map_files/cyberiad/cyberiad.dmm | 126 ++++++------ _maps/map_files/cyberiad/z4.dmm | 76 +++---- _maps/map_files/cyberiad/z6.dmm | 50 ++--- _maps/map_files/generic/Lavaland.dmm | 16 +- code/__DEFINES/layers.dm | 1 + code/datums/diseases/critical.dm | 2 +- code/game/gamemodes/blob/blob_report.dm | 6 +- code/game/objects/structures/lattice.dm | 133 ++++++------- code/game/turfs/simulated/floor/chasm.dm | 112 ++++++++--- code/game/turfs/simulated/floor/lava.dm | 6 +- code/game/turfs/simulated/floor/plating.dm | 54 ----- code/game/turfs/space/space.dm | 12 +- code/game/turfs/turf.dm | 3 +- code/game/turfs/unsimulated.dm | 12 +- .../mining/lavaland/loot/tendril_loot.dm | 1 + .../hostile/megafauna/swarmer.dm | 3 - .../simple_animal/hostile/mining/goliath.dm | 6 +- code/modules/power/cable.dm | 14 +- icons/obj/smooth_structures/catwalk.dmi | Bin 7703 -> 2149 bytes icons/obj/smooth_structures/lattice.dmi | Bin 6995 -> 1104 bytes 26 files changed, 511 insertions(+), 520 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index dcd2d4d88f3..f3db701269c 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -668,7 +668,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "abH" = ( /obj/structure/computerframe{ @@ -860,7 +860,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "acf" = ( /obj/structure/cable{ @@ -881,7 +881,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "acg" = ( /obj/structure/cable{ @@ -889,12 +889,12 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "ach" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "aci" = ( /obj/structure/cable{ @@ -902,7 +902,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "acj" = ( /obj/structure/cable{ @@ -922,7 +922,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "ack" = ( /obj/structure/spacepoddoor, @@ -968,7 +968,7 @@ /area/maintenance/auxsolarstarboard) "acp" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "acq" = ( /obj/structure/table, @@ -1082,11 +1082,11 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "acF" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "acG" = ( /obj/structure/cable{ @@ -1094,7 +1094,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "acH" = ( /obj/structure/chair/stool, @@ -1776,7 +1776,7 @@ req_access_txt = "10;13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "aed" = ( /obj/docking_port/mobile/pod{ @@ -5693,7 +5693,7 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "ami" = ( -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "amj" = ( /obj/machinery/door/poddoor/shutters{ @@ -8928,7 +8928,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "asV" = ( /obj/structure/cable{ @@ -8944,7 +8944,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "asW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9002,7 +9002,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atb" = ( /obj/structure/cable{ @@ -9010,12 +9010,12 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atc" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atd" = ( /turf/simulated/wall/r_wall, @@ -9355,7 +9355,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atL" = ( /obj/structure/cable{ @@ -9375,7 +9375,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atM" = ( /obj/structure/cable{ @@ -9496,7 +9496,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "atV" = ( /obj/structure/disposalpipe/segment{ @@ -9547,7 +9547,7 @@ /area/maintenance/auxsolarport) "atZ" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "aua" = ( /obj/effect/decal/cleanable/dirt, @@ -12859,7 +12859,7 @@ dir = 6 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aAf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12908,7 +12908,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aAj" = ( /obj/structure/cable{ @@ -13823,7 +13823,7 @@ dir = 5 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aBW" = ( /obj/structure/cable{ @@ -14709,7 +14709,7 @@ dir = 10 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aDD" = ( /obj/structure/cable{ @@ -14983,14 +14983,14 @@ dir = 8 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/engine/controlroom) "aEa" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aEb" = ( /obj/structure/cable{ @@ -14998,7 +14998,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "aEc" = ( /obj/structure/cable{ @@ -15007,7 +15007,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "aEd" = ( /obj/machinery/atmospherics/trinary/filter{ @@ -15773,7 +15773,7 @@ dir = 10 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aFA" = ( /turf/simulated/wall, @@ -18104,12 +18104,12 @@ "aJy" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aJz" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aJA" = ( /obj/structure/cable{ @@ -19475,7 +19475,7 @@ icon_state = "0-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarport) "aLR" = ( /obj/structure/chair/stool, @@ -19495,7 +19495,7 @@ "aLT" = ( /obj/item/wrench, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aLU" = ( /turf/simulated/wall, @@ -21052,7 +21052,7 @@ dir = 5 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aOV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21066,7 +21066,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aOX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25725,7 +25725,7 @@ dir = 8 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/incinerator) "aWS" = ( /obj/structure/table/reinforced, @@ -27686,7 +27686,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aZZ" = ( /obj/item/radio/intercom{ @@ -27708,7 +27708,7 @@ icon_state = "pipe-c" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bab" = ( /obj/effect/spawner/window/reinforced, @@ -28084,7 +28084,7 @@ level = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/atmos) "baO" = ( /obj/machinery/access_button{ @@ -28617,7 +28617,7 @@ level = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/atmos) "bbG" = ( /turf/simulated/floor/plating, @@ -33633,7 +33633,7 @@ /area/atmos) "bkQ" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/atmos) "bkR" = ( /obj/structure/reagent_dispensers/fueltank, @@ -39480,7 +39480,7 @@ level = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/atmos) "buY" = ( /obj/structure/cable{ @@ -52898,7 +52898,7 @@ dir = 9 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bRn" = ( /obj/structure/rack, @@ -53135,7 +53135,7 @@ layer = 2.9 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bRH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -54805,7 +54805,7 @@ req_access_txt = "32" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bUc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -55199,7 +55199,7 @@ level = 1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bUK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -55457,7 +55457,7 @@ dir = 10 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bVg" = ( /obj/structure/cable{ @@ -55674,7 +55674,7 @@ dir = 6 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bVt" = ( /obj/structure/sign/vacuum{ @@ -57189,7 +57189,7 @@ req_access_txt = "10;13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bXG" = ( /obj/structure/cable{ @@ -57199,7 +57199,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bXH" = ( /obj/item/twohanded/required/kirbyplants, @@ -57392,7 +57392,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bYb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -57475,7 +57475,7 @@ level = 1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bYm" = ( /obj/structure/cable{ @@ -57489,7 +57489,7 @@ level = 1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bYn" = ( /obj/structure/sign/directions/evac{ @@ -57698,7 +57698,7 @@ dir = 9 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bYK" = ( /obj/effect/spawner/window/reinforced, @@ -57919,7 +57919,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bZg" = ( /obj/structure/table/reinforced, @@ -58094,7 +58094,7 @@ level = 1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bZx" = ( /obj/structure/disposalpipe/segment{ @@ -62780,7 +62780,7 @@ level = 1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "chx" = ( /obj/structure/cable{ @@ -63831,7 +63831,7 @@ icon_state = "D-SE" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cjm" = ( /obj/structure/closet/crate, @@ -66344,7 +66344,7 @@ icon_state = "E-SW-NW" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cnI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -66567,7 +66567,7 @@ icon_state = "E-W-Pass" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "coj" = ( /obj/structure/cable/yellow{ @@ -69034,7 +69034,7 @@ }, /obj/structure/transit_tube, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "css" = ( /obj/structure/table/reinforced, @@ -69095,7 +69095,7 @@ icon_state = "W-SE" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "csz" = ( /obj/structure/closet/crate{ @@ -69742,7 +69742,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ctJ" = ( /obj/structure/transit_tube{ @@ -69753,7 +69753,7 @@ dir = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ctK" = ( /obj/structure/table/wood, @@ -69902,7 +69902,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ctZ" = ( /obj/effect/spawner/window/reinforced, @@ -73001,7 +73001,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "czx" = ( /obj/structure/cable{ @@ -74443,7 +74443,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cBV" = ( /obj/structure/chair/office/dark, @@ -77536,7 +77536,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cHu" = ( /obj/effect/decal/cleanable/cobweb, @@ -78383,7 +78383,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cJf" = ( /obj/structure/sign/directions/evac{ @@ -78830,7 +78830,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cKk" = ( /obj/structure/cable{ @@ -78845,7 +78845,7 @@ "cKl" = ( /obj/structure/window/reinforced, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cKm" = ( /obj/structure/cable{ @@ -80281,7 +80281,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cNo" = ( /obj/structure/cable{ @@ -80750,7 +80750,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cOa" = ( /obj/structure/table/reinforced, @@ -80926,7 +80926,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cOn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -81685,7 +81685,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cPL" = ( /obj/structure/disposalpipe/segment{ @@ -81853,7 +81853,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cPY" = ( /obj/machinery/access_button{ @@ -81866,7 +81866,7 @@ req_access_txt = "0" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -107538,7 +107538,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "dKy" = ( /obj/structure/grille, @@ -110244,7 +110244,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "dPo" = ( /obj/structure/bed/roller, @@ -110931,7 +110931,7 @@ /area/medical/virology) "dQB" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dQC" = ( /obj/machinery/field/generator{ @@ -115002,7 +115002,7 @@ req_access_txt = "0" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "dXY" = ( /obj/structure/table/reinforced, @@ -115340,7 +115340,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYJ" = ( /obj/structure/cable{ @@ -115349,7 +115349,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYK" = ( /obj/structure/cable{ @@ -115367,7 +115367,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYL" = ( /obj/structure/cable{ @@ -115383,7 +115383,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYM" = ( /obj/structure/cable{ @@ -115404,7 +115404,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYN" = ( /obj/structure/cable{ @@ -115412,7 +115412,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYO" = ( /obj/structure/cable{ @@ -115432,7 +115432,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYP" = ( /obj/structure/cable{ @@ -115447,7 +115447,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYQ" = ( /obj/machinery/access_button{ @@ -115460,7 +115460,7 @@ req_access_txt = "10;13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "dYR" = ( /obj/structure/cable{ @@ -115469,7 +115469,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYS" = ( /obj/structure/cable{ @@ -115479,7 +115479,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/portsolar) "dYT" = ( /turf/simulated/floor/carpet, diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index c1740c983de..5a8e88915b3 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -766,7 +766,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abB" = ( /turf/simulated/wall/r_wall, @@ -869,7 +869,7 @@ "abL" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abM" = ( /obj/structure/cable{ @@ -883,7 +883,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abN" = ( /obj/structure/table, @@ -959,7 +959,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abV" = ( /obj/structure/cable{ @@ -967,11 +967,11 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abW" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abX" = ( /obj/structure/cable{ @@ -979,7 +979,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abY" = ( /obj/structure/cable{ @@ -998,7 +998,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "abZ" = ( /obj/structure/cable{ @@ -1012,7 +1012,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "aca" = ( /obj/structure/cable/yellow{ @@ -1056,7 +1056,7 @@ "acf" = ( /obj/item/stack/cable_coil, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "acg" = ( /obj/effect/spawner/window/reinforced, @@ -1270,7 +1270,7 @@ pixel_x = -1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "acA" = ( /turf/simulated/floor/plasteel, @@ -1628,7 +1628,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "adj" = ( /obj/structure/cable{ @@ -1637,7 +1637,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "adk" = ( /obj/machinery/light/small{ @@ -1991,7 +1991,7 @@ "adP" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "adQ" = ( /obj/structure/table, @@ -2118,10 +2118,10 @@ /area/security/permabrig) "aee" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "aef" = ( -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /turf/space, /area/space) "aeg" = ( @@ -2136,7 +2136,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "aeh" = ( /turf/simulated/shuttle/wall{ @@ -2420,7 +2420,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "aeB" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ @@ -2894,7 +2894,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "afp" = ( /obj/structure/chair/stool, @@ -2919,7 +2919,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "afr" = ( /obj/effect/spawner/window/reinforced, @@ -3125,7 +3125,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "afH" = ( /turf/simulated/shuttle/wall{ @@ -3386,7 +3386,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "agf" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -3452,7 +3452,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "ago" = ( /obj/structure/cable, @@ -3655,7 +3655,7 @@ "agH" = ( /obj/item/stack/cable_coil, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "agI" = ( /turf/space, @@ -3700,7 +3700,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "agN" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -5106,7 +5106,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "aiR" = ( /obj/structure/cable{ @@ -5115,7 +5115,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "aiS" = ( /obj/structure/closet/secure_closet/brig{ @@ -6297,7 +6297,7 @@ pixel_x = -1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "akY" = ( /obj/effect/spawner/window/reinforced, @@ -11643,7 +11643,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/maintenance/auxsolarstarboard) "auw" = ( /obj/structure/disposalpipe/segment, @@ -27656,7 +27656,7 @@ /area/maintenance/fore) "aWw" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aWx" = ( /obj/machinery/door/airlock/maintenance{ @@ -31845,7 +31845,7 @@ "bdO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/construction/hallway{ name = "\improper MiniSat Exterior" }) @@ -43951,7 +43951,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bxn" = ( /obj/structure/transit_tube{ @@ -43972,7 +43972,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bxo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -43985,7 +43985,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bxp" = ( /obj/structure/transit_tube/station{ @@ -44026,7 +44026,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "bxr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -65914,7 +65914,7 @@ "ciB" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "ciC" = ( /obj/effect/decal/warning_stripes/northeast, @@ -66275,7 +66275,7 @@ /area/atmos) "cjc" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cjd" = ( /obj/effect/spawner/window/reinforced, @@ -67037,7 +67037,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cks" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -68472,7 +68472,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cmI" = ( /obj/machinery/vending/wallmed1{ @@ -74383,7 +74383,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cvR" = ( /obj/structure/chair/office/light, @@ -76938,7 +76938,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cAg" = ( /obj/structure/closet, @@ -77557,7 +77557,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cBf" = ( /obj/machinery/computer/security/telescreen{ @@ -77580,7 +77580,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cBh" = ( /obj/item/storage/secure/safe{ @@ -78230,7 +78230,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cCg" = ( /obj/item/reagent_containers/glass/beaker/large, @@ -78313,7 +78313,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cCk" = ( /obj/structure/table, @@ -78464,7 +78464,7 @@ "cCw" = ( /obj/item/stack/cable_coil, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cCx" = ( /obj/structure/cable/yellow{ @@ -78498,7 +78498,7 @@ icon_state = "0-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cCA" = ( /turf/simulated/floor/plasteel{ @@ -78815,7 +78815,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cDa" = ( /obj/machinery/door/airlock/maintenance{ @@ -82337,7 +82337,7 @@ }, /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cIO" = ( /obj/item/flashlight/lamp, @@ -86873,7 +86873,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cPV" = ( /obj/structure/closet/wardrobe/robotics_black{ @@ -91764,7 +91764,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -92030,7 +92030,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cYj" = ( /obj/structure/chair, @@ -92227,7 +92227,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cYB" = ( /obj/machinery/light/small{ @@ -92484,11 +92484,11 @@ "cYY" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cYZ" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZa" = ( /obj/machinery/light_switch{ @@ -92534,7 +92534,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZd" = ( /obj/structure/cable{ @@ -92553,7 +92553,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZe" = ( /turf/simulated/shuttle/wall{ @@ -92601,7 +92601,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -92809,7 +92809,7 @@ "cZA" = ( /obj/item/stack/cable_coil, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZB" = ( /turf/simulated/shuttle/floor, @@ -93007,7 +93007,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cZX" = ( /obj/machinery/light{ @@ -94648,7 +94648,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "dcw" = ( /obj/structure/window/reinforced, @@ -94856,7 +94856,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "dcO" = ( /obj/docking_port/stationary{ @@ -95133,7 +95133,7 @@ pixel_x = -1 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddx" = ( /turf/simulated/shuttle/wall{ @@ -95205,7 +95205,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddE" = ( /turf/simulated/shuttle/wall{ diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm index 557fd0918a9..ed8e7334c83 100644 --- a/_maps/map_files/MetaStation/z4.dmm +++ b/_maps/map_files/MetaStation/z4.dmm @@ -452,7 +452,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bk" = ( /obj/structure/disposalpipe/trunk{ @@ -489,7 +489,7 @@ }, /area/solar/derelict_starboard) "bo" = ( -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bp" = ( /obj/structure/cable{ @@ -502,7 +502,7 @@ d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bq" = ( /obj/structure/cable{ @@ -520,7 +520,7 @@ d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "br" = ( /obj/structure/cable{ @@ -528,7 +528,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bs" = ( /obj/structure/cable{ @@ -546,7 +546,7 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bt" = ( /obj/structure/cable{ @@ -559,7 +559,7 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bu" = ( /obj/structure/cable{ @@ -572,7 +572,7 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bv" = ( /obj/machinery/power/solar{ @@ -584,14 +584,14 @@ /area/solar/derelict_starboard) "bw" = ( /obj/structure/cable, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "bx" = ( /obj/structure/cable{ icon_state = "0-2"; d2 = 2 }, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_starboard) "by" = ( /turf/simulated/wall, @@ -4865,7 +4865,7 @@ "nv" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nw" = ( /obj/structure/grille, @@ -4901,7 +4901,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nB" = ( /obj/structure/cable{ @@ -4922,7 +4922,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nD" = ( /obj/structure/cable{ @@ -4957,7 +4957,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nG" = ( /obj/structure/cable{ @@ -4971,7 +4971,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nH" = ( /obj/structure/cable{ @@ -4980,7 +4980,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nI" = ( /obj/structure/cable{ @@ -5000,7 +5000,7 @@ pixel_y = 0 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nJ" = ( /obj/structure/cable{ @@ -5014,7 +5014,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nK" = ( /obj/structure/cable{ @@ -5033,12 +5033,12 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "nL" = ( /obj/item/stack/cable_coil/cut, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "nM" = ( /turf/simulated/floor/plating/airless{ @@ -5121,7 +5121,7 @@ /area/derelict/se_solar) "oa" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "ob" = ( /obj/machinery/door/airlock/external{ @@ -5157,7 +5157,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "og" = ( /obj/structure/closet/emcloset, @@ -5186,7 +5186,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/derelict_aft) "ok" = ( /obj/effect/landmark/damageturf, diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index ec99538fe31..4f479c38bf3 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -131,7 +131,7 @@ "dB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/chemistry) "dC" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/chemistry) "dE" = (/obj/structure/table/glass,/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = -2; pixel_y = 6},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_y = 2},/obj/item/stack/sheet/mineral/plasma{amount = 5; pixel_x = 2; pixel_y = -2},/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/glass/bottle/charcoal{pixel_x = 6},/obj/item/reagent_containers/glass/bottle/epinephrine,/turf/simulated/floor/plasteel/white/corner{dir = 4},/area/ruin/unpowered/syndicate_lava_base/chemistry) -"dG" = (/turf/simulated/floor/plating/airless/catwalk,/turf/simulated/floor/plating/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) +"dG" = (/obj/structure/lattice/catwalk,/turf/simulated/floor/plating/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) "dI" = (/obj/structure/table/glass,/obj/machinery/reagentgrinder{pixel_y = 5},/obj/item/reagent_containers/glass/beaker/large,/turf/simulated/floor/plasteel/white/side{dir = 5},/area/ruin/unpowered/syndicate_lava_base/chemistry) "dK" = (/obj/effect/turf_decal/box/white/corners{dir = 1},/obj/structure/closet/crate/secure/gear{req_access_txt = "150"},/obj/item/clothing/gloves/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/syndicate/combat,/obj/item/storage/belt/military,/obj/item/storage/belt/military,/obj/item/clothing/shoes/combat,/obj/item/clothing/shoes/combat,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/night,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) "dL" = (/obj/machinery/alarm/syndicate{pixel_y = 24},/obj/structure/closet/crate,/obj/item/extinguisher{pixel_x = -5; pixel_y = 5},/obj/item/extinguisher{pixel_x = -2; pixel_y = 2},/obj/item/extinguisher{pixel_x = 1; pixel_y = -1},/obj/item/flashlight{pixel_x = -5; pixel_y = 5},/obj/item/flashlight{pixel_x = -2; pixel_y = 2},/obj/item/flashlight{pixel_x = 1; pixel_y = -1},/obj/item/radio/headset/syndicate/alt{pixel_x = -3; pixel_y = 3},/obj/item/radio/headset/syndicate/alt,/obj/item/radio/headset/syndicate/alt{pixel_x = 3; pixel_y = -3},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index efdcca780f7..a59e8dad0a9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -782,7 +782,7 @@ /area/ruin/space/ancientstation/deltacorridor) "ck" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "cl" = ( /obj/structure/transit_tube/station/reverse, @@ -1820,7 +1820,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "eL" = ( /obj/machinery/light{ @@ -3003,7 +3003,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "hg" = ( /obj/effect/decal/cleanable/dirt, @@ -3131,7 +3131,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "ht" = ( /obj/structure/cable{ @@ -3311,7 +3311,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "hK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -3723,7 +3723,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "iC" = ( /obj/structure/cable{ @@ -3832,7 +3832,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "iP" = ( /obj/structure/cable/yellow{ @@ -3841,7 +3841,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "iQ" = ( /obj/machinery/light/small, @@ -4136,7 +4136,7 @@ icon_state = "1-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "jx" = ( /obj/effect/decal/cleanable/cobweb, @@ -4489,7 +4489,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "km" = ( /obj/structure/cable{ @@ -4585,7 +4585,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "kw" = ( /obj/machinery/atmospherics/unary/vent_pump{ @@ -4817,7 +4817,7 @@ /area/ruin/space/ancientstation/deltacorridor) "kZ" = ( /turf/simulated/floor/plating, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/template_noop) "la" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index bd6b40c51de..85a39ae2fb5 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -1060,7 +1060,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/awaymission/centcomAway/maint) "cO" = ( /obj/structure/cable{ @@ -1083,7 +1083,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/awaymission/centcomAway/maint) "cP" = ( /obj/structure/table/reinforced, @@ -1552,7 +1552,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/awaymission/centcomAway/maint) "dV" = ( /obj/structure/closet/crate, @@ -1647,7 +1647,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/awaymission/centcomAway/maint) "ei" = ( /obj/structure/table, @@ -1695,7 +1695,7 @@ /obj/structure/cable, /obj/machinery/power/tracker, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/awaymission/centcomAway/maint) "ep" = ( /obj/structure/table, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 2989134021a..97f4f8d25db 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -6589,7 +6589,7 @@ }, /obj/machinery/power/tracker, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "alE" = ( /obj/structure/closet/secure_closet/brig, @@ -7013,7 +7013,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "amp" = ( /obj/structure/chair{ @@ -7392,7 +7392,7 @@ }, /obj/machinery/power/tracker, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "amV" = ( /obj/structure/sign/nosmoking_2, @@ -7545,7 +7545,7 @@ "ann" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "ano" = ( /obj/structure/cable{ @@ -7792,7 +7792,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "anH" = ( /turf/simulated/wall/r_wall, @@ -8470,7 +8470,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "aoL" = ( /obj/structure/cable{ @@ -8846,7 +8846,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "apo" = ( /obj/structure/grille/broken, @@ -9769,7 +9769,7 @@ /area/lawoffice) "aqZ" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "ara" = ( /obj/structure/table/reinforced, @@ -9796,7 +9796,7 @@ "arb" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "arc" = ( /obj/effect/spawner/window/reinforced, @@ -10307,7 +10307,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "arM" = ( /obj/structure/cable{ @@ -10330,7 +10330,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "arN" = ( /obj/structure/cable{ @@ -10338,7 +10338,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "arO" = ( /obj/structure/cable{ @@ -10411,7 +10411,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "arV" = ( /obj/structure/shuttle/engine/propulsion{ @@ -10467,7 +10467,7 @@ /area/shuttle/trade/sol) "asb" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "asc" = ( /obj/effect/spawner/random_barrier/obstruction, @@ -11025,7 +11025,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "asM" = ( /obj/structure/cable{ @@ -11041,7 +11041,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "asN" = ( /turf/simulated/floor/carpet, @@ -13086,7 +13086,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "avN" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -13434,7 +13434,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxport) "awl" = ( /turf/simulated/wall, @@ -13729,7 +13729,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "awR" = ( /obj/structure/cable{ @@ -13737,7 +13737,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "awS" = ( /obj/item/twohanded/required/kirbyplants, @@ -14016,7 +14016,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "axr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14826,7 +14826,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/auxstarboard) "ayF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15170,7 +15170,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "azc" = ( /obj/effect/spawner/window/reinforced, @@ -16536,7 +16536,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aBy" = ( /obj/effect/landmark/damageturf, @@ -18254,7 +18254,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "aEN" = ( /obj/structure/closet/emcloset, @@ -66723,7 +66723,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cpA" = ( /obj/effect/decal/warning_stripes/southwestcorner, @@ -72414,7 +72414,7 @@ /area/maintenance/asmaint) "cyO" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cyP" = ( /obj/effect/spawner/random_barrier/obstruction, @@ -80083,7 +80083,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cMC" = ( /obj/effect/landmark{ @@ -80630,7 +80630,7 @@ level = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cNF" = ( /obj/structure/cable{ @@ -81636,12 +81636,12 @@ "cPw" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cPx" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cPy" = ( /obj/structure/table/reinforced, @@ -81689,7 +81689,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cPD" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ @@ -81735,7 +81735,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cPH" = ( /obj/structure/cable{ @@ -81743,7 +81743,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cPI" = ( /obj/structure/cable{ @@ -81751,7 +81751,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cPJ" = ( /obj/structure/table, @@ -81935,7 +81935,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cQb" = ( /obj/machinery/particle_accelerator/control_box, @@ -82070,7 +82070,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cQr" = ( /obj/structure/disposalpipe/segment{ @@ -82584,7 +82584,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cRf" = ( /obj/machinery/door/poddoor{ @@ -83279,7 +83279,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/port) "cSl" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -84254,7 +84254,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cTS" = ( /obj/effect/landmark/burnturf, @@ -84300,7 +84300,7 @@ /area/maintenance/turbine) "cTW" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "cTX" = ( /obj/structure/cable{ @@ -86911,7 +86911,7 @@ pixel_y = -8 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "cYA" = ( /obj/structure/cable{ @@ -89489,7 +89489,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddB" = ( /obj/structure/disposalpipe/segment{ @@ -89503,12 +89503,12 @@ icon_state = "E-W-Pass" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ddD" = ( /obj/item/wrench, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ddE" = ( /obj/structure/cable{ @@ -89519,7 +89519,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddF" = ( /obj/structure/sign/biohazard{ @@ -89582,12 +89582,12 @@ req_access_txt = "75;13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ddN" = ( /obj/structure/cable, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddO" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -89595,7 +89595,7 @@ level = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ddP" = ( /obj/structure/cable{ @@ -89611,7 +89611,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddQ" = ( /obj/structure/cable{ @@ -89634,7 +89634,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddR" = ( /obj/structure/cable{ @@ -89642,7 +89642,7 @@ icon_state = "0-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddS" = ( /obj/structure/particle_accelerator/fuel_chamber, @@ -89654,7 +89654,7 @@ d2 = 4 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddU" = ( /obj/structure/cable{ @@ -89677,7 +89677,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddV" = ( /obj/structure/cable{ @@ -89693,7 +89693,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "ddW" = ( /obj/structure/shuttle/engine/propulsion/burst{ @@ -89717,7 +89717,7 @@ req_access_txt = "13" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk0"; icon_state = "catwalk0" }, @@ -89766,7 +89766,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "dec" = ( /obj/machinery/atmospherics/pipe/manifold/visible, @@ -89778,7 +89778,7 @@ d2 = 2 }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "dee" = ( /obj/structure/cable{ @@ -89789,7 +89789,7 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "def" = ( /obj/structure/cable{ @@ -89811,13 +89811,13 @@ tag = "" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "deg" = ( /obj/structure/cable, /obj/machinery/power/tracker, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/solar/starboard) "deh" = ( /obj/machinery/space_heater, @@ -93982,7 +93982,7 @@ /area/maintenance/asmaint2) "dmo" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "dmp" = ( /obj/structure/table, @@ -95310,7 +95310,7 @@ /area/crew_quarters/captain) "doE" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk0"; icon_state = "catwalk0" }, diff --git a/_maps/map_files/cyberiad/z4.dmm b/_maps/map_files/cyberiad/z4.dmm index e533422b39a..b7896298f0b 100644 --- a/_maps/map_files/cyberiad/z4.dmm +++ b/_maps/map_files/cyberiad/z4.dmm @@ -846,35 +846,35 @@ /area/constructionsite/hallway/center) "cl" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk6"; icon_state = "catwalk6" }, /area/space) "cm" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/space) "cn" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk14"; icon_state = "catwalk14" }, /area/engiestation/solars) "co" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "cp" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk10"; icon_state = "catwalk10" }, @@ -885,14 +885,14 @@ /area/constructionsite/hallway/center) "cr" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, /area/space) "cs" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, @@ -914,7 +914,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, @@ -941,7 +941,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, @@ -983,7 +983,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, @@ -1005,7 +1005,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk3"; icon_state = "catwalk3" }, @@ -1080,14 +1080,14 @@ /area/constructionsite/ai) "cL" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk6"; icon_state = "catwalk6" }, /area/engiestation/solars) "cM" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk9"; icon_state = "catwalk9" }, @@ -1104,7 +1104,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" }, @@ -1126,21 +1126,21 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" }, /area/engiestation/solars) "cP" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk5"; icon_state = "catwalk5" }, /area/engiestation/solars) "cQ" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk10"; icon_state = "catwalk10" }, @@ -1160,7 +1160,7 @@ /area/engiestation) "cT" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" }, @@ -1326,7 +1326,7 @@ /area/constructionsite/ai) "do" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk7"; icon_state = "catwalk7" }, @@ -1343,7 +1343,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1366,7 +1366,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1389,7 +1389,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" }, @@ -1504,7 +1504,7 @@ pixel_x = 0 }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk4"; icon_state = "catwalk4" }, @@ -1527,7 +1527,7 @@ pixel_x = 0 }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1544,14 +1544,14 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, /area/engiestation/solars) "dB" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk11"; icon_state = "catwalk11" }, @@ -1708,7 +1708,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1726,7 +1726,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1744,7 +1744,7 @@ icon_state = "2-4" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" }, @@ -1804,7 +1804,7 @@ pixel_x = 0 }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk4"; icon_state = "catwalk4" }, @@ -1822,7 +1822,7 @@ pixel_x = 0 }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1834,7 +1834,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk12"; icon_state = "catwalk12" }, @@ -1978,7 +1978,7 @@ /area/engiestation) "em" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk1"; icon_state = "catwalk1" }, @@ -2020,7 +2020,7 @@ /area/constructionsite/ai) "es" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk9"; icon_state = "catwalk9" }, @@ -2332,7 +2332,7 @@ /area/engiestation) "fi" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk2"; icon_state = "catwalk2" }, @@ -2636,7 +2636,7 @@ /area/engiestation) "fQ" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk5"; icon_state = "catwalk5" }, @@ -2644,7 +2644,7 @@ "fR" = ( /obj/item/lighter/zippo, /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk8"; icon_state = "catwalk8" }, @@ -2742,7 +2742,7 @@ /area/engiestation) "gc" = ( /turf/simulated/floor/plating/airless, -/turf/simulated/floor/plating/airless/catwalk{ +/obj/structure/lattice/catwalk{ tag = "icon-catwalk4"; icon_state = "catwalk4" }, diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 3fdc3e4a78d..1babb56fc28 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -16,7 +16,7 @@ /area/djstation/solars) "ad" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/space) "ae" = ( /obj/structure/lattice, @@ -77,7 +77,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation/solars) "ao" = ( /obj/structure/grille{ @@ -94,7 +94,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation/solars) "aq" = ( /obj/structure/cable{ @@ -126,7 +126,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation) "at" = ( /obj/structure/lattice, @@ -313,7 +313,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation) "aR" = ( /obj/structure/cable{ @@ -332,7 +332,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation/solars) "aS" = ( /obj/structure/cable{ @@ -341,7 +341,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation/solars) "aT" = ( /obj/structure/cable{ @@ -360,7 +360,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation/solars) "aU" = ( /obj/item/storage/toolbox/mechanical{ @@ -387,7 +387,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/djstation) "aW" = ( /turf/simulated/floor/plasteel{ @@ -4603,7 +4603,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "jL" = ( /obj/structure/table/wood, @@ -6694,7 +6694,7 @@ icon_state = "1-2" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "oT" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -7752,7 +7752,7 @@ icon_state = "4-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "rn" = ( /obj/structure/cable{ @@ -7766,7 +7766,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "ro" = ( /obj/structure/window/reinforced, @@ -7994,7 +7994,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "rG" = ( /obj/structure/closet/crate/secure/loot, @@ -8030,7 +8030,7 @@ /area/derelict/crew_quarters) "rJ" = ( /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "rK" = ( /obj/machinery/power/tracker, @@ -8273,7 +8273,7 @@ icon_state = "2-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "si" = ( /obj/structure/cable{ @@ -9007,7 +9007,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "tF" = ( /obj/structure/sign/greencross, @@ -9041,7 +9041,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "tI" = ( /obj/structure/cable{ @@ -9564,7 +9564,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "uJ" = ( /turf/space, @@ -9896,7 +9896,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "vn" = ( /obj/item/shard{ @@ -10463,7 +10463,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "wm" = ( /obj/structure/cable{ @@ -10477,7 +10477,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "wn" = ( /obj/structure/closet/jcloset, @@ -10503,7 +10503,7 @@ icon_state = "2-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "wp" = ( /obj/structure/cable{ @@ -10522,7 +10522,7 @@ icon_state = "1-4" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "wq" = ( /obj/structure/cable{ @@ -10541,7 +10541,7 @@ icon_state = "1-8" }, /turf/space, -/turf/simulated/floor/plating/airless/catwalk, +/obj/structure/lattice/catwalk, /area/derelict/solar_control) "wr" = ( /obj/docking_port/stationary{ diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 700d63ed5bb..cd7de69d65f 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -2368,9 +2368,7 @@ /area/mine/living_quarters) "fq" = ( /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/turf/simulated/floor/plating/airless/catwalk{ - layer = 2.2 - }, +/obj/structure/lattice/catwalk, /area/lavaland/surface/outdoors) "fr" = ( /obj/structure/table, @@ -2480,9 +2478,7 @@ /turf/simulated/floor/plasteel, /area/mine/living_quarters) "fB" = ( -/turf/simulated/floor/plating/airless/catwalk{ - layer = 2.2 - }, +/obj/structure/lattice/catwalk, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "fC" = ( @@ -3088,18 +3084,14 @@ name = "scrubber outlet" }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/turf/simulated/floor/plating/airless/catwalk{ - layer = 2.2 - }, +/obj/structure/lattice/catwalk, /area/mine/living_quarters) "gK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/turf/simulated/floor/plating/airless/catwalk{ - layer = 2.2 - }, +/obj/structure/lattice/catwalk, /area/mine/living_quarters) "gL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 9da2c725a43..c4d2239641e 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -5,6 +5,7 @@ #define PLANE_SPACE -95 #define PLANE_SPACE_PARALLAX -90 +#define FLOOR_PLANE -2 #define GAME_PLANE 0 diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm index 5be814e5de2..710a1ff64c1 100644 --- a/code/datums/diseases/critical.dm +++ b/code/datums/diseases/critical.dm @@ -93,7 +93,7 @@ virus_heal_resistant = TRUE /datum/disease/critical/heart_failure/has_cure() - if (affected_mob.has_status_effect(STATUS_EFFECT_EXERCISED)) + if(affected_mob.has_status_effect(STATUS_EFFECT_EXERCISED)) return TRUE return ..() diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 3d65a41eeb8..53a98de7028 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -64,13 +64,15 @@ src.floor += 1 if(istype(T, /turf/simulated/wall)) - if(T:intact) + var/turf/simulated/wall/W = T + if(W.intact) src.wall += 2 else src.wall += 1 if(istype(T, /turf/simulated/wall/r_wall)) - if(T:intact) + var/turf/simulated/wall/r_wall/R = T + if(R.intact) src.r_wall += 2 else src.r_wall += 1 diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 936c94f5c4f..0841c4db115 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -1,86 +1,83 @@ /obj/structure/lattice - desc = "A lightweight support lattice." name = "lattice" - icon = 'icons/obj/structures.dmi' - icon_state = "latticefull" - density = 0 - anchored = 1.0 + desc = "A lightweight support lattice." + icon = 'icons/obj/smooth_structures/lattice.dmi' + icon_state = "lattice" + density = FALSE + anchored = TRUE armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - layer = 2.3 //under pipes - // flags = CONDUCT + layer = LATTICE_LAYER //under pipes + var/number_of_rods = 1 + canSmoothWith = list(/obj/structure/lattice, + /turf/simulated/floor, + /turf/simulated/wall, + /obj/structure/falsewall) + smooth = SMOOTH_MORE -/obj/structure/lattice/New() - ..() - if(!(istype(src.loc, /turf/space))) - qdel(src) - for(var/obj/structure/lattice/LAT in src.loc) +/obj/structure/lattice/Initialize(mapload) + . = ..() + for(var/obj/structure/lattice/LAT in loc) if(LAT != src) - qdel(LAT) - icon = 'icons/obj/smoothlattice.dmi' - icon_state = "latticeblank" - updateOverlays() - for(var/dir in cardinal) - var/obj/structure/lattice/L - if(locate(/obj/structure/lattice, get_step(src, dir))) - L = locate(/obj/structure/lattice, get_step(src, dir)) - L.updateOverlays() + QDEL_IN(LAT, 0) -/obj/structure/lattice/Destroy() - for(var/dir in cardinal) - var/obj/structure/lattice/L - if(locate(/obj/structure/lattice, get_step(src, dir))) - L = locate(/obj/structure/lattice, get_step(src, dir)) - L.updateOverlays(src.loc) - return ..() +/obj/structure/lattice/examine(mob/user) + ..() + deconstruction_hints(user) + +/obj/structure/lattice/proc/deconstruction_hints(mob/user) + to_chat(user, "The rods look like they could be cut. There's space for more rods or a tile.") + +/obj/structure/lattice/attackby(obj/item/C, mob/user, params) + if(resistance_flags & INDESTRUCTIBLE) + return + if(istype(C, /obj/item/wirecutters)) + to_chat(user, "Slicing [name] joints...") + deconstruct() + else + var/turf/T = get_turf(src) + return T.attackby(C, user) //hand this off to the turf instead (for building plating, catwalks, etc) + +/obj/structure/lattice/deconstruct(disassembled = TRUE) + if(!can_deconstruct) + new /obj/item/stack/rods(get_turf(src), number_of_rods) + qdel(src) /obj/structure/lattice/blob_act() qdel(src) - return /obj/structure/lattice/ex_act(severity) switch(severity) - if(1.0) + if(1) qdel(src) - return - if(2.0) + if(2) qdel(src) + if(3) return - if(3.0) - return - else - return - -/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob, params) - if(istype(C, /obj/item/stack/tile/plasteel) || istype(C, /obj/item/stack/rods)) - var/turf/T = get_turf(src) - T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead - return - if(istype(C, /obj/item/weldingtool)) - var/obj/item/weldingtool/WT = C - if(WT.remove_fuel(0, user)) - to_chat(user, "Slicing lattice joints...") - new /obj/item/stack/rods(src.loc) - qdel(src) - - -/obj/structure/lattice/proc/updateOverlays() - //if(!(istype(src.loc, /turf/space))) - // qdel(src) - spawn(1) - overlays = list() - - var/dir_sum = 0 - - for(var/direction in cardinal) - if(locate(/obj/structure/lattice, get_step(src, direction))) - dir_sum += direction - else - if(!(istype(get_step(src, direction), /turf/space))) - dir_sum += direction - - icon_state = "lattice[dir_sum]" - return /obj/structure/lattice/singularity_pull(S, current_size) if(current_size >= STAGE_FOUR) - qdel(src) \ No newline at end of file + qdel(src) + +/obj/structure/lattice/catwalk + name = "catwalk" + desc = "A catwalk for easier EVA maneuvering and cable placement." + icon = 'icons/obj/smooth_structures/catwalk.dmi' + icon_state = "catwalk" + number_of_rods = 2 + smooth = SMOOTH_TRUE + canSmoothWith = null + +/obj/structure/lattice/catwalk/deconstruction_hints(mob/user) + to_chat(user, "The supporting rods look like they could be cut.") + +/obj/structure/lattice/catwalk/Move() + var/turf/T = loc + for(var/obj/structure/cable/C in T) + C.deconstruct() + ..() + +/obj/structure/lattice/catwalk/deconstruct() + var/turf/T = loc + for(var/obj/structure/cable/C in T) + C.deconstruct() + ..() diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index eb06d65b0eb..4968b8963ab 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -2,14 +2,19 @@ name = "chasm" desc = "Watch your step." baseturf = /turf/simulated/floor/chasm - smooth = SMOOTH_TRUE | SMOOTH_BORDER - icon = 'icons/turf/floors/chasms.dmi' + smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE + icon = 'icons/turf/floors/Chasms.dmi' icon_state = "smooth" + canSmoothWith = list(/turf/simulated/floor/chasm) + density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf + var/static/list/falling_atoms = list() //Atoms currently falling into the chasm + var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/temp_visual, /obj/effect/collapse)) var/drop_x = 1 var/drop_y = 1 var/drop_z = 1 /turf/simulated/floor/chasm/Entered(atom/movable/AM) + ..() processing_objects.Add(src) drop_stuff(AM) @@ -17,8 +22,46 @@ if(!drop_stuff()) processing_objects.Remove(src) +/turf/simulated/floor/chasm/attackby(obj/item/C, mob/user, params, area/area_restriction) + ..() + if(istype(C, /obj/item/stack/rods)) + var/obj/item/stack/rods/R = C + var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) + if(!L) + if(R.use(1)) + to_chat(user, "You construct a lattice.") + playsound(src, 'sound/weapons/genhit.ogg', 50, 1) + ReplaceWithLattice() + else + to_chat(user, "You need one rod to build a lattice.") + return + if(istype(C, /obj/item/stack/tile/plasteel)) + var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) + if(L) + var/obj/item/stack/tile/plasteel/S = C + if(S.use(1)) + qdel(L) + playsound(src, 'sound/weapons/genhit.ogg', 50, 1) + to_chat(user, "You build a floor.") + ChangeTurf(/turf/simulated/floor/plating) + else + to_chat(user, "You need one floor tile to build a floor!") + else + to_chat(user, "The plating is going to need some support! Place metal rods first.") + +/turf/simulated/floor/chasm/proc/is_safe() + //if anything matching this typecache is found in the chasm, we don't drop things + var/static/list/chasm_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile)) + var/list/found_safeties = typecache_filter_list(contents, chasm_safeties_typecache) + for(var/obj/structure/stone_tile/S in found_safeties) + if(S.fallen) + LAZYREMOVE(found_safeties, S) + return LAZYLEN(found_safeties) + /turf/simulated/floor/chasm/proc/drop_stuff(AM) . = 0 + if(is_safe()) + return FALSE var/thing_to_check = src if(AM) thing_to_check = list(AM) @@ -28,19 +71,17 @@ INVOKE_ASYNC(src, .proc/drop, thing) /turf/simulated/floor/chasm/proc/droppable(atom/movable/AM) + if(falling_atoms[AM]) + return FALSE if(!isliving(AM) && !isobj(AM)) - return 0 - if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile) || AM.throwing) - return 0 - if(istype(AM, /obj/effect/portal)) - //Portals aren't affected by gravity. Probably. - return 0 + return FALSE + if(is_type_in_typecache(AM, forbidden_types) || AM.throwing) + return FALSE //Flies right over the chasm if(isliving(AM)) - var/mob/MM = AM - if(MM.flying) - return 0 - + var/mob/M = AM + if(M.flying) + return FALSE if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(istype(H.belt, /obj/item/wormhole_jaunter)) @@ -48,15 +89,14 @@ //To freak out any bystanders visible_message("[H] falls into [src]!") J.chasm_react(H) - return 0 - - return 1 + return FALSE + return TRUE /turf/simulated/floor/chasm/proc/drop(atom/movable/AM) //Make sure the item is still there after our sleep if(!AM || QDELETED(AM)) return - + falling_atoms[AM] = TRUE var/turf/T = locate(drop_x, drop_y, drop_z) if(T) AM.visible_message("[AM] falls into [src]!", "GAH! Ah... where are you?") @@ -66,14 +106,17 @@ var/mob/living/L = AM L.Weaken(5) L.adjustBruteLoss(30) + falling_atoms -= AM - -/turf/simulated/floor/chasm/straight_down/New() - ..() +/turf/simulated/floor/chasm/straight_down/Initialize() + . = ..() drop_x = x drop_y = y - if(z+1 <= world.maxz) - drop_z = z+1 + drop_z = z - 1 + var/turf/T = locate(drop_x, drop_y, drop_z) + if(T) + T.visible_message("The ceiling gives way!") + playsound(T, 'sound/effects/break_stone.ogg', 50, 1) /turf/simulated/floor/chasm/straight_down/lava_land_surface oxygen = 14 @@ -81,18 +124,25 @@ temperature = 300 planetary_atmos = TRUE baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface + light_range = 1.9 //slightly less range than lava + light_power = 0.65 //less bright, too + light_color = LIGHT_COLOR_LAVA //let's just say you're falling into lava, that makes sense right /turf/simulated/floor/chasm/straight_down/lava_land_surface/drop(atom/movable/AM) //Make sure the item is still there after our sleep if(!AM || QDELETED(AM)) return + falling_atoms[AM] = TRUE AM.visible_message("[AM] falls into [src]!", "You stumble and stare into an abyss before you. It stares back, and you fall \ into the enveloping dark.") if(isliving(AM)) var/mob/living/L = AM L.notransform = TRUE - L.Stun(10) + L.Stun(200) L.resting = TRUE + var/oldtransform = AM.transform + var/oldcolor = AM.color + var/oldalpha = AM.alpha animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10) for(var/i in 1 to 5) //Make sure the item is still there after our sleep @@ -109,9 +159,21 @@ var/mob/living/silicon/robot/S = AM qdel(S.mmi) + falling_atoms -= AM + qdel(AM) + if(AM && !QDELETED(AM)) //It's indestructible + visible_message("[src] spits out the [AM]!") + AM.alpha = oldalpha + AM.color = oldcolor + AM.transform = oldtransform + AM.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1, 10),rand(1, 10)) + /turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air - oxygen = 22 - nitrogen = 82 - temperature = T20C \ No newline at end of file + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD + temperature = T20C + +/turf/simulated/floor/chasm/CanPass(atom/movable/mover, turf/target) + return 1 \ No newline at end of file diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index 218e28a813a..ce636c5ac14 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -4,7 +4,9 @@ gender = PLURAL //"That's some lava." baseturf = /turf/simulated/floor/plating/lava //lava all the way down slowdown = 2 - luminosity = 1 + light_range = 2 + light_power = 0.75 + light_color = LIGHT_COLOR_LAVA /turf/simulated/floor/plating/lava/New() ..() @@ -37,7 +39,7 @@ return /turf/simulated/floor/plating/lava/proc/is_safe() - var/static/list/lava_safeties_typecache = typecacheof(list(/turf/simulated/floor/plating/airless/catwalk, /obj/structure/stone_tile)) + var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile)) var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache) for(var/obj/structure/stone_tile/S in found_safeties) if(S.fallen) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 08cede1aad0..d7ce7393131 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -221,60 +221,6 @@ /turf/simulated/floor/snow/ex_act(severity) return - -// CATWALKS -// Space and plating, all in one buggy fucking turf! -// These are *so* fucking bad it makes me want to kill myself -/turf/simulated/floor/plating/airless/catwalk - icon = 'icons/turf/catwalks.dmi' - icon_state = "catwalk0" - name = "catwalk" - desc = "Cats really don't like these things." - - temperature = TCMB - thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT - heat_capacity = 700000 - -/turf/simulated/floor/plating/airless/catwalk/New() - ..() - set_light(4) //starlight - name = "catwalk" - update_icon(1) - -/turf/simulated/floor/plating/airless/catwalk/update_icon(var/propogate=1) - underlays.Cut() - underlays += new /icon('icons/turf/space.dmi',SPACE_ICON_STATE) - - var/dirs = 0 - for(var/direction in cardinal) - var/turf/T = get_step(src,direction) - if(istype(T, /turf/simulated/floor/plating/airless/catwalk)) - var/turf/simulated/floor/plating/airless/catwalk/C=T - dirs |= direction - if(propogate) - C.update_icon(0) - icon_state="catwalk[dirs]" - -/turf/simulated/floor/plating/airless/catwalk/attackby(obj/item/C, mob/user, params) - if(istype(C, /obj/item/stack/rods)) - return 1 - else if(istype(C, /obj/item/stack/tile)) - return 1 - - if(..()) - return 1 - - if(!broken && isscrewdriver(C)) - to_chat(user, "You unscrew the catwalk's rods.") - new /obj/item/stack/rods(src, 1) - ReplaceWithLattice() - for(var/direction in cardinal) - var/turf/T = get_step(src,direction) - if(istype(T, /turf/simulated/floor/plating/airless/catwalk)) - var/turf/simulated/floor/plating/airless/catwalk/CW=T - CW.update_icon(0) - playsound(src, C.usesound, 80, 1) - /turf/simulated/floor/plating/metalfoam name = "foamed metal plating" icon_state = "metalfoam" diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 42f19fb2f7f..1a134fa5b04 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -4,6 +4,7 @@ icon_state = "0" dynamic_lighting = 0 luminosity = 1 + intact = 0 temperature = TCMB thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT @@ -58,12 +59,15 @@ if(istype(C, /obj/item/stack/rods)) var/obj/item/stack/rods/R = C var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) + var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src) + if(W) + to_chat(user, "There is already a catwalk here!") + return if(L) if(R.use(1)) - to_chat(user, "You begin constructing catwalk...") + to_chat(user, "You construct a catwalk.") playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - qdel(L) - ChangeTurf(/turf/simulated/floor/plating/airless/catwalk) + new/obj/structure/lattice/catwalk(src) else to_chat(user, "You need two rods to build a catwalk!") return @@ -220,6 +224,8 @@ return /turf/space/can_have_cabling() + if(locate(/obj/structure/lattice/catwalk, src)) + return 1 return 0 /turf/space/proc/set_transition_north(dest_z) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 287a3225b01..70604a126d9 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -277,8 +277,7 @@ /turf/proc/ReplaceWithLattice() ChangeTurf(baseturf) - if(istype(baseturf, /turf/space)) - new /obj/structure/lattice( locate(src.x, src.y, src.z) ) + new /obj/structure/lattice(locate(x, y, z)) /turf/proc/kill_creatures(mob/U = null)//Will kill people/creatures and damage mechs./N //Useful to batch-add creatures to the list. diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index 35b6c2056e3..8ae608a0af6 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -37,12 +37,6 @@ nitrogen = 0 temperature = TCMB - New() - ..() - name = "plating" - -/turf/unsimulated/floor/plating/airless/catwalk - icon = 'icons/turf/catwalks.dmi' - icon_state = "catwalk0" - name = "catwalk" - desc = "Cats really don't like these things." \ No newline at end of file +/turf/unsimulated/floor/plating/airless/New() + ..() + name = "plating" diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 46180c9c8fb..4b8dae48d2d 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -126,6 +126,7 @@ icon = 'icons/obj/lavaland/dragonboat.dmi' keytype = /obj/item/oar burn_state = LAVA_PROOF | FIRE_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF /obj/vehicle/lavaboat/relaymove(mob/user, direction) var/turf/next = get_step(src, direction) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 07241c0af54..307c0561f95 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -279,9 +279,6 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa else return ..() - - - //SWARMER CATWALKS //Used so they can survive lavaland better /obj/structure/lattice/catwalk/swarmer_catwalk diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm index ad212688167..c672ef0ff4d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm @@ -104,11 +104,7 @@ var/spawndir = pick_n_take(directions) var/turf/T = get_step(src, spawndir) if(T) - new /obj/effect/goliath_tentacle(T, new_spawner) - - icon_state = "Goliath_tentacle_wiggle" - deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/trip), 3, TIMER_STOPPABLE) + new /obj/effect/goliath_tentacle(T, spawner) /obj/effect/goliath_tentacle/proc/tripanim() icon_state = "Goliath_tentacle_wiggle" diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 238d2e43599..1dfb154e93e 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -62,21 +62,17 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/cable/New() ..() - // ensure d1 & d2 reflect the icon_state for entering and exiting cable - var/dash = findtext(icon_state, "-") + d1 = text2num(copytext(icon_state, 1, dash)) + d2 = text2num(copytext(icon_state, dash+1 )) - d1 = text2num( copytext( icon_state, 1, dash ) ) + var/turf/T = loc // hide if turf is not intact - d2 = text2num( copytext( icon_state, dash+1 ) ) - - var/turf/T = src.loc // hide if turf is not intact - - if(level==1) hide(T.intact) + if(level == 1) + hide(T.intact) LAZYADD(GLOB.cable_list, src) //add it to the global cable list - /obj/structure/cable/Destroy() // called when a cable is deleted if(powernet) cut_cable_from_powernet() // update the powernets diff --git a/icons/obj/smooth_structures/catwalk.dmi b/icons/obj/smooth_structures/catwalk.dmi index c9bcbc04b93fe6889da9ac7883b02e55b3b80c8b..4b71fb507316716348e933692ae426dfe6167955 100644 GIT binary patch literal 2149 zcmZWreK-?p8{Z6Tk|C+2HZr7WIU-*hp%KN2gVdN(S-z5;LfZ_lucY}poQRpv)WLB` zzQT%lm5*5=$wJu}Ml%~4@A6*P`_KEwbKlQ%KfmX9U-$jo*L~e7Zs#$(6f_h70KhIM zNBav>UG#J9keABTfg6TWRTJ&uO|ZWfarHL-76Bg?3IIetPV28#cnw!en7l}v%6ylj zfyLgZ2RKgHYPgqG$^9`Sw3Kb$GjQiPQFF7`bp8nli;>%N(8CoQZh=%Ux^2Vj| z{c%*08@0m2%X*V)czir&C zqLN`&6XU6V+(=}=c{Z$~Hs&zL8xRm9UOjdrixuVLTZU?rd$4QIsee7&1l{OjNaZbB zLcGWS{Ox2+mbEQ52k(tx=Z~Nf1GF%gT#T}){pf|Yknn;$T6Ia~r#kP!V1=&|P9NOu z&;szqHxS;*q^gX4nuk+)0@a@?;W#%nH{X0;clq)n6YPTIfplxkzJbn43cKR2yAOhO z{OM3f^+9kjfYh;C1RYger<_d}wF?$LnJu(W<}F8Bq4$68SbdE*x3Zdl&%C$Q&@xLf zh$?)`8KBV(JsQ>#;YHA9(w`KB)k^D;36k5Y-D#Lw%8?T~hmJ82-1tzKE)KF@^eGA9 z&5hSSfk^C(M>NWkIu>5b9-E|doaxX;&>*-Qe_?TNHH zlZ({%Ya>3|+LW{`Z&(l9Ag<0o+Jrn=riX?-n`UX>Cj8(}of;#)Nqzg$vydWS;Fd}; z4Z)HDVjE}aU{jzH6#ARxQ@t#R3E4*yGK#Dw>4V-EbO-h)z30BT1=K-S2`Rp!5;|VB zJ>YXEyEuQ&ORq>I2@K5Z92jDkKVQEz3$*5Aexc}+)vr_zg-yyh;)+mkyt))_4{iMF z9k5GMwL&TUNuhy08YpCeJKZhG!^DoSjXC60$-s5|OD@vI_2yo;Bh!^4B&o&UZI>ucFuf^a`$1l2UeXcJYpUwC&_Bnsl|3EE)&nPd~L_}T>H{X#pdD)#rOX)d11X6)va}=&2;wxo1#H* z0MrrY7JpX~IJjH_b>xCF8w0d&dqvlm3wXok7?InAu;gNA&G>W~=YRlM!KzI5Xfv?2 zH@F%x;)9vQqVu%L5;Dw~cH*r7?bnr~^zM9;UbPQ~&ZJ$N6ixTuI+abZD)>PfvbLD0 zYOMyMV9GCH=TfEazEA=6(6X);vdNOH{f3*5G=!^+#O1~5s1YcF2-u+>2|2^Zu%@tR zjYyedQ3-yz8kUxzI!{8=?n>NVfhoAyTpS;j_mk?sncBYonKIZ}F+lm)lIr~SVV4!~ zK6(4Gh7%L1yB$ejbZULN)pIthHuG%z>R$j+hw066e zv0urhchnDqhQL9IA~9b0VhCiUBIJ%)@G`cMp3yezID`Ko2f?z_*5nmn!M2oa%M?F2 z3eFKo5>Q2%x~TLXb`ya~hd!yOg_>w8T@o)ZLKZ-Gl$4Za>OKZf8{{&1!mqrM8oKi> z!apB_b@fUPs8phdJzIQT%n;$Tt;Dt4WaH)|XX-=K>I5z*648j=9>dv)D84wTP-D&;89<`~U#8buCxB%t82r(x;aW+{={Iz?82WV3C46#(BxtpFk0X6a+6?mEMK_Q<-q zmRzc=m1WJ$l&Sn4CRnGytH!r4MzSuqyJOP6b`54&$JRMax_U-BHvpU*&f8a?#>M>y Da0fTN literal 7703 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 J5!No`e*lR*danQg