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
..
BanList	Adds a Pii Flag, Censors Hwid and Ip (#27776 )	2024-06-01 00:23:54 -07:00
Commands	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-04 19:47:54 +03:00
Components	Content update for UI prediction (#27214 )	2024-04-26 18:16:24 +10:00
Logs	Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687 )	2024-08-05 16:13:27 -07:00
Managers	Fix role ban loading bugs (#32725 )	2024-10-14 14:30:31 +11:00
Notes	Improve admin message seen/dismiss state. (#26223 )	2024-03-21 16:15:46 +01:00
Systems	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-04 19:47:54 +03:00
Toolshed	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084 )	2024-09-02 13:26:04 +02:00
UI	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084 )	2024-09-02 13:26:04 +02:00
AdminCommandAttribute.cs	Toolshed (#17895 )	2023-08-02 16:09:08 -05:00
AdminPermsChangedEventArgs.cs	Un-revert IPlayerManager refactor (#21244 )	2023-10-28 09:59:53 +11:00
AdminRank.cs
BanPanelEui.cs	Remove unused IoC dependency references. (#31704 )	2024-09-01 23:22:50 +02:00
ContentNetworkResourceManager.cs	Un-revert IPlayerManager refactor (#21244 )	2023-10-28 09:59:53 +11:00
PlayerLocator.cs	Random spontaneous cleanup PR (#25131 )	2024-02-13 16:48:39 -05:00
PlayerPanelEui.cs	Implement a playerpanel (#30238 )	2024-08-09 15:33:25 +10:00
QuickDialogSystem.cs	Obsolete refactor - ConnectedClient to Channel (#24409 )	2024-01-23 09:14:13 +11:00
QuickDialogSystem.OpenDialog.cs	Obsolete refactor - ConnectedClient to Channel (#24409 )	2024-01-23 09:14:13 +11:00
ServerApi.cs	Panic Bunker uses minutes not hours (#28805 )	2024-06-09 22:45:47 +02:00
ServerApi.Utility.cs	Game server admin API (#26880 )	2024-04-14 20:13:29 +10:00