From 6c01ab5b8fd02a7d678ee364a663235227ff1cc8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 5 Apr 2020 00:41:05 -0400 Subject: [PATCH] Adds Ascian's Medals - Adds a Medal of Unity with two bronze stars for Ascian. Has its own sprite. - Adds Ascian's Medal of Valor to loadout - Refactors collars to be part of tie_vr in expected places. --- .../loadout/loadout_fluffitems_vr.dm | 8 +++- .../under/accessories/accessory_vr.dm | 45 ++++++++++-------- icons/mob/ties_vr.dmi | Bin 0 -> 713 bytes icons/obj/clothing/collars_vr.dmi | Bin 3718 -> 0 bytes icons/obj/clothing/ties_vr.dmi | Bin 0 -> 1909 bytes 5 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 icons/mob/ties_vr.dmi delete mode 100644 icons/obj/clothing/collars_vr.dmi create mode 100644 icons/obj/clothing/ties_vr.dmi 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 601e130e0e..6ea5153d28 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -797,11 +797,17 @@ // T CKEYS /datum/gear/fluff/ascian_medal - path = /obj/item/clothing/accessory/medal/silver/unity + path = /obj/item/clothing/accessory/medal/silver/unity/tabiranth display_name = "Ascian's Unity Medal" ckeywhitelist = list("tabiranth") character_name = list("Ascian") +/datum/gear/fluff/ascian_medal_2 + path = /obj/item/clothing/accessory/medal/silver/valor + display_name = "Ascian's Valor Medal" + ckeywhitelist = list("tabiranth") + character_name = list("Ascian") + /datum/gear/fluff/ascian_spiritspawner path = /obj/item/weapon/grenade/spawnergrenade/spirit display_name = "The Best Kitten" diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 9f1e33f457..6926e68f8a 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -4,30 +4,30 @@ /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING - icon = 'icons/obj/clothing/collars_vr.dmi' - icon_override = 'icons/obj/clothing/collars_vr.dmi' + icon = 'icons/obj/clothing/ties_vr.dmi' + icon_override = 'icons/mob/ties_vr.dmi' var/writtenon = 0 /obj/item/clothing/accessory/collar/silver name = "Silver tag collar" desc = "A collar for your little pets... or the big ones." icon_state = "collar_blk" - item_state = "collar_blk_overlay" - overlay_state = "collar_blk_overlay" + item_state = "collar_blk" + overlay_state = "collar_blk" /obj/item/clothing/accessory/collar/gold name = "Golden tag collar" desc = "A collar for your little pets... or the big ones." icon_state = "collar_gld" - item_state = "collar_gld_overlay" - overlay_state = "collar_gld_overlay" + item_state = "collar_gld" + overlay_state = "collar_gld" /obj/item/clothing/accessory/collar/bell name = "Bell collar" desc = "A collar with a tiny bell hanging from it, purrfect furr kitties." icon_state = "collar_bell" - item_state = "collar_bell_overlay" - overlay_state = "collar_bell_overlay" + item_state = "collar_bell" + overlay_state = "collar_bell" var/jingled = 0 /obj/item/clothing/accessory/collar/bell/verb/jinglebell() @@ -50,8 +50,8 @@ name = "Shock collar" desc = "A collar used to ease hungry predators." icon_state = "collar_shk0" - item_state = "collar_shk_overlay" - overlay_state = "collar_shk_overlay" + item_state = "collar_shk" + overlay_state = "collar_shk" var/on = FALSE // 0 for off, 1 for on, starts off to encourage people to set non-default frequencies and codes. var/frequency = 1449 var/code = 2 @@ -165,31 +165,26 @@ name = "Spiked collar" desc = "A collar with spikes that look as sharp as your teeth." icon_state = "collar_spik" - item_state = "collar_spik_overlay" - overlay_state = "collar_spik_overlay" + item_state = "collar_spik" + overlay_state = "collar_spik" /obj/item/clothing/accessory/collar/pink name = "Pink collar" desc = "This collar will make your pets look FA-BU-LOUS." icon_state = "collar_pnk" - item_state = "collar_pnk_overlay" - overlay_state = "collar_pnk_overlay" + item_state = "collar_pnk" + overlay_state = "collar_pnk" /obj/item/clothing/accessory/collar/holo name = "Holo-collar" desc = "An expensive holo-collar for the modern day pet." icon_state = "collar_holo" - item_state = "collar_holo_overlay" - overlay_state = "collar_holo_overlay" + item_state = "collar_holo" + overlay_state = "collar_holo" matter = list(DEFAULT_WALL_MATERIAL = 50) -//TFF 17/6/19 - public loadout addition: Indigestible Holocollar /obj/item/clothing/accessory/collar/holo/indigestible - name = "Holo-collar" desc = "A special variety of the holo-collar that seems to be made of a very durable fabric that fits around the neck." - icon_state = "collar_holo" - item_state = "collar_holo_overlay" - overlay_state = "collar_holo_overlay" //Make indigestible /obj/item/clothing/accessory/collar/holo/indigestible/digest_act(var/atom/movable/item_storage = null) return FALSE @@ -276,3 +271,11 @@ /obj/item/clothing/accessory/medal/silver/unity name = "medal of unity" desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat." + +/obj/item/clothing/accessory/medal/silver/unity/tabiranth + icon = 'icons/obj/clothing/ties_vr.dmi' + icon_override = 'icons/mob/ties_vr.dmi' + 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." diff --git a/icons/mob/ties_vr.dmi b/icons/mob/ties_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e9651101126aa0ea22f8daf5c998fba76993f5f5 GIT binary patch literal 713 zcmV;)0yh1LP)=15}hK<3pBGa`Ey8885%wvqhBtc*1KbHRw6&CY1r@Gh_ZIl5HD< zv)Q-cf;T@iMpVVl0kM?prs6HNMO%CkXJ-4>tQ*?*7hmSjgVk*($)5lK0g6dPK~#90 z?cKjk12Gf_V4ouKM*=CPPLUCiSb-Jj8G(+LG9?|Nqhk%&fC-odM0LJX@;ELR2l&3L zUhHREE`PF=lmPe-n$NG0=R56>g$w3oyPDPy<5ZL=01ONa4sAp{ccl7xcR(C^>kc)WfaBzN? z@7vXJw?914YT2%4tNx7gfZfsKVEvRH*A`zphW*Q7)4Lv?q8a54c1JJH2X8sd^V7I~ zPbvWb007n+ng5;S)GRjCsp&1(|7Ei{|9fj!r=9$7u~^JE)y?bcOS?YljK@yH8RY>x vgH6sG>y*nI=#7Wo-{Lt{#Wx550Q^E9{qP|<9K){b00000NkvXXu0mjfKax$3 literal 0 HcmV?d00001 diff --git a/icons/obj/clothing/collars_vr.dmi b/icons/obj/clothing/collars_vr.dmi deleted file mode 100644 index 6c93ced866887681f5458cfc8cd5b1b416831631..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3718 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 diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fc13c4f683f76b2e77a56261d1fc98937b72b620 GIT binary patch literal 1909 zcmaJ?dpy$%8~<&XVJrxnoZ8dhhpZBlx$NT>AJm2s4^E{vDpXdAed@r5w!YRsY$O8bN z=zi4o6`D&K!GT+T|}9>@Kfc&?p)>X`m!&;1vtVtlUO z!p8m*8({Rb)wIXTwSXO~xHal@FmMa9I`B4Y#R>N2I;G;_9b6(EiCc zU>IjJ1dt>5TQNRH8UbUvzE9~WXlO72I%#&jltZ5BkslHlrdT6FG`#!O!MAfe2f{D- zO=A`_D>As#A4jnJIUJ$zRaH$ee3-&PCHl{DH)LS(z-_04n(7imMe5ko8qV8yT)WA!2mjiNbLJQ;JFdkO?YFb2Ff9X+T|W!H_e;Xm!quU(dlQKL$xq(B z^I1=^Z}~u4LSe7Q7@nfn>3fUZY2k}|&qdoNc zA(VCiBeA`q{AyoElElz2G>~qPn`egbak{>d5!`YT<+n4QZqJ>{ZvUDABQXJF9ai?sFxsU)ix9r z3+KyrCFHW{Xd_{~3>pMkR;PaNQV{9GkVt1ei6_dng2nFcZRQhG=ZsbqdVpN97!7~W z>}GJ<@y0_VQKWq5$-2w)ea#kQVw(5thMGFIg3Bf<)@Ek3D!iQSLm~Ix(!tDR?oSvc z$Tgu*s1b{175~uOEA$L9t9k&GC0krIdF9+ZHc@%>c;ij{sNo4N7n50Eh*#YnGbgC& zTJ9ZISR0IaL`hFKJ?V5$ty9*iH!f&+!fS9TF;XdcBtb!T%19LdvvUOtE0_2LBw62b z-WD$|8jC(IP*(;MAb@E%^RtC$GW(#I!WVHj-M6bQHE7Ku@qmCGJ=KVpQnUG1@&@D{ zFxCJL-}X{JHYd)qoN-7?wKb4z^VWEhoM>@00&%FIr+C9()ZAIGa&xoUs?OmIpfO zWgb;-2&V57-+g!|WB!^{+V5nNn`xaDxm0|&Le}h#k7mYg@1yh}@zxdVSNQ z)yrXe9Mrmz6L#1Bi+kv5!9aKvB5-MA$YcP^O zj1Xla5%%0^NDF3)PPfXJdxS1l6xn51_O;- zf5gEO`~e3W8}|!gy`iqb(wEGo1xmGfSRYv}$)yf`&h!ut56R|v@G*LpUeuV!o+o(P z05HHmcsi}~&1+U@7n@%-o`h?J3Ol6KMm?VRUFyukOBT+aixr9p1N z{fEFakXnHfU}g{1ZMtR(Z?iWikXSjy{GXeW=o#EBMoj=gCum0Mj2)D$Fq|kovFE=( a?v<3f;A3h?!N+%U6mUP{<@&&xkoh;(JdEN1 literal 0 HcmV?d00001