NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-09 04:24:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Credits
History
Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
..
GitHub.txt Update contributors list (#20482) 2023-09-24 17:16:00 -07:00
OriginalRemake.txt Update credits 2020-06-26 03:46:28 +02:00
Patrons.yml Update Patrons.yml (#21344) 2023-10-30 01:57:32 -07:00
SpaceStation13.txt Update credits 2020-06-26 03:46:28 +02:00
SpecialThanks.txt Credits 2020-06-14 15:15:15 +02:00
TTS.txt TTS (Text-To-Speech) (#618) 2023-01-10 18:01:20 -08:00