From 9db3249cf1383af37d28e26860427a6820db531b Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Sun, 19 Dec 2021 05:09:45 +0100 Subject: [PATCH] Fixes a set of reversed pain checks in sensitive hearing (#12858) * Fixes a set of reversed pain checks * typo fix Co-authored-by: TGW Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> --- code/modules/mob/living/carbon/human/human.dm | 10 +++++----- html/changelogs/SensitiveHearingHalloss.yml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/SensitiveHearingHalloss.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 210c67d46cb..03226bb7b97 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2120,16 +2120,16 @@ var/obj/item/organ/external/E = organs_by_name[BP_HEAD] switch (intensity) if (1) - custom_pain("Your ears hurt a little.", 5, FALSE, E, 0) + custom_pain("Your ears hurt a little.", 5, FALSE, E, TRUE) if (2) - custom_pain("Your ears hurt!", 10, TRUE, E, 0) + custom_pain("Your ears hurt!", 10, TRUE, E, TRUE) if (3) - custom_pain("Your ears hurt badly!", 40, TRUE, E, 0) + custom_pain("Your ears hurt badly!", 40, TRUE, E, TRUE) if (4) - custom_pain("Your ears begin to ring faintly from the pain!", 70, TRUE, E, 0) + custom_pain("Your ears begin to ring faintly from the pain!", 70, TRUE, E, TRUE) adjustEarDamage(5, 0, FALSE) stop_listening() if (5) - custom_pain("YOUR EARS ARE DEAFENED BY THE PAIN!", 110, TRUE, E, 1) + custom_pain("YOUR EARS ARE DEAFENED BY THE PAIN!", 110, TRUE, E, FALSE) adjustEarDamage(5, 5, FALSE) stop_listening() diff --git a/html/changelogs/SensitiveHearingHalloss.yml b/html/changelogs/SensitiveHearingHalloss.yml new file mode 100644 index 00000000000..16c2cca4bc1 --- /dev/null +++ b/html/changelogs/SensitiveHearingHalloss.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed a set of reversed checks regarding when sensitive hearing would give halloss."