-
Notifications
You must be signed in to change notification settings - Fork 224
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3690 from MistakeNot4892/tweak/default_emotes
Updating the emote system
- Loading branch information
Showing
65 changed files
with
822 additions
and
650 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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,159 +1,8 @@ | ||
| /mob | ||
| var/list/default_emotes = list() | ||
| var/list/usable_emotes = list() | ||
| /mob/proc/get_default_emotes() | ||
| return | ||
|
|
||
| /mob/proc/update_emotes(var/skip_sort) | ||
| usable_emotes.Cut() | ||
| for(var/emote in default_emotes) | ||
| var/decl/emote/emote_datum = GET_DECL(emote) | ||
| if(emote_datum.check_user(src)) | ||
| usable_emotes[emote_datum.key] = emote_datum | ||
| if(!skip_sort) | ||
| usable_emotes = sortTim(usable_emotes, /proc/cmp_text_asc) | ||
|
|
||
| /mob/Initialize() | ||
| /mob/living/get_default_emotes() | ||
| . = ..() | ||
| update_emotes() | ||
|
|
||
| // Specific defines follow. | ||
| /mob/living/carbon/alien | ||
| default_emotes = list( | ||
| /decl/emote/visible, | ||
| /decl/emote/visible/scratch, | ||
| /decl/emote/visible/drool, | ||
| /decl/emote/visible/nod, | ||
| /decl/emote/visible/sway, | ||
| /decl/emote/visible/sulk, | ||
| /decl/emote/visible/twitch, | ||
| /decl/emote/visible/dance, | ||
| /decl/emote/visible/roll, | ||
| /decl/emote/visible/shake, | ||
| /decl/emote/visible/jump, | ||
| /decl/emote/visible/shiver, | ||
| /decl/emote/visible/collapse, | ||
| /decl/emote/visible/spin, | ||
| /decl/emote/visible/sidestep, | ||
| /decl/emote/audible/hiss, | ||
| /decl/emote/audible, | ||
| /decl/emote/audible/deathgasp_alien, | ||
| /decl/emote/audible/whimper, | ||
| /decl/emote/audible/gasp, | ||
| /decl/emote/audible/scretch, | ||
| /decl/emote/audible/choke, | ||
| /decl/emote/audible/moan, | ||
| /decl/emote/audible/gnarl | ||
| ) | ||
|
|
||
| /mob/living/carbon/human | ||
| default_emotes = list( | ||
| /decl/emote/visible/blink, | ||
| /decl/emote/audible/synth, | ||
| /decl/emote/audible/synth/ping, | ||
| /decl/emote/audible/synth/buzz, | ||
| /decl/emote/audible/synth/confirm, | ||
| /decl/emote/audible/synth/deny, | ||
| /decl/emote/visible/nod, | ||
| /decl/emote/visible/shake, | ||
| /decl/emote/visible/shiver, | ||
| /decl/emote/visible/collapse, | ||
| /decl/emote/audible/gasp, | ||
| /decl/emote/audible/sneeze, | ||
| /decl/emote/audible/sniff, | ||
| /decl/emote/audible/snore, | ||
| /decl/emote/audible/whimper, | ||
| /decl/emote/audible/yawn, | ||
| /decl/emote/audible/clap, | ||
| /decl/emote/audible/chuckle, | ||
| /decl/emote/audible/cough, | ||
| /decl/emote/audible/cry, | ||
| /decl/emote/audible/sigh, | ||
| /decl/emote/audible/laugh, | ||
| /decl/emote/audible/mumble, | ||
| /decl/emote/audible/grumble, | ||
| /decl/emote/audible/groan, | ||
| /decl/emote/audible/moan, | ||
| /decl/emote/audible/grunt, | ||
| /decl/emote/audible/slap, | ||
| /decl/emote/human/deathgasp, | ||
| /decl/emote/audible/giggle, | ||
| /decl/emote/audible/scream, | ||
| /decl/emote/visible/airguitar, | ||
| /decl/emote/visible/blink_r, | ||
| /decl/emote/visible/bow, | ||
| /decl/emote/visible/salute, | ||
| /decl/emote/visible/flap, | ||
| /decl/emote/visible/aflap, | ||
| /decl/emote/visible/drool, | ||
| /decl/emote/visible/eyebrow, | ||
| /decl/emote/visible/twitch, | ||
| /decl/emote/visible/dance, | ||
| /decl/emote/visible/twitch_v, | ||
| /decl/emote/visible/faint, | ||
| /decl/emote/visible/frown, | ||
| /decl/emote/visible/blush, | ||
| /decl/emote/visible/wave, | ||
| /decl/emote/visible/glare, | ||
| /decl/emote/visible/stare, | ||
| /decl/emote/visible/look, | ||
| /decl/emote/visible/point, | ||
| /decl/emote/visible/raise, | ||
| /decl/emote/visible/grin, | ||
| /decl/emote/visible/shrug, | ||
| /decl/emote/visible/smile, | ||
| /decl/emote/visible/pale, | ||
| /decl/emote/visible/tremble, | ||
| /decl/emote/visible/wink, | ||
| /decl/emote/visible/hug, | ||
| /decl/emote/visible/dap, | ||
| /decl/emote/visible/signal, | ||
| /decl/emote/visible/handshake, | ||
| /decl/emote/visible/afold, | ||
| /decl/emote/visible/alook, | ||
| /decl/emote/visible/eroll, | ||
| /decl/emote/visible/hbow, | ||
| /decl/emote/visible/hip, | ||
| /decl/emote/visible/holdup, | ||
| /decl/emote/visible/hshrug, | ||
| /decl/emote/visible/crub, | ||
| /decl/emote/visible/erub, | ||
| /decl/emote/visible/fslap, | ||
| /decl/emote/visible/ftap, | ||
| /decl/emote/visible/hrub, | ||
| /decl/emote/visible/hspread, | ||
| /decl/emote/visible/pocket, | ||
| /decl/emote/visible/rsalute, | ||
| /decl/emote/visible/rshoulder, | ||
| /decl/emote/visible/squint, | ||
| /decl/emote/visible/tfist, | ||
| /decl/emote/visible/tilt, | ||
| /decl/emote/visible/spin, | ||
| /decl/emote/visible/sidestep, | ||
| /decl/emote/visible/vomit | ||
| ) | ||
|
|
||
| /mob/living/silicon/robot | ||
| default_emotes = list( | ||
| /decl/emote/audible/clap, | ||
| /decl/emote/visible/bow, | ||
| /decl/emote/visible/salute, | ||
| /decl/emote/visible/flap, | ||
| /decl/emote/visible/aflap, | ||
| /decl/emote/visible/twitch, | ||
| /decl/emote/visible/twitch_v, | ||
| /decl/emote/visible/dance, | ||
| /decl/emote/visible/nod, | ||
| /decl/emote/visible/shake, | ||
| /decl/emote/visible/glare, | ||
| /decl/emote/visible/look, | ||
| /decl/emote/visible/stare, | ||
| /decl/emote/visible/deathgasp_robot, | ||
| /decl/emote/visible/spin, | ||
| /decl/emote/visible/sidestep, | ||
| /decl/emote/audible/synth, | ||
| /decl/emote/audible/synth/ping, | ||
| /decl/emote/audible/synth/buzz, | ||
| /decl/emote/audible/synth/confirm, | ||
| /decl/emote/audible/synth/deny, | ||
| /decl/emote/audible/synth/security, | ||
| /decl/emote/audible/synth/security/halt | ||
| ) | ||
| var/decl/species/my_species = get_species() | ||
| if(LAZYLEN(my_species?.default_emotes)) | ||
| return . | my_species.default_emotes |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.