Commit graph

5 commits

Author SHA1 Message Date
Morb0
05929d24a3 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Speech/EntitySystems/MothAccentSystem.cs
2023-12-16 12:36:47 +03:00
router
53b3eaddb9
for realsies fix moth accent (#22588)
* *chitters.

* Update MothAccentSystem.cs
2023-12-16 02:29:52 -07:00
router
b33e56583b
*chitters. (#22563) 2023-12-16 01:26:44 -07:00
lzk
4d406a3082
Locale moth accent (#1610) 2023-12-08 16:38:10 +03:00
lzk
440de19e30
Moth accent (#21910)
* :trollface:

* :trollface:

* :trollface:

* Update moth.yml

* Update animals.yml
2023-11-27 14:28:43 -07:00