cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3299 from Anewbe/grabfix

Browse Source 
Should fix throwing people.
This commit is contained in:
Neerti
2017-04-14 01:10:23 -04:00
committed by GitHub
parent cc64f0e537 4cf38d9037
commit e5fd28818d
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mob/mob_grab.dm
View File

@@ -75,14 +75,9 @@
if(affecting) if(affecting)
if(affecting.buckled) if(affecting.buckled)
return null return null
if(!affecting.Adjacent(affecting.grabbed_by))
qdel(src)
return null
if(state >= GRAB_AGGRESSIVE) if(state >= GRAB_AGGRESSIVE)
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1) animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1)
var/mob/living/affected = affecting return affecting
qdel(src)
return affected
return null return null
@@ -300,9 +295,6 @@
return return
if(world.time < (last_action + 20)) if(world.time < (last_action + 20))
return return
if(!M.Adjacent(user))
qdel(src)
return
last_action = world.time last_action = world.time
reset_kill_state() //using special grab moves will interrupt choking them reset_kill_state() //using special grab moves will interrupt choking them
@@ -348,9 +340,6 @@
qdel(src) qdel(src)
/obj/item/weapon/grab/proc/reset_kill_state() /obj/item/weapon/grab/proc/reset_kill_state()
if(!assailant)
qdel(src)
return
if(state == GRAB_KILL) if(state == GRAB_KILL)
assailant.visible_message("<span class='warning'>[assailant] lost \his tight grip on [affecting]'s neck!</span>") assailant.visible_message("<span class='warning'>[assailant] lost \his tight grip on [affecting]'s neck!</span>")
hud.icon_state = "kill" hud.icon_state = "kill"