From ad398717e91098616df4282fc3de3b0a04b82f78 Mon Sep 17 00:00:00 2001 From: Xantholne Date: Fri, 21 Apr 2017 18:14:45 -0600 Subject: [PATCH] Fixes subtypes --- .../client/preference/loadout/loadout_hat.dm | 18 +++++++++--------- .../preference/loadout/loadout_shoes.dm | 12 ++++++------ code/modules/clothing/head/misc.dm | 14 +++++++------- code/modules/clothing/shoes/miscellaneous.dm | 8 ++++---- icons/mob/head.dmi | Bin 231527 -> 231529 bytes icons/obj/clothing/hats.dmi | Bin 100529 -> 100529 bytes 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 82d215e7b4f..4657893bec7 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -97,21 +97,21 @@ display_name = "cowboy hat" path = /obj/item/clothing/head/cowboyhat -/datum/gear/hat/cowboyhat_brown - display_name = "cowboy hat, brown" - path = /obj/item/clothing/head/cowboyhat +/datum/gear/hat/cowboyhat/brown + display_name = "cowboy hat, dark brown" + path = /obj/item/clothing/head/cowboyhat/darkbrown -/datum/gear/hat/cowboyhat_black +/datum/gear/hat/cowboyhat/black display_name = "cowboy hat, black" - path = /obj/item/clothing/head/cowboyhat_black + path = /obj/item/clothing/head/cowboyhat/black -/datum/gear/hat/cowboyhat_white +/datum/gear/hat/cowboyhat/white display_name = "cowboy hat, white" - path = /obj/item/clothing/head/cowboyhat_white + path = /obj/item/clothing/head/cowboyhat/white -/datum/gear/hat/cowboyhat_pink +/datum/gear/hat/cowboyhat/pink display_name = "cowboy hat, pink" - path = /obj/item/clothing/head/cowboyhat_pink + path = /obj/item/clothing/head/cowboyhat/pink /datum/gear/hat/pr_beret display_name = "beret, purple" diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm index f39b25aabf6..89ccd952065 100644 --- a/code/modules/client/preference/loadout/loadout_shoes.dm +++ b/code/modules/client/preference/loadout/loadout_shoes.dm @@ -26,21 +26,21 @@ path = /obj/item/clothing/shoes/centcom /datum/gear/shoes/cowboyboots - display_name = "cowboy boots" + display_name = "cowboy boots, dark brown" cost = 1 path = /obj/item/clothing/shoes/cowboyboots /datum/gear/shoes/cowboyboots_black display_name = "cowboy boots, black" cost = 1 - path = /obj/item/clothing/shoes/cowboyboots_black + path = /obj/item/clothing/shoes/cowboyboots/black -/datum/gear/shoes/cowboyboots_white +/datum/gear/shoes/cowboyboots/white display_name = "cowboy boots, white" cost = 1 - path = /obj/item/clothing/shoes/cowboyboots_white + path = /obj/item/clothing/shoes/cowboyboots/white -/datum/gear/shoes/cowboyboots_pink +/datum/gear/shoes/cowboyboots/pink display_name = "cowboy boots, pink" cost = 1 - path = /obj/item/clothing/shoes/cowboyboots_pink + path = /obj/item/clothing/shoes/cowboyboots/pink diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index ee16f4129c8..e8b6ab50d92 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -188,25 +188,25 @@ item_state = "fedora" desc = "There's a new sheriff in town. Pass the whiskey." -/obj/item/clothing/head/cowboyhat_brown - name = "cowboy hat" - icon_state = "cowboyhat_brown" - item_state = "cowboyhat_brown" +/obj/item/clothing/head/cowboyhat/darkbrown + name = "dark brown cowboy hat" + icon_state = "cowboyhat_darkbrown" + item_state = "cowboyhat_darlbrown" desc = "For the Rancher in us all." -/obj/item/clothing/head/cowboyhat_black +/obj/item/clothing/head/cowboyhat/black name = "black cowboy hat" icon_state = "cowboyhat_black" item_state = "cowboyhat_black" desc = "This station aint big enough for the two ah' us." -/obj/item/clothing/head/cowboyhat_white +/obj/item/clothing/head/cowboyhat/white name = "white cowboy hat" icon_state = "cowboyhat_white" item_state = "cowboyhat_white" desc = "Authentic Marshall hair case. Now ya can protect this here homestead. Navy Model not included." -/obj/item/clothing/head/cowboyhat_pink +/obj/item/clothing/head/cowboyhat/pink name = "cowgirl hat" icon_state = "cowboyhat_pink" item_state = "cowboyhat_pink" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 9ad55d65e7a..923a8b4e5ab 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -235,23 +235,23 @@ /obj/item/clothing/shoes/cowboyboots name = "cowboy boots" - desc = "A pair a' brown boots." + desc = "A pair a' dark brown boots." icon_state = "cowboyboots" item_color = "cowboyboots" -/obj/item/clothing/shoes/cowboyboots_black +/obj/item/clothing/shoes/cowboyboots/black name = "black cowboy boots" desc = "A pair a' black rustlers' boots" icon_state = "cowboyboots_black" item_color = "cowboyboots_black" -/obj/item/clothing/shoes/cowboyboots_white +/obj/item/clothing/shoes/cowboyboots/white name = "white cowboy boots" desc = "For the rancher in us all." icon_state = "cowboyboots_white" item_color = "cowboyboots_white" -/obj/item/clothing/shoes/cowboyboots_pink +/obj/item/clothing/shoes/cowboyboots/pink name = "pink cowgirl boots" desc = "For a Rustlin' tustlin' cowgirl." icon_state = "cowboyboots_pink" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f41205fb0fd02e1bd62b1ed40d79180c72b920b4..3f37086edb00541934e6c29487bceb6190a79949 100644 GIT binary patch delta 59 zcmaDpf$!x6z6mOfPd2JvihqH?fLcR`Sj!enWO6EYd2WxEoc_xY8T{U N1Y)M`f?UiIbpU1Z8X^Dy diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index abcd031c8eddea6b4eae2f2d4ffd852429bf2c66..d1b9bb901fca018e7d774f7a5a2dce75beaa7ad0 100644 GIT binary patch delta 2011 zcmV<12PF8hkp{7m29P^{liM~7hR?gd!joR(&Z^CIFP(HcIV8Pwdey)rEMd(L1*EKa ze|-;D+c_p4XB=0t7(#m(?GC{`KYC>hsqx_j}ePF{~a}pMHI~znjG7e)YKe z{kQwOo~7&a{7=f1dG)yZKu$RH>^$cW_jgt_tsYm+{oPi{^ZfUJne{`NNr`hiXv}P~ z#L%jAH;LNB?IN_1 zPb9pP4e8JtN+S?74MW-BjKTTea-suV8pv=9CcCDm!I6X(3Kgd3EdYtxap;+l57ZbU z`mQccXcBLKqIQD4Lev4p!~O_Ay!lvVJqV zjO~*#<>(U>_$^cJ)AtcrD$7u^W;wITvM)y=_N*NTbAaCTA~S|O`~?rY`rEp4jONf) z`9A2QthqJOdkU5n`{FMZ_*d6+0RlhjQc(3I&sGe7Iru>reARP~i7x!0OF_+(=7n#K zhgS6_nt`(LR{Dv`LGVm_AOzn^BWYbFy(et>XAWQWE4~~gwiL_(J8!_^6vm#*jHBEl zd1mLx3L$0bi5!7Xjn3vcASd=2g<3^tT!DSqDRV%3cAYW@=v3~MIY6n-iG*{VMFG~k zo$>*HeUU@ud&qVx0b0V5)ItY;Pi6<6M`slF;8&8e6Za&#b#Vf!$}?Kt|2?VgDL>5J zRUEgF51jC*6uJt282zvVYQ>WP@v#e7f@R2(ivsHqobUrX7blc&>Wtsi8NaDCep74w zrpEY9weg!e<2ShRQyvwHqCGv6S}+(K(TZSy@InFv116iCc)%)HT`*(c{{0IiyV!M( zfi26Y?}O22sjPegjDo9T% zshn2>&4D}RNrHV>SBmIlM> zgO6k4vTyn^^~jzL5}vS%|3tzI@lsKLUWt&E%g0R^!Fzx(YGT9+%LP6**|EUL!8m8J z&_+0;@KzWoJY(-M5Hi>@(7>9Iv4<1cCNID&!$3-&t(Z0MX$|Ig17~RQ=B%fTIqF8X z(ID-ZAv!S(Roz3JSX)vbM@3uO^Hc}4FU}~wFDAg96=3I6IDm6;7c5*5 zzt)sX;=~5ZeHRYSeUV|0HybxKLm%h|)U}RMPoA+G+_Y16ZYj&anf_}H=KU$e$x{Hv zKjF(~Y(O;)WY~*mu<}d;84g_TeWpwfs*KV&uu9a{Qv!@TYG-Ibm*PYNE#@PP^_Y(| z_-l+bA@O6PjM?lEtQe$!YjGmiJv+Y!&Gv?9joI)mC5KLaMhXPEx3u6oz9mJbsNNKU z*UoQhk?V?A!umD2$t;~RhqWcG-aNNiWLB-6bUolU?`z9jC--BptTqA{%iz$|n0g93 zvdHk+!U9uUd)Xlg`d*^r4ECD#$X&$5&LU4*5|P_s%T-J4aS|FZh?+vnBiuV3!}17U~A(9tx+n}hWSxAg}Bynu)+<}v^P delta 2011 zcmV<12PF8hkp{7m29P^{bK^J;hR?~baLruXThVM^bJ^;tsXk24WooY~n1m(7{Lp}u z)y}WqgJfGyC(D=aTT=DB5)Bd{KtjK6{`31EU%zd>{Q33q$eJXE&GY8-zn&f+Cb7BS zJa7K}+v7ve()D@%CuPdKdEWd&PB`@JJm+5?AFOEFJa3xEhrN=2=lSm|>xVLv66bc% znAv2Bp;hVb619oRv3>d(aZ?oUC|C+q=9qL~SGLiP>B!plgrIz29#{cVf$7; z1$|6a(@^)LhfxQAht9?fw;`%02WpZLkeo;@15>xwHIR9IAbbw0(8E(O3*Yq?vlF&k-!t}fcATb9HJrnXk zjUl3Ab#X#}lXw%g6Kn`k2W-_WAiikgw2LRipN+-|@P(0g$e% zp{w$J&_`KwYohlQEGzcI-zxB*uGazte$`q~^(N1MRt!1#MJvAQJ?BIhe$iS`^QL*? zTjQZwy^Cg`EWDR~p>hzs(jExG_tHpOS4kfUoBo-@XZ?mR2Z=oebHer;usDUW*D~WM zw@9AZIkG}XS$ZKy;HlBs90z2_zM{}k(G^!<9d^nb&@;PEnFF*dcgh@~ROdp%xz3^h z>)lR&`GgMSR5=dW? z#*_s(cw4yNVDO{7>GR`*Wk;vY^QQUKd}==ZsD&ca!gk8Qg~$2>}1(<)+hic9=ohM zgK*{GjWR}^0t6X4DY9H}cw*u@DN=Zb}Y2dZpM z1ZG&-Vq=)On)jpk{>m0?d{F7O5xB|kNo^V>KW*_!dgg0dpH`~%ZAYc<{KiTd+LLpu zS~81D)j&#Mm(;BgZtuCu=IZzSe~qwep6dcF{8ONW;FN3jOMPG(cBd? zntNkLb6?D8s$9RRcKxQ-^_wb3ZmJ!*sdVJ#4o7Y(9l5#3k()|KZmJylX}e=htcNN; zsn7eY~QkH=|{kIy-`%{RM zrvS8n!k5ojgK8Scuour@<(URD9JqY;nKC)3GD_pXDp6Zc2{7)couL7piVF=KF`r@V zjQLE1Ut^>Ri60YX%x0&5V8tM(78i2cv-4ZfZ10G+m<``ka_Hn|q(G2+PYcfDds3u} z>Rlmt?fkA5xvuy@SU)FsnWay^fJ%>{-8T$xol8_l|0J)-ItIkS*e)e)B(XO1-tOOjoa_P3>`;!H- zrj-EM1lG6&prBd_kk2gFI8bj-l1({<1cSqjZTEBld_Z1%%Elof?>h(J1E234fHn8s zQ$j-Wd|?k2LRS{$EGD#V`h)ccxAg}BynqHQ=x+c3