From 947840cc5cad64afb0f4a8f1ecddf63d0c1960cf Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 5 Dec 2016 02:04:47 -0800 Subject: [PATCH 1/2] Fixes #3628 - Disablers no longer blow up mechs --- code/game/mecha/mecha.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c8f93bc74ce..ed189eb62ea 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -565,6 +565,8 @@ if(prob(deflect_chance * deflection) && (Proj.damage_type == BRUTE || Proj.damage_type == BURN)) visible_message("[src]'s armour deflects [Proj]!") + else if (Proj.damage_type == STAMINA) + visible_message("[src]'s armour is undamaged by [Proj]!") else visible_message("[src] is hit by [Proj].") take_damage(Proj.damage * dam_coeff, Proj.flag) From 9e7a30d7867ce9e2b4ad5edfb6915d2f77bccf81 Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 5 Dec 2016 15:00:30 -0800 Subject: [PATCH 2/2] Requested changes --- code/game/mecha/mecha.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ed189eb62ea..20cedf6895f 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -563,10 +563,10 @@ dam_coeff = B.damage_coeff break - if(prob(deflect_chance * deflection) && (Proj.damage_type == BRUTE || Proj.damage_type == BURN)) - visible_message("[src]'s armour deflects [Proj]!") - else if (Proj.damage_type == STAMINA) + if(Proj.damage_type != BRUTE && Proj.damage_type != BURN) visible_message("[src]'s armour is undamaged by [Proj]!") + else if(prob(deflect_chance * deflection)) + visible_message("[src]'s armour deflects [Proj]!") else visible_message("[src] is hit by [Proj].") take_damage(Proj.damage * dam_coeff, Proj.flag)