Merge branch 'radiation-group' of https://github.com/coil0/technic into pandorabox

2019-08-23 07:15:07 +02:00 · 2019-08-23 07:15:07 +02:00 · 372bbea9c0
parent 62ee9016b7 6a89a9ca83
commit 372bbea9c0
1 changed files with 2 additions and 0 deletions
--- a/technic/radiation.lua
+++ b/technic/radiation.lua
@ -294,6 +294,8 @@ local function calculate_damage_multiplier(object)
 	end
 	if ag.radiation then
 		return 0.01 * ag.radiation
+	elseif armor_enabled then
+		return 0
 	end
 	if ag.fleshy then
 		return math.sqrt(0.01 * ag.fleshy)