From 55c68a5df3df7a42093d0af98b9c890bc1bd8dc1 Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 6 Sep 2022 15:44:32 -0400 Subject: [PATCH 1/2] Fixes licking wounds of dead/from dead --- code/modules/mob/living/carbon/lick_wounds.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 1bc94d0d98..6a885f3a05 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -1,12 +1,18 @@ -/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M as mob in range(1)) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff. +/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M as mob in view(1)) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff. set name = "Lick Wounds" set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva." +<<<<<<< HEAD //CHOMPEdit Start - No longer usable while incapacitated if(src.incapacitated()) return //CHOMPEdit End +======= + if(stat || paralysis || weakened || stunned) + to_chat(src, "You can't do that in your current state.") + return +>>>>>>> 01ed141833... Merge pull request #13673 from Heroman3003/lickfix if(nutrition < 50) to_chat(src, "You need more energy to produce antiseptic enzymes. Eat something and try again.") From a3b80c737005756c3ec55305a555b7b6ce6498b1 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 7 Sep 2022 16:09:00 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/living/carbon/lick_wounds.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 6a885f3a05..8ec651d05b 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -3,16 +3,9 @@ set category = "Abilities" set desc = "Disinfect and heal small wounds with your saliva." -<<<<<<< HEAD - //CHOMPEdit Start - No longer usable while incapacitated - if(src.incapacitated()) - return - //CHOMPEdit End -======= if(stat || paralysis || weakened || stunned) to_chat(src, "You can't do that in your current state.") return ->>>>>>> 01ed141833... Merge pull request #13673 from Heroman3003/lickfix if(nutrition < 50) to_chat(src, "You need more energy to produce antiseptic enzymes. Eat something and try again.")