rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/Administration
History
Vigers Ray 10888fd269 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
2025-02-26 22:01:48 +03:00
..
BanList Integrate Modern HWID into content 2024-11-12 01:51:54 +01:00
Commands Merge remote-tracking branch 'space-wizards/master' 2025-02-26 22:01:48 +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 Merge remote-tracking branch 'space-wizards/master' 2025-02-19 13:16:37 +03:00
Notes Improve admin message seen/dismiss state. (#26223) 2024-03-21 16:15:46 +01:00
Systems Merge remote-tracking branch 'space-wizards/master' 2025-02-26 22:01:48 +03:00
Toolshed Fix mark verb 2025-01-03 18:45:02 +13:00
UI Persist deadmin to database, add admin suspension system (#34048) 2025-01-15 00:46:45 +01: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 Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
BanPanelEui.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-26 17:50:59 +03:00
ContentNetworkResourceManager.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
PlayerLocator.cs Integrate Modern HWID into content 2024-11-12 01:51:54 +01:00
PlayerPanelEui.cs Integrate Modern HWID into content 2024-11-12 01:51:54 +01: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