Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276

Browse Source

[MIRROR] Moves laughter to the emote

...

This commit is contained in:

LetterJay

2017-10-04 22:01:49 -04:00

committed by GitHub

parent e2738722fc cfd98caf98

commit d4cd519730

2 changed files with 509 additions and 504 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/modules/mob/living/emote.dm

+508 -492

File diff suppressed because it is too large Load Diff