diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index f2654d86588..0294f674f21 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1280,6 +1280,13 @@ icon_state = "cockatoo" phrase = "Chirp!" +//Norinori plushie +/obj/item/toy/plushie/norinori + name = "\improper Norinori plushie" + desc = "A plump and fluffy plushie depicting Up!Burger's mascot Norinori the Onigiri! It smells faintly of rice." + icon_state = "norinori" + phrase = "Buy. Up!Burger!" + //Toy cult sword /obj/item/toy/cultsword name = "foam sword" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 109450eada5..2448f5d7171 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -84,7 +84,8 @@ /obj/item/toy/plushie/bear, /obj/item/toy/plushie/bearfire, /obj/item/toy/plushie/herring_gull, - /obj/item/toy/plushie/cockatoo + /obj/item/toy/plushie/cockatoo, + /obj/item/toy/plushie/norinori ) /obj/random/balloon diff --git a/code/modules/client/preference_setup/loadout/items/toy.dm b/code/modules/client/preference_setup/loadout/items/toy.dm index 7eadc414769..419c2e0928b 100644 --- a/code/modules/client/preference_setup/loadout/items/toy.dm +++ b/code/modules/client/preference_setup/loadout/items/toy.dm @@ -98,6 +98,7 @@ plushies["plushie, Xana"] = /obj/item/toy/plushie/xana plushies["plushie, Aphy"] = /obj/item/toy/plushie/ipc plushies["plushie, jeweler cockatoo"] = /obj/item/toy/plushie/cockatoo + plushies["plushie, Norinori"] = /obj/item/toy/plushie/norinori gear_tweaks += new /datum/gear_tweak/path(plushies) /datum/gear/toy/mecha diff --git a/html/changelogs/GeneralCamo-norinoriplushie.yml b/html/changelogs/GeneralCamo-norinoriplushie.yml new file mode 100644 index 00000000000..3ead335275a --- /dev/null +++ b/html/changelogs/GeneralCamo-norinoriplushie.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: GeneralCamo + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a Norinori plushie to the loadout and random plush spawns." diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index fc08baf9e5b..553d2cf2711 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ