From c70f42d139cb168415811e9b5abfaa7884ee1314 Mon Sep 17 00:00:00 2001 From: IrkallaEpsilon <42441793+IrkallaEpsilon@users.noreply.github.com> Date: Tue, 4 Sep 2018 20:40:49 +0200 Subject: [PATCH 1/2] Attacking mirrors is now not spamable anymore Kinda a funny bug that you can attack mirrors without a cooldown. A bug nonetheless. Not sure if this should fix it, but it was used to fix the no cooldown on Gas Cannisters. --- code/game/objects/structures/mirror.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 7d7c9628d63..0f85d0bb8eb 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -54,6 +54,7 @@ /obj/structure/mirror/attackby(obj/item/I, mob/living/user, params) + user.changeNext_move(CLICK_CD_MELEE) if(isscrewdriver(I)) user.visible_message("[user] begins to unfasten [src].", "You begin to unfasten [src].") if(do_after(user, 30 * I.toolspeed, target = src)) @@ -80,6 +81,7 @@ /obj/structure/mirror/attack_alien(mob/living/user) + user.changeNext_move(CLICK_CD_MELEE) if(islarva(user)) return user.do_attack_animation(src) @@ -91,6 +93,7 @@ /obj/structure/mirror/attack_animal(mob/living/user) + user.changeNext_move(CLICK_CD_MELEE) if(!isanimal(user)) return var/mob/living/simple_animal/M = user @@ -105,6 +108,7 @@ /obj/structure/mirror/attack_slime(mob/living/user) + user.changeNext_move(CLICK_CD_MELEE) var/mob/living/carbon/slime/S = user if(!S.is_adult) return @@ -125,4 +129,4 @@ /obj/item/mounted/mirror/do_build(turf/on_wall, mob/user) var/obj/structure/mirror/M = new /obj/structure/mirror(get_turf(user), get_dir(on_wall, user), 1) transfer_prints_to(M, TRUE) - qdel(src) \ No newline at end of file + qdel(src)