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

Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989

Browse Source 
[MIRROR] Fixes silicon mob contents becoming contaminated
This commit is contained in:
LetterJay
2017-10-23 03:35:35 -04:00
committed by GitHub
parent 8382fdf6b6 a47bf89877
commit 82d02050cd
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/radiation_wave.dm
+6 -1
View File
@@ -89,7 +89,12 @@
continue
thing.rad_act(strength)
var/static/list/blacklisted = typecacheof(list(/turf, /mob, /obj/structure/cable, /obj/machinery/atmospherics))
var/static/list/blacklisted = typecacheof(list( //These types will never be contaminated
/turf,
/mob,
/obj/structure/cable,
/obj/machinery/atmospherics
))
if(!can_contaminate || blacklisted[thing.type])
continue
if(prob((strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_CHANCE_COEFFICIENT * min(1/(steps*range_modifier), 1))) // Only stronk rads get to have little baby rads