Readded feeding to simplemobs (#12378)

This commit is contained in:
Putnam3145
2020-05-29 20:01:51 -07:00
committed by GitHub
parent 5ab8d41d9a
commit 266707b119
2 changed files with 2 additions and 11 deletions
+1 -1
View File
@@ -465,7 +465,7 @@
log_attack("[key_name(owner)] digested [key_name(M)].")
// If digested prey is also a pred... anyone inside their bellies gets moved up.
if(is_vore_predator(M))
if(has_vore_belly(M))
M.release_vore_contents(include_absorbed = TRUE, silent = TRUE)
//Drop all items into the belly
+1 -10
View File
@@ -73,15 +73,9 @@
to_chat(user, "<span class='notice'>They aren't able to be fed.</span>")
to_chat(pred, "<span class='notice'>[user] tried to feed you themselves, but you aren't voracious enough to be fed.</span>")
return
if(!is_vore_predator(pred))
to_chat(user, "<span class='notice'>They aren't voracious enough.</span>")
return
feed_self_to_grabbed(user, pred)
else if(pred == user) //you click yourself
if(!is_vore_predator(src))
to_chat(user, "<span class='notice'>You aren't voracious enough.</span>")
return
feed_grabbed_to_self(user, prey)
else // click someone other than you/prey
@@ -93,9 +87,6 @@
to_chat(user, "<span class='notice'>They aren't able to be fed to someone.</span>")
to_chat(prey, "<span class='notice'>[user] tried to feed you to [pred], but you aren't able to be fed to them.</span>")
return
if(!is_vore_predator(pred))
to_chat(user, "<span class='notice'>They aren't voracious enough.</span>")
return
feed_grabbed_to_other(user, prey, pred)
//
// Eating procs depending on who clicked what
@@ -395,7 +386,7 @@
return taste_message
// Check if an object is capable of eating things, based on vore_organs
//
/proc/is_vore_predator(var/mob/living/O)
/proc/has_vore_belly(var/mob/living/O)
if(istype(O))
if(O.vore_organs.len > 0)
return TRUE