diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index c1d1e20d0f9..1ed89d65183 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -958,6 +958,28 @@ desc = "A bear plushie. Only you can stop phoron fires!" icon_state = "bearplushie_fire" +/obj/item/toy/plushie/schlorrgo + name = "schlorrgo plush" + desc = "A schlorrgo plushie, ready to roll his way into your heart!" + icon_state = "schlorrgoplushie" + phrase = "Eough!" + +/obj/item/toy/plushie/coolschlorrgo + name = "Cool Schlorrgo plush" + desc = "A plushie of the popular cartoon character, Cool Schlorrgo. Hadii's grace!" + icon_state = "coolerschlorrgoplushie" + phrase = "Eough!" + +/obj/item/toy/plushie/slime + name = "slime plush" + desc = "A beanbag-filled slime plushie. Relaxing!" + icon_state = "slimeplushie" + +/obj/item/toy/plushie/bee + name = "bee plush" + desc = "A chunky plushie bee. Your new buzz-t friend!" + icon_state = "beeplushie" + //Squid Plushies /obj/item/toy/plushie/squid @@ -977,6 +999,13 @@ item_state = "[colorvar]squid" desc = "A small, cute and loveable squid friend. This one is in [colorvar]." +/obj/item/toy/plushie/squidcolour + name = "squid plushie" + desc = "A small, cute, and loveable squid friend. This one comes in a wide variety of colours." + icon_state = "squidplushie_colour" + // slot_flags = SLOT_HEAD - head sprite may come someday, but not today. + phrase = "Blub!" + //Toy cult sword /obj/item/toy/cultsword name = "foam sword" diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 8351c8da170..e26d0df999a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -162,6 +162,28 @@ display_name = "battlemonsters starter deck" path = /obj/item/battle_monsters/wrapped +/datum/gear/plushie + display_name = "plushie selection" + path = /obj/item/toy/plushie + +/datum/gear/plushie/New() + ..() + var/plushies = list() + plushies["plushie, nymph"] = /obj/item/toy/plushie/nymph + plushies["plushie, mouse"] = /obj/item/toy/plushie/mouse + plushies["plushie, kitten"] = /obj/item/toy/plushie/kitten + plushies["plushie, lizard"] = /obj/item/toy/plushie/lizard + plushies["plushie, spider"] = /obj/item/toy/plushie/spider + plushies["plushie, farwa"] = /obj/item/toy/plushie/farwa + plushies["plushie, bear"] = /obj/item/toy/plushie/bear + plushies["plushie, firefighter bear"] = /obj/item/toy/plushie/bearfire + plushies["plushie, random squid"] = /obj/item/toy/plushie/squid //if someone can figure out how to make color work with these, good luck lmao + plushies["plushie, bee"] = /obj/item/toy/plushie/bee + plushies["plushie, schlorrgo"] = /obj/item/toy/plushie/schlorrgo + plushies["plushie, cool schlorrgo"] = /obj/item/toy/plushie/coolschlorrgo + plushies["plushie, slime"] = /obj/item/toy/plushie/slime + gear_tweaks += new/datum/gear_tweak/path(plushies) + /datum/gear/toothpaste display_name = "toothpaste and toothbrush" path = /obj/item/storage/box/toothpaste diff --git a/html/changelogs/crunchypretzels-plushieloadout.yml b/html/changelogs/crunchypretzels-plushieloadout.yml new file mode 100644 index 00000000000..5aa2b1cd2ae --- /dev/null +++ b/html/changelogs/crunchypretzels-plushieloadout.yml @@ -0,0 +1,13 @@ +author: Waff-AI + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the ability to add plushies to your loadout." + - rscdel: "Adds greyscaled squid plushies, a bee, a slime, and two schlorrgo plushies." diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 86360883ac9..9176a44a66f 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ