This commit is contained in:
silicons
2020-07-23 16:59:27 -07:00
parent b20e3bc2b6
commit 64de8f16a9
5 changed files with 21 additions and 5 deletions
+2
View File
@@ -116,6 +116,8 @@
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
/obj/attack_animal(mob/living/simple_animal/M)
if(!M.CheckActionCooldown(CLICK_CD_MELEE))
return
if(!M.melee_damage_upper && !M.obj_damage)
M.emote("custom", message = "[M.friendly_verb_continuous] [src].")
return 0
+1
View File
@@ -177,6 +177,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
/obj/structure/window/attack_paw(mob/user)
user.DelayNextAction()
return attack_hand(user)
/obj/structure/window/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime