From d8fd5b76297dce3490bd67d6f778a501e0d24d3d Mon Sep 17 00:00:00 2001 From: evilew Date: Sat, 6 Apr 2024 19:08:26 +0200 Subject: [PATCH] believe it or not, more of that fucking lava window fixes just made the lava into a harmless preset now ig --- .../SyndieBoxStation/SyndieBoxStation.dmm | 104 ++++++++++-------- .../turfs/simulated/floor/plasteel_floor.dm | 4 + code/game/turfs/simulated/lava.dm | 3 + 3 files changed, 65 insertions(+), 46 deletions(-) diff --git a/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm b/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm index d970acca..3a994f53 100644 --- a/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm +++ b/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm @@ -6551,8 +6551,8 @@ /obj/structure/sign/warning/electricshock{ pixel_y = 32 }, -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/primary/fore) "ana" = ( /obj/structure/sign/warning/electricshock{ @@ -6571,8 +6571,8 @@ /turf/open/floor/engine, /area/hallway/primary/fore) "anc" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/primary/fore) "and" = ( /obj/effect/turf_decal/tile/red{ @@ -6698,8 +6698,8 @@ /turf/open/floor/engine, /area/security/processing) "ant" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/security/prison) "anu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -8779,9 +8779,10 @@ /turf/open/floor/mineral/basaltstone_floor, /area/crew_quarters/fitness) "asJ" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, -/area/hallway/primary/central) +/obj/structure/window/plastitanium, +/obj/machinery/light, +/turf/open/floor/plasteel/lava, +/area/hallway/primary/port) "asK" = ( /obj/effect/spawner/structure/window/plastitanium, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -16752,8 +16753,8 @@ /turf/open/floor/plasteel/dark, /area/hydroponics) "aKn" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/bridge) "aKo" = ( /obj/machinery/light{ @@ -18166,8 +18167,8 @@ /turf/open/floor/carpet/black, /area/crew_quarters/bar) "aOd" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/crew_quarters/bar) "aOe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -18682,7 +18683,6 @@ icon_state = "drain"; name = "drain" }, -/obj/machinery/light, /turf/open/floor/engine, /area/hallway/primary/port) "aPw" = ( @@ -31677,8 +31677,8 @@ /turf/open/floor/engine, /area/hallway/primary/starboard) "bsw" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/primary/port) "bsx" = ( /obj/effect/turf_decal/bot, @@ -31735,7 +31735,8 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) "bsC" = ( -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/primary/central) "bsD" = ( /obj/effect/turf_decal/loading_area{ @@ -61529,8 +61530,8 @@ /turf/open/floor/engine, /area/science/xenobiology) "inP" = ( -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/secondary/exit) "iDI" = ( /obj/effect/turf_decal/tile/red{ @@ -61753,7 +61754,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/atmos) "lOI" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/crew_quarters/heads/hop) "lOR" = ( @@ -62052,8 +62053,8 @@ dir = 1; pixel_y = 16 }, -/obj/structure/window/plasma/reinforced/fulltile, -/turf/open/lava, +/obj/structure/window/plastitanium, +/turf/open/floor/plasteel/lava, /area/hallway/primary/fore) "qhL" = ( /obj/structure/cable{ @@ -62139,6 +62140,14 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/pool) +"rwl" = ( +/obj/structure/window/plastitanium, +/obj/machinery/light{ + dir = 1; + pixel_y = 16 + }, +/turf/open/floor/plasteel/lava, +/area/hallway/primary/port) "rxt" = ( /obj/effect/turf_decal/loading_area{ dir = 1; @@ -62505,7 +62514,7 @@ /turf/open/floor/pod/light, /area/quartermaster/miningdock) "wBC" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/crew_quarters/heads/captain) "wHA" = ( @@ -62566,6 +62575,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/engine, /area/hallway/primary/fore) "xJw" = ( @@ -78427,13 +78439,13 @@ aCH aFx bgT azc -bsw +rwl bsw aNX aLd aPn bsw -bsw +asJ aPj aQA aRT @@ -87961,10 +87973,10 @@ bmx blh blh bqU -asJ -asJ -asJ -asJ +bsC +bsC +bsC +bsC bxZ aTB bYr @@ -89992,8 +90004,8 @@ aDj ayo aFO ayq -asJ -asJ +bsC +bsC biF aLz aOs @@ -90249,8 +90261,8 @@ aAQ ayo aFP ayq -asJ -asJ +bsC +bsC bYr aIP aOq @@ -90279,7 +90291,7 @@ bYd bYd bTo aTB -asJ +bsC bXB aIP bDr @@ -90506,8 +90518,8 @@ ayq ayq ayq ayq -asJ -asJ +bsC +bsC bYr aIP aOq @@ -90536,7 +90548,7 @@ bYd bYd bYd aTB -asJ +bsC bXB aIP bDs @@ -90793,7 +90805,7 @@ aTB aTB aTB aTB -asJ +bsC bXB aIP bfQ @@ -92335,7 +92347,7 @@ aTB aTB aTB aTB -asJ +bsC bYr aIP bDy @@ -92562,7 +92574,7 @@ aom aom aom aom -asJ +bsC bsC bYr aIP @@ -92592,7 +92604,7 @@ cdi cdi cdi aTB -asJ +bsC bYr aIP bDz @@ -92819,8 +92831,8 @@ aGg aGg btS aom -asJ -asJ +bsC +bsC bYr aIP aOq @@ -92849,7 +92861,7 @@ cdi cdi cdi aTB -asJ +bsC bYr aIP bDA @@ -93076,8 +93088,8 @@ aFZ aHt btT aom -asJ -asJ +bsC +bsC cFD aLz aPP diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index a3a92e78..824049d9 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -91,6 +91,10 @@ /turf/open/floor/plasteel/cafeteria icon_state = "cafeteria" +/turf/open/floor/plasteel/lava + name = "lava" + icon_state = "lava" + /turf/open/floor/plasteel/airless/cafeteria icon_state = "cafeteria" diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index efdf8c13..5baabb2d 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -17,6 +17,9 @@ clawfootstep = FOOTSTEP_LAVA heavyfootstep = FOOTSTEP_LAVA +/turf/open/lava/fake + + /turf/open/lava/ex_act(severity, target) contents_explosion(severity, target)