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 8ae86bf691 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Polymorphs/polymorph.yml
#	Resources/Textures/Structures/Windows/mining.rsi/full.png
#	Resources/Textures/Structures/Windows/mining.rsi/meta.json
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png
#	Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png
#	Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
#	Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png
#	Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
#	Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
#	Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
#	Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
#	Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png
#	Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png
#	Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
#	Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
#	Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
#	Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
#	Resources/Textures/Structures/Windows/window.rsi/full.png
#	Resources/Textures/Structures/Windows/window.rsi/meta.json
#	Resources/Textures/Structures/Windows/window.rsi/window0.png
#	Resources/Textures/Structures/Windows/window.rsi/window1.png
#	Resources/Textures/Structures/Windows/window.rsi/window2.png
#	Resources/Textures/Structures/Windows/window.rsi/window3.png
#	Resources/Textures/Structures/Windows/window.rsi/window4.png
#	Resources/Textures/Structures/Windows/window.rsi/window5.png
#	Resources/Textures/Structures/Windows/window.rsi/window6.png
#	Resources/Textures/Structures/Windows/window.rsi/window7.png
#	Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
#	Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
#	Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
2024-11-14 03:15:01 +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-13 04:35:52 +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