[MIRROR] you can kill pipes to death

SierraBay · Feb 20, 2025 · ea872c4 · ea872c4
1 parent c567d7c
commit ea872c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm
@@ -2,6 +2,8 @@
 
 /obj/machinery/atmospherics/pipe
 
+	health_max = 200
+
 	var/datum/gas_mixture/air_temporary // used when reconstructing a pipeline that broke
 	var/datum/pipeline/parent
 	var/volume = 0
@@ -35,6 +37,9 @@
 /obj/machinery/atmospherics/pipe/hides_under_flooring()
 	return level != ATOM_LEVEL_OVER_TILE
 
+/obj/machinery/atmospherics/pipe/on_death()
+	burst()
+
 /obj/machinery/atmospherics/pipe/proc/set_leaking(new_leaking)
 	if(new_leaking && !leaking)
 		START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
@@ -231,13 +236,13 @@
 
 	else return 1
 
-/obj/machinery/atmospherics/pipe/simple/proc/burst()
+/obj/machinery/atmospherics/pipe/proc/burst()
 	ASSERT(parent)
 	parent.temporarily_store_air()
-	src.visible_message(SPAN_DANGER("\The [src] bursts!"));
-	playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
+	visible_message(SPAN_DANGER("\The [src] bursts!"))
+	playsound(loc, 'sound/effects/bang.ogg', 25, TRUE)
 	var/datum/effect/smoke_spread/smoke = new
-	smoke.set_up(1,0, src.loc, 0)
+	smoke.set_up(1, 0, loc, 0)
 	smoke.start()
 	qdel(src)
 

diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm
@@ -44,13 +44,6 @@
 
 	else return 1
 
-/obj/machinery/atmospherics/pipe/zpipe/proc/burst()
-	src.visible_message(SPAN_WARNING("\The [src] bursts!"));
-	playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
-	var/datum/effect/smoke_spread/smoke = new
-	smoke.set_up(1,0, src.loc, 0)
-	smoke.start()
-	qdel(src) // NOT qdel.
 
 /obj/machinery/atmospherics/pipe/zpipe/Destroy()
 	if(node1)