diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7a00cb34994..c1d1e20d0f9 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -925,6 +925,13 @@ icon_state = "kittenplushie" slot_flags = SLOT_HEAD +/obj/item/toy/plushie/pennyplush + name = "Penny plush" + desc = "It's a plush of the beloved company mascot cat, Penny! For the price Nanotrasen sells these things at, you probably could have bought an actual cat." + 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." diff --git a/html/changelogs/witchbells - changelog.yml b/html/changelogs/witchbells - changelog.yml new file mode 100644 index 00000000000..b51f7268bdf --- /dev/null +++ b/html/changelogs/witchbells - changelog.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: witchbells + +# 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 plushtoy of Penny. You're welcome." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index cc748f562c4..289680d6a8d 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_toy.dmi b/icons/mob/items/lefthand_toy.dmi index 98fcb6d54de..83716d0ca64 100644 Binary files a/icons/mob/items/lefthand_toy.dmi and b/icons/mob/items/lefthand_toy.dmi differ diff --git a/icons/mob/items/righthand_toy.dmi b/icons/mob/items/righthand_toy.dmi index 62c008e21d6..5e0760a66de 100644 Binary files a/icons/mob/items/righthand_toy.dmi and b/icons/mob/items/righthand_toy.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 8e55d260d6e..86360883ac9 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ