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.

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

Another shork plushie #2318

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions tff_modular/modules/toys/code/loadout_datum_toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@
/datum/loadout_item/toys/special/yulia
name = "Yulia Plushie"
item_path = /obj/item/toy/plush/tff/yulia

/datum/loadout_item/toys/special/maru
name = "Maru Plushie"
item_path = /obj/item/toy/plush/tff/maru
ckeywhitelist = list("mercreaper", "skadi999")
8 changes: 8 additions & 0 deletions tff_modular/modules/toys/code/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@
attack_verb_continuous = list("attacks", "bites", "gnashes at", "hugs")
attack_verb_simple = list("attack", "bite", "gnash at", "hug")
squeak_override = list('sound/weapons/bite.ogg' = 1,'modular_nova/modules/emotes/sound/voice/feline_purr.ogg' = 1)

/obj/item/toy/plush/tff/maru
name = "Maru plushie"
desc = "An adorable stuffed toy, resembling a shark, wearing a formal maid suit. Beware of runes on the floor!"
icon_state = "plush_ivolga"
attack_verb_continuous = list("attacks", "bites", "gnashes at", "casts at")
attack_verb_simple = list("attack", "bite", "gnash at", "cast at")
squeak_override = list('sound/weapons/bite.ogg' = 1,'tff_modular/modules/toys/sounds/rrr.ogg' = 1)
Binary file modified tff_modular/modules/toys/icons/plushes.dmi
Binary file not shown.
Binary file added tff_modular/modules/toys/sounds/rrr.ogg
Binary file not shown.
Loading