Merge pull request #11440 from farie82/xeno-devour-fix

Force move for regurgitate and devour now
This commit is contained in:
Fox McCloud
2019-05-05 16:43:50 -04:00
committed by GitHub
2 changed files with 11 additions and 2 deletions
@@ -159,7 +159,7 @@ Doesn't work on other aliens/AI.*/
for(var/mob/M in src)
if(M in stomach_contents)
stomach_contents.Remove(M)
M.loc = loc
M.forceMove(loc)
//Paralyse(10)
src.visible_message("<span class='alertalien'><B>[src] hurls out the contents of [p_their()] stomach!</span>")
return
+10 -1
View File
@@ -387,15 +387,24 @@
if(M == assailant && state >= GRAB_AGGRESSIVE) //no eatin unless you have an agressive grab
if(checkvalid(user, affecting)) //wut
var/mob/living/carbon/attacker = user
if(affecting.buckled)
to_chat(user, "<span class='warning'>[affecting] is buckled!</span>")
return
user.visible_message("<span class='danger'>[user] is attempting to devour \the [affecting]!</span>")
if(!do_after(user, checktime(user, affecting), target = affecting)) return
if(affecting.buckled)
to_chat(user, "<span class='warning'>[affecting] is buckled!</span>")
return
user.visible_message("<span class='danger'>[user] devours \the [affecting]!</span>")
if(affecting.mind)
add_attack_logs(attacker, affecting, "Devoured")
affecting.loc = user
affecting.forceMove(user)
attacker.stomach_contents.Add(affecting)
qdel(src)