Skip to content

add cry fallback, so you can finally cry audibly as a non humanoid #6

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

Open
Techbot121 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add cry fallback, so you can finally cry audibly as a non humanoid #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4dc8967
plushies for meta
Danielance Jul 23, 2026
5f8b559
Merge pull request #1 from Danielance/meta-plushies
Techbot121 Jul 23, 2026
5af9f1c
Merge branch 'Bubberstation:master' into master
Techbot121 Jul 27, 2026
161f15c
Merge branch 'Bubberstation:master' into master
Techbot121 Jul 29, 2026
206d6d2
add cry fallback, so you can finally cry audibly as a non humanoid
Techbot121 Aug 2, 2026
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
21 changes: 21 additions & 0 deletions modular_zubbers/code/game/objects/items/plushes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,27 @@
attack_verb_simple = list("businesscard-slap", "financially educate", "threaten to sue", "zap", "bzzt", "buzz")
squeak_override = list('sound/effects/sparks/sparks1.ogg' = 98, 'sound/mobs/non-humanoids/hygienebot/cutarteries.ogg' = 1, 'sound/items/dump_it.ogg' = 1)

//Plushie of Daoma, by Dottrina
/obj/item/toy/plush/daoma
name = "pink alien plush"
desc = "An otherworldly yet familiar plushie. There is a tag on it with indecipherable writing."
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
icon_state = "daoma_plush"
gender = FEMALE
attack_verb_continuous = list("bullies", "slams", "attacks", "slaps")
attack_verb_simple = list("bully", "slam", "attack", "slap")

//Plushie of Sansiri, by Danielone
/obj/item/toy/plush/sansiri
name = "purple bird plush"
desc = "A delicate plushie whose softness is second to none. It looks ready to go to hell and back with you."
icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
icon_state = "sansiri_plush"
gender = FEMALE
attack_verb_continuous = list("crushes", "cleaves", "smashes", "chops", "pulps", "attacks") // crusher attack verbs
attack_verb_simple = list("crush", "cleave", "smash", "chop", "pulp", "attack")
squeak_override = list('sound/items/weapons/thudswoosh.ogg'=1) // hug sound

//Plushie for Roxy, of Cellophane
/obj/item/toy/plush/cello_plush
var/shirt = TRUE
Expand Down
12 changes: 12 additions & 0 deletions modular_zubbers/code/modules/emotes/species_crys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// Fallback cry sound for any species that doesn't define its own get_cry_sound() override.
/datum/species/get_cry_sound(mob/living/carbon/human/human)
if(human.physique == FEMALE)
return pick(
'sound/mobs/humanoids/human/cry/female_cry1.ogg',
'sound/mobs/humanoids/human/cry/female_cry2.ogg',
)
return pick(
'sound/mobs/humanoids/human/cry/male_cry1.ogg',
'sound/mobs/humanoids/human/cry/male_cry2.ogg',
'sound/mobs/humanoids/human/cry/male_cry3.ogg',
)
8 changes: 8 additions & 0 deletions modular_zubbers/code/modules/loadout/categories/toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@
name = "Weighty Moostoat Plushie"
item_path = /obj/item/toy/plush/sunny_plush

/datum/loadout_item/toys/plush/sansiri
name = "Purple Bird Plush"
item_path = /obj/item/toy/plush/sansiri

/datum/loadout_item/toys/plush/daoma
name = "Pink Alien Plush"
item_path = /obj/item/toy/plush/daoma

/datum/loadout_item/toys/plush/amber_shadekin_plush
name = "Squishy Shadekin Plush"
item_path = /obj/item/toy/plush/amber_shadekin_plush
Expand Down
2 changes: 2 additions & 0 deletions modular_zubbers/code/modules/vending/games.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/obj/item/toy/plush/carpplushie = 3,
/obj/item/toy/plush/cello_plush = 3,
/obj/item/toy/plush/chirp_plush = 3,
/obj/item/toy/plush/daoma = 3,
/obj/item/toy/plush/expie = 3,
/obj/item/toy/plush/expie/milky = 3,
/obj/item/toy/plush/goatplushie = 3,
Expand All @@ -34,6 +35,7 @@
/obj/item/toy/plush/plasmamanplushie = 3,
/obj/item/toy/plush/purplecat = 3,
/obj/item/toy/plush/rouny = 3,
/obj/item/toy/plush/sansiri = 3,
/obj/item/toy/plush/secoff = 3,
/obj/item/toy/plush/shark = 3,
/obj/item/toy/plush/skyrat/blue_cat = 3,
Expand Down
Binary file modified modular_zubbers/icons/obj/toys/plushes.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9805,6 +9805,7 @@
#include "modular_zubbers\code\modules\emotes\emotes.dm"
#include "modular_zubbers\code\modules\emotes\hand_items.dm"
#include "modular_zubbers\code\modules\emotes\scream_datums.dm"
#include "modular_zubbers\code\modules\emotes\species_crys.dm"
#include "modular_zubbers\code\modules\emotes\species_screams.dm"
#include "modular_zubbers\code\modules\emotes\synth_emotes.dm"
#include "modular_zubbers\code\modules\events\brain_trauma.dm"
Expand Down