Attempting to reduce incidence of clickspam against mobs.

This commit is contained in:
Zuhayr
2013-08-12 22:44:57 -07:00
parent 82a4dedf5d
commit 5476ae192d
4 changed files with 13 additions and 1 deletions
+6
View File
@@ -49,7 +49,11 @@
. = ..()
/mob/living/carbon/attack_hand(mob/M as mob)
if(!istype(M, /mob/living/carbon)) return
M.delay_click(10)
if (hasorgans(M))
var/datum/organ/external/temp = M:organs_by_name["r_hand"]
if (M.hand)
@@ -76,6 +80,8 @@
/mob/living/carbon/attack_paw(mob/M as mob)
if(!istype(M, /mob/living/carbon)) return
M.delay_click(10)
for(var/datum/disease/D in viruses)
if(D.spread_by_touch())
@@ -217,6 +217,8 @@
M << "No attacking people at spawn, you jackass."
return
M.delay_click(10)
if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
var/obj/item/clothing/gloves/G = M.gloves
if(G.cell)
+2 -1
View File
@@ -83,6 +83,7 @@
//This is awful
/mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.delay_click(10)
//Holding a balloon will shield you from an item that is_sharp() ... cause that makes sense
if (user.intent != "harm")
if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W))
@@ -960,4 +961,4 @@ mob/verb/yank_out_object()
pinned -= O
if(!pinned.len)
anchored = 0
return 1
return 1