CatStation/Resources/Prototypes/Datasets
Morbo 6b74e70360 Merge remote-tracking branch 'upstream/master' into test2
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Textures/Tiles/attributions.yml
2022-08-16 00:21:46 +03:00
..
Names Merge remote-tracking branch 'upstream/master' into test2 2022-08-16 00:21:46 +03:00
adjectives.yml Translate traitor codewords to russian (#72) 2022-01-17 17:23:32 +03:00
news.yml Perform CentCom-ification (#9876) 2022-07-19 21:08:24 -07:00
verbs.yml Translate traitor codewords to russian (#72) 2022-01-17 17:23:32 +03:00