CatStation

mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21: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
..
Jobs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-04 19:47:54 +03:00
Miscellaneous	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-15 17:04:40 +03:00
loadout_groups.yml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-15 17:04:40 +03:00
role_loadouts.yml	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-09-19 10:30:01 +03:00