From 1321158fbf725317cc88e583a786cc848b31dc84 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 29 Jan 2016 21:45:57 -0500 Subject: [PATCH 1/2] Refactors Human Explosion Damage --- code/modules/mob/living/carbon/human/human.dm | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4978be101d3..c0f9adce72d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -384,33 +384,7 @@ if(prob(50) && !shielded) Paralyse(10) - var/update = 0 - var/weapon_message = "Explosive Blast" - for(var/obj/item/organ/external/temp in organs) - switch(temp.limb_name) - if("head") - update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message) - if("chest") - update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message) - if("groin") - update |= temp.take_damage(b_loss * 0.1, f_loss * 0.1, used_weapon = weapon_message) - if("l_arm") - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if("r_arm") - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if("l_leg") - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if("r_leg") - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if("r_foot") - update |= temp.take_damage(b_loss * 0.025, f_loss * 0.025, used_weapon = weapon_message) - if("l_foot") - update |= temp.take_damage(b_loss * 0.025, f_loss * 0.025, used_weapon = weapon_message) - if("r_hand") - update |= temp.take_damage(b_loss * 0.025, f_loss * 0.025, used_weapon = weapon_message) - if("l_hand") - update |= temp.take_damage(b_loss * 0.025, f_loss * 0.025, used_weapon = weapon_message) - if(update) UpdateDamageIcon() + take_overall_damage(b_loss,f_loss) ..() From 500cc7b12aa77589c8638a386fcb09838c9c0d09 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 29 Jan 2016 21:51:09 -0500 Subject: [PATCH 2/2] apparently, this is a thing --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c0f9adce72d..d82376c2f86 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -384,7 +384,7 @@ if(prob(50) && !shielded) Paralyse(10) - take_overall_damage(b_loss,f_loss) + take_overall_damage(b_loss,f_loss, used_weapon = "Explosive Blast") ..()