mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Should fix throwing people.
This commit is contained in:
@@ -75,14 +75,9 @@
|
||||
if(affecting)
|
||||
if(affecting.buckled)
|
||||
return null
|
||||
if(!affecting.Adjacent(affecting.grabbed_by))
|
||||
qdel(src)
|
||||
return null
|
||||
if(state >= GRAB_AGGRESSIVE)
|
||||
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1)
|
||||
var/mob/living/affected = affecting
|
||||
qdel(src)
|
||||
return affected
|
||||
return affecting
|
||||
|
||||
return null
|
||||
|
||||
@@ -300,9 +295,6 @@
|
||||
return
|
||||
if(world.time < (last_action + 20))
|
||||
return
|
||||
if(!M.Adjacent(user))
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
last_action = world.time
|
||||
reset_kill_state() //using special grab moves will interrupt choking them
|
||||
@@ -348,9 +340,6 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/grab/proc/reset_kill_state()
|
||||
if(!assailant)
|
||||
qdel(src)
|
||||
return
|
||||
if(state == GRAB_KILL)
|
||||
assailant.visible_message("<span class='warning'>[assailant] lost \his tight grip on [affecting]'s neck!</span>")
|
||||
hud.icon_state = "kill"
|
||||
|
||||
Reference in New Issue
Block a user