From 70d75c3988d2b3758798a835907b0ef2eae3b3df Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Thu, 9 Nov 2017 01:45:30 -0500 Subject: [PATCH 1/2] fixes radioactive half life (#32511) --- code/datums/components/radioactive.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm index b0bf28f163..c149fd8492 100644 --- a/code/datums/components/radioactive.dm +++ b/code/datums/components/radioactive.dm @@ -37,11 +37,15 @@ return ..() /datum/component/radioactive/process() - if(hl3_release_date && prob(50)) - radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate) - strength -= strength / hl3_release_date - if(strength <= RAD_BACKGROUND_RADIATION) - qdel(src) + if(!prob(50)) + return + radiation_pulse(parent, strength, RAD_DISTANCE_COEFFICIENT*2, FALSE, can_contaminate) + + if(!hl3_release_date) + return + strength -= strength / hl3_release_date + if(strength <= RAD_BACKGROUND_RADIATION) + return PROCESS_KILL /datum/component/radioactive/InheritComponent(datum/component/C, i_am_original) if(!i_am_original)