diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2733e134b7e..c34881d99bb 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -969,7 +969,6 @@ icon_state = "pennyplushie" slot_flags = SLOT_HEAD - /obj/item/toy/plushie/lizard name = "lizard plush" desc = "A plushie of a scaly lizard! Very controversial, after being accused as \"racist\" by some Unathi." @@ -1012,11 +1011,19 @@ name = "slime plush" desc = "A beanbag-filled slime plushie. Relaxing!" icon_state = "slimeplushie" + phrase = "Rawr!" /obj/item/toy/plushie/bee name = "bee plush" desc = "A chunky plushie bee. Your new buzz-t friend!" icon_state = "beeplushie" + phrase = "Buzz!" + +/obj/item/toy/plushie/shark + name = "shark plush" + desc = "A beloved jumbo sized shark that is sure to impress your friends." + icon_state = "sharkplushie" + phrase = "Gashunk!" /obj/item/toy/plushie/greimorian name = "greimorian plushie" @@ -1028,19 +1035,19 @@ name = "Axic plushie" desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Axic. " icon_state = "axicplushie" - phrase = "warble!" + phrase = "Warble!" /obj/item/toy/plushie/qill name = "Qill plushie" desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Qill. " icon_state = "qillplushie" - phrase = "warble!" + phrase = "Warble!" /obj/item/toy/plushie/xana name = "Xana plushie" desc = "Plushie designed after the main characters of the hit show, Swimstars! This one is Xana. " icon_state = "xanaplushie" - phrase = "warble!" + phrase = "Warble!" /obj/item/toy/plushie/ipc name = "Aphy plushie" diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index b61cfdaa909..e66a692b1d5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -267,6 +267,7 @@ 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, shark"] = /obj/item/toy/plushie/shark 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 diff --git a/html/changelogs/toyupdateandaddition.yml b/html/changelogs/toyupdateandaddition.yml new file mode 100644 index 00000000000..6c3ba2c9543 --- /dev/null +++ b/html/changelogs/toyupdateandaddition.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: niennab + +# 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 a shark plushie." + - tweak: "Tweaked the sprites on the spirit board, eight ball, penny plushie, slime plushie, bee plushie, SwimStars! plushies, and all therapy dolls." + - tweak: "Raised the sprite of all magazines/comics so they are more in the center." diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index d4d6251878d..ffcce968c8b 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ