shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1

Browse Source 
I did a oopsie and made containment bags also stop radiation internal to a contained object.
This commit is contained in:
Lin
2020-04-12 16:20:08 +00:00
committed by GitHub
parent 05dad4c3d1 98312ec2c8
commit 4e1079bc9a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/radiation.dm
+13 -9
View File
@@ -27,12 +27,20 @@
return return
var/area/A = get_area(source) var/area/A = get_area(source)
var/atom/nested_loc = source.loc var/atom/nested_loc = source.loc
var/spawn_waves = TRUE
while(nested_loc != A) while(nested_loc != A)
if(nested_loc.rad_flags & RAD_PROTECT_CONTENTS) if(nested_loc.rad_flags & RAD_PROTECT_CONTENTS)
return spawn_waves = FALSE
break
nested_loc = nested_loc.loc nested_loc = nested_loc.loc
for(var/dir in GLOB.cardinals) if(spawn_waves)
new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate) for(var/dir in GLOB.cardinals)
new /datum/radiation_wave(source, dir, intensity, range_modifier, can_contaminate)
var/static/last_huge_pulse = 0
if(intensity > 3000 && world.time > last_huge_pulse + 200)
last_huge_pulse = world.time
log = TRUE
var/list/things = get_rad_contents(source) //copypasta because I don't want to put special code in waves to handle their origin 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) for(var/k in 1 to things.len)
@@ -41,11 +49,7 @@
continue continue
thing.rad_act(intensity) thing.rad_act(intensity)
var/static/last_huge_pulse = 0
if(intensity > 3000 && world.time > last_huge_pulse + 200)
last_huge_pulse = world.time
log = TRUE
if(log) if(log)
var/turf/_source_T = isturf(source) ? source : get_turf(source) var/turf/_source_T = get_turf(source)
log_game("Radiation pulse with intensity: [intensity] and range modifier: [range_modifier] in [loc_name(_source_T)] ") log_game("Radiation pulse with intensity: [intensity] and range modifier: [range_modifier] in [loc_name(_source_T)][spawn_waves ? "" : " (contained by [nested_loc.name])"]")
return TRUE return TRUE