From b262b4ac969f5a9e9bd3e8a0b44b4ccf0a7464bf Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 12 Jan 2020 15:17:16 -0800 Subject: [PATCH] Merge pull request #6623 from Heroman3003/radfix Fixes calculation of wall rad resistance --- code/modules/radiation/radiation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index dc14c630f62..51f67c8d883 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -45,7 +45,7 @@ /turf/simulated/wall/calc_rad_resistance() SSradiation.resistance_cache[src] = (length(contents) + 1) - cached_rad_resistance = (density ? material.weight / config.radiation_material_resistance_divisor : 0) + cached_rad_resistance = (density ? (material.weight + material.radiation_resistance) / config.radiation_material_resistance_divisor : 0) return /obj