From c861540dbb1bd17832e748384eb326c6fe601bb8 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 30 May 2015 20:21:40 -0700 Subject: [PATCH 1/2] Fix headbutting. For the 3rd time. Jeez, I should take some lessons on ACTUALLY FIXING BUGS. --- code/modules/mob/mob_grab.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index cd4b79a4f58..af7313bd920 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -80,6 +80,9 @@ assailant.client.screen -= hud assailant.client.screen += hud + var/hit_zone = assailant.zone_sel.selecting + last_hit_zone = hit_zone + if(assailant.pulling == affecting) assailant.stop_pulling() @@ -117,11 +120,10 @@ affecting.drop_item() affecting.hand = h - var/hit_zone = assailant.zone_sel.selecting + //var/announce = 0 //(hit_zone != last_hit_zone) //announce = 1 - last_hit_zone = hit_zone /* if(ishuman(affecting)) switch(hit_zone) /*if("mouth") From ba646c51a13639aab1191769b102690f8095b0dd Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 30 May 2015 20:30:43 -0700 Subject: [PATCH 2/2] Fix being able to throw people while not next to them --- code/modules/mob/mob_grab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index af7313bd920..47e0740be4b 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -56,7 +56,7 @@ //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code. /obj/item/weapon/grab/proc/throw() - if(affecting) + if(affecting && assailant.Adjacent(affecting)) if(affecting.buckled) return null if(state >= GRAB_AGGRESSIVE)