Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +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

"Death gasp" for a moth (#28409)

2024-06-03 14:48:01 -04: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