diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 2327d816e23..8c4a9d4aace 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -118,6 +118,7 @@ return if(user.species.can_shred(user)) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) set_status(0) user.do_attack_animation(src) visible_message("\The [user] slashes at [src]!") diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 8999a9756c5..a0cfb789820 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -156,6 +156,7 @@ if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) visible_message("[user] smashes against the [src.name].", 1) take_damage(25) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 0eddf05370b..df58b146574 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -37,6 +37,7 @@ desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE" name = "DEATH-RIPLEY" icon_state = "deathripley" + initial_icon = "deathripley" step_in = 2 opacity=0 lights_power = 60 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index fb81b76cbcb..938c6e475db 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -766,6 +766,7 @@ return else if(H.species.can_shred(H)) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.visible_message("\red [user.name] slashes at the [src.name]!", "\blue You slash at the [src.name]!") playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)