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, "<span class='warning'>You can't do that in your current state.</span>")
+		return
+>>>>>>> 01ed141833... Merge pull request #13673 from Heroman3003/lickfix
 
 	if(nutrition < 50)
 		to_chat(src, "<span class='warning'>You need more energy to produce antiseptic enzymes. Eat something and try again.</span>")