diff --git a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm index 4132ea51f5c0..4b70d291d992 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm @@ -16,6 +16,14 @@ // check that the user has grabbed someone and they are not currently coiling someone if(ishuman(owner.pulling) && !currently_coiling) coil_mob(owner.pulling) + else + if (currently_coiling) + var/mob/living/carbon/human/H = owner + if(H.pulling && H.grab_state == GRAB_AGGRESSIVE && H.voremode) + var/mob/P = H.pulling + H.vore_attack(H, P, H) + else + currently_coiled.grabbedby(H) /datum/action/innate/ability/coiling/proc/update_coil_offset(atom/source, old_dir, new_dir) // update the coiling offset on the coiled user depending on the way the owner is facing @@ -41,10 +49,13 @@ currently_coiled = H H.layer -= 0.1 // LISTEN I HATE TOUCHING MOB LAYERS TOO BUT THIS IS JUST SO THEY RENDER UNDER THE OTHER PLAYER SDFHSDFHDSFHDSH - + var/prev_grab_state = owner.grab_state // move user to same tile H.forceMove(get_turf(owner)) - + owner.start_pulling(H) + var/i + for (i=1; i