Skip to content

Commit

Permalink
fix: исправлены хвосты наг (#793)
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkest08 authored Mar 9, 2024
1 parent 2ae7414 commit 064c509
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<prev_grab_state+1;i++)
currently_coiled.grabbedby(owner)
// cancel the coiling action if certain things are done
RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/cancel_coil)
RegisterSignal(owner, COMSIG_LIVING_RESTING, .proc/cancel_coil)
Expand Down Expand Up @@ -78,7 +89,6 @@
UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
UnregisterSignal(owner, COMSIG_LIVING_RESTING)
UnregisterSignal(owner, COMSIG_LIVING_STOPPED_PULLING)
UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)

// change overlay back to original image
H.dna.species.mutant_bodyparts["taur"] = "Naga"
Expand Down

0 comments on commit 064c509

Please sign in to comment.