From f35bb3e757a8a6233de6230c26bc920cf06d5cd0 Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Thu, 30 May 2024 07:14:15 -0500 Subject: [PATCH] Makes IB less likely to happen on the first hit and adds a sound effect on wound (#25546) * splorch * Update code/modules/surgery/organs/organ_external.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> --------- Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> --- code/modules/surgery/organs/organ_external.dm | 7 ++++--- sound/effects/blood1.ogg | Bin 0 -> 12388 bytes 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sound/effects/blood1.ogg diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 8f313f51f10..eb30f1ffc0f 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -243,6 +243,8 @@ // See if bones need to break check_fracture(brute) + // check if we need to inflict internal bleeding + check_for_internal_bleeding(brute) // See if we need to inflict severe burns check_for_burn_wound(burn) // Threshold needed to have a chance of hurting internal bits with something sharp @@ -273,7 +275,6 @@ if((brute_dam + burn_dam + brute + burn) < max_limb_damage) brute_dam += brute burn_dam += burn - check_for_internal_bleeding(brute) else //If we can't inflict the full amount of damage, spread the damage in other ways //How much damage can we actually cause? @@ -287,7 +288,6 @@ can_inflict = max(0, can_inflict - brute) //How much brute damage is left to inflict brute = max(0, brute - temp) - check_for_internal_bleeding(brute) if(burn > 0 && can_inflict) //Inflict all burn damage we can @@ -497,7 +497,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(owner && (NO_BLOOD in owner.dna.species.species_traits)) return var/local_damage = brute_dam + damage - if(damage > 15 && local_damage > 30 && prob(damage)) + if(damage > 15 && local_damage > min_broken_damage && prob(damage)) cause_internal_bleeding() /obj/item/organ/external/proc/check_for_burn_wound(damage, update_health = TRUE) @@ -744,6 +744,7 @@ Note that amputating the affected organ does in fact remove the infection from t return status |= ORGAN_INT_BLEEDING custom_pain("You feel something rip in your [name]!") + playsound(owner, 'sound/effects/blood1.ogg', 170, TRUE) /obj/item/organ/external/proc/fix_internal_bleeding() if(is_robotic()) diff --git a/sound/effects/blood1.ogg b/sound/effects/blood1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..88c76eb9e34f480a78fb64ff36b1533590a670b0 GIT binary patch literal 12388 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