Merge pull request #9390 from mwerezak/attack-animation

Attack animations

code/game/objects/structures/crates_lockers/closets.dm

@@ -335,6 +335,7 @@
 /obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
 	if(!damage || !wallbreaker)
 		return
+	user.do_attack_animation(src)
 	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
 	dump_contents()
 	spawn(1) qdel(src)

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -105,6 +105,7 @@
 
 /obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob)
 	health -= I.force
+	user.do_attack_animation(src)
 	visible_message("<span class='danger'>[user] strikes [src] with [I].</span>")
 	if(health <= 0)
 		for(var/mob/M in src)

code/game/objects/structures/girders.dm

@@ -17,6 +17,7 @@
 /obj/structure/girder/attack_generic(var/mob/user, var/damage, var/attack_message = "smashes apart", var/wallbreaker)
 	if(!damage || !wallbreaker)
 		return 0
+	user.do_attack_animation(src)
 	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
 	spawn(1) dismantle()
 	return 1

code/game/objects/structures/grille.dm

@@ -34,6 +34,7 @@
 /obj/structure/grille/attack_hand(mob/user as mob)
 
 	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+	user.do_attack_animation(src)
 
 	var/damage_dealt = 1
 	var/attack_message = "kicks"
@@ -156,6 +157,7 @@
 	else if(istype(W, /obj/item/weapon/material/shard))
 		health -= W.force * 0.1
 	else if(!shock(user, 70))
+		user.do_attack_animation(src)
 		playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
 		switch(W.damtype)
 			if("fire")
@@ -217,6 +219,7 @@
 
 /obj/structure/grille/attack_generic(var/mob/user, var/damage, var/attack_verb)
 	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
+	user.do_attack_animation(src)
 	health -= damage
 	spawn(1) healthcheck()
 	return 1

code/game/objects/structures/inflatable.dm

@@ -116,6 +116,7 @@
 
 /obj/structure/inflatable/attack_generic(var/mob/user, var/damage, var/attack_verb)
 	health -= damage
+	user.do_attack_animation(src)
 	if(health <= 0)
 		user.visible_message("<span class='danger'>[user] [attack_verb] open the [src]!</span>")
 		spawn(1) deflate(1)

code/game/objects/structures/mirror.dm

@@ -54,6 +54,7 @@
 
 /obj/structure/mirror/attack_generic(var/mob/user, var/damage)
 
+	user.do_attack_animation(src)
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return 0

code/game/objects/structures/window.dm

@@ -178,6 +178,7 @@
 	if(HULK in user.mutations)
 		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
+		user.do_attack_animation(src)
 		shatter()
 
 	else if (usr.a_intent == I_HURT)
@@ -189,13 +190,14 @@
 				return
 
 		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
-							"\red You bang against the [src.name]!", \
+		user.do_attack_animation(src)
+		usr.visible_message("\red [usr.name] bangs against the [src.name]!",
+							"\red You bang against the [src.name]!",
 							"You hear a banging sound.")
 	else
 		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
-		usr.visible_message("[usr.name] knocks on the [src.name].", \
-							"You knock on the [src.name].", \
+		usr.visible_message("[usr.name] knocks on the [src.name].",
+							"You knock on the [src.name].",
 							"You hear a knocking sound.")
 	return
 
@@ -207,6 +209,7 @@
 		take_damage(damage)
 	else
 		visible_message("<span class='notice'>\The [user] bonks \the [src] harmlessly.</span>")
+	user.do_attack_animation(src)
 	return 1
 
 /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
@@ -269,6 +272,7 @@
 			qdel(src)
 	else
 		if(W.damtype == BRUTE || W.damtype == BURN)
+			user.do_attack_animation(src)
 			hit(W.force)
 			if(health <= 7)
 				anchored = 0