From c9f0489875b7f8bee2915f70daece2a55ba0764b Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Mon, 24 Jul 2023 04:24:17 +0100 Subject: [PATCH] Re-adds cat scream (#385) ## About The Pull Request Restores the cat scream from https://github.com/Skyrat-SS13/Skyrat-tg/pull/22050 All tested and such. ![image](https://github.com/Bubberstation/Bubberstation/assets/8881105/46ed44a0-6399-4ba3-9347-020be09f9630) ## Changelog :cl: sound: Re-instated the cat scream previously removed. /:cl: --- .../code/modules/emotes/scream_datums.dm | 4 ++++ .../code/modules/emotes/species_screams.dm | 3 +++ .../sound/emotes/screams/cat_scream.ogg | Bin 0 -> 11599 bytes tgstation.dme | 2 ++ 4 files changed, 9 insertions(+) create mode 100644 modular_zubbers/code/modules/emotes/scream_datums.dm create mode 100644 modular_zubbers/code/modules/emotes/species_screams.dm create mode 100644 modular_zubbers/sound/emotes/screams/cat_scream.ogg diff --git a/modular_zubbers/code/modules/emotes/scream_datums.dm b/modular_zubbers/code/modules/emotes/scream_datums.dm new file mode 100644 index 00000000000..c993ee32bb9 --- /dev/null +++ b/modular_zubbers/code/modules/emotes/scream_datums.dm @@ -0,0 +1,4 @@ +/datum/scream_type/tajaran + name = "Cat Scream" + male_screamsounds = list('modular_zubbers/sound/emotes/screams/cat_scream.ogg') + female_screamsounds = null diff --git a/modular_zubbers/code/modules/emotes/species_screams.dm b/modular_zubbers/code/modules/emotes/species_screams.dm new file mode 100644 index 00000000000..9cfdb318ebe --- /dev/null +++ b/modular_zubbers/code/modules/emotes/species_screams.dm @@ -0,0 +1,3 @@ +/datum/species/tajaran + screamsounds = list('modular_zubbers/sound/emotes/screams/cat_scream.ogg') + femalescreamsounds = null diff --git a/modular_zubbers/sound/emotes/screams/cat_scream.ogg b/modular_zubbers/sound/emotes/screams/cat_scream.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cea4c2f3893c57cd5cd4dc219012cc158597bd29 GIT binary patch literal 11599 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