NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Prototypes/Datasets
History
Arthur 075299b54d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
2022-07-22 22:45:30 +03:00
..
Names Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-24 04:58:34 +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