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 d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +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 'refs/remotes/wizards/master' 2024-09-21 06:29:09 +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 Доработка вампира и мелочи (#598) 2024-11-13 04:02:57 +03:00
Notes Improve admin message seen/dismiss state. (#26223) 2024-03-21 16:15:46 +01:00
Systems Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-11-19 18:34:32 +03:00
Toolshed tag:with toolshed command (#31751) 2024-11-14 06:27:31 +07: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 Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
BanPanelEui.cs upstream 2024-09-16 12:40:23 +03: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