mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Fix more click cooldown issues (#2184)
Fix all the issues related with shred behavior and lack of click cooldow, such as hitting cameras, apcs and windowdoors And fixes #2085
This commit is contained in:
@@ -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("<span class='warning'>\The [user] slashes at [src]!</span>")
|
||||
|
||||
@@ -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("<span class='danger'>[user] smashes against the [src.name].</span>", 1)
|
||||
take_damage(25)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user