From fd9c78dd853b66044f7b617d04d43b4e4b2cfc27 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Thu, 16 Jan 2014 17:10:41 +0100 Subject: [PATCH 1/2] Assembly holders get destroyed by explosions. --- code/modules/assembly/holder.dm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 2cca18392aa..e4ae1944802 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -183,9 +183,20 @@ return 1 - - - + ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + if (prob(50)) + del(src) + return + if(3.0) + if (prob(25)) + del(src) + return + return From f390a11d07cc2c35876b91e986a39fb09a58d394 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Thu, 16 Jan 2014 17:14:57 +0100 Subject: [PATCH 2/2] Runtime fix --- code/ZAS/Fire.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 1b5d1137ccd..73033f9bdc7 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -30,8 +30,9 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) var/obj/structure/reagent_dispensers/fueltank/FT = locate() in src if(exposed_temperature >= AUTOIGNITION_WELDERFUEL) - FT.explode() - return 1 + if (FT) + FT.explode() + return 1 var/igniting = 0 var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in src