diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 7e03826f055..16cbb7fa9d9 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -64,6 +64,7 @@ if(open) health = min(maxhealth, health+10) user.visible_message("[user] repairs [src]!","You repair [src]!") + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) else user << "Unable to repair with the maintenance panel closed." else @@ -75,6 +76,7 @@ src.health -= W.force * fire_dam_coeff if("brute") src.health -= W.force * brute_dam_coeff + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) ..() healthcheck() else diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index f80e71ef422..88af4fb76ca 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -747,6 +747,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co O.show_message("[user.name] further abuses the shattered [src.name].") else if(istype(I, /obj/item/weapon) ) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) var/obj/item/weapon/W = I if(W.force <15) for (var/mob/O in hearers(5, src.loc)) @@ -764,7 +765,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else - user << "This does nothing." + user << "This does nothing." src.update_icon() /obj/machinery/newscaster/attack_ai(mob/user as mob) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8ce2a88f244..b98b730b61c 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -55,6 +55,7 @@ /obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.health -= W.force src.healthcheck() ..() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index ddc56dad3f6..80eb2f1a447 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -93,6 +93,7 @@ if(health < maxhealth) if(open) health = min(maxhealth, health+10) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") else user << "Unable to repair with the maintenance panel closed." @@ -101,6 +102,7 @@ else user << "Unable to repair while [src] is off." else if(hasvar(W,"force") && hasvar(W,"damtype")) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) switch(W.damtype) if("fire") health -= W.force * fire_dam_coeff