shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feeding works! aaaaayyy. Didn't have to martial art it either

Browse Source
This commit is contained in:
Poojawa
2019-03-27 03:18:41 -05:00
parent b11e3bbc96
commit 8d84299d6d
6 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/mob/living/living_defense.dm
View File

@@ -129,6 +129,18 @@
/mob/living/proc/grabbedby(mob/living/carbon/user, supress_message = 0)
if(user == src || 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
return
if(!user.pulling || user.pulling != src)
user.start_pulling(src, supress_message)
return
@@ -163,6 +175,8 @@
return 0
if(!user.pulling || user.pulling != src || user.grab_state != old_grab_state || user.a_intent != INTENT_GRAB)
return 0
if(user.voremode && user.grab_state == GRAB_AGGRESSIVE)
return 0
user.grab_state++
switch(user.grab_state)
if(GRAB_AGGRESSIVE)