From f69d40fc56d65ffae22d86e55766e6dc14bcd491 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 20 Apr 2021 18:37:48 -0400 Subject: [PATCH] Updates Medals (again) Astra, Ascian, and Lucky were nominated for a Unity medal as well. This applies it. --- .../loadout/loadout_fluffitems_vr.dm | 6 ++++++ .../under/accessories/accessory_vr.dm | 2 +- icons/obj/clothing/ties_vr.dmi | Bin 2822 -> 2830 bytes 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 8bafe40431..87c3cc431f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -107,6 +107,12 @@ ckeywhitelist = list("astraether") character_name = list("Astra Ether") +/datum/gear/fluff/astra_medal_2 + path = /obj/item/clothing/accessory/medal/silver/unity + display_name = "Astra's Unity Medal" + ckeywhitelist = list("astraether") + character_name = list("Astra Ether") + /datum/gear/fluff/collar/azura path = /obj/item/clothing/accessory/collar/azura display_name = "collar, Azura" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 85c2804758..5422e294b4 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -365,4 +365,4 @@ icon_state = "silverthree" item_state = "silverthree" overlay_state = "silverthree" - desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat. This one has two bronze service stars, denoting that it has been awarded three times." + desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat. This one has three bronze service stars, denoting that it has been awarded four times." diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi index b6ffe4b998b809224bc07a624de42bc1202895e2..537da3aa5fe240709f649e1500303e2072b02101 100644 GIT binary patch delta 2620 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 R$NvPj#{utxdumIF|1W+c|1$sp delta 2612 zcmZ`*dpOgJ8~={EUlwyc!?Z3Wmtv>bVk4K_Dc4G@=ohUuizUo=$X%=>L=B~*)DcG{ za#<)M!*SBwa#?alb7yJH(VxHP_x#?!-sgFr=ktEv_x-%@^Jb|ft1)X~=3E9yR< z>3-?Upms-#0axWE$@M{gUtx5Yyxi}7V=jo_oDa6H9|{__tjIBT4u3#ZFXL4oUutD& zDa#+`vtDYvq&nwSyTXNE5(p;F9&R#M^wuA!D8o2!UGwo2@~mQrrJY4o+%n>p$dc!1 zRwxj%f}H>1>G1@#76F*E`ZoUH$jZthlgSfAUqdx`3J$Eyxmq`(bLPh#leK)4o;#9Z z5+m*m@kYTtOi}ElfW2M3CF-4;H&DTZcc<&vyT0(vaC(2a-+Uxr8ULprT3_})*v$I_ zw;el>1{j3l$kBiOeo}@{Ju}-bV{oCc%vE^X;!MCd=W$8347*Z4!(XJNq|7lGN-M4+ zf2yQ$c4*0`fV+Oe%tas7f^iHAOCnxYBx@u}ST z{iYwoRAXXd%18Qpnj_#I`YPXS9t0I*uPd&WMjF6eKKSw49mynvT&M4%y{7+o)*?Sq z8MJa~e3leFL)}CSpi-&$ISeyvj8BChm5Kl>4XmV>UVpbv)icUD!3z$YwPxr86JAg( z7R#nQ9*CEPMD+{2TrP#rkG)Re^RIkhv!{k@FVjM%f_tmiaT{ifIk=w5>$p*tdR$+i zeLcOJgPq!*O$aZj79?p!;!~M3QO8fBmw#lXXV#xjTX)3KXq{{B+?aGg1{W z8v`ja){;n5+u?MPbn46d%Gg8bkxH3-Vc3TTb$?)t^y!}n49!vZV>Bf;Z?d?g5GL;+ z@3j*D?Jaq2s$6;sgX{$TLEtuz7s_2+?4x2WpJ`2u9q5jl>Z}=a>qSXL&F$&da8m5c z5c>&4C>{(65RS3grVywklj$ucEsw!wt;9pOAnj5(e{7Mb!?*o(rj-u)vB&=v@qg)i z&l+gjiSBXmtgAJgJG{|G5XP^+C_=Jmt-qfPMa@ELM)*0+;_2bmHFXP=S7QMgX9x8S z*NvQeV0b;_YpsMni8RXYn!538jhSt2y4JQuNc{Bs0nunJiWtM>$5@QB9(LqeP4@?W zo`0@jE1`=A_*7v#P3gC@_=0L;3zE_Ze!#;^kKX;;2zoSLN!Jnk^n zuQM~+SkJEeNedDhWxFkB^$a(~WjiGHhH~xS$Msscxn4#8!WkWPsp+*Zo&4N_K0*ZM z(z4nzPVCIKl~S)|?$b0x{E<8w-K2w+LFCZ@I6$86QYDf|$-@Ghh-P_vg6Au^pHx+! za4lnEsQ&2EyLV=j!kqUIP=82iq;UtL+_EWlqk3g~a8QjjI0w)%5A{3^_@Ay84LevC zZ0%4F8t<;}?(Sx9^Qj{;!n_bWokVNFZ1SRR=e)74!9f&e%p^scDAq2g_A6v~csM;O zYBIB7Yh&ZaXj9B}o3qqhcQn-|_R@v3v(v!ydZj9b&85%v@nF5u!(rber=ElsW*7E+ zz4=;Fc`bTt@2webX%KFt z0QK5B>?Z|?_&sQbcsV04;6q7qTW=J;tEq*r8VNjo`Xs41 ztSC$`l>z9ZTwanmft#Dq=9i1UT1}!mFPKj+NEab>6Bj;7O;W$l&W3%du036G)uLRt z^Kiuv<3R{oHBRY6uUh!o`YWmHGv`2q07&r0R*TyNW-3NYpcbBVi{_PZ@fH$DdU zYXuWX$%+iq`NAj5-p^%)X()Q6 zh{GDm#^b0W-T6ZEuyuGZjO7MioS+4D zR&{iky$LowLgpB8xtgFULdyxRyKpgtkp|6H`1|L}6)T$>-GPV{a2