Skip to content

Commit

Permalink
adds specific handling for picked up mobs to matter eater
Browse files Browse the repository at this point in the history
  • Loading branch information
Gboster-0 committed Feb 6, 2025
1 parent 484737b commit 9b92c6a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions monkestation/code/datums/mutations/active.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,11 @@
Heal()
return TRUE

if(isliving(cast_on))
if(isliving(cast_on) || ispickedupmob(cast_on))
var/mob/living/living_target = cast_on
var/obj/item/clothing/head/mob_holder/holder = cast_on
if(holder)
living_target = holder.held_mob
var/do_after_time = living_target.health + 1
if(iscyborg(living_target))
do_after_time *= 2
Expand All @@ -151,6 +154,9 @@
if(istype(ai_target) && ai_target.is_anchored)
do_after_time *= 2

if(ispickedupmob(cast_on))
do_after_time = 1

owner.visible_message(span_danger("[owner] begins stuffing [living_target] into [owner.p_their()] gaping maw!"))
if(!do_after(owner, do_after_time, living_target))
to_chat(owner, span_danger("You were interrupted before you could eat [cast_on]!"))
Expand Down Expand Up @@ -181,9 +187,7 @@
if(istype(cast_on, /obj/item/organ/internal/brain))
brain = cast_on
else
brain = locate(/obj/item/organ/internal/brain) in cast_on
if(!brain) // check for MMI's
brain = locate(/obj/item/organ/internal/brain) in cast_on.contents
brain = locate(/obj/item/organ/internal/brain) in cast_on.contents

if(brain)
INVOKE_ASYNC(src, PROC_REF(vomit_object), brain)
Expand Down

0 comments on commit 9b92c6a

Please sign in to comment.