CatStation/Resources/Credits
Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/ServerInfo/Gameplay.txt
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
#	Resources/Textures/Clothing/Mask/bat.rsi/meta.json
#	Resources/Textures/Clothing/Mask/bear.rsi/meta.json
#	Resources/Textures/Clothing/Mask/bee.rsi/meta.json
#	Resources/Textures/Clothing/Mask/breath.rsi/meta.json
#	Resources/Textures/Clothing/Mask/clown.rsi/meta.json
#	Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
#	Resources/Textures/Clothing/Mask/ert.rsi/meta.json
#	Resources/Textures/Clothing/Mask/fox.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gas.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
#	Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
#	Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
#	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
#	Resources/Textures/Clothing/Mask/medical.rsi/meta.json
#	Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
#	Resources/Textures/Clothing/Mask/merc.rsi/meta.json
#	Resources/Textures/Clothing/Mask/mime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
#	Resources/Textures/Clothing/Mask/rat.rsi/meta.json
#	Resources/Textures/Clothing/Mask/raven.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
#	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
#	Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
#	Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
..
GitHub.txt Update Credits (#23651) 2024-01-06 18:40:37 -07:00
OriginalRemake.txt Update credits 2020-06-26 03:46:28 +02:00
Patrons.yml Update Patrons.yml (#23250) 2023-12-30 16:04:28 -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