Manual merge of head.dmi.

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

@@ -174,13 +174,6 @@
 
 	return
 
-/obj/structure/closet/attack_animal(mob/living/user as mob)
-	if(user.wall_smash)
-		visible_message("\red [user] destroys the [src]. ")
-		for(var/atom/movable/A as mob|obj in src)
-			A.loc = src.loc
-		del(src)
-
 // this should probably use dump_contents()
 /obj/structure/closet/blob_act()
 	if(prob(75))
@@ -267,10 +260,6 @@
 			spawn(30)
 				lastbang = 0
 
-
-/obj/structure/closet/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/closet/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
 	src.toggle(user)
@@ -308,4 +297,12 @@
 	for (var/atom/A in src)
 		if(istype(A,/obj/))
 			var/obj/O = A
-			O.hear_talk(M, text)
+			O.hear_talk(M, text)
+
+/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
+	if(!damage || !wallbreaker)
+		return
+	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
+	dump_contents()
+	spawn(1) del(src)
+	return 1

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

@@ -181,10 +181,6 @@
 			usr << "\blue The [src.name] is closed."
 		update_icon()
 
-	attack_paw(mob/user as mob)
-		attack_hand(user)
-		return
-
 	attack_ai(mob/user as mob)
 		if(src.smashed)
 			user << "\red The security of the cabinet is compromised."

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

@@ -104,9 +104,6 @@
 	else
 		src.toggle(user)
 
-/obj/structure/closet/secure_closet/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
 /obj/structure/closet/secure_closet/verb/verb_togglelock()
 	set src in oview(1) // One square distance
 	set category = "Object"