From 34332051302ddc5c5c14453fdd01949b0e160ff0 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 9 Apr 2020 13:56:19 +0200 Subject: [PATCH] Makes radioactive atoms actually still radiate other atoms within itself even if contained. --- code/__HELPERS/radiation.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/radiation.dm b/code/__HELPERS/radiation.dm index abdfe7e8d3..e210f0bf1e 100644 --- a/code/__HELPERS/radiation.dm +++ b/code/__HELPERS/radiation.dm @@ -27,12 +27,15 @@ return var/area/A = get_area(source) var/atom/nested_loc = source.loc + var/spawn_waves = TRUE while(nested_loc != A) if(nested_loc.rad_flags & RAD_PROTECT_CONTENTS) - return + spawn_waves = FALSE + break nested_loc = nested_loc.loc - for(var/dir in GLOB.cardinals) - new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate) + if(spawn_waves) + for(var/dir in GLOB.cardinals) + new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate) var/list/things = get_rad_contents(source) //copypasta because I don't want to put special code in waves to handle their origin for(var/k in 1 to things.len)