From 0e3bc3b8609ae1ab131741efa0d8094e3890a151 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 09:20:02 +0200 Subject: [PATCH 1/2] NPC mobs and blobs now attack all external human limbs. When attacked by simple mobs and blobs now all external limbs are available for random selection. The overall damage will be the same but the number of fractures caused will, in general, be fewer. --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +- code/modules/research/xenoarchaeology/finds/finds_special.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4f31bd5a84..10e165fa5f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -172,7 +172,7 @@ /mob/living/carbon/human/blob_act() if(stat == 2) return show_message("\red The blob attacks you!") - var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") + var/dam_zone = pick(organs_by_name) var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) apply_damage(rand(30,40), BRUTE, affecting, run_armor_check(affecting, "melee")) return diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 21a386b5cf..7451e6ae6a 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -295,7 +295,7 @@ src.visible_message("[user] has [attack_message] [src]!") user.do_attack_animation(src) - var/dam_zone = pick("head", "chest", "l_arm", "r_arm", "l_leg", "r_leg", "groin") + var/dam_zone = pick(organs_by_name) var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) var/armor_block = run_armor_check(affecting, "melee") apply_damage(damage, BRUTE, affecting, armor_block) diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index b2c0fb3898..af73f541d6 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -127,7 +127,7 @@ playsound(src.loc, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) nearby_mobs.Add(M) - var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot") + var/target = pick(M.organs_by_name) M.apply_damage(rand(5, 10), BRUTE, target) M << "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out." var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc) From 288e6189806204040ef65da350358616a20be1f4 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 09:23:20 +0200 Subject: [PATCH 2/2] Changelog entry. --- html/changelogs/PsiOmegaDelta-ExternalDamage.yml | 5 +++++ html/changelogs/{Yoshax-emptypls.xml => Yoshax-emptypls.yml} | 0 2 files changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-ExternalDamage.yml rename html/changelogs/{Yoshax-emptypls.xml => Yoshax-emptypls.yml} (100%) diff --git a/html/changelogs/PsiOmegaDelta-ExternalDamage.yml b/html/changelogs/PsiOmegaDelta-ExternalDamage.yml new file mode 100644 index 0000000000..2fc23a20fd --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-ExternalDamage.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - tweak: "Blobs and simple mobs now attack all external organs instead of a subset. The overall damage remains the same but the number of fractures caused will, in general, be fewer." diff --git a/html/changelogs/Yoshax-emptypls.xml b/html/changelogs/Yoshax-emptypls.yml similarity index 100% rename from html/changelogs/Yoshax-emptypls.xml rename to html/changelogs/Yoshax-emptypls.yml