From 6fdb5e97f8caf07096eff6a2e96346d2528aa38d Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawamanthing@gmail.com>
Date: Wed, 27 Mar 2019 03:43:18 -0500
Subject: [PATCH] removes debug and override

---
 code/modules/mob/living/living_defense.dm            | 12 +++++-------
 .../modules/mob/living/carbon/human/human_defense.dm |  6 ------
 .../code/modules/vore/eating/living_vr.dm            |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index dddbe18666..d4e14dbd20 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -127,20 +127,18 @@
 	IgniteMob()
 
 /mob/living/proc/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src || anchored || !isturf(user.loc))
+	if(user == anchored || !isturf(user.loc))
 		return FALSE
 
 	if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
 		if(ismob(user.pulling))
 			var/mob/P = user.pulling
-			if(P != src)
-				to_chat(world, "<span class='notice'>grabbedby check : [user], [P], [src] (target).</span>")
-				user.vore_attack(user, P, src) //feed grabbed to other
-			else
-				to_chat(world, "<span class='notice'>grabbedby check : [user], [P], [src] (target).</span>")
-				user.vore_attack(user, P, src) //feed self to grabbed
+			user.vore_attack(user, P, src) // User, Prey, Predator
 			return
 
+	if(user == src) //we want to be able to self click if we're voracious
+		return FALSE
+
 	if(!user.pulling || user.pulling != src)
 		user.start_pulling(src, supress_message)
 		return
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm
index 23add047ca..bbff8ee750 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm
@@ -1,9 +1,3 @@
-/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
-		vore_attack(user, pulling, user) //feeding prey to self
-	else
-		..()
-
 /mob/living/carbon/human/alt_attack_hand(mob/user)
 	if(..())
 		return
diff --git a/modular_citadel/code/modules/vore/eating/living_vr.dm b/modular_citadel/code/modules/vore/eating/living_vr.dm
index cfbdcd49fa..fa711e911c 100644
--- a/modular_citadel/code/modules/vore/eating/living_vr.dm
+++ b/modular_citadel/code/modules/vore/eating/living_vr.dm
@@ -94,7 +94,7 @@
 			return
 		feed_self_to_grabbed(user, pred)
 
-	else if(pred == user) //you click yourself
+	if(pred == user) //you click yourself
 		if(!is_vore_predator(src))
 			to_chat(user, "<span class='notice'>You aren't voracious enough.</span>")
 			return