Merge pull request #3569 from Citadel-Station-13/upstream-merge-31834

[MIRROR] mechs no longer spam deflect attack messages for attacks with no damage
2017-10-23 15:08:45 -04:00
parent 9e47e120ce ae8d8f0ce6
commit 9a86385a23
1 changed files with 2 additions and 0 deletions
@@ -25,6 +25,8 @@

 /obj/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
 	. = ..()
+	if(!damage_amount)
+		return 0
 	var/booster_deflection_modifier = 1
 	var/booster_damage_modifier = 1
 	if(damage_flag == "bullet" || damage_flag == "laser" || damage_flag == "energy")