From ee0d7a4ed33f9331c0951239959660ccc00dacf6 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 6 Aug 2019 07:43:28 -0400 Subject: [PATCH 1/2] Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit --- code/game/objects/structures/femur_breaker.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm index 077eb25688..ede0331d3a 100644 --- a/code/game/objects/structures/femur_breaker.dm +++ b/code/game/objects/structures/femur_breaker.dm @@ -83,8 +83,9 @@ icon_state = "breaker_drop" /obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H) - H.say("AAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHH!!", forced = "femur broken") + H.emote("scream") H.apply_damage(150, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) + H.adjustBruteLoss(rand(5,20) + (max(0, H.health)) //Make absolutely sure they end up in crit, so that they can succumb if they wish. /obj/structure/femur_breaker/proc/raise_slat() slat_status = BREAKER_SLAT_RAISED From ddb29551fc32fbe57033e4ff1cdcde3c06c1a8de Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 6 Aug 2019 11:28:01 -0400 Subject: [PATCH 2/2] paren --- code/game/objects/structures/femur_breaker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm index ede0331d3a..e3002a8fae 100644 --- a/code/game/objects/structures/femur_breaker.dm +++ b/code/game/objects/structures/femur_breaker.dm @@ -85,7 +85,7 @@ /obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H) H.emote("scream") H.apply_damage(150, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - H.adjustBruteLoss(rand(5,20) + (max(0, H.health)) //Make absolutely sure they end up in crit, so that they can succumb if they wish. + H.adjustBruteLoss(rand(5,20) + (max(0, H.health))) //Make absolutely sure they end up in crit, so that they can succumb if they wish. /obj/structure/femur_breaker/proc/raise_slat() slat_status = BREAKER_SLAT_RAISED @@ -172,4 +172,4 @@ #undef BREAKER_ACTIVATE_DELAY #undef BREAKER_WRENCH_DELAY #undef BREAKER_ACTION_INUSE -#undef BREAKER_ACTION_WRENCH \ No newline at end of file +#undef BREAKER_ACTION_WRENCH