NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 12:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Administration
History
Morb0 37dc87ad6f Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/MassMedia/Systems/NewsSystem.cs
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
#	Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png
#	Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png
#	SpaceStation14.sln
#	Tools/actions_changelogs_since_last_run.py
#	Tools/package_client_build.py
#	Tools/package_server_build.py
2024-01-15 01:56:14 +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-01-05 00:55:19 +03:00
Components Super Bonk Smite (#22413) 2023-12-18 14:39:23 -05:00
Logs Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +11:00
Managers Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Notes message notes no longer show seen notes in chat (#23271) 2023-12-31 01:01:05 -06:00
Systems Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-01-15 01:56:14 +03:00
Toolshed Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
UI Fix solution editor UI (#24004) 2024-01-13 15:52:42 +11: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 Cache HTTP client in player locator (#12555) 2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
QuickDialogSystem.OpenDialog.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00