From bc44b8e3c515a580e613ad59ae0f87b9efc02e06 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:18:43 +0100 Subject: [PATCH] [Hot Fix] WHY WERE THEY USING THE ONBJ FOR BOTH AAAA (#1620) WHY WHO DONE THIS WHY WERE THEY BOTH USING THE SAME DMI FOR ONMOB AND OBJ ## Changelog :cl: fix: Drill Hats ACTUALLY work. /:cl: Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- .../code/modules/clothing/head/jobs.dm | 8 ++++---- .../icons/mob/clothing/head/hats.dmi | Bin 2044 -> 2526 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm index 9d27e0b7e2b50..b79ca871cef6a 100644 --- a/modular_zubbers/code/modules/clothing/head/jobs.dm +++ b/modular_zubbers/code/modules/clothing/head/jobs.dm @@ -2,7 +2,7 @@ name = "blueshield's campaign hat" desc = "A variant of the warden's campaign hat recolored to match the Blueshield. Made with durathread to protect their squishy braincase. It's padded with nano-kevlar, making it more protective than standard berets." icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' - worn_icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "bluedrill" armor_type = /datum/armor/suit_armor/blueshield //same as the Blueshield's default beret. @@ -10,7 +10,7 @@ name = "captain's campaign hat" desc = "A variant of the warden's campaign hat for your more militaristic captains." icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' - worn_icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "capdrill" armor_type = /datum/armor/hats_caphat @@ -18,7 +18,7 @@ name = "head of security's campaign hat" desc = "A variant of the warden's campaign hat for the Head of Security. End the blood-feud and team up." icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' - worn_icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "hosdrill" armor_type = /datum/armor/hats_hos @@ -26,7 +26,7 @@ name = "representative's campaign hat" desc = "A variant of the warden's campaign hat for your more militaristic representatives." icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' - worn_icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "repdrill" armor_type = /datum/armor/head_nanotrasen_consultant diff --git a/modular_zubbers/icons/mob/clothing/head/hats.dmi b/modular_zubbers/icons/mob/clothing/head/hats.dmi index ec18da30c75122e3aa3463d8ff19be4e4d6d9560..140c381820557f7dbaa4d0528a6f3f22f3870f2a 100644 GIT binary patch delta 2268 zcmY*X2{_aLAD>D>ri=L{IYN!fQK1~ee>n85k&l+nl@Q$7g0PV4}gF>NbG}_0<=MD(O zxK5-37Tc{14UF7w`CFac=Lk=*vhZ+qadW4-y9C}1T5opMcw7D!>#yamuTB~9EB5kV zA07Xg;mmq!xP3sA_{wX@k{>1I0Jn$a~`5a7ffzgsm2s`RoZEp+RG z02?QGOs-a{!4|r-Ip~aYhHmas^Xl0C{5REZ^#aOdIn6YzZASBW*&P+_Xw%z;+VUH# zky+ znLP9`|B0im7UdZCz_aRO#2>#{({XGc^>P#t^H$p`XV=bu68zvl1E5?Q(Qpc=WX`7Z zqdu!X8@0c%Z}ZO4FVw1_muXL1dTOH}V+KM=r~Ks5vKk;gHZ@)*1fRI;oz>6*NW9}$ zN#@vHenm34IgPGoEsN}^ghd+Qmav$Tht7mjF%WUgy)xE!Vb?{CFhTC!in-N8t1 z%`HR&pi_yA)}4e?cY$iB#qQe0Zthglv5w)M5^^REKP-+r@c;ACjk7P#i4*w0=)NM0 z-a1Z3)8(U=Pd9&!300Dcc!Hm9z%Lk z73?UIX<0AM7Z8S&^L!5qL*{+0yUk+9orhniZF5yoh`9WeJjXGM^OcBlJ6y=X<1|&D z%r&Z=uxDusif_7*#^4tly80M|rk}rT%2LeEM0#UWZOn!0pQj*yYGqIDnV1ajUEMU8 zMLlE?)Dkwq!+*RPxjlrI><2vl31IHdk*J8zxgV5o>>4GTAg^p$MPoF~(gtXq99YVa zB(!xBzGra-nE!6~>Ed>s{utmaGmg9sh*bnT+e7)&q6{+EyK5ZB$Xh~FrBlTCnm(rS zh*Ug(SjVyhV|z_x0y8f)KQ5J}9On`STRB4j23bV*mItHj03xFn$mi<6M2O?&1mV5LUQo1RF$*IcB?1xU|F=n zyZqt0q1dll6NgNTSKBMRW=G4WZh3HBI+?MwdN=?mE@e-T#QyU}*{1x7AK4e8&f*n4 zc-x;iYnq28@1#TJch0vLAL3xL74J1PaQZx z9?})O;AoUYk6v(^BKlrnDJ67MpOg@sBv&=;QZxjtV`3T!Fh}KyS|ODMOQ*Ry&Hb@g zii5ka>!t+P)9sFS@Y&xyrvlE;)W(F*Abdw;Gqp@~j|&q&p>c}vsg8X*m?h^j*u~L| zPw}*>9#vLxVtjEVm5rj(r|l_8ebht?gTGp`X9=O*ZLf+ex^=q?-`aK(8opI{%qt54 zxf;7(ACO8tVj%^O!!CT#uqsQSCRHXn>vNgt4~Ci>mo3l-B%>G!_mtO7NL6TPXm`13 zygOZ)-2`7U1Dl$P)P1P8ZC;eQ6?+&r063XBb__JMm3!Q@&+%?3Gi+(6z6m~n+rYQB zrL=iekbvcU6Y^!^jqTG?>w5_fqqMv8u5Qs6OG&YWu%gn;V;&!Y_dz`_8MGhKDzR?@T;uZf*`L zOEX)?Ol9>JeKGVKlX%cv{Klp+?pznxI`H`1roK|>wA7X)D%Dq0!ODQ^C02f84heH3 zvsDj}_vY{14um*xc&#L9jS3w*E0mB5EUE`d^LYxK-o+y?;+IIU?~aaQvA7?;W-?1h zoTn^)txm@#hcQiaqVd0_fIw%?wYRrxLCFu54>Bl}EhQKhL=o>4!mt;^+Vl2>Apk*0 zgJplsIRBc0EaN4GGVU%YRr5io_$M#$C-o-bWoanjp6*Uw@VE(RjA&i} delta 1783 zcmZXS2~d;g7KVSIY%ZWuL1eWQg#w1DhE+f*5&^>^h%6;(M7FR=K*IhrLJR1n2%;2- zL>LgcEKwqffe>1hN`TtP(h#;#Ws3m<#6Xjf{Do;d_RjrgzM1!Y-#qWkdC!^A+SW8J z^7TgS-*a>i008?vF1TF+00raStEL11fJqpteW!qznz}1N^Iw<7ey$Z62sqf;nVXxV z(P$(R$pC=L(gqqBR}<>E11O|i^7aSLE{sR+6pW03pcJ==%q9QnmO;uli|`Zx1vuh8)OHRO9uP$qJ>e9D(NkkpLYKAxTZNN=<++g3?;u~*OkO?v%}#wzH6#S_EvdebgXFD zVqSW|JYh7-L%W2Ssia8E;TUT8HvoWgvxnQcfHcC&bY`d);?q~_Z*D2v#%me(g}|$G z7u>Pu!7KB1O@UXNjvOY{hKOW6`88oIN@sE;@nwn%QGhV5;tmlw%(pHzQSb$>hQ76` z=21uWi2gNNbFM(*el@=HkAxvw?AaxeCQ?68*!!}+$_IJT@Xdxv!HGRmn!HxfSb{a# z^XhvdE7k7C_RFG}hyui;5<{m)%hn$xWj?W>$u;m*hrw~_T?1{)P_s|3ffE{EkrKUY z9GsFQqaIR~z5f3GcL!8V2?Wc}+mGLV(My5W_`4(i`{3-NM>mf~t;Rh`x`?MNKHoUF zPct&EPj)iuzgIHeb82(ZC|%H_-pvrmt66;MYL7a7SN^ywIjaBW z5~5!JaMh1#T7C?CvG`i?P_tgS2rG6CPSPwU*{q`#x4DZPsl@l)+ z%MkZ9?R>JiGF!+$TPn7DzneujV{12-e~nJx(_R9GJKKzp%f(>5oT#7vy{a0ogq`GM zbb%SR;*=Q?CD*O)i-LUG7NKYiQ5_MgpO$)sL$dYN;2G4<)3n8&)gO1( zn&4HzuYeWb8O$A=01(TpXq&2yVJvl`l1As2>FAF2qrPdv6wAq;UE$0e#>U{-d@Q>) zIgCcji5FwDUO3E3ii3zG>M1`WgG~Xt-o~BLT@w2TC-fKA>QhI%>+-j~c zqF5BTsXonp~MeI|O`Lok4CfkyF7!W#x; z{PaoV!{5rI47wCRQ@iQQVv=dpPr5PTViQ zETqcPr$7v96CK&doP-UFzk0y35c1kHc|^t#k~D_u<}ClvGDXjcFtn|*XmeNz6cnY4 z987da@x$x~6655BhoJnKyal?*_?hFC*r+sT3q~$7CwbfP?BfNS5Aj`OObM6HB==8J zIRgCMWU*Jy{?7Yn+62qXqv2i&l)DO%iKY8^lg#aP16EKspW%b%;<>>aX$MYN(!{J{ zD#a4dMlcIk3;Za&H?y+Y5%v(hTHlWvJ2=9hX`e!MS#*XHRdTA^_O<;nqxjG6uDwe< X;Hz_IUENS;_sQeDw_BU*H#h$T#YBS%