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 0000000000..e965110112 Binary files /dev/null and b/icons/mob/ties_vr.dmi differ diff --git a/icons/obj/clothing/collars_vr.dmi b/icons/obj/clothing/collars_vr.dmi deleted file mode 100644 index 6c93ced866..0000000000 Binary files a/icons/obj/clothing/collars_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi new file mode 100644 index 0000000000..fc13c4f683 Binary files /dev/null and b/icons/obj/clothing/ties_vr.dmi differ