From 1bc20df7345c8358a50f1b06b58b16fc775892e7 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Tue, 14 Nov 2023 13:52:21 +0100 Subject: [PATCH] Makes lavaland outpost (and gulag) less annoying to fix. (#23163) * Makes lavaland outposts less annoying to fix. * explosions work correctly! * another outpost oversight that slipped in * plating deconstruction fixed --- _maps/map_files/generic/Lavaland.dmm | 53 ++++++++++------------ code/game/turfs/simulated/floor/plating.dm | 2 +- code/game/turfs/turf.dm | 2 +- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 0ef5c348d1f..81202a08678 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -758,10 +758,10 @@ }, /area/mine/outpost/storage) "bW" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -1043,10 +1043,10 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "cy" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel, /area/mine/laborcamp) "cz" = ( @@ -1609,10 +1609,10 @@ /area/mine/outpost/airlock) "dG" = ( /obj/machinery/atmospherics/binary/pump/on, -/obj/effect/baseturf_helper/lava_land/surface, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -2107,7 +2107,6 @@ /turf/simulated/floor/plating/lava/smooth/mapping_lava, /area/lavaland/surface/outdoors/outpost/catwalk) "eD" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2122,6 +2121,7 @@ d2 = 8; icon_state = "4-9" }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "eE" = ( @@ -2550,7 +2550,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "fv" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -3392,7 +3392,7 @@ /obj/structure/sign/poster/random{ pixel_x = -32 }, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "ir" = ( @@ -3771,6 +3771,10 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"kA" = ( +/obj/effect/baseturf_helper/asteroid/basalt, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/siberia) "kB" = ( /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/surrounding_tile{ @@ -4584,15 +4588,6 @@ }, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"nQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/turf/simulated/floor/plasteel, -/area/mine/laborcamp) "nX" = ( /obj/structure/disposaloutlet, /obj/structure/lattice/catwalk/mining, @@ -4983,7 +4978,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/outpost/catwalk) "rM" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/mineral/titanium, /area/shuttle/mining) "rS" = ( @@ -5624,7 +5619,6 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "xA" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -5635,6 +5629,7 @@ icon_state = "1-2" }, /obj/effect/spawner/random_spawners/dirt_maybe, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -5739,8 +5734,8 @@ }, /area/mine/laborcamp) "yp" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/effect/decal/cleanable/dirt, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plating, /area/mine/outpost/production) "yq" = ( @@ -5805,7 +5800,7 @@ dir = 9; network = list("Mining Outpost") }, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/carpet, /area/mine/outpost/quartermaster) "yO" = ( @@ -6027,7 +6022,7 @@ /turf/simulated/floor/plating, /area/mine/outpost/maintenance/south) "Av" = ( -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ icon_regular_floor = "yellowsiding"; icon_state = "tranquillite" @@ -6573,8 +6568,8 @@ }, /area/mine/outpost/lockers) "EF" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/item/cigbutt, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -6918,10 +6913,10 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull"; dir = 8 @@ -7013,7 +7008,6 @@ /turf/simulated/floor/plating/lavaland_air, /area/shuttle/siberia) "Jb" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -7026,6 +7020,7 @@ d2 = 4 }, /obj/item/radio/beacon, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -7205,7 +7200,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -7213,6 +7207,7 @@ c_tag = "Mining Outpost - Custodial Storage"; network = list("Mining Outpost") }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ icon_state = "darkgreencorners" }, @@ -8132,7 +8127,6 @@ /turf/simulated/floor/plasteel, /area/mine/outpost/mechbay) "SX" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -8143,6 +8137,7 @@ /obj/structure/cable/cyan{ icon_state = "1-4" }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel/dark, /area/mine/outpost/comms) "Ta" = ( @@ -8178,7 +8173,7 @@ dir = 1 }, /obj/effect/spawner/random_spawners/dirt_maybe, -/obj/effect/baseturf_helper/lava_land/surface, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plating, /area/mine/outpost/maintenance/east) "Ts" = ( @@ -8546,7 +8541,6 @@ /turf/simulated/floor/plating, /area/mine/outpost/production) "Wf" = ( -/obj/effect/baseturf_helper/lava_land/surface, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8556,6 +8550,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/baseturf_helper/asteroid/basalt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkfull" @@ -12100,7 +12095,7 @@ BP Bg kI iB -pq +kA pq IR xD @@ -15435,7 +15430,7 @@ aq tZ qA JZ -nQ +JZ JZ JZ JZ diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 48459592e82..3fcffc31db1 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -155,7 +155,7 @@ if(baseturf == /turf/space) ReplaceWithLattice() else - TerraformTurf(baseturf) + TerraformTurf(baseturf, keep_icon = FALSE) /turf/simulated/floor/plating/airless icon_state = "plating" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 0563340fdf7..a60da9933cd 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -338,7 +338,7 @@ SSair.add_to_active(src) /turf/proc/ReplaceWithLattice() - ChangeTurf(baseturf) + ChangeTurf(baseturf, keep_icon = FALSE) new /obj/structure/lattice(locate(x, y, z)) /turf/proc/remove_plating(mob/user)