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 85aef31f937..fe7e65b0afc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -14,6 +14,14 @@ allowed_roles = list("Station Engineer") */ + +/datum/gear/fluff/collar //Use this as a base path for collars if you'd like to set tags in loadout. Make sure you don't use apostrophes in the display name or this breaks! + slot = slot_tie + +/datum/gear/fluff/collar/New() + ..() + gear_tweaks = list(gear_tweak_collar_tag) + // 0-9 CKEYS /datum/gear/fluff/malady_crop path = /obj/item/weapon/material/twohanded/fluff/riding_crop/malady @@ -69,6 +77,13 @@ ckeywhitelist = list("arokha") character_name = list("Aronai Sieyes") +/datum/gear/fluff/collar/azura + path = /obj/item/clothing/accessory/collar/azura + display_name = "collar, Azura" + description = "For the kobold's pet." + ckeywhitelist = list("azura chitin") + character_name = list("Azura Chitin") + // B CKEYS /datum/gear/fluff/yuuko_kimono path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono @@ -515,9 +530,9 @@ ckeywhitelist = list("kisukegema") character_name = list("Kisuke Gema") -/datum/gear/fluff/excess_collar +/datum/gear/fluff/collar/excess path = /obj/item/clothing/accessory/collar/pink/fluff/warning - display_name = "Excess's Collar" + display_name = "collar, Excess" ckeywhitelist = list("killerdragn") character_name = list("Excess") @@ -1103,6 +1118,4 @@ path = /obj/item/device/radio/headset/fluff/zodiacshadow display_name = "Nehi's Radio" ckeywhitelist = list("zodiacshadow") - character_name = list("Nehi Maximus") - - + character_name = list("Nehi Maximus") \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index ece0457efa1..39d4a36d500 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1939,7 +1939,7 @@ Departamental Swimsuits, for general use /obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip/equipped() //Because otherwise it gets reset every time ..() icon_override = 'icons/vore/custom_clothes_vr.dmi' - + //CappyCat:Cappy Fuzzlyfeathers /obj/item/clothing/accessory/watch name = "silver pocket watch" @@ -1948,8 +1948,18 @@ Departamental Swimsuits, for general use icon_state = "deadringer" w_class = ITEMSIZE_SMALL slot_flags = SLOT_ID | SLOT_BELT | SLOT_TIE - + //Pimientopyro:Zaku Fyodorovna /obj/item/clothing/suit/varsity/green/sweater_vest name = "green sweater vest" desc = "A green argyle sweater vest with a white undershirt, a must for long winter nights and looking like a dork." + +//Azura Chitin: Azura Chitin +/obj/item/clothing/accessory/collar/azura + name = "Azura's collar" + desc = "A black collar with green patterns, reminiscent of tribal tattoos. Regardless of what the front of the tag says, the back of it reads \"Azura Chitin\"." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "azuracollar" + + icon_override = 'icons/vore/custom_onmob_vr.dmi' + icon_state = "azuracollar" diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index daf6b0895af..c1ededb9697 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index d94c0da70de..1dbfb6d011b 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ