Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds some coloured shark plushes #11730

Closed
wants to merge 1 commit into from
Closed

Adds some coloured shark plushes #11730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,26 @@
..()
SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "big_plush")

/obj/item/toy/plush/shark/pink
name = "pink shark plushie"
desc = "A big plushie depicting a rather cartoonish, yet cute shark. Smells like strawberries."
icon_state = "pinkswedishsharkplush"

/obj/item/toy/plush/shark/purple
name = "purple shark plushie"
desc = "A big plushie depicting a rather cartoonish, yet cute shark. Tastes like grape."
icon_state = "purpleswedishsharkplush"

/obj/item/toy/plush/shark/red
name = "red shark plushie"
desc = "A big plushie depicting a rather cartoonish, yet cute shark. Is that blood?"
icon_state = "redswedishsharkplush"

/obj/item/toy/plush/shark/green
name = "pink shark plushie"
desc = "A big plushie depicting a rather cartoonish, yet cute shark. Has fur that feels like moss."
icon_state = "greenswedishsharkplush"

/obj/item/toy/plush/flushed/rainbow
name = "rainbow flushed plushie"
desc = "Hgrgrhrhg cuter."
Expand Down Expand Up @@ -888,6 +908,10 @@
/obj/item/toy/plush/moth/whitefly,
/obj/item/toy/plush/moth/witchwing,
/obj/item/toy/plush/shark,
/obj/item/toy/plush/shark/pink,
/obj/item/toy/plush/shark/green,
/obj/item/toy/plush/shark/purple,
/obj/item/toy/plush/shark/red,
)

/obj/item/choice_beacon/radial/plushie/generate_options(mob/living/M)
Expand Down
Binary file modified icons/mob/inhands/plushes_lefthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/plushes_righthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/plushes.dmi
View file
Open in desktop
Binary file not shown.
Loading