From 50448549fbd0b698fe94fd700f460f436e71a969 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Sun, 9 Aug 2020 15:26:08 +1000 Subject: [PATCH] ee --- code/modules/clothing/gloves/ring.dm | 11 ++++++++++- code/modules/clothing/under/accessories.dm | 9 +++++++++ code/modules/paperwork/pen.dm | 2 +- icons/obj/clothing/accessories.dmi | Bin 9764 -> 10015 bytes .../code/modules/client/loadout/backpack.dm | 4 ++++ .../code/modules/client/loadout/gloves.dm | 4 ++++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/gloves/ring.dm b/code/modules/clothing/gloves/ring.dm index 8354f13bd2..70c131e298 100644 --- a/code/modules/clothing/gloves/ring.dm +++ b/code/modules/clothing/gloves/ring.dm @@ -21,7 +21,7 @@ desc = "An expensive ring, studded with a diamond. Cultures have used these rings in courtship for a millenia." icon_state = "ringdiamond" item_state = "dring" - + /obj/item/clothing/gloves/ring/diamond/attack_self(mob/user) user.visible_message("\The [user] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") @@ -30,3 +30,12 @@ desc = "A tiny silver ring, sized to wrap around a finger." icon_state = "ringsilver" item_state = "sring" + +/obj/item/clothing/gloves/ring/custom + name = " ring" + desc = "A ring." + gender = NEUTER + w_class = WEIGHT_CLASS_TINY + obj_flags = UNIQUE_RENAME + icon_state = "ringsilver" + item_state = "sring" diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index cb173f3bde..ee7e4c48e1 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -369,3 +369,12 @@ icon_state = "plastics" armor = list("melee" = 0, "bullet" = 0, "laser" = 20, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = -40) flags_inv = HIDEACCESSORY + +//necklace +/obj/item/clothing/accessory/necklace + name = "necklace" + desc = "A necklace." + icon_state = "locket" + obj_flags = UNIQUE_RENAME + custom_materials = list(/datum/material/iron=100) + resistance_flags = FIRE_PROOF diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 997ada6b21..91b8a6719b 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -147,7 +147,7 @@ log_game("[user] [key_name(user)] has renamed [O] to [input]") if(penchoice == "Change description") - var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100) + var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 2048) if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE)) return O.desc = input diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index c62a88c829482d49e53f2e07978276a1234fa84d..7d13e3f802e71e0d06087eec0b15a220e158d414 100644 GIT binary patch literal 10015 zcma)iby!r68u$>25)4K)ORf1Vm68q@@{#Mx;?d=}=HWke2SDJ48B$lo)b= z0q*$w_f=&YZK)JTrT*{jRmwyY^c9oxZLbF#$aR006`q>dJTd&uij_%%$Zms~}m-R7K$GJ zZNzxP!Z8aU?)QZ^?P+#u3gKH-!oRzlzZAJ&iEaPF>(;kZzY_K0H%wm9REZJ^%Qh14 z+}D-Gl5TO)iVzLAtlpt76dd$<_*{zcdH4)hqMewifvv64DQMKQN zn(_DV=_L=RJ_(z~U~hg8e*CowJoPl&AwKV#T7jtF_@i>z^wZcm-P1h}m*LfBNzDA9 z*cR(CLv*hOFj%qx8p?`Bep&n3f!++$Er)Gv@$7qu3pSt17hBUSfQCEwTg?)G1Xeng zreQ1vo<^#mRc&8pk)eeMcrE@B=okq-8Z z=4`1tTXSe1shoXL@Ez^`xO&AVjaxETT~ z5OZTSvWzbf^Bq9ANtQQZt4eC-WU3#+~uC-wjqj%n{>K$^aFGyHlrv2%t(Br!u>CUISPzyn6 zFZ+QAU;o|;*2E;<&A15l0p<9 zTjEkLM)3?}$!4!L1+C3;uNCW|ah;qs$Va=%raOzKI}sOMI~VI8=Hmky=nbI{=1Cw5 z+L5xSCIY8+0ztZvAU5b}w&!}t(v8UilHyT&t3c*Ph{FC!#a9G#Ufgq0mV)h}?Cno? zphi!n;7jipgrg_NwJ`-5KG;Do8ARJbApu10d39<0eSH8B6Ty<1etSS-00yLPpnyUq zoUIM6wlSDhrN|U;r6hWB@MyyXic_9|oy%%_w0!T7L?$1}fQ+`jkZ)WKKzzD^esT&1ZPz1SrWjjbPzwnrlnFb4O4YwqSNRDlgiz&f`FwA(()yO z?77G+|2N#_ju9gzkt^p)_EVjQgaFXYmO`!p9Fe>iw$Vh&B*w*wC|cm?$5viz3!PSb zt?V&&mt95zhFq=cNYV!OXIr1WJs&@q?KqLm?|j+l%>%6b{`vYCnm+i^kRs@%xl+l| zD3pW}fh`x@-pmk=OT;+~{->UImZTvpFpRhy+yQcuk0K08@8N@2SiuJhfLVeP4!lDN z&jJd;Q6X1?LR=S`BscfweNdnR$q+&iq+{&Ti74k6iCH#zmMRxBTR?QO%pJpqpo7{> zGuyFGyonR5vK}B`%zOYMUt)#a?pz(+Y7U(Mnm86={Lq`fjNZ9BAA8bCN`B*7V0r3D zZ+!NqRX=&lDC493NU@RbG0puDgH{`yIj{zd;4Yw=Zb<>a$tDR%2v1BBMoxO-z^&CO zlRG@dJQ&64iDe_&DO|`SkXZ3ubzP)n&hMCdjO}7_n2zY^hs>^+(5=3!2bqznZcC)& zAMwja@RpL^C68o^cw190aFN0$9Tc&kWNkEnzR?+ZteXqHq{$GD{!C{Tz@}Yk17$sb zGpB55aBcXLv>^gB_6*DtSAdJb>{>0>^0~avUs?-68Vwb`yt12*wa_B`R*0$6*9ii~ zl5&paT2tY*3#CzyG3VL|=W-wIVZFhwPyijl((Zu=R;d74O*xEl;Ca$}5A5fN-(o~h zD*axL(fZh~1m?1?5a4JrJ%0%$?AVW9UwGnu`<6~_oMyZOqgj>8e4p`G4rSrhohtY*kc!B+U}z019YP#}(;IH;pauwhgU z?{65a%<7LgZ>$L7ZstDE?HGp;BTY02m_y)D3Z@k8Ufj!@cFq%XGH@TJvl$Hr!9E;2 zoY6bHHH^tgGt3G&VcH(99=ki!=`%ldoYHk)5bGE)qrsbQZXN0H)1#uP9c>$^mC1VD ztv4ycQoDxxTX<86W|k9WkZ<` zdnRZGpa5dly#Kc#2BfG^ulN0MkO*f;jNTS0nV3*8xTW;YG7*5y;b8xjXa3W&)SwpP z0BJX(jXm6@THU1)o)G966_jLgYc=?BDU%RqRW!&|`w+xZJp~i845Dlu7yNrY%d8ro ztItJ?7vEmggv}`MKrFy?-$p(1d1 zQ^p??!Oji^j{p9cz&qu-b7H${_2@d}kh<{TZf%+7X#3H?K?n-f=7w6~3}Y)dB~-b1 z{pqRb^#@qQX#n7TcbLU~UN zP7AevC=M@uIiQL0{3s&gfCL$?><2jpVjbf@tQ%jIdT^R16bmbTRSoBtmrcfWfR%AI zbm+%DoHshvNAcoA&blGm)HPoHH$a3#CK|4UcZNUdp+^?^*}BS{sW#6VRRhRtXrNubUb>jL&HlZU(B?cH z-EoHWa(C+@c1*n6Szc5ESVoKBYcy*wse=ZPzW3Jc_kN<5PJ5S|9Vz?~(__9J6gnX= zaO-{l?J-tE6O*Wg1q&NHyH|dGwAk3#DD=rFvWq#P4Xs?2ae#_2 zSi`fpHOTVFZjbUc`6>$?d|ImU^LaFXHZ^rPb)h9B3JlTxo!xMTiHDfmJS2Do$5;o; zB72H@N(K{IilfTg8TU&=A{m?581ZKwI_rBLyitdP8h*L1sCcts3} zSYiW56rksg7C?IvOV8U&H4s3vP>i_1>*i|9`L39dZK|Vbw`YB$fUOmcqiSj9#6-#Ax!{CLbOAmegK1dgw4rd2&Ve=l{0 z01KkpV{IA+XJWYJXQj|z#a3`-A`Q31&K!=;qGq~Ol12IKe6TdQKcA#$Cd5SsFv^q9 z1@KJXIB)4c;moU*2R7`G)@!4~YpdS4vk1~3qmT`v-V5vm1M;~vEA(rnr=lGcda{Z@ zU%}{be@A;>4R;C)9xW4n>^zv_{6Ev%9M0q-gh)R7j{NZci2?G{u$_M!}@JfoCC6TqksGmY+kqrJm3}*f_HhLH4>K_Ht{}v z5lWAATP-&X8WG+!P3?^UL^_og`etbqyBw1{=&TXdtJK-3qX~Tfv9M3musMYE z3SpSrO^XQX^0BE{e0zOpvNgoz5%cCiTmS?CPd(dk>{DY;T7@>jFdgv*QjJn3~nPk`MP|I@GqiHEqz$=0GaG`*7XLP4e>wKjbUZ6JO+-3VQN62m=|kjoD0qIZiJ2 z_}G)5w7cGupX&DQj1vlNxm}C1ErktUBc^}|*t@F|UE*Q@$=@Oxa}qxylay7~yw@%D ztgpE9rKL-x`Dxehis;Z;tD}pDqJy>W)R)$lUn5z_OvP$5j9sE$Col)FwV%*CC^HF4 zh7y7gmT_6K-tjf_qY>}R-2-og=}(2XC62DJs!$&>F@Tl2vMV*IB8%|Wwumr$=YH}K zYxl)r;y~S-`A+G^FqXWMN;0_)O#}ah^ZohPuJ?M0!kMJKW6&$O5Cv;%RtzizgoL)N zG?bKma06uKu-zPyZZQQ(G&bf=ACEIPH@CgFmpYkLS68PYf@?f3{-t}yDR6KNU!QAXB<>*bF`vSlMmWs21$!$fOwqB&o#7+)ClpCYWrhUs)(rQ z!@DdwU%|30yw_$h|C3D+pqnH6E-DHKXfIHCuWxFKS3Jq{e$nMo*N%6mU3I@iYroAC zpSl{ml0iggBq7ZPx~ZZ<=qp+#=O0ocE|dlq7Oe1D+{})}ty(GnV|I)wF4bXQu-2if zPZ0o2chukFSTl-8!pJJr79WUnyw?n(A)==MtKV4!yXU476^`16e@wq+DqM5dz6^OT ztmDXVyt1I;I6VDpj?VORe)v z>{`o>&69Q^01hFW;olk%!V&h-&MT8f*oN zt|9@wa!xJ6BCmR4{}m*KcY>dYq%X=-Z1R!?1YYUpM`@JVeoZDRn@30f~G}RN-8SW97=};0~TA{ zjESYCgoFf=#~)2=9LUoI%sFS9uP+Yazr41DeGe?aSRf-4lQoR7{AZys1#6g~Y2>R5 zi;HoE%HO+H?Vi-OfPv#PmE$`3m!vrNnz9By(DUkBx6(_G0CM*2>0P-Uo6c%KTZup@ zgA{`V`3mCn<~JURw_{L+pFHfMnOe#fgIvX;Ue#jypX{STXB8?|-7CHD(xY0qhs9YG zV6j6)-ajr@7oL;4R`^S{qC9a;$(IESe8>L%NlQ%sF`Niv0&=6PD?eE+cFzmEO@yHu zI4;4KSxp-nn)`RZUnlBFubv$b3c;!DC#=UDo`8E}$pQK6zhXf9F=7z85>DE=j?Bx? zx7J)gd>VgO-J-Tm-In5@3c$ohC;+mw*<2s!J;2nel|&MO=86H4hcH~(Xs+Ll#{qE? z*g%kDy6Q$6Wrl~Z3P}(sjMR-b)*Nk(3|Fl*6R+e}4R|;V055Y$dS6=gF7kPvMoDCKJ; zTBeKdqy}SqeHi}M&o*;=xz~RSdwrqfbv+sQR<5O z1&Zy+>$U;DY{My}<-W3@KGx2^42-7>^OzIcS1oej_4U5J=+W1jq4&v=f1+?)4?jz6tVc6F z90K)(mD+=}#FM)3CL`W-r8PyRTDe-Gze%H2LhWasEjoC^_2m zDZ>V)AXREevp?y)Y^Uevo&zQ;GJUic4K{FSkgZO}>fP$4S|QU#g*lYQ1d8nXs!_qQ zx`nOH6`1qkmSqo0bqj*e=eT??E&YkaxtP%E%B=;dxG3EwOz~@W_Rp2 z`e7A&yH%kBO$K-B4>Z2u19^>&pBbTu%I22FMrnkjUZC*$_q*xB-+s$y>x^gIyEz}U z^{ET1>^EfF`|;DRvK(Gkk%2)4+-tj~6*w&AVKj$V#Ylyomv?0!sI)A^(&LD{@a zK}U*Jn4pD-l(g#*lQZ*vLaE{>%Y<<^uWqi+zBNV7K=NJT(o?fCuuZlJHGUFXTB4|%fPYBORr(Y||6Ui%ArKHOHkKeuE|A*R)>g`64J?(= z#e9c?7u{t)e45)xWv?INF28FMkrtFTDE{EjPeI#nV`{$p9Dsgllh#t5P{V%0#Vn^p zPStthLVcc5VzyfdYnyyZ2FXgLrZXeFE{YC&Duy6aBl^GdRzbu@ZmF zATO>BI7v?WUFr&aP6Ui4^GG`OlLo#y-IH&07Rv8z+f3(!QQ58JQPk>bU0*ELrnAq3 z$5HMV%OKbS!I-C^8SEy$DTbqgi1~%Pbg~IdH^%>zMZK30~;(A-v~3%}=WiEO*9e1r`_~jbL709uQH)iCwUxyBNC?^_`)Uw4@OvwT&n9 z=p%PeB9)!R$sm;!^0eavyxg=g%~_ta_R%b~iL&hq9*78r>%Dm5Rr-KRYh7$5Lmr?C zu`{8bc_i-cQ_q08m?5Y7Lw7HDp?h7WYroP;{`yx%d8_c>Fg?$4csbi=`kK8Hn^abT zTF@c}<1ZK7yNIPiZe<4s2F7M*qxXI^kzjUlrVZ|_4zVA!cXzA4)NHPx@e@lSQp|5< zW;EEIXhhB28lkyduK=zb`4|exV3y206W{c#hhJi2zc~NeGzm0)lUsrc^)SpED&x1f z%MO%c@je{A?R}yASWFwa5Q3}f(Vvi)`m{0o@CW;`Aux8NP6xTPP|)5j3JzO?n{=HYn_FL( zb?mSGI3he&xQ{{6grAjjgR9iJFI$?JSLY{P^BKIJ9B_C`9>fCP&^<9iUfu`tUz zg3Ljj-klLQXDfelr~RZq*TnJHih|r`;SYkEVla<-LKXRyx`#r82@;w_GxY5_K!2;4F;-c z{#%Ew*l2rS2@ejFZ`Jd=DZIz;z&aN^iSaWb>K_zX00T-zJjG|v(z7mbDHGXrI2m3p z@w|{J-`T4|e87Wc9ZyZ$4k{H`A8OtAZEj1O=V}&0T;XPWj#Tg;QY`6Rsgtqb|B6eG zAXaxA!(f%TX(IF4d>^%VaDh1GV#0`L219m3EOnUPEE`ScsOKzBcTX?-66UkXkG6{3 zMhE&lqfm=hl?k%xe7(LJFS)cbQ}$fRFGo#FOY3)%{hK!etPv}v6|J2NZq3QwpuY0< zSTP{%ftB<`AuTdrsfefaCS2LaZ*m;;Ri6TYb@0nouhzB<`@L~{<#A zC-Uy*_Ix?1R*`Bmb^A2`w$;4o+U}uhtR1fm^SnBBh?b^@!)-+tX&#Tk;61eo=MWBq zEfARJM(2#ofnTf%Q`~@%y=JzO6-lSuvi5V}c444`u>Eog^5?2Q`56xecBvj%d^y_j z_|{CqdmJ1)p5q;NgN?+OF?l80?k911w)`vldJS@}_7>qia|<&%nKW6^42{jCXZ_Ra zoh&$B{JBV$dFB1xZ@rS0O!h^Cu=V=reBNykfnX>_ z&W&`9FG<^OLmpSvY1N~q=$V1jfEM)C^l)b1_mq2n#e3qd*Bhhozqvf!vIM7Fh{189 zyv9~082fEj7USRFKe2&I^vE;Vczxv!=`=+ahX_V?4PReLCue84_?fqPaIoCBiVD4V zv{OvEYbP3f!WA#unA&ct?j3q(_qw&YbX=Y7J*9i}CC(Y#n+4P@rrJI|XbuOK3wPDReAHK_Ng%~_?{a^y|JNUK5d4oGUJ?+6D>B@d8C*!Ld z{1IFW&yDkK)Ln=Bzu!34)(+*|$7X-{Dswmrqaz+VtG$_Wb{Uyg8=`Y#(rI$ zl_1-@(2fR+cbBeXee`lmqTwEoJDHL?^d(%3@uI$4<5-o@+X4Ug#^(lVxG|rQ+cM+% zi>ccA#&Lh18lsiIhH~ewxm4#l@Vb_in(K{XncFmhI{|*^dTWT%suN+gYC(x9H)8D*7han};X-j@BpQm!y|w?cERqp0)pAS<-F)?d^) zgrznYa&U;PET}U+J1hBS8DD^(pBfm7XvvzoI#0~#>>mpfi>hbi z=OR^!pnebRXy_-Y9`Tbd1-U)0N{dhy3cBR?|AH(Ca;Y+hIdESCI|`SVcgT>NHsSFt z1S0wFwps>MUc+c3n;W9Zqwnm@M-ya2av>Cb7u9N?qjfo{d6na@OAU$7-pxqXrzoLL zsf(WIPI&aQR=-%5ponr!=0$P;*KaxQ_m_60eHt?!1Hir9e`f*W(TEMNtt)-WnGea?=-`ZbEP9gooG) zahc}>V7IqWAgTW1;$raHa;fz(CYg)S72c=#=VpyL2)_n2YCJctV&S(Nz*bd=X7)0H zMvhq4W73tCHoSRjdNUsQT`CT-u@KL|lzc4A>xZHQti^>&nNP);b+oDZ;-OV#)X=MB zQp~`Tn`hcK13XEiTbXrg>)LR!Z`#ZJ;d{G<+szwYe+^ssZ!d57#;^l-*KpK6e`ucY zBhNe(Nc24I;hs;y)d~F9i_l`ep8q~6a4S@wFn4~fdM%X;@%gRoj>WA5sITcs3|K!K z_`^{HAyZs0`#GONOchMuO$z+s7>%Dh|DEDN;<~_i;ySf z!7us)PL^!?7XQq3N<*j)p0m{b!~!Qn-EEe*fB-Ep%OaNIh2H2#4qd|;oPP!nO!(;OH?FIM(}Nn0BbnoG zq2cID`+_4L7Y_@}0?xMj-&e73`1h>OpFi)kMmR>+{_hMf_QfCeX1*@|d4|*V`M%?| zXSd{XkQnFf^s|@QGeY)8#>SB^l)Su7;%+=+=rw)=MraJXo7TC^W$b@@ghd6(?xTC~ zAhPF`;?t)Tpo!Q29P-5YcxXq5qK&K{Im}q^khBu>P*m}!f?sP#1}10v0-GS z7r72c+&qo97X9SvCgY1tWy;KckA5LikFG0N!!rE$6`1rzm?q7ukJb(VlCCo^%M^A0Mx6Q? zXSw6vy_*9l-a*W?l3X56G6A%-wC&s5CHw)6a>ip>xv>kb_0gXcK9O*Q*Ll%EzGaxp zJMv11O3QvTpdEkL4`?FQDC8HZpX*W^p}jVT@F@bHKc~aN!Rbset|RJaHye4WuMadW zGD#3?KKxmOm1|Lt`ZIX+jVc|Int;V4(_9l?%5M1g&6_uUgM(UsxRVUg17?Hem zefY?}2p=|9$t9u48&P3XmEh*+$OD@i!ZsQbXd8CwN25y9*4J}ns8f~0gPB=yN=m-< zu}$U~#WLf)yFy={coHf+&0bho`0$=NDdL5h*=HXlwjtk<@u0^+W6x|#>@P%peCk0Z zH4A9Xj869x2}r@xk_mP?e5+aq-XVjs52Ufo?dX<`QCr)1qt5?9hVS}XKmm)rM*LNy zT_8N1o^`QaPCw=GybM(sn{qwwHGaK;SU0v9V9wyJs-$C8YXe=FoR9Z&OV)1!{a(xy zW0WSJnVct1?FT<%q-S<9j^P7%F~>>nr4LFhri&F?3A9rw7_9PhqQTZU4Opn}2&rdA zQiPnT_$raR&<}>qm6RCHFVGO}MO9M&k7u6#RbDsmu%E>6pf0DEcQ6Ov01Xvg)nB|@}l871oIy+o8~K@cQ*h~9}7Wr!BN6Lmxx z4DRH9>;C%g{nonQk9p^;^_H{G-p|?lInOz<`nu|bcyxFG01#?ws2HICyZ-%fAn2>X zqANB4fVlmQOra|FZ|uCBJfKeQZUEqyo1Qx2+$%_;I(uOf^U~&ea3&{}q)j8ZJ3*9O z(=_9!<9bSP5cPb7lJp%54TGLXj zxsWn{H1ri!AGU+!UE0F-{Z{kW4Yak-Aa(++#V+nSIl5*%$%3MMGs#K@%7vWz3g(R}~N zwjny;XJKYUfY!GjsY|M+(o(t14ArTgCtfVL?KD*^6nOmJx^xD*FTz+pv@s>Up3h)9 zRUW5xT9H=^5J|PSNM)BCI~X^&{wOOv>HadLGvNMWxk%PhTN|H-py5;29=@%h1DOL5 z_2oIlwv6uoZpbZ@-?!~NQ)=`MxdM7BzY0FRI-ZdoEct`M&FOMEhzOwWNM4_EXSK8r zU!U?F+^TM@XvNr=9Y!#5Os_J&HI-8f{)Q>tWUPwHNE_%hc+L+fPxrls`MI1!f88md z8l0t^S4P-^0~@5i-jauFZyU$RAHPlCy*mxHq;j)L7h4-xe|g9_*?JPxY#Df+RF8Xn znqZ^N$T98p7JD|^b4`49niQzngErZ(bR^^)b>2NE1OacVh!$L|^`wFgAOPzPIEzAF zHS7H=gTPEZl({PEXY9Q~kSzE1Thn^;4-Mu`n4l&MQ0|$Zhn}I~?`pe+wVT-Hm}og| z{B~9RPF~>N5xC`)MdtgqXL+EC32WR(IIfuV?-zM#uduo7GKk{1tFXNEwjK-1P;{4A|;WJSU_r@rH_Ulgl7~VS@obLs0!S-!7lq<|B#Z zy5A1FI_5YZ0VoGQ#vL=zCC)?p4h&j}!BPHB(YZgkD?$G7B~XGBpnIt(FHU_|#q!h4 z6wDm79#3^&VBzKc(Tp=w*poqKoSX+`Kav3gk{F~pn0#B8oJ70%f14{shHR4;Gy%JZ z*i?%&QqQ>>I3)CK^t8_X!C{Jj3&?H<)&))e}P**6$N90dv}}#q1Wb)-W(oud4Wm0^oq+p)hUf-n3DKOgEyk) z<&h-qibyMvA4C-yg^8R$e|MYSv;#^bXu&c=T{k!HN-lB63y|yA61QM&W_b?^?+bod z+n4Y;_~06*BkV86cejo)L{Nuo08rkYQ{e}8GZRQLoISvnXCYlLwPzc6Zc6cdQ({+w zh%OOgt+YzmfYYNA%3+H(P}8`ak$svfX4(2gjc}VUfEsi!eR4M59V>nmzB?9W{0hT; z@Q35{Cuy|KR9uR!Kt$ zF4&RSZ7_GT_{w1Ncj{C_Fa}`3@p=%(0(SvEh|odt!*U^cXMUd(IuB27H@{@_A=OkI z&*>b`vtwSnI5B11XWA&AfLCQ&X{4 zG_l0k7nWBc#^n?t$W-F7cs2mAhyKP-o!6w#)mkxXIzhVJ{-IA)3gW2H4_r7j+P z!8q!@`yyexJrSg%4fjf0E^Z!I*N?;0Y#(DSdv--MZP$Wb<@Qar2ZQdc1Y!zGpizws z_2{VndBeGoPgJ+9%~7C_xV$LczNJ1|9`#1vmWj|I4i8+@=m}29!!DzvCXReIbjqkM z!6ihcnrxaHOj;oi!T=M&m^B5!p_0lRR~j)wpT ziKBb_oFvGmMbN|CpQ)S88|ux$kDiJNVvObt(Y12&s474w@)e@8vNLRDIvlndXLf@* zwF_3yu^sFARG-{6;lkBuwn-$|o&k+#qFKQ;p1D(SknVLEF%whw+`>t^`ZL^8e-{=%*;n>d6g!?Jv8`wek&U`;$kYZ$8c? z36Z91uigAMX*nPo8E?-6-a zK)J}*I~NP~^u9=UrA4;-zELP9-5sBO!hz1htDIma$=+T#Cq)B_Us93;S5pfGY|dMi zknZYrPjj4wY$+pONY5QSl68KJuPvaw^l8Mefbf17olw;+d0ZE z#MGn3?<}|fX~-!)9y1O`@YRToSF-$_1bh!lvwIvpNr6aB0TD4ssbmP)5CIeW=QZY) z0IZ`!4(LML1{73QJ_$}VsWnDHv0AqB$X{*^r#CJAl4L{V>?ftX{p^C~tE|lGnb-gg zRdLf%7Y(o)wv&dU3q@`n?$K?|Aw-LzRg7lGF1Cliy85(7h=}|nCcHJimgLdlRF7{E zSFS>Ae?y#Htd%qP1VO-=4EB2#iVz8k70S2}MN%96KD|)IG7z9Z0^WsAUK=@yb`>f| zqa%`;SyWcWr4$$$8R-$3(Os~=q0a&dS3JACEMkUsA9vii8L%#%j^Sbe&CSi|A+5e; z#HW7L_opp1q0hZanw6iZBqyFvj@npz1ed5vd=G?vqj8>jt|=Q8tw z^dW~|EH>8l3r7k5gj`&+HbO=?R;dK+#qDCmdZTP}RN56d`Z`hb!2&9@&mm&J&j*_2aBNE*eT zl+0eX0oI}Z0^;O6eT0S1T98*@5u|xu=EoxI16|TL@#OJLi31yBFa;Bj;VC77jD|s}~_abZ=-+j}lH8EH#x(;sH@Yq9%7Jjemr0 zo65j_D5YQy=+csRnLaN(o?1XnB!pVPx^H|82OWAGFvf)QmHvT{k&%(Ds$gxpUHM7% z=$BCW)o^PUSdy>;a|gP>*S!;dE+GhJdlmLkSm7(YOIzlIjGK~#+>#|9FGN+7O6CRd z86->422t*$d}mb{`BefK@!|)EGV@x*OR`f*>|hm$gJh~h)i&2INSYK^uU?b%>_zm9 z^w@Y>QOR@wIuKa`f5O1K0>0oaF@S(5esE-s1qYmADGP~K^=nI&jOe?&6`KG4+CoL$ zgak}MO<5>z#LY9l&=C}{SlQL|d;(p(-yH{EwsP_Cgw4CEJ$?F)Zxij1D;b_(G(vK^ zx4gRdpgmh&ibe1)hi`?Qoi@74WBKy(TUbvhJFEP__sCI8*DD`V9v&WBL7JDs$Ur$i z8AkNg;{o>jp$LIa)Z;?rsJFU?w-3K-pd2(8L?uUmH_=P=$tBpFkx+{CAqY$ok&h%% zATd9wajX;Kk=ha|LsxNo)OXI=6pInB6!%{}T`so5e^yCLW)69x8Gm(5CmZBdK<%0#EH&1uf)=IWp) z$YSJM$+hd$xRn=p^u1fSFMct=M#v-7Fkfah(9n^hd;jYD2WcoICB<`}D;Xg6DVJcw z9EOEY1pvCa5}}_za{yhb?ArQ9M&Qg5_V}e2wOwc@xiyZ6cA#-J%27%C$EVeEtp`i; z{^ZAJd!`2^wwCpV7U{D(MIvC!V_r8YJYm z*nL25IEg#6e=bN<>~eM$cq+zRq7h5>jXZF7f~D?7KOT@uvg9U?21qiyb_M{rbzC_l zBqT6POD~evoAQx>LDY{dQ(W%C!Z30rJTU+=y3acHsM32sBA}*V$954RZ?>S0ch*l5 z&f3zpv&tEKcHOG)kaA5DU!iTk#tVM~LHj@uL6s1v`w}5G*UkW>Ob9wHymuL_Q`&1E zCk|L6B!MPg3$Ad;7J8a_QY{9PIs`S{)t%7cC}OmZV1G>-NHI~VdN#$dT3*qln)vUC5`y|w_aWtTF`o4t5fU&)Kqs-WaB?9jDLT!J`Dzz= zOfhgQeSb~AcX${%^zb|!tO%RkkAyp>89q-Q2wz`+@h}zRi3DEp0bnR4B{eZW&s|EU zox#_Ax;3(u?R$TBD-m$Pw>_SpY%3V^M>GN2IJVY)nfeB7V1nqrvsSec!N-$Z$UwqS<<>AGn*cgw&9&t!`Mv=S+IFXugn zeC5{QOuvb_grZd)eB*cD+-w;+bd1J)3B*UI8Gpj)aI4-Xk#%LW?;u4CBL{kT!*cSs zS8Yh$L+RN5OzEyTBoS$lan*5_z)7HH0|L>N2!K)Y8n1?8GooFiYG^oB|6`?;{(c}J znS(Ewy*2>=O05P!%&gV&Th|YOnn5pqx8YkoblC62P&-bE_XCeH1eXbblPqPrcNXT3 z-B#(%C)l`hP0uBsBh>qdX<0_Tggz6RB!3M7kOxLwcdYnF=2`fi3MZwVlERM_Gx$99 zBH+yc&~*5H0nlIt!^XyRExo6o?H(L}0SXF=E?2RQu24+woV>g}B=ivgRMiHP!+x<6 z;D_U|0v|V6$efzk;>V+sgx7dyOSy9x+ycB3AKd?V;WRjZl(Bx^e9QHCAHI{pvE+3o zqa#IV9-w9@CcQZGAW4t2m#fHb(ot_kpQ|H1dZ<9r=e2Ij{a;KnBn`SvI!P~5rSpDqo&zWj*Y4sNxY^-}NqDoE>iwqHi zmqIS9UfODouZjCRfA$j>+rEYJsI@LVIv(khmCV!*bcU3Y1Z&v-A0A84)Z1wJa{VK- zWbhyXrmiZ=j5!c5Kn~4hYmWc1+y4!xebU3*dsz83{;DLR;mMP4+Yl~DI9Vnr?Nh$S z?pbcngvm_D-#=e}k|d0L1AWHQgM|(kdDF5wvO&#ak)k6v=p1^;ZJb+*4#J3jqB$l z-^Cox+}kLuRfn>NCb;dDFpEDyI?0~YJnw~I0IfcU>l_Q2L}e%RJ{6dNh+La`EkA>H zCh7I{wS+zI$rBn*8G-3qCW~kE&ygX4NAEuD-0o+rsHE8-3+#toG_S7!;h~S5#qxtK zHY&kgu@|M;+1Yfib2XvpI!2=8G4(`zZ5Lj&M-Xc_E|wC-un)VC*N{(}@KFvYENj6} zBoICHS!Xi8S^Ko!8ED$rFqs${VqU-3MaX~u zk^zlT_^ZypxVerkwj3Z!7lOdamUmv0>O=6W^Es4&xa2L#?_k4+P(&9dams#GD-jzT z8=9$jG+UCWl3G_&KYRAfv@m>c#cT&mlDEcvbkfdL*~UeE2Hv}lICfkbSqN)UD4-yR#@ z`Nru6(HVbK+vtvTG^MpZHG4D#bsT7^FHvGzZq5W0+K+VKu5?UvEUZ}MO!^J~mcO3+ z^jOxX$Q$GwN_kiJYc%3-ErI=Bk} zQY=8`x|;ZCGpK8$GS-UlbvdW-CUAw0gBm#lpTfENtBcnvJNpj6h9Bprd$>m*Tj8Jy z8%C2Kf|ZKj9GtX4LIC+k9w?}&!cxv&Du^sOnbQ7#8l=35J1q`i=aKGwCNDwOPKLPz zcaRO_OMSR#N*|f=svIbu*`~J<=oPrzW4xN9<`gJwSPC7skEQjnWP-)XOLJnoO=p$&}L5N{XADX{h}&1Ef#AGUXCp7Bvvd7WQ@48=7lILLiqc|Y1J$sBk*ez$F< zA}OqcSoW1x^X-&9k}X44Zto@5f7~T5714T8BDx<8?+K!qroCIrDR;rz4Ht(>F-Ro6 zXBzGOD@ap7(3B>?{`G|MlDCr-G=w&J}!)yg{6iF0tLe+{u1D@z5 zqEsG{O#Zb~`geR?krym5OGW~?=ZMsLfFv^WrA^ko+*kj&ya$Fq{dEs*&~NbL-fXpH);< zBHDirzPFad1wK}svKxM5cg~c`PD7wXp-Q5JUc~Y5+$#2OXc!Lt$n?>g)pfasaKaAbZvf{VgXm2EwTL1fVpFE`Ll~02Q)Ukd_ zk3&|R)H>wWyQ-=x=|m>^`}glLEaTVL{z^FAJNY3=vo;~JTNo)8q3NZd2&pb;vAWQ@ zaw0cj)~ZV1f9vyg9kZ?H=uRbs~z<=SI65^YpAXgV=_x zyzI7A8Et^p<)}&`#i+55T+2JlOHuCr!mCa%IoM~F*VMV()wk(=x!5GdXW~oB1&E&q z7>LvKda=s8Jq^f^zQBC z3&Y&e78?ZIV4CzXMSE`bGNyFvi+;Oy(}&o#{I5l((X>WoVgiDPLE4_d!E&vKVLd0 zhm;68F)^DVO8=b04;C5)9HhkHcSc1QNL5wU;xAv~>Khx?`&``JInfnFP7CoLx1#Dv@dF!T`eT3=$}q z-QPMi5p!q#s!hFicw~s2A(yB14g5}W$u+@bQlY>L%l@GTq$1zEc~fgQKm>HfNn1mH zEcackOzWIJ8iJ#3_xJbLx3Q70DlfgEqo>!jv$HerE4V;XblRAQzP-IZN1nfW?bmuk z5qxV#KT~a!KUU*}rVDL<$E0f(4yXLzpq=8o{Pvakajp0M4EKF`ZNxjCUyL@mm1`Cj z7R^Qbv(LTvSRYt*5>-}KJ|GbrbbT>NQP$c@uki9w$o6F?HXYrj7y8LQmpi11?E*17 zVrrIi@0^ z71zdvrv?U(`7vFWTGHoSV=KLM#>MFp=UTjZ5&rFtt~y67q|V7q@o3uW)*Xgrpx(5G z>vldhPFA&sTZN7X@-`Ui<1^L*FXO%e&|=N*(a{eybpl}HIoY<23yAf20SqAcdMdxi zt+8k?WCaUwyuQjoKc(j4;xb9CniEt6$0-uJn8LApw|m7Gyq+uhChG6aZP}MEtm5K_ z5X$>3;a3iM$WRG$fM*k}jX;?fS&d9gFgJ!TV!Y}&PW;;q^F{jiKeK@w229938vunl zoY;)_EYC)L>Ws-srKP30CQr7nu~j5ge5ML7 z5-(nUVj>xLbq@##P?{A)^PaQik18WS0TU`TTpvnHOTQSLI=<}PKex^*Qh*Y{;-uk^ zH-)$)f&DRE+UR-Ct= zxDSpoA)>*3pfa4m`yL&Ns&C)k=ZvmnuL~;F^_W~R(IkwdHyuL~tKj7P!Zev|2OwI4 zXT8Re|LxZ7e<{HK&93dgTbhoZmJO$q7o(&rs#dL)*jAZ6BfuE{l-==#Bx&_q=)wqh zt6uQu4fpxe71nj};~Q}bt916v8!2^9y<2&ew(aJfJN4gk_cflRA4BfmHlsG*>#+_5 z@T`j>f`ex;{!xB~2M^72KG$8eKUn89&nd0Dz@EIhBEOSUIGd!ny}cE_$eZ}|iPb<~ zpQKg*ZZAZ(CeX^rCT?Yd19%ABsw}(T9jF0aHVY4$ynFF!uPg{Q ze9p8P8jKFH|I2YI5PctYap6-{Pyj17JcC2e-wHMkMidfP^)Ip-e(q7*?9MqZR~VbD z*^M0k$RZ$alQ#au8=nN9Oa5N|w)&o$Bq;ZtG-a;{NQLQ;50d{nYsIdTH$xgD{;l#)oTHKIPrZ6*no=M-d(4Y0 ziRXqjw(1qyLf*!(1Ofo~%fGV#{rRnb-T(@jpRiJ<3ctVQPA;vunsIy27`LNFT%ZwJ zLt)x#^n0;2C<&EaUk^4yMXahbT_e_cl+6hXQK)3M09rs$P!Ir4@6eg~YEFAWob&9e zbP4x!P#9VXsB3}3p(}1$#+i@eVzMq^Pbby}7N6x8eH~|uw~^$_A}T`~dRtF=Jk9>J zp1hp@qO8l%n~}YwNC7=%b+;BqO%uxXvlYyY@#U{4l9_^bnHpv3vwZM2FK=EQz$Jtc zIy`?(M%Fs6xmq4w2{q~n#D}bPX`S`F>u4%`$H9*FY2S7L&x_n3p&uQ;6sJC-zc3Kr zxIblmgQ>9kt#aey_WQh0_f9gC7EZn#X69~%j@?}!HAchchFwc7;fi6|IbG={!Q|%8JVu{uNQvs>of%2TqFcZu79oWprgM3^R;?x zH&gh_*RO0fqX4S-+^4mzw(pX5H?WmffV#qRa7LDUF}_9Hxr5>2eFiN1=Wu+C3Uz2?DtVR89!a@XRbpp8>b7EG>wVuh-6?%@n(1}?O?yMdXy zD=j6p8ML*v<mpzHg9GvrY|KV@p8yJC5UXwW^dbfFEmS?0 ze)cN;3K9Z{;fYwpxL6hJo~aMPi_~iaue@^6uPXRQ$rn8VBBEu>aVJ><*$uq|M}~)i zhmQg;f?!$fRTMFC*>N&bgj%J@(3-OGJZa8GKxBGoWJJ3a3DTUix3}k}l(*Z~bhMYS zmjVN5OMu7XH}p$nFO`sRE{iauV(AL34`!+6bV7#T+Q}6YQ}z}Zxyo}7?I9n`=6)9l r69{+x>^Xwi|91y{{^x3veNQaeoh7aeD}9DO{RL>M>Z(*J*@pcG*Jgq! diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index fbc498df64..0b700b11e2 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -98,3 +98,7 @@ name = "A diamond ring box" path = /obj/item/storage/fancy/ringbox/diamond cost = 5 + +/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories + name = "A renameable necklace" + path = /obj/item/clothing/accessory/necklace diff --git a/modular_citadel/code/modules/client/loadout/gloves.dm b/modular_citadel/code/modules/client/loadout/gloves.dm index 85be8bd487..ffa4724f63 100644 --- a/modular_citadel/code/modules/client/loadout/gloves.dm +++ b/modular_citadel/code/modules/client/loadout/gloves.dm @@ -24,3 +24,7 @@ name = "A diamond ring" path = /obj/item/clothing/gloves/ring/diamond cost = 4 + +/datum/gear/gloves/customring + name = "A ring, renameable" + path = /obj/item/clothing/gloves/ring/custom