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 f4bb579c43..5560eaf8cb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -338,6 +338,12 @@ ckeywhitelist = list("hottokeeki") character_name = list("Belle Day") +/datum/gear/fluff/amaryll_claws + path = /obj/item/weapon/surgical/scalpel/amaryll_claws + display_name = "Amaryll's Claws" + ckeywhitelist = list("hunterbirk") + character_name = list("Amaryll") + // I CKEYS /datum/gear/fluff/ruda_badge path = /obj/item/clothing/accessory/badge/holo/detective/ruda diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e5d28b7d86..fd2e9a0396 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1347,4 +1347,69 @@ End CHOMP Removal*/ +<<<<<<< HEAD +======= +// Astra - // Astra +/obj/item/weapon/material/knife/ritual/fluff/astra + name = "Polished Ritual Knife" + desc = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" + +//AlFalah - Charlotte Graves +/obj/item/weapon/storage/fancy/fluff/charlotte + name = "inconspicuous cigarette case" + desc = "A SkyTron 3000 cigarette case with no additional functions. The buttons and CRT monitor are completely for show and have no functions. Seriously. " + icon_state = "charlotte" + icon = 'icons/vore/custom_items_vr.dmi' + storage_slots = 7 + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter, /obj/item/trash/cigbutt) + icon_type = "charlotte" + //brand = "\improper Professional 120" + w_class = ITEMSIZE_TINY + starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) + +//Ashling - Antoinette deKaultieste +/obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette + name = "sawtooth ritual knife" + desc = "A mostly decorative knife made from thin ceramic and toothed with large black fangs. Printed on the flat is an eight-armed cross, like an asterisk with an extra stroke, ringed by a calligraphy-style crescent." + attack_verb = list("mauled", "bit", "sawed", "butchered") + dulled = 1 + default_material = "glass" + + +//Ashling - Antoinette deKaultieste +/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette + name = "silk knife loops" + desc = "A clip-on pair of pouched loops made from surprisingly sturdy silk. Made for holding knives and small vials in a pinch." + icon_state = "unathiharness1" + slots = 2 + +/obj/item/weapon/reagent_containers/glass/bottle/poppy + name = "poppy flour bottle" + desc = "A small bottle of finely ground poppyseed and mixed dried berries." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle3" + prefill = list("bicaridine" = 30, "nutriment" = 30) + +/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize() + . = ..() + hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 + hold.can_hold = list(/obj/item/weapon/material/knife, /obj/item/weapon/reagent_containers/glass/bottle) + + new /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold) + new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold) + +//Hunterbirk - Amaryll +//This is a 'technical item' which basically is meant to represent rippiing things up with bare claws. +/obj/item/weapon/surgical/scalpel/amaryll_claws + name = "Amaryll's Claws" + desc = "This doesn't quite look like what it really is." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "claws" + drop_sound = null + pickup_sound = null + origin_tech = null + matter = null +>>>>>>> 6b5f2032a1... Merge pull request #11931 from Heroman3003/amaryll