added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.

Added melee click cooldown for paper spam on cameras.
This commit is contained in:
Aranclanos
2014-08-03 22:14:56 -03:00
parent 0ad9b394d5
commit ccae5781c5
21 changed files with 51 additions and 45 deletions
@@ -31,7 +31,7 @@
update_icon()
return
else if(istype(O, /obj/item/weapon))
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/W = O
if(src.smashed || src.localopened)
if(localopened)
+2 -2
View File
@@ -66,7 +66,7 @@
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
src.health -= W.force
src.healthcheck()
..()
@@ -76,7 +76,7 @@
return src.attack_hand(user)
/obj/structure/displaycase/attack_hand(mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
if (src.destroyed && src.occupied)
new /obj/item/weapon/gun/energy/laser/captain( src.loc )
user << "\b You deactivate the hover field built into the case."
+5 -5
View File
@@ -26,7 +26,7 @@
attack_hand(user)
/obj/structure/grille/attack_hand(mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("<span class='warning'>[user] hits [src].</span>", \
"<span class='warning'>You hit [src].</span>", \
@@ -42,7 +42,7 @@
/obj/structure/grille/attack_alien(mob/user as mob)
if(istype(user, /mob/living/carbon/alien/larva)) return
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("<span class='warning'>[user] mangles [src].</span>", \
"<span class='warning'>You mangle [src].</span>", \
@@ -54,7 +54,7 @@
return
/obj/structure/grille/attack_slime(mob/living/carbon/slime/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
if(!user.is_adult) return
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
@@ -67,7 +67,7 @@
return
/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M as mob)
M.changeNext_move(8)
M.changeNext_move(CLICK_CD_MELEE)
if(M.melee_damage_upper == 0) return
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
@@ -100,7 +100,7 @@
return
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
if(istype(W, /obj/item/weapon/wirecutters))
if(!shock(user, 100))
+2 -2
View File
@@ -61,7 +61,7 @@
/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
src.health -= W.force
src.healthcheck()
..()
@@ -71,7 +71,7 @@
return src.attack_hand(user)
/obj/structure/lamarr/attack_hand(mob/user as mob)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
if (src.destroyed)
return
else
+3 -3
View File
@@ -109,7 +109,7 @@
R.add_fingerprint(user)
qdel(src)
else
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("<span class='notice'>[user] knocks on [src].</span>")
add_fingerprint(user)
playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
@@ -122,7 +122,7 @@
/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime
if(!can_be_reached(user))
return
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
health -= damage
if(health <= 0)
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
@@ -191,7 +191,7 @@
qdel(src)
else
if(I.damtype == BRUTE || I.damtype == BURN)
user.changeNext_move(8)
user.changeNext_move(CLICK_CD_MELEE)
hit(I.force)
if(health <= 7)
anchored = 0