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
..
Commands	Allow for respawn and erase verb to be used on offline players. Also minor rewrite on respawn command and new erase command (#30433 )	2024-08-31 21:38:03 +10:00
Events	Add job whitelist system (#28085 )	2024-06-01 05:08:31 -07:00
Presets	Make all prototype types partial (#21374 )	2023-11-01 19:56:23 -07:00
Prototypes	Make all prototype types partial (#21374 )	2023-11-01 19:56:23 -07:00
Rules	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-15 17:04:40 +03:00
GameTicker.cs	Fix RA0032 (#32514 )	2024-09-29 02:25:21 +02:00
GameTicker.CVars.cs	Fix RA0032 (#32514 )	2024-09-29 02:25:21 +02:00
GameTicker.GamePreset.cs	Fix RA0032 (#32514 )	2024-09-29 02:25:21 +02:00
GameTicker.GameRule.cs	refactor event schedulers to use explicit game rules (#29320 )	2024-08-14 15:21:01 +10:00
GameTicker.Lobby.cs	Don't show Station Event announcements to players in the lobby. (#30886 )	2024-08-11 16:09:33 +10:00
GameTicker.LobbyBackground.cs	WebP lobby images (#25184 )	2024-02-16 16:55:57 -07:00
GameTicker.Player.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-04 19:47:54 +03:00
GameTicker.Replays.cs	Fix RA0032 (#32514 )	2024-09-29 02:25:21 +02:00
GameTicker.RoundFlow.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-15 17:04:40 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-15 17:04:40 +03:00
GameTicker.StatusShell.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-07-14 12:15:16 +03:00
ManifestEntry.cs