-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# About the pull request Adds a panel I shamelessly ripped from #3792 for Yautja emotes. <!-- Remove this text and explain what the purpose of your PR is. Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool. If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420. Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. --> # Explain why it's good for the game Easy management of emotes is nice! # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: ui: Adds a UI panel for Yautja emotes, all credit to Zonespace. /:cl: --------- Co-authored-by: Zonespace <[email protected]> Co-authored-by: harryob <[email protected]>
- Loading branch information
1 parent
0938ac8
commit 7ce0f0e
Showing
15 changed files
with
401 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 0 additions & 145 deletions
145
code/modules/mob/living/carbon/human/species/emote-yautja.dm
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
code/modules/mob/living/carbon/human/species/yautja/_emote.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/datum/emote/living/carbon/human/yautja | ||
species_type_allowed_typecache = list(/datum/species/yautja) | ||
keybind_category = CATEGORY_YAUTJA_EMOTE | ||
emote_type = EMOTE_AUDIBLE | ||
/// A general category for the emote, for use in the Yautja emote panel. See [code/__DEFINES/emote_panels.dm] for categories. | ||
var/category = "" | ||
/// Override text for the emote to be displayed in the Yautja emote panel | ||
var/override_say = "" | ||
/// Override for being in panel or not | ||
var/no_panel = FALSE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
code/modules/mob/living/carbon/human/species/yautja/fake_sounds.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/datum/emote/living/carbon/human/yautja/fake_sound | ||
category = YAUTJA_EMOTE_CATEGORY_FAKESOUND | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl | ||
key = "aliengrowl" | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/aliengrowl/get_sound(mob/living/user) | ||
return pick('sound/voice/alien_growl1.ogg', 'sound/voice/alien_growl2.ogg') | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp | ||
key = "alienhelp" | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/alienhelp/get_sound(mob/living/user) | ||
return pick('sound/voice/alien_help1.ogg', 'sound/voice/alien_help2.ogg') | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/malescream | ||
key = "malescream" | ||
sound = "male_scream" | ||
|
||
/datum/emote/living/carbon/human/yautja/fake_sound/femalescream | ||
key = "femalescream" | ||
sound = "female_scream" |
Oops, something went wrong.