From 736d5a95319a842be4f8fd751ab8415bd161031f Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 19 Feb 2018 17:45:26 -0500 Subject: [PATCH] Allow shadekin phase-shift noms Allows shadekin to phase in on people, and if they are set to be a dropnom pred in the vore panel, they'll belly the person they land on. --- .../vore/shadekin/ability_procs.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm index e35f6304023..f14901a63df 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/ability_procs.dm @@ -36,9 +36,24 @@ flick("tp_in",src) custom_emote(1,"phases in!") sleep(5) //The duration of the TP animation - update_icon() canmove = original_canmove + //Potential phase-in vore + if(can_be_drop_pred) //Toggleable in vore panel + var/list/potentials = living_mobs(0) + if(potentials.len) + var/mob/living/target = pick(potentials) + var/datum/belly/B = vore_organs[vore_selected] + if(istype(target) && istype(B)) + target.forceMove(src) + B.internal_contents |= target + playsound(src, B.vore_sound, 100, 1) + to_chat(target,"\The [src] phases in around you, [B.vore_verb]ing you into their [B.name]!") + to_chat(src,"Your [B.name] has a new occupant!") + + // Do this after the potential vore, so we get the belly + update_icon() + //Affect nearby lights var/destroy_lights = 0 if(eye_state == RED_EYES)