diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8953ade8055..b1a28bb9766 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -843,6 +843,16 @@ desc = "A farwa plush doll. It's soft and comforting, with extra grip!" icon_state = "farwaplushie" slot_flags = SLOT_HEAD + +/obj/item/toy/plushie/bear + name = "bear plush" + desc = "A bear plushie. You should hug it, quickly!" + icon_state = "bearplushie" + +/obj/item/toy/plushie/bearfire + name = "firefighter bear plush" + desc = "A bear plushie. Only you can stop phoron fires!" + icon_state = "bearplushie_fire" //Squid Plushies diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 00e067991eb..f1e403da68c 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -317,6 +317,8 @@ /obj/item/toy/plushie/kitten, /obj/item/toy/plushie/lizard, /obj/item/toy/plushie/farwa, + /obj/item/toy/plushie/bear, + /obj/item/toy/plushie/bearfire, /obj/random/squid_plushie ) @@ -1227,4 +1229,4 @@ var/obj/item/weapon/gun/energy/E = spawned E.charge_cost *= 2 E.self_recharge = 0 - E.reliability = 90 \ No newline at end of file + E.reliability = 90 diff --git a/html/changelogs/SubberTheFabulous-PR-6519.yml b/html/changelogs/SubberTheFabulous-PR-6519.yml new file mode 100644 index 00000000000..77f2463f2e6 --- /dev/null +++ b/html/changelogs/SubberTheFabulous-PR-6519.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: Subber + +# 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 bear plushies." \ No newline at end of file diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 53351324cdf..7301baa3d01 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ