From 294f3c3dcd76a7616bdd3308edb2daf93d1f7b11 Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 22 Dec 2020 16:46:10 +0200 Subject: [PATCH] Shrapnel Damage (#10674) --- code/modules/mob/living/carbon/human/human.dm | 7 ++++--- html/changelogs/geeves-useful_shrapnel.yml | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-useful_shrapnel.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a18552832f6..2735ffd527f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1342,16 +1342,17 @@ if(organ.status & ORGAN_SPLINTED) //Splints prevent movement. continue for(var/obj/item/O in organ.implants) - if(!istype(O,/obj/item/implant) && prob(5)) //Moving with things stuck in you could be bad. - // All kinds of embedded objects cause bleeding. + if(m_intent == "run" && !istype(O, /obj/item/implant) && prob(5)) //Moving quickly with things stuck in you could be bad. if(!can_feel_pain()) to_chat(src, SPAN_WARNING("You feel [O] moving inside your [organ.name].")) else var/msg = pick( \ SPAN_WARNING("A spike of pain jolts your [organ.name] as you bump [O] inside."), \ SPAN_WARNING("Your movement jostles [O] in your [organ.name] painfully."), \ - SPAN_WARNING("Your movement jostles [O] in your [organ.name] painfully.")) + SPAN_WARNING("Your movement jostles [O] in your [organ.name] painfully.") \ + ) custom_pain(msg, 10, 10, organ) + organ.take_damage(rand(1, 3), 0, DAM_EDGE) /mob/living/carbon/human/verb/check_pulse() set category = "Object" diff --git a/html/changelogs/geeves-useful_shrapnel.yml b/html/changelogs/geeves-useful_shrapnel.yml new file mode 100644 index 00000000000..cbcdf79d944 --- /dev/null +++ b/html/changelogs/geeves-useful_shrapnel.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Shrapnel now does damage when you move, again. This only occurs if you're running." \ No newline at end of file