Ed 9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-29 16:28:04 +03:00

..

en-defaults

enTranslationHelp (#115)

2024-04-26 23:40:11 +03:00

en-US

Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream

2024-04-29 16:28:04 +03:00

nl-NL

Add basic example NL entity localizations.

2021-05-11 23:13:43 +02:00

ru-RU

KBAS5 clothing + Jaraten Structures (#120)

2024-04-28 22:47:01 +03:00