From 784748bdcf90d09c57566cfa109388b45ec49a1c Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 9 Jul 2021 13:36:58 -0300 Subject: [PATCH] Fixesan issue with two custom items (#12165) --- code/game/objects/structures/coathanger.dm | 2 +- code/modules/customitems/item_defines.dm | 6 +++--- icons/obj/custom_items/ana_clothing.dmi | Bin 1014 -> 1128 bytes icons/obj/decals.dmi | Bin 205966 -> 205967 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 86dc703e9d3..d3368bd443c 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -5,7 +5,7 @@ icon_state = "coatrack0" var/obj/item/clothing/suit/coat var/list/allowed = list(/obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/det_trench, - /obj/item/clothing/suit/storage/forensics, /obj/item/clothing/suit/storage/toggle/trench) + /obj/item/clothing/suit/storage/toggle/forensics, /obj/item/clothing/suit/storage/toggle/trench) /obj/structure/coatrack/attack_hand(mob/user as mob) if (!ishuman(user)) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 3095879e3aa..8b0c46cd403 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -131,7 +131,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "ana_uniform" contained_sprite = TRUE -/obj/item/clothing/suit/storage/forensics/fluff/ana_jacket //CSI Jacket - Ana Roh'hi'tin - suethecake +/obj/item/clothing/suit/storage/toggle/forensics/fluff/ana_jacket //CSI Jacket - Ana Roh'hi'tin - suethecake name = "CSI jacket" desc = "A black jacket with the words \"CSI\" printed in the back in bright, white letters." icon = 'icons/obj/custom_items/ana_clothing.dmi' @@ -2122,10 +2122,10 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "coalition-fisanduh" /obj/structure/sign/flag/fisanduh_coalition/left - icon_state = "coalition-fisanduh_l" + icon_state = "fisanduh_coalition_l" /obj/structure/sign/flag/fisanduh_coalition/right - icon_state = "coalition-fisanduh_r" + icon_state = "fisanduh_coalition_r" /obj/item/flag/fluff/bian_flag //Coalition Fisanduh Unity Flag - Bian Quy Le - persephoneq name = "coalition fisanduh unity flag" diff --git a/icons/obj/custom_items/ana_clothing.dmi b/icons/obj/custom_items/ana_clothing.dmi index a980ec7b93e4f161831fd04c09bb23cba51a42c9..f539b1170dc886e5233450a1c4d8e29c883a42bf 100644 GIT binary patch delta 974 zcmV;<12O#e2j~cp7Ycv~0{{R3^x%>Cks%inJv~sz$H(8_-$g}Q>FMd(+S-vy9u?X) zzk~n)00DGTPE!Ct=GbNc005DZeQ1B5Uyzzdiu&SGglZF_Oea=LXcU`CMuo zhCGaUh_yTq0X{oWm#eA5@;vX&!Qa4g!tur08ekisJsae7Z6~9$U7Vkhr{7;I2?C} zuR__>TJr(i*t5e|cCEnnU)c9s^8xI?kb~E@&1mX?Y-Yc{EgwLTfkzSYz8)Q3spRkb z^=Bv|r+yMQJMU=25cQh7^0@Ja^{ zfl_%(KJZEh>my*y2WXwm$|@tiDZDu!zz!IS0F^iA1DDJD$FGm~%SHI|8gI@Au6Kyv zJvbn^rj+=Q1R%%9aROqz#;6F05u&(?cM)(6S5*K6`89GpTmXO0KP;zzC4g3-=X4H- z!{PYRXzZz)zWelEqg9%$z}N5)c;iIBDi`5g^|njlWF* zkAN;f8)5S1e?fnMycXMZyZ}<5i~#pQsBr3btD>ifQR5HgW;b`(G4ncV6r6^(P3>>#sI2 w3sA#!j?*myR{i_Y0#^O|y194z|Nr4PKanQ#bGRNY000UA07*qoM6N<$f+Azf!2kdN delta 859 zcmV-h1El=u2=)h%7Ybkq0{{R3;-rduks%inMMYXYJy6HT$KT)I+S=Ob>FJS59u-MT za(n;)00DGTPE!Ct=GbNc004-QeQ1AQT#8U_f?IWIUS?W;Q7%y?L)8LlTt+J^xca$( zJqZBRGDVcF05IJE00PlTL_t(&f$f@&ZmTd1h2#7|mjK&%|98E%pf$a`xFQcLhAeOkdG&i|Dfp; z!0pyaa4zJW-j;6NTgv%ot4%-VUjZn@A1|;4xB;+) z_ax2$ub?``MfEoUT*!aC7YncyfKxsR7(keTX?p+o{CJ-xq4N%Z;!OciGyHs)*jIl+ zz^^fB(*QKhAq3u}0_gE30e&K&If;x^I?L~sJr2NYW zusmmc1%ShU^Zmnbh{mOeuK*1E4&q_}`2=bHF9*foA`UlUqA2>pRLcah2002ovPDHLkV1nR^mBIi3 diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 5e0382b5d8649e23be1f5655e675bfa7a5dbdd47..4a610be498fa1b32748b4cf54d2fc12ce1315573 100644 GIT binary patch delta 961 zcmV;y13vtY$qbLl43H!Nw2>tte@Z5j6{k{>#5WlicTKu9J1~h|BFiNGp9e0^LVP%?3AHMn;l_txVD1&*>nMW%0)(9a|j?kI0JbR z)$NDT3+swu^uk89J8Qaiy&i@Sj>IeQgDSluBQ=-{h~95V&=ulT<8=jXH99+*L!+BP z_vlsn&tHGfJ;eAPxCmVGz@^$%>(%C$)vKizeXu}!T$DRV#~KRtf1C`%^JPO0FehvN zW>TrRlac4(beKVZurY6GU-vqdE;Dg~Ie4GE?mEU%^t(e7LGQ_bgS3X3K*#TxJ5ssK zvE_q`B}iNZGNxLO_6imiJ~?1eJ%hR;#!h*grC4=>eG&BJr4@vKTXU@_t&ZOap zqlZ*TKWGzZ>3$Qco9F1;$TAvKFQ{ErzjGoMN^LzbCH>wxe?TEjCD)vyu8loPTjMho zeY-B`UwT;$hUx4F(^T<;X{cB%+6>z4749I1I#a8+q15TVrOx78>MXtm9Q5%JaIlPq zfP-Z$95J|GUN*sbxNUF?IAyPArvpVGV=IIW=e5Ih&HbSUoy0 z!0}MK076{WbKs2%dvu-QZ3j{dvNdu)8|GrqLJ)P!6KQw|I+Oa_(nQt+xw5~0NPj0u zuNUafLx%%?$ jp?diGxcnC@-+gpklL}^o-~)%?0|AHN0|K|;0|Txgwpie4 delta 960 zcmV;x13&za$qbIk43H!Nvymksf4WR0JC{mD65nK8+%@Ua?7$>;i7c03KuYJ;uTP;5 z%Rbw{78x~?=i!SFf&k5r&F^3Sy#LnReZ61qQ3`Qtw$1HNKQ9;G$=A?qo14vY5s>;& zk3ULV**5Ftq7xYL`2E6oW+^Jwk)R4CE+Y?=`i&h`f60PwCkTR| zqk-L^2P~X*sSHjJ*dx?XG8c#{o7wAW?m2o)Il{j?-8$5fi;*43dqN{TLabP@gXlPY zirCfHmuzm93y%?|X4`yToj;q^X7zdXd3C#5uWp}x*5|)n1uTfk2^T##&%F}r!~f@& zfG4QLN%aaJVHD<3cc0UMe^Z-*Qnl3mBPO<--{J_9!?hLE&!!7FQmHcOnmK@s;0)wN zRJR`{FRUwu$qO6RZmj9n^+w3=9Elg;J5_o`M(VIs5WU}!psU2G#p?>X)#&1A4vlUG zJ)&3Xzkd6pj1c2n;39A>nQOCc)~n60s~1Zx`e1?dxTp+}4lPs~e>oY3=hKGlVNTZk zvq`1mP9~m%(|!j1&c?i^eckI+y3WJ}=HO%Uy6YGx(eDmj1idH!1JWC20v*0%8A#;{ z$Da2pmLPEzD41G3+ACO8_~?K^^#tmQ7$*UP;E~hyx(K~Nu8YuH;;n*_>OoEUp5q=O zfLF-@4nxod9YpZ7f75R{hX9s4`$&llMNI{g-vu*hN%a}k)7^v5P{U3iY!}ktz!R%` z@N^mst(=pd(bLg3xOpaZCy!mlAbA3fr{;klQLo=qDH*JvNkbD5@{siYcj7GV;zSyb zIC@Bx^n-Q=E#2>o>gGB6KC(;()eCA@)$g2$l~Uhkrlj9He=}6VR7=Y#>e@J>^esM8 z)wk<{{;ii)HcV%qO;g2Z(@?Qkv>CM7t2{snZJ}OoLut@`OM}I?G+2BKnDy}xFk41L zz-$={2TXm~>5~vsA9e<_Cr~&1Kv+!zWNT>=+`Mo)a#l!Tb}edq7?cJ@Ej0 z_GMtbbyuMTe==p1?sylUzrqmVk86yPTIRDCQ%Aq##8QbD)-b4?Q*&0Fvnkn&)uRIg z9QUmYAjEY&2i~Z#M>iPWb|Cd2w?^(4!(1F$2%>KJOd1}7PNe>}bSB$OuI{cM(%(qZ z%LTeKr9#))=J+1sFbQERSPZ-S4A=Kp(A&G+HEby1A!qoEuKQ`mzc;TedehR!=F7Lc i=I-nL@;?x7eGtb0?zw~E1Bc-Q0f*rO0=MA<1Fj&4;o`*r