diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6d8f6fd2c44..e9e21a6c8bc 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1255,6 +1255,13 @@ icon_state = "herring_gull_lying" item_state = "herring_gull_lying" +//Jeweler cockatoo plushie +/obj/item/toy/plushie/cockatoo + name = "jeweler cockatoo plushie" + desc = "A plushie of Konyang's national animal, much smaller than the real thing. This one won't get you arrested for touching it, either." + icon_state = "cockatoo" + phrase = "Chirp!" + //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 f5d33e6a945..2399d2271b1 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -83,7 +83,8 @@ /obj/item/toy/plushie/squid, /obj/item/toy/plushie/bear, /obj/item/toy/plushie/bearfire, - /obj/item/toy/plushie/herring_gull + /obj/item/toy/plushie/herring_gull, + /obj/item/toy/plushie/cockatoo ) /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 a0569510d5d..7eadc414769 100644 --- a/code/modules/client/preference_setup/loadout/items/toy.dm +++ b/code/modules/client/preference_setup/loadout/items/toy.dm @@ -97,6 +97,7 @@ plushies["plushie, Qill"] = /obj/item/toy/plushie/qill 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 gear_tweaks += new /datum/gear_tweak/path(plushies) /datum/gear/toy/mecha diff --git a/html/changelogs/greenjoe12345 - cockatooplush.yml b/html/changelogs/greenjoe12345 - cockatooplush.yml new file mode 100644 index 00000000000..461aaa13b23 --- /dev/null +++ b/html/changelogs/greenjoe12345 - cockatooplush.yml @@ -0,0 +1,41 @@ +################################ +# 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: Greenjoe12345 + +# 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: "Adds a jeweler cockatoo plushie" \ No newline at end of file diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index b12b5958066..fc08baf9e5b 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ