From 097ef1efe5ef8160cb8548924eedcaa33154ca43 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 16 Dec 2019 04:04:57 -0300 Subject: [PATCH] Removes pain displaying phantom wounds when examining yourself (#7663) * Removes pain creating phantom wounds * adds changelog. --- code/modules/mob/living/carbon/carbon.dm | 7 +------ html/changelogs/alberyk-pain.yml | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/alberyk-pain.yml diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 5f1f4825699..2588fcd441c 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -28,7 +28,7 @@ bloodstr.clear_reagents() touching.clear_reagents() var/datum/reagents/R = get_ingested_reagents() - if(istype(R)) + if(istype(R)) R.clear_reagents() breathing.clear_reagents() ..() @@ -212,11 +212,6 @@ var/list/status = list() var/brutedamage = org.brute_dam var/burndamage = org.burn_dam - if(getHalLoss() > 0) - if(prob(30)) - brutedamage += getHalLoss() - if(prob(30)) - burndamage += getHalLoss() switch(brutedamage) if(1 to 20) status += "bruised" diff --git a/html/changelogs/alberyk-pain.yml b/html/changelogs/alberyk-pain.yml new file mode 100644 index 00000000000..922046cf49a --- /dev/null +++ b/html/changelogs/alberyk-pain.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Pain should no longer create phantom wounds when examining yourself."