Ed 3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync ...

# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml

2024-06-21 18:30:31 +03:00

..

auto_emotes.yml

Cluwne smite (#13367)

2023-03-06 11:09:24 -08:00

disease_emotes.yml

fixed ru emote sound v2 (#240)

2024-06-13 13:39:55 +03:00

speech_emote_sounds.yml

Fix female reptilians not having gasp sounds (#29143)

2024-06-18 13:56:37 +10:00

speech_emotes.yml

fixed ru emote sound v2 (#240)

2024-06-13 13:39:55 +03:00

speech_sounds.yml

Add chicken speech sound (#28948)

2024-06-13 19:43:02 -07:00

speech_verbs.yml

Fix master (#26501)

2024-03-28 04:12:36 -07:00