From 774f7e31007ccf11be0d65ca763dc2901ddbff78 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Tue, 7 Mar 2017 06:19:57 -0500
Subject: [PATCH] Fixes things having latches that shouldn't (#24715)

---
 .../objects/items/weapons/storage/toolbox.dm  |  19 +++++++++---------
 icons/obj/storage.dmi                         | Bin 58609 -> 58611 bytes
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 8c495a360f8..3ecb5bb383f 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -13,22 +13,23 @@
 	origin_tech = "combat=1;engineering=1"
 	attack_verb = list("robusted")
 	hitsound = 'sound/weapons/smash.ogg'
-	var/hinges = "single_hinge"
-	var/has_hinges = TRUE
+	var/latches = "single_latch"
+	var/has_latches = TRUE
 
 /obj/item/weapon/storage/toolbox/Initialize()
 	..()
-	if(has_hinges)
+	if(has_latches)
 		if(prob(10))
-			hinges = "double_hinge"
+			latches = "double_latch"
 		else if(prob(1))
-			hinges = "triple_hinge"
+			latches = "triple_latch"
 	update_icon()
 
 /obj/item/weapon/storage/toolbox/update_icon()
 	..()
 	cut_overlays()
-	add_overlay(image('icons/obj/storage.dmi', "[hinges]"))
+	if(has_latches)
+		add_overlay(image('icons/obj/storage.dmi', "[latches]"))
 
 
 /obj/item/weapon/storage/toolbox/suicide_act(mob/user)
@@ -54,7 +55,7 @@
 /obj/item/weapon/storage/toolbox/emergency/old
 	name = "rusty red toolbox"
 	icon_state = "toolbox_red_old"
-	has_hinges = FALSE
+	has_latches = FALSE
 
 /obj/item/weapon/storage/toolbox/mechanical
 	name = "mechanical toolbox"
@@ -73,7 +74,7 @@
 /obj/item/weapon/storage/toolbox/mechanical/old
 	name = "rusty blue toolbox"
 	icon_state = "toolbox_blue_old"
-	has_hinges = FALSE
+	has_latches = FALSE
 
 /obj/item/weapon/storage/toolbox/electrical
 	name = "electrical toolbox"
@@ -134,7 +135,7 @@
 	desc = "A huge brass box with several indentations in its surface."
 	icon_state = "brassbox"
 	item_state = null
-	has_hinges = FALSE
+	has_latches = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	w_class = WEIGHT_CLASS_HUGE
 	max_w_class = WEIGHT_CLASS_NORMAL
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index db32c6a4ec29921e352fc34a34e7daa02feeea12..afdd5c3630781e7a95a603a26694407347da1d87 100644
GIT binary patch
delta 1107
zcmV-Z1g!h<$piDr1CS&Ed66YBe}J<9m*kcpzyP2m_UU_&7)!2{{i_{c<eA^%V?VLW
zkHwd#U!Px!$FI+e6~`pO7Z1hl&)18KwN$w+9*R#li;I?}Y4i4<lqqxZP<$|CyMb)?
zVR2DOOvOX7TwK(Vdfxti1H(pT$O(G{Y{v${5?ctHd?k#K>nK@#gL36|e`WnTOfjoe
zAI8Kv(x8%!qm($QTors*cA{@xJ4&q~;N~s)%8qpnC_RdAblo`0445!;6sNBy{ou&!
z7dA{CN5HA8$xx$fdJyLj2dgAu7ID(FAeBc0s9Bme_p;$i*P)IK73sQ*!nLIY7_Iu<
z>3h}^QzqbWCXQL()Wk9Ke~pR-@wsQfqiTr^ACY{P95&)n^4yhYUccZwflsPHqzXRG
z9;=^Z57tjHjB#+d!h^oO;lDZRbuO_TqwZdbY7DxDD07^;SzJ`?Xeu6x<=y4-?ocQV
zbm~I4dxDqC%jM<Xe%6JxhiZP$l~{5Ro7j#~@&v(_hD-t;B6yw*FzKbMVkaw(lZ^!A
zhwrotiS_WG@quhd4d0zBaC@$R9wP4q^ayw-u!IGW%GXGp|C0d%9)Gw>d~-VBKL0CW
z93~ADL&sRavTua3oI%;P>{KpCO0A)$<bKE#j;Eg78LRg|q4^HiBe1j!wliV#6HLM@
zo+udmId*gzvch~N$ny*}dPUoTx?Ao*-Rall91!nYtOV@1BbxxcOm}P&w*q>K9c|fX
z8+sHEk&teRS5mRJIDZ(-Ur3q9AM<N=6~}YJ`-*|Sb7p&>ftgv`vaa75ZdiYe&um79
z4m)-wx=YM#VvAo6m=nxwJK;+6A>vA_9qB>059^U^CE5{akbADkVYzcg@iq1A`R5-`
zkNSGjV}-67>l&DDY_ThF>U2OOadRL*eIHPX-E$q@0C4jidVj{Tkt{Nw*M&8F+A0PQ
zj1vM@Ol`|O1UBq3-^pPEaVv=d0>8YLr@j0B=sWOT134Lv<!%(G&(7j#49C=lTtY7#
z&Mi3@H{?B7kKWL$2>9I|ZrljCh!`NoyATPeL^jf3LI4~tG7reJq!pmYYJ;1w(In-T
zCFxuaJ)jiv&40wsg|$9R%q@Kz_3>n~!afHVniCDfe#djYbMl*gH}BbHz)d{c7<}l(
z2Hmb^jQ->Yh`S@Pw{IHXA&s8z^ddaaz|l}sz96~pfG({I2~f+M5c!ZJCHAkGd`0np
z$)3Ia>*OnW^<+C>%6~-Y><xc|J_a4)=ijOq$I~wabbkUzWYF!tKj1fm3lT^%Gl-?*
zNGTyH{@W-><JGz?sQ0Hc353&*)I(|}^{Gz|!I`irBUdHTe$KpcBSQi|Xln0|B)wyQ
z_wTb$ntUY|8Pg%970mTe*=-^tt)2MBap@@AR(~0W(ZFzyGQe;je8-a=&5u4;e=MF}
Z9*f7X&kKux0LcMjmZ$CsI<uq%P2eI>A=Ll?

delta 1130
zcmV-w1eN>q$pi7p1CS&EcabG9e?YSUmgJTozyP2m_UU`D7)!34{i_{c<eA^%V?VLW
zkJXolUmu^U`>&6SHK!~wRCm?&&zFm{jkwZQch#q>#aYYJwB_ZWT&Qq$SA8&KyMb)?
zVR7ap<?60lF3##iJ-_^Z1>;s_$O{JqY{v${GFu3nf)hr_O_Cy^LAlk-f6DrGm{L)x
zK8~47qCq7aPdRf|ITu5>>O|kV_LN&gz|C6<&W?2rC_PDNblrF=44ANR60ff&{opC+
z7dA{CC%~!QWT??KJ&5;+gE`5VMZ7dENR`n5YL=!gy=>X(I@FQDk*>QWTwBV3(cJG|
z-?NsK3jv2SX)OAtCXI!!e^e|=C_MunRZC*{h!l#HxRrpCr>;En`UT$zd{PAxIrubt
ztbUR`SU<%urorP1kNWn8|K_CExy*J<x_f1+G3XMa%yH^!apu_5RNYm}oAc$(p->*^
zy$fCM37#*{m*;!?Ssyn6s`))TvE(5(vmKL^34$#Rg#<iA3_Kaqe@mBRFKbSdO$6kJ
z@3fDZ_3)qZfow+&-<&FNeX4*SB5wrr2zVo~gawew*GOIdE00<1KmxPcz6fl&BSO0M
zjtJ=%JR+o9@raOa$u@c?p?N>xKL0CW93~BuV#ip(a%hCHoI%C5>{YHL%B`Vh#r;qw
z9M3)Z6ISnmLh~K2e@9?xA8lvi_9vKxSA3^n?C03g7sv|pl_1YE)aVs$2kLIQ19hk0
zkoQ2mzhEoCjytl6z{_;UX7OvFr`XY!L$R?(@t6qdrg$xmgT=vU{zA$;{+QpecbrZM
z?+XU{&YA6j24-e$%esDNxMBS<KC=ZGI_%iB=q@p{nJs=fe_&29v+aZ{EyRQ?t@fk`
z-9D^GvXx{<ph520k;ii9jN)tR+4Ijo9`5z^q{j-K8|xaFZoFU@;MD1WM&jl`fcie7
z61(R*yaC|mJM@HOBUxlVua6t}v@XQ}j1wYOOl`|O1U4Kn-zjkmacfBt0>3=3-uLd?
zqwl~s4di4vf30?-IDK}OMq@bTHkK9i!r{`AhjBw8fc5AVy-0xH?cv6cfQyI$V!Vrq
zfJ$T&4JJmw;S%$JJWE;udaO432^&pPX<4$)mDmGHk<d)+ecb57#M08YQ6EocD;!Gn
zv3aLq*zb5QcTRq_@8&)G0=P+Fn_`H)*r?mpj48bPe*xm=NbK#KCUi)n7dpKN4>WKx
z)U2M6+;>2)tdAK`%c~HDSQ2Fp&xL}c^uJ_J-u`(CPM!nV4w&*E5juIp-=L2{hxqBY
z>c#W)3jv+L5gBy5?+^Ix;9~-k%nV}bI8n|>ivKnW(s;H01=Rb~nFPXVN9rLplls)B
z#OO`jSFRGf71DmryzwJL0zYVKZ;vFsV}G}AvrnFa6N`-LkkSg~dZ_F+iILV$LgRVW
wLf<T191RSYBm)fhF?2lH(fsIh^~dVr>At%E`ndQ9$A@B*tMcwqv!(=1;O-$swg3PC