NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Administration
History
Morb0 c44d509701 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
#	Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
2024-03-29 11:43:30 +03:00
..
BanList Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
Commands Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-03-29 11:43:30 +03:00
Components Add events for GunComponent values, muzzle flashes and cartridge spread (#24077) 2024-01-29 10:32:42 +11:00
Logs Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +11:00
Managers Fix Incorrect stealth messages appearing on readmin. (#26511) 2024-03-28 20:19:53 +01:00
Notes Improve admin message seen/dismiss state. (#26223) 2024-03-21 16:15:46 +01:00
Systems Merge remote-tracking branch 'upstream/master' into master-syndicate 2024-03-27 01:12:55 +03:00
Toolshed Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
UI Enable multiple Solution Editor windows (#26005) 2024-03-12 05:10:09 -07: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 Fix bad sawmill IPostInjectInit (#23626) 2024-01-07 02:33:53 +11: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
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