diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index a447852b62c..4f20d4e44bf 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -242,7 +242,7 @@
 			src.attack_hand(user)
 
 /obj/structure/closet/proc/place(var/mob/user, var/obj/item/I)
-	if(!src.opened)
+	if(!src.opened && secure)
 		togglelock(user)
 		return 1
 	return 0
@@ -301,7 +301,7 @@
 	if(!usr.canmove || usr.stat || usr.restrained())
 		return
 
-	if(ishuman(usr))
+	if(iscarbon(usr) || issilicon(usr))
 		src.attack_hand(usr)
 	else
 		usr << "<span class='warning'>This mob type can't use this verb.</span>"
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 9f140649769..a4510966df7 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -159,7 +159,7 @@
 
 /obj/structure/closet/wardrobe/atmospherics_yellow
 	name = "atmospherics wardrobe"
-	icon_door = "atmos"
+	icon_door = "atmos_wardrobe"
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/New()
 	..()
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 73b5e59c713..17c8ee52030 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1770,6 +1770,9 @@
 				if(delete_mobs == "Cancel")
 					return
 
+				log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
+				message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].</span>")
+
 				var/area/thunderdome = locate(/area/tdome/arena)
 				if(delete_mobs == "Yes")
 					for(var/mob/living/mob in thunderdome)
@@ -1781,9 +1784,6 @@
 				var/area/template = locate(/area/tdome/arena_source)
 				template.copy_contents_to(thunderdome)
 
-				log_admin("[key_name(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].", 1)
-				message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the thunderdome to default with delete_mobs==[delete_mobs].</span>")
-
 			if("monkey")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","M")
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index b69cc7be2ea..1dc010c9799 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ