cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6344 from VOREStation/upstream-merge-6572

Browse Source 
[MIRROR] Buffs radiation so it isn't defeated by a thin sheet of lead.
This commit is contained in:
Novacat
2019-12-24 11:59:27 -05:00
committed by GitHub
parent 8bf106670d bf70c3ec3b
commit 01b57eb28f
6 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/radiation/radiation.dm
View File

@@ -24,6 +24,7 @@
rad_power = new_power
if(!flat)
range = min(round(sqrt(rad_power / config.radiation_lower_limit)), 31) // R = rad_power / dist**2 - Solve for dist
return
/turf
var/cached_rad_resistance = 0
@@ -37,13 +38,15 @@
else if(O.density) //So open doors don't get counted
var/material/M = O.get_material()
if(!M) continue
cached_rad_resistance += M.weight + M.radiation_resistance
cached_rad_resistance += (M.weight + M.radiation_resistance) / config.radiation_material_resistance_divisor
// Looks like storing the contents length is meant to be a basic check if the cache is stale due to items enter/exiting. Better than nothing so I'm leaving it as is. ~Leshana
SSradiation.resistance_cache[src] = (length(contents) + 1)
return
/turf/simulated/wall/calc_rad_resistance()
SSradiation.resistance_cache[src] = (length(contents) + 1)
cached_rad_resistance = (density ? material.weight + material.radiation_resistance : 0)
cached_rad_resistance = (density ? material.weight / config.radiation_material_resistance_divisor : 0)
return
/obj
var/rad_resistance = 0 // Allow overriding rad resistance
@@ -56,4 +59,5 @@
if(severity && !isbelly(loc)) //eaten mobs are made immune to radiation //VOREStation Edit
src.apply_effect(severity, IRRADIATE, src.getarmor(null, "rad"))
for(var/atom/I in src)
I.rad_act(severity)
I.rad_act(severity)
return