mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Merge pull request #1232 from tigercat2000/b4ad7ac3827209cda6f8f5bab7da14bf
Grab Fixes MKIIIIIIIIVIVIvXXVV.
This commit is contained in:
@@ -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)
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user