From 15718c515de6a732d935900760e40e10296db6bb Mon Sep 17 00:00:00 2001
From: Jordie0608 <Jordie0608@gmail.com>
Date: Thu, 23 Apr 2015 20:46:40 +1000
Subject: [PATCH] fixes opening lockers, atmos locker sprite and misc logging
 bug

---
 .../structures/crates_lockers/closets.dm      |   4 ++--
 .../crates_lockers/closets/wardrobe.dm        |   2 +-
 code/modules/admin/topic.dm                   |   6 +++---
 icons/obj/closet.dmi                          | Bin 29806 -> 29812 bytes
 4 files changed, 6 insertions(+), 6 deletions(-)

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 b69cc7be2eafba36e1bca63e505536f49c80f38c..1dc010c97997e3840397940e4ddf06977cb10a80 100644
GIT binary patch
delta 653
zcmV;80&@NC=mGTT0gxnrZ+cW%bVOxyV{&P5bZKvH004NLm6y$K+b|G>&-POg$u%hI
zwpU+@1Vs+XD+n~TqP7u9XGL3epS}kfNrC?8)6E7(Go$_2t^4}$?eW>&KRs^GVxyMq
z_U_AvkK4_pZSCFOeg3rF^rEq^^PjQ$DsJy?PI)NdMcSL~rd1n%-QMlCo6dZa`S%+T
z!b;aIV#cGl7tQhSz%ScPD}%qdz1!XG?sj*-JvqtH0uxcPn1-e;#TLPb;Uo;1^oO(z
z8ci-3DVafw`5d9wqvjWeH2O|cuNA6aWEjds<L?8s>T4=vGkI&R9H5nJE#R6dN6E{c
zwZNCtg2=GyS&d77H)l1be^y&zViek2GZ>R%2j4yHnJXBRA_wCow;DX{hBx>MV&p@T
zSd<*#sCk30AZGE9a55SU2`2-Qm?@Ebq7y8E-I1has-c&p!4FKjGm)QStH78P`R$aZ
zs8f)jPHB21$EKD710^{&=3zo5$3_M^jU>lrl7Vw0MjV5GHC^(KUqj8hMYHBeFP{9*
zJMB+OHoZ$az|mdOfzcshKPWx4{GgbS%?g<Iu$=C&VkoYuxOe;-YPKGNN~R&Wf-xzJ
zzqbg_rr<3u-%K+h(tb@$_%#tKx{vWPMr25J^48K0o3WG<$@gVs+I<-j8LX@$t*av<
zgYODe`?9Qm+83xA678V`Iw-;ZF}Sa7`L;87+Vz)~er5HS7JOpOgltXKL<`y11WI`(
zgvET&ER`1YL9<j$${d*1O3&mg7?UywrRx+<u^CG#+34;|ji(&^NcZLY1FOi_xLLkI
nxnDs}g?p6$7`$~4&-d>B>2doDbV@UU*pPO2001DfnF7^u*e*(8

delta 653
zcmV;80&@NI=mGBN0gxnrX?j#xbVOxyV{&P5bZKvH004NLm6y$K+b|G>&(>2A$u%hI
zHdkMY1VIkTD;PAjqP7u9XGPm}pS}kfPJ#aD)6E7(GsETn@z#BNe0qL$4=>NnQEb$b
z-NxO2`rNEe+ScA}+}AJ7suzuYo&Jo~S8*G6bI3ypZ_?g0t5$7)bQ`yBR-O4I)9)(~
z!b;c8V#d9<H_h?y!24#^%HYp#<JNcUyY<~~U!G)Wfr%(tOvAP<#b&{~;UEl|^oO(z
z8cog^DVafw`5d9wz2-NDG<v2}uNA7FWf;nd#@`2M)z?%;7}hBTaH^EO<aw)F;F+`_
zGOT)3<I>xs8q+_2sx2@v3N5J#j7hPB?;e)Q1&m3NgYleO4W1Uk6~2HN`H&<QB?s7H
zuJ8rKEFKaLMuQ>YU?36`C6Z6HaV0P^lC(@U^pZ6Afk}5J@>6UP7?UEuozg4n6kJfJ
z^m-)6Z7l@`N^;zqhZib2Ze^g|NOIhsWZ>M05yxOjm3-iTmr%26(X2VrMJNArJ^PcA
zb?=gPuyvQTV{}N^4@&ndKPV<-y#ii)n7{6@peZiNxDWgiYBnB%N~R&WfH5hHzqbh2
zrr<5k?@SXR(tb}&_&pISI*;)%Mr26!<gKL@Heo3xlJDt@pf4jLgPFCbd9_Dm@T^d^
zFY~H>fvO>Y(Hcsif)cDBgY(+vcRPctU4L%rE2}@Z;E6R6vN6S<w!S8i$`c_>=ACA#
zG@*BzrD9U%z_eDnCSSmqlsPC}r?87nSW3xScVB8e<lsj-FF!t5M83q${0_?f3UVsk
nqx{F<t$TcZa1Srf%`Z^>FU%*Xac%$rAOJ~3K~#9Nr2@}!LH|HH