From dc837b05b48d253bf3b493ed8d9775a374139a86 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 19 Feb 2022 17:04:46 -0500 Subject: [PATCH] [ready] pastelprincedan plushie fluff item --- code/game/objects/items/toys/toys_vr.dm | 8 ++++++++ .../loadout/loadout_fluffitems_vr.dm | 6 ++++++ .../preference_setup/loadout/loadout_general.dm | 6 +++++- code/modules/vore/fluffstuff/custom_items_vr.dm | 13 +++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 0f50131ddb..aae72540c0 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -4,6 +4,14 @@ icon = 'icons/obj/toy_vr.dmi' icon_state = "mistletoe" +<<<<<<< HEAD +======= +/* + * Plushies + */ +// HEY FUTURE PLUSHIE CODERS: IF YOU'RE ADDING A SNOWFLAKE PLUSH ITEM USE PATH /obj/item/toy/plushie/fluff +// the loadout entry shouldn't be able to grab those if everything goes right +>>>>>>> fc7a67073bd... Merge pull request #12288 from Hatterhat/slimeiyoshi-plush /obj/item/toy/plushie/lizardplushie name = "lizard plushie" desc = "An adorable stuffed toy that resembles a lizardperson." 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 9a224ebfe5..546e67bac6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -772,6 +772,12 @@ ckeywhitelist = list("pastelprincedan", "hatterhat") character_name = list("Masumi Maki", "Harold Robinson") +/datum/gear/fluff/slimecat_rd_plush + path = /obj/item/toy/plushie/fluff/slimeowshi + display_name = "slimecat RD plushie" + ckeywhitelist = list("pastelprincedan") + character_name = list("Kiyoshi Maki", "Masumi Maki") + // Q CKEYS // R CKEYS diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 8b566fe3c9..615e16bf5d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -53,7 +53,11 @@ /datum/gear/plushie/New() ..() var/list/plushies = list() - for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - /obj/item/toy/plushie/therapy) + var/list/blacklisted_types = list() + // look if theres a better way to do this im all ears + blacklisted_types += subtypesof(/obj/item/toy/plushie/therapy) + blacklisted_types += subtypesof(/obj/item/toy/plushie/fluff) + for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - blacklisted_types) plushies[initial(plushie_type.name)] = plushie_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies)) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index b59b2d2821..3870eeb304 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1448,3 +1448,16 @@ End CHOMP Removal*/ force = 1 sharp = TRUE edge = TRUE +<<<<<<< HEAD +======= + +//PastelPrinceDan - Kiyoshi/Masumi Maki +/obj/item/toy/plushie/fluff/slimeowshi + name = "Slime-Cat Research Director plushie" + desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a Research Director's insignia." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "kimeowshi" + attack_verb = list("blorbled", "slimed", "absorbed", "glomped") + gender = PLURAL // this seems like a good idea but probably prone to changing. todo: ask dan + // the only reason this thought is relevant because the base slimeplush has its gender set to female +>>>>>>> fc7a67073bd... Merge pull request #12288 from Hatterhat/slimeiyoshi-plush