From 65a86e565f95505ecc558c27b2fa6000e069e397 Mon Sep 17 00:00:00 2001 From: Erki Date: Fri, 30 Aug 2019 20:45:38 +0300 Subject: [PATCH] Adjusts shrapnel to cause HALLOSS (#6919) --- code/modules/mob/living/carbon/human/human.dm | 5 +---- html/changelogs/skull132_shrapnel.yml | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/skull132_shrapnel.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7dd0c69cf52..83ef0349897 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1136,10 +1136,7 @@ "Your movement jostles [O] in your [organ.name] painfully.") to_chat(src, msg) - organ.take_damage(rand(1,3), 0, 0) - if(!(organ.status & ORGAN_ROBOT) && !(species.flags & NO_BLOOD)) //There is no blood in protheses. - organ.status |= ORGAN_BLEEDING - src.adjustToxLoss(rand(1,3)) + adjustHalLoss(rand(1, 3)) /mob/living/carbon/human/verb/check_pulse() set category = "Object" diff --git a/html/changelogs/skull132_shrapnel.yml b/html/changelogs/skull132_shrapnel.yml new file mode 100644 index 00000000000..7764a1bc6a5 --- /dev/null +++ b/html/changelogs/skull132_shrapnel.yml @@ -0,0 +1,5 @@ +author: Skull132 +delete-after: True + +changes: + - tweak: "Shrapnel no longer causes direct damage. Instead, it causes HALLOSS." \ No newline at end of file