From 37e43bf832affbdba0e426243a93aedae136e803 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 17 Feb 2022 08:15:55 -0500 Subject: [PATCH] revolver eloise fluff item --- .../loadout/loadout_fluffitems_vr.dm | 6 ++++++ code/modules/vore/fluffstuff/custom_items_vr.dm | 14 ++++++++++++++ 2 files changed, 20 insertions(+) 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 c8c63754be..9a224ebfe5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -807,6 +807,12 @@ ckeywhitelist = list("residentcody") character_name = list("Pathfinder") +/datum/gear/fluff/revolver_claymore + path = /obj/item/weapon/sword/fluff/revolver + display_name = "Catnip" + ckeywhitelist = list("revolvereloise") + character_name = list("Revolver Eloise") + /datum/gear/fluff/nikki_dorky_outfit path = /obj/item/weapon/storage/box/fluff display_name = "Nikki's Witchy Outfit" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index c61b032826..b3fb7d621c 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1437,3 +1437,17 @@ End CHOMP Removal*/ from_suit = /obj/item/clothing/suit/storage/hooded/explorer to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky +<<<<<<< HEAD +======= +//RevolverEloise - Revolver Eloise +/obj/item/weapon/sword/fluff/revolver + name = "Catnip" + desc = "A steel claymore with what appears to be a teppi engraved into the hilt and a finely forged metal cuboid for a pommel. The blade is honed and balanced to an unusually high degree and has clearly been meticulously cared for." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "revclaymore" + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "revclaymoremob" + force = 1 + sharp = TRUE + edge = TRUE +>>>>>>> 522b931dd87... Merge pull request #12244 from PastelPrinceDan/revfluff