Merge Conflict Fix, Attempt 2

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

@@ -328,10 +328,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)

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

@@ -183,10 +183,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

@@ -100,9 +100,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"

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

@@ -14,7 +14,7 @@
 
 /obj/structure/closet/statue/New(loc, var/mob/living/L)
 
-	if(ishuman(L) || ismonkey(L) || iscorgi(L))
+	if(ishuman(L) || iscorgi(L))
 		if(L.buckled)
 			L.buckled = 0
 			L.anchored = 0
@@ -28,13 +28,13 @@
 		intialFire = L.getFireLoss()
 		intialBrute = L.getBruteLoss()
 		intialOxy = L.getOxyLoss()
-		if(ishuman(L))
+		if(issmall(L))
+			name = "statue of a monkey"
+			icon_state = "monkey"
+		else if(ishuman(L))
 			name = "statue of [L.name]"
 			if(L.gender == "female")
 				icon_state = "human_female"
-		else if(ismonkey(L))
-			name = "statue of a monkey"
-			icon_state = "monkey"
 		else if(iscorgi(L))
 			name = "statue of a corgi"
 			icon_state = "corgi"