NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-21 07:41:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
CatStation/Content.Client/Administration/UI
History
Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
..
AdminRemarks Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
BanList Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
BanPanel Add admin Erase verb, add checkbox to erase from the ban panel (#20985) 2023-10-14 02:02:56 -07:00
Bwoink Fix not being able to sort by playtime in the F7 players tab (#21004) 2023-10-14 14:56:06 -07:00
CustomControls More UI fixes (#22431) 2023-12-12 19:02:19 -07:00
Logs Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
ManageSolutions Fix solution EUIs (#20033) 2023-09-12 14:35:30 +10:00
Notes Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
SetOutfit Fix misc commands (#20004) 2023-09-11 15:21:52 +10:00
SpawnExplosion Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
Tabs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
AdminAnnounceWindow.xaml Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
AdminMenuWindow.xaml.cs Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
AdminMenuWindowEui.cs Ensure EUIs close themselves (#15860) 2023-04-29 13:16:24 +10:00
AdminUIHelpers.cs Add confirmation to kick and respawn in the admin player actions panel (#20542) 2023-09-28 15:46:06 -07:00
PermissionsEui.cs Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00