CatStation

mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00

History

Morb0 0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync # Conflicts: # .github/CODEOWNERS # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json		2024-10-15 17:04:40 +03:00
..
GitHub.txt	Update Credits (#32774 )	2024-10-13 18:06:40 +02:00
OriginalRemake.txt	Update credits	2020-06-26 03:46:28 +02:00
Patrons.yml	Update Patrons.yml (#27560 )	2024-04-30 18:20:39 -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	Revert "Replace TTS provider" (#2289 )	2024-06-18 13:00:33 +03:00