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 4
CatStation/Resources/Credits
History
Arthur Asimov f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +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 (#21979) 2023-11-29 01:18:27 -08: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