The grab item won't be created and instantly deleted on their New() when you click a mob anchored.

This commit is contained in:
Aranclanos
2013-07-19 20:56:43 -03:00
parent 28b030baed
commit 11918572a2
8 changed files with 13 additions and 12 deletions
@@ -261,7 +261,7 @@
help_shake_act(M)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
@@ -233,7 +233,7 @@
help_shake_act(M)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -7,7 +7,8 @@
if ("help")
visible_message(text("\blue [M] caresses [src] with its scythe like arm."))
if ("grab")
if(M == src) return
if(M == src || anchored)
return
if (w_uniform)
w_uniform.add_fingerprint(M)
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
@@ -33,7 +33,7 @@
src << "<span class='unconscious'>You feel a breath of fresh air enter your lungs. It feels good.</span>"
if("grab")
if(M == src)
if(M == src || anchored)
return 0
if(w_uniform)
w_uniform.add_fingerprint(M)
@@ -432,7 +432,7 @@
help_shake_act(M)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -523,7 +523,7 @@
O.show_message(text("\red <B>[] has attempted to lunge at [name]!</B>", M), 1)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -160,7 +160,7 @@
O.show_message(text("\red <B>[] has attempted to punch [name]!</B>", M), 1)
else
if (M.a_intent == "grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -230,7 +230,7 @@
O.show_message(text("\red <B>[] has attempted to lunge at [name]!</B>", M), 1)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -587,7 +587,7 @@
O.show_message(text("\blue [M] caresses [src]'s plating with its scythe like arm."), 1)
if ("grab")
if (M == src)
if (M == src || anchored)
return
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
@@ -268,7 +268,7 @@
O.show_message("\blue [M] [response_help] [src].")
if("grab")
if (M == src)
if (M == src || anchored)
return
if (!(status_flags & CANPUSH))
return
@@ -304,7 +304,7 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1)
if ("grab")
if(M == src)
if(M == src || anchored)
return
if(!(status_flags & CANPUSH))
return
@@ -467,4 +467,4 @@
var/obj/mecha/M = target
if (M.occupant)
return 0
return 1
return 1