From ce5b476c917780325d8e26c017189e4188dacb6a Mon Sep 17 00:00:00 2001 From: githubuser4141 <61243846+githubuser4141@users.noreply.github.com> Date: Tue, 6 Jul 2021 06:23:55 +1200 Subject: [PATCH 1/2] backstab (#4707) --- code/game/mecha/mecha_defense.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index e3a4819cd20..bbc0a124f10 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -1,12 +1,10 @@ /obj/mecha/proc/get_armour_facing(relative_dir) - switch(relative_dir) - if(0) // BACKSTAB! + switch(abs(relative_dir)) + if(180) // BACKSTAB! return facing_modifiers[MECHA_BACK_ARMOUR] - if(45, 90, 270, 315) - return facing_modifiers[MECHA_SIDE_ARMOUR] - if(225, 180, 135) + if(0, 45) return facing_modifiers[MECHA_FRONT_ARMOUR] - return 1 //always return non-0 + return facing_modifiers[MECHA_SIDE_ARMOUR] //always return non-0 /obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -43,7 +41,7 @@ break if(attack_dir) - var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src)) + var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(dir)) booster_damage_modifier /= facing_modifier booster_deflection_modifier *= facing_modifier if(prob(deflect_chance * booster_deflection_modifier)) From 78d29cfd8dbeecbde8da1b2ea63d91a106700e7c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 5 Jul 2021 18:24:42 +0000 Subject: [PATCH 2/2] Ports directional armor mech fix from Paradise [PORT]