From de2ee165887ca8a0e086b4bee45cb6c3cd34c7ec Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 9 Sep 2015 23:38:54 +0100 Subject: [PATCH] Fixes issues with incorrect loadout ids --- code/modules/client/preferences_gear.dm | 4 ++-- icons/mob/ears.dmi | Bin 2676 -> 2873 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index c159406d31..32b59a5d5a 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -196,7 +196,7 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_head -/datum/gear/rhairflower +/datum/gear/hairflower display_name = "hair flower pin, red" path = /obj/item/clothing/head/hairflower cost = 1 @@ -208,7 +208,7 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_head -/datum/gear/ghairflower +/datum/gear/phairflower display_name = "hair flower pin, pink" path = /obj/item/clothing/head/hairflower/pink cost = 1 diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 4e61bb1c4287daaa2eb72df13c28c10e2cc0b044..1a7179994a41d532d7d26d7fdb0c26f3a0ef9fd4 100644 GIT binary patch delta 2453 zcmV;G32OHA6uB0V7k}Ug1^@s68ZBz!0002VdQ@0+L}hbha%pgMX>V=-0C=30kFg4a zFcd}SU1-&piTzNFwhY`iPQVSqBVqN`HjqBRXJ^ZX9wuE<(5v zFr+8BvO=2`?O)Ul7PW34lB+2c?)cOPhqdvt6*zK@$DANz`?T%!vda@`yqk>&2I)1) zlHY|{O~aAJH)?IxJtKy)DWIq;`T?`ttNI3BhME8X3M)xOK~#90?cKp^9OoIw@n=j# zWx17|%7}u5p?`CV0~P4GDf7O(ZNu9$tBQ>{(~HJ$bHjN@FfI%tmH!x_)t*y z&_h+oA&smM(nB#3*uqXXQngm&xYNV#TaTwZtC`(-=Qr=_`+>#U)q0*sv-8_`b|l_6 zYPZ`4K;weC0pL7)P2B*()M~Zjg@pw>I5@EN_4Vky)qgJw0YqV&o11a+px@lwjMvuI zDhq+SezNYt!GSF-EZC^^IR!-_tyb&*4)(RRwW!r<#pj`Zx{vks^=O>%6F}tl{>__l z*6H5*`g-*K&6{3Bpst_n~uPDqtU4K)uu+H5p_Bp?;}$P`=V^`+`AVYoSqJS&ZBPE-nnbv0u_IPU7k$6 zKAgHfCd0@9EMsl7acZ+Zo&GgY)lNJ4)k?fFWA?#Uu{D1Gr=Z>p3r$U*rPXR>E*n+0 ztXfs|psuf~H;lTM#=9%=gKx|pe`|K>?oKWCNnWLV20Xcc->O)fO}##xx_+{cveu_7 zLshSTmfbr$(c^E;_D;iFF>ZhC0G7R8+F5mmVST#l)uo?HcXy)DPCv~`2w>Ukr46g| zvyVO+`W)Zu)4jMbe0PPoKHa$L)=y~04q(~qr46g|yW6*|)9J+SmVS=!_30jUyF;H- z_4;(b`0&I3?T_8vUCHQE)$2d0O1TIFU^M(99uOjcfDi!$ga{xYL;#cg100jU0vnUS z0tbI6*yYLUVE(8XAI`RAlhLZ`&mT2knFLt159-p#I2Zv(kbdFQ_b0i&3%$ElT|e1} zSub?%rs!i_LC=h>To=wAh;%n7OLe#yvoW=mdp{Atz+{EsaJC)&@%#H; z0uoC29A6=vKWfHV+f9D&z2|S|u1x@Q%KL))df^A%?}zTf{82OBnA(~-dH(NPPK=>Ld(zTQKfBBDJzc`$2N56ggo0Fd( z|Fr9)hqJD@s(ueRtgerJ@YzGNW=}^{iOS?JFbETtg6pu>OVRt!gnCAS=$}89wQ)ft7G^!rncsi_kH&`>>}7G+hYU- zgct#n;R835zyb+>qBKROWJeE^G66!2fPfGI1cV463fo_8#`~+iso#@dqqvbj1BSjd zun!wkThWidvuL;f)tJ}=(uHl=%=Qxhnwc$a`#TPjA@^Bl9HaD@D}aO61Yevp``#t9 z;}f$lpAKFty;%GC>!%-AE|Hwold>;g_E($nH8Xo?z2G^2duHYy_Ysc$)n=ToXP#<} zBKfA|>{-74a-D)6&bFh=7hhc)?YP?upIffUh4S)6KL?)Mc5(%r%NIvmldTMHy|_U= zEzX_wzejV{sh-bMK^H!^I@eL^->&sS==*f^$jq+xZ|c)uSKsw>bk=_uAopj$FQ(ej zakm$)!`XI!^!2k|_`ZJj^0DJ??|CEiG1TE~JNokJ%lpZ|9iLPmLKnW{lfgZ?GXfvA zvktf_!*@0HeRtny2#@-=u9-dQ->zD3)Tug%uHJIL2iH$G(Pv(TF2W?k+wEvC<9m6px|Q9JvR-l|u3B>RPxn-0JNzvug15igjH`Y#D61v`1cWBy6ch** zlW_?zldu8`e_m5JfbgxndlH+inAr!mbEi?;Sh-)~KrNLm%z0!F`>4{=A1i+!W}p zpE^jd&!Cv59it0oUeF?^puX0qOKw|nsuxmU$S0Tp0+Wc}0|G(>5D+4O0os__;&q!4 zypREU5%2li|Jj(@;v≶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 aLBz)5(Qc^A9;EOa39x}USXP-|P5cXy1=%qG