diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 11c4082794..0bfe5bd45a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -284,7 +284,14 @@ ckeywhitelist = list("dawidoe") character_name = list("Melissa Krutz") allowed_roles = list("Security Officer") - +//Dopiotl +//Jeanne Petite +/datum/gear/fluff/jeans_chocolates + path = /obj/item/weapon/storage/secure/briefcase/fluff/jeans + display_name = "ChocoBox" + description = "M-M-M-M-MONEY SHOT" + ckeywhitelist = list("dopiotl") + character_name = list("Jeanne Petite") //dwaggy90 //Saur Darastrix /datum/gear/fluff/saur_rig diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm index 5d9df5a5d4..759c4ef425 100644 --- a/code/modules/vore/appearance/sprite_accessories_yw.dm +++ b/code/modules/vore/appearance/sprite_accessories_yw.dm @@ -41,6 +41,14 @@ icon_state = "cyberdoe_s" do_colouration = 0 +/datum/sprite_accessory/wing/cyberangel + name = "Cyber angel wing (colorable)" + desc = "" + icon = 'icons/mob/vore/wings_yw.dmi' + icon_state = "cyber_angel" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + //Tails /datum/sprite_accessory/tail/tripplekitsune_colorable_yw icon = 'icons/mob/vore/tails_yw.dmi' diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 0ff0ea5c69..c9de33290a 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -650,3 +650,36 @@ H.resize(1) if("Large") H.resize(1.22) + +// ************* +// Dopiotl +// ************* +/obj/item/weapon/storage/secure/briefcase/fluff/jeans + name = "Sweet Ebony" + desc = "An ebony/wooden secure case lined with gold. It looks thick, heavy, expensive, and incredibly sturdy. The design is sleek and elegant, adorned in intricate markings on the side, with hand-crafted artwork of a constellation you can't quite seem to recollect. It is surprisingly cold to the touch." + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "jeans_lockbox" + item_state_slots = list(slot_r_hand_str = "jeans_lockbox", slot_l_hand_str = "jeans_lockbox") + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi', + slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi', + ) + var/list/has_items = list( + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + ) + +/obj/item/weapon/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke + storage_slots = has_items.len + allowed = list() + for(var/P in has_items) + allowed += P + new P(src) + ..() + return \ No newline at end of file diff --git a/icons/mob/vore/wings_yw.dmi b/icons/mob/vore/wings_yw.dmi index c6c4d7a548..b4e9630aa6 100644 Binary files a/icons/mob/vore/wings_yw.dmi and b/icons/mob/vore/wings_yw.dmi differ diff --git a/icons/vore/custom_items_left_hand_yw.dmi b/icons/vore/custom_items_left_hand_yw.dmi index b527bcd0a8..b503889d55 100644 Binary files a/icons/vore/custom_items_left_hand_yw.dmi and b/icons/vore/custom_items_left_hand_yw.dmi differ diff --git a/icons/vore/custom_items_right_hand_yw.dmi b/icons/vore/custom_items_right_hand_yw.dmi index 0ed094c161..fc303c9c2d 100644 Binary files a/icons/vore/custom_items_right_hand_yw.dmi and b/icons/vore/custom_items_right_hand_yw.dmi differ diff --git a/icons/vore/custom_items_yw.dmi b/icons/vore/custom_items_yw.dmi index 293396d8cc..a4bce86d2c 100644 Binary files a/icons/vore/custom_items_yw.dmi and b/icons/vore/custom_items_yw.dmi differ