removes debug and override

This commit is contained in:
Poojawa
2019-03-27 03:43:18 -05:00
parent 8d84299d6d
commit 6fdb5e97f8
3 changed files with 6 additions and 14 deletions
+5 -7
View File
@@ -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
@@ -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
@@ -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