From 40c9947bca17139979c63d5c11928f57957c6817 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 19 Feb 2022 04:23:35 -0600 Subject: [PATCH] bro i dont wanna talk about loadout_general.dm --- code/game/objects/items/toys/toys_vr.dm | 2 ++ .../loadout/loadout_fluffitems_vr.dm | 6 ++++++ .../loadout/loadout_general.dm | 6 +++++- .../vore/fluffstuff/custom_items_vr.dm | 12 +++++++++++- icons/vore/custom_items_vr.dmi | Bin 63668 -> 64218 bytes 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 3884b0a17cd..21f2f1cc071 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -4,6 +4,8 @@ icon = 'icons/obj/toy_vr.dmi' icon_state = "mistletoe" +// 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." 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 5953edb77b7..0f9060a1afe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/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 diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 8b566fe3c98..615e16bf5d9 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 ba6d7976ef0..f21eed951f3 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1449,4 +1449,14 @@ item_state = "revclaymoremob" force = 1 sharp = TRUE - edge = TRUE \ No newline at end of file + 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 \ No newline at end of file diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index 3c05eb5d57f4c8a05a637b0e2f99a401b19c9568..ca6f3dfa19e2675d9fcc3d4d45df93180caaa596 100644 GIT binary patch delta 2497 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 delta 1942 zcmZ{iX*}Br8pr>HhAK5xWm+WNx_V5jRaHl&dLS{VTc~qr6r~tfZ2U8}^zbPr>Zqzr zTR|vs##Kp1$Jrq$v5ruq=!8lmLgZl6e)i42*tgH~`#tA(N&so%L2~uwhU*P}SJ3)p z#0+GXrrF%eL6lbPLK^kXKQl(Q9&A)p^!gyL;n?WEsIm`aXE=EF#Omx0+8N*adH!)o z#y~*dY-L~WQ?0$}0mkTg|MtCCBDD@UJb|Bx*z8Gn__)W-8P)1T%k_6SnfN07H34}l zvi2t-;c$&Q?Z#iF@4J(4VKB_qA&dA~A{QDOoVY0=;`A(-F-!}-weRRg^rw~uR9+gT zWEzZhvUUY$u{tG^)aJGI*_(vuR6E?s0-kxQq%rglz$Yb+qN&hz4aac@!=)U!j=gjM zu6@64`^{_noPpgX8+5uM%30|_{Cdu@jf;7po8e4ry7EHIrm**KreBi06|2sV!Dh1u zmifM|cV9f}eraiCWuRKi&)-UJU|ai*@^m>V;Cj@^yJEAy#Lq=qRC@UYU1G)(5e8Zq zl`c5W{Xlxb!#txEQg@a;Zf;UVt89gaN$OTwayVg*Z+Lc8YfoG*Pk20rUBZ+uQ3&54}yxiu5qH)`c z*`m=P^_OW)0$0L4mr}#nbSIe`vcMgB!rNcGobUb|KK%Z@Y19E9Y#Nn%CiUo8o{fMU z6NfWW>O}_&CxuI+eTsxIPOHz7;LOFxT|hr9kvPehAS3H27821OxbTOaf=b1 zQq~cXB#Rr7_S`h7hb{%@^1{$R!E7pH9u^=Tc{?ZQt(Gh|*MM8For=GECn}Rh^e70< zfEhq-YO1WRb|jp?Gj%=?8a;PnaQM6Db!w4IJ)>t={Lj54k*-fA`*eq#Wr-duRnhn+ zU-v>uM`pG^Naync72eT-zVgP393-K3=8b3C=dpej4oBpg#NAvOB?UMYpGRVbN=}2F zsV#xtwHqM0L%dv{14FPF41CmdL6~2|o~TKx!8Fw@2wi+GtV(Z&UQu3dh%O*yX`LB* zH~#%RG;yt-h{ZTL6Kb2!oaht|qL8|TveZZ$Dv`}Er680t6&VR)%wi%rsD(;J5h~z9 z=_sJN?qmXfi@|bQA#H193 z)cXYN^EzAtpK+EDtcen`4E_BS?x~!E7+i&Ok)YZ_#TwRVQxp*OCh#rAQ-hWB;Q0W-Fy{d7%V?h;gptM6iq&IuN^UKjsXsC+v z4ol4oZMsnYg2=u%xpn*Ve^us8zu!qmLk;o^X^!rQ3UZArh^96hix z)v^it3Nl%8p$&)8H;x{^E&Wj#UpUU&1BAM~Rk1Zix2ag_8<2>~;97&_EP#*N8)~F( zSpA}FFA|L1GM#7od-Waxa{Yg~qv(AJouE}dov}n^B;8Y5PYzbH()Zlr_p{w0++|e8 z(uIx=6SlLXFpIP6@S<(7cDDQ2Bc7T_2mq#v?OI=CCx~C@ef+DwAnF-~Mav#Oq~P3c zGVPnP8u>X(URI$7r`uL~hi`zCsgM%wYv4FdCYx#Ay#DK$6P74Dv(Yf{Ny+MoK03_! z!Aq}$(wn-8Hx4AwP4)oz-xTzKx2@}ihOQaul~)rN^Dplk;K*LnFv$118=zS{y=rGz zYX|D>kUF{VXLpS2GaVdN7oQy31dENP1 J?UkVP{{YDj$oc>P