From 95aa7b8ecb3ccaaf7600b559460bf42159465bc1 Mon Sep 17 00:00:00 2001 From: Theos Date: Sun, 22 Dec 2019 22:03:28 -0500 Subject: [PATCH 1/2] e --- code/modules/mob/living/carbon/human/human_defense.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index d0551716ab81..d09cc5c02c84 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -423,7 +423,6 @@ var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src))) throw_at(throw_target, 200, 4) damage_clothes(400 - bomb_armor, BRUTE, "bomb") - return if (EXPLODE_HEAVY) brute_loss = 60 From 0feba2eee1abdca9fd72aa6638245940aa38eb21 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 23 Dec 2019 03:53:41 -0500 Subject: [PATCH 2/2] bruh --- code/modules/mob/living/carbon/human/human_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index d09cc5c02c84..55de19aff519 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -443,7 +443,7 @@ damage_clothes(max(50 - bomb_armor, 0), BRUTE, "bomb") if (!istype(ears, /obj/item/clothing/ears/earmuffs)) adjustEarDamage(15,60) - Unconscious(160 - (bomb_armor * 1.6)) //100 bomb armor prevents knockdown entirely + Knockdown(160 - (bomb_armor * 1.6)) //100 bomb armor prevents knockdown entirely take_overall_damage(brute_loss,burn_loss)