From f7999fee26d980e296aa13618cf1e76101d474c4 Mon Sep 17 00:00:00 2001 From: lewcc Date: Mon, 25 Oct 2021 19:47:58 -0400 Subject: [PATCH 1/4] Add more organ pain messages --- code/modules/surgery/organs/pain.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 56d8b05d72a..facada84448 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -79,6 +79,13 @@ for(var/obj/item/organ/internal/I in internal_organs) if(I.hidden_pain) continue - if(I.damage > 2 && prob(2)) + if(prob(2) && I.damage > 2) var/obj/item/organ/external/parent = get_organ(I.parent_organ) - custom_pain("You feel a sharp pain in your [parent.limb_name]") + if(I.damage <= 10) + custom_pain("You feel a dull pain in your [parent.limb_name].") + else if(I.damage <= 30) + custom_pain("You feel a nagging pain in your [parent.limb_name], it's hard to ignore.") + else if(I.damage <= 50) + custom_pain("You feel a sharp pain in your [parent.limb_name]!") + else + custom_pain("You feel a stabbing pain in your [parent.limb_name]!") From cf5f487ac957a03e460abdb854cad1c4f3b2fe56 Mon Sep 17 00:00:00 2001 From: lewcc Date: Mon, 25 Oct 2021 20:01:51 -0400 Subject: [PATCH 2/4] Clean up pain messages a bit more --- code/modules/surgery/organs/pain.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index facada84448..2ae2f8192f2 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -81,11 +81,13 @@ continue if(prob(2) && I.damage > 2) var/obj/item/organ/external/parent = get_organ(I.parent_organ) + var/intensity = "" if(I.damage <= 10) - custom_pain("You feel a dull pain in your [parent.limb_name].") + intensity = "dull" else if(I.damage <= 30) - custom_pain("You feel a nagging pain in your [parent.limb_name], it's hard to ignore.") + intensity = "nagging" else if(I.damage <= 50) - custom_pain("You feel a sharp pain in your [parent.limb_name]!") + intensity = "sharp" else - custom_pain("You feel a stabbing pain in your [parent.limb_name]!") + intensity = "stabbing" + custom_pain("You feel a [intensity] pain in your [parent.limb_name].") From 2c20cce54398ad9f569b1577b5cc9e8c6271fd39 Mon Sep 17 00:00:00 2001 From: lewcc Date: Mon, 25 Oct 2021 20:04:37 -0400 Subject: [PATCH 3/4] Ehhh why not --- code/modules/surgery/organs/pain.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 2ae2f8192f2..06a5c855b18 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -83,11 +83,11 @@ var/obj/item/organ/external/parent = get_organ(I.parent_organ) var/intensity = "" if(I.damage <= 10) - intensity = "dull" + intensity = "a dull" else if(I.damage <= 30) - intensity = "nagging" + intensity = "a nagging" else if(I.damage <= 50) - intensity = "sharp" + intensity = "a sharp" else - intensity = "stabbing" - custom_pain("You feel a [intensity] pain in your [parent.limb_name].") + intensity = "a stabbing" + custom_pain("You feel [intensity] pain in your [parent.limb_name]!") From 431c1fe368d6d58b9884df0b777ef001a0cf8f65 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Tue, 26 Oct 2021 16:03:45 -0400 Subject: [PATCH 4/4] Update code/modules/surgery/organs/pain.dm Co-authored-by: Farie82 --- code/modules/surgery/organs/pain.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 06a5c855b18..8364c2fd4d4 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -81,13 +81,14 @@ continue if(prob(2) && I.damage > 2) var/obj/item/organ/external/parent = get_organ(I.parent_organ) - var/intensity = "" - if(I.damage <= 10) - intensity = "a dull" - else if(I.damage <= 30) - intensity = "a nagging" - else if(I.damage <= 50) - intensity = "a sharp" - else - intensity = "a stabbing" + var/intensity + switch(I.damage) + if(0 to 10) + intensity = "a dull" + if(10 to 30) + intensity = "a nagging" + if(30 to 50) + intensity = "a sharp" + else + intensity = "a stabbing" custom_pain("You feel [intensity] pain in your [parent.limb_name]!")