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

Emote ports #36

Merged
merged 12 commits into from
Aug 16, 2024
Merged

Emote ports #36

merged 12 commits into from
Aug 16, 2024

Conversation

deepestwaterdiver
Copy link
Collaborator

Not quite working yet, error is happening. Making a PR for Mosley to have a look at.

deepestwaterdiver and others added 7 commits July 28, 2024 19:11
Debugging is still needed, some parts are not working. This is just to get the grunt work done before getting to the nitty gritty.
Final batch of emote porting.
Running through and fixing bugs.
"ah" is currently giving problems.
@deepestwaterdiver deepestwaterdiver linked an issue Aug 11, 2024 that may be closed by this pull request

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every run_emote override that's used only to select the sound of an emote should be replaced by a get_sound() override similar to the fart emote

Comment on lines +691 to +696

// Set random emote sound
sound = pick('modular_zzplurt/sound/voice/aauugghh1.ogg', 'modular_zzplurt/sound/voice/aauugghh2.ogg')

// Return normally
. = ..()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Set random emote sound
sound = pick('modular_zzplurt/sound/voice/aauugghh1.ogg', 'modular_zzplurt/sound/voice/aauugghh2.ogg')
// Return normally
. = ..()
// Return normally
. = ..()
/datum/emote/living/snore/snore2/get_sound(mob/living/user)
return pick('modular_zzplurt/sound/voice/aauugghh1.ogg', 'modular_zzplurt/sound/voice/aauugghh2.ogg')

@MosleyTheMalO MosleyTheMalO merged commit 7429013 into master Aug 16, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom SPLURT emotes
3 participants