Merge pull request #12288 from Hatterhat/slimeiyoshi-plush

[ready] pastelprincedan plushie fluff item

code/game/objects/items/toys/toys_vr.dm

@@ -37,6 +37,8 @@
 /*
  * 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
 /obj/item/toy/plushie/lizardplushie
 	name = "lizard plushie"
 	desc = "An adorable stuffed toy that resembles a lizardperson."

code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm

@@ -851,6 +851,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

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))
 

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1449,4 +1449,14 @@
 	item_state = "revclaymoremob"
 	force = 1
 	sharp = TRUE
-	edge = TRUE
+	edge = TRUE
+
+//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