Morb0 3306908b30 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png		2023-08-15 03:07:16 +03:00
..
AdminRemarks	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
BanList	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
BanPanel	IP ban by default (#18545)	2023-08-01 16:05:14 -05:00
Bwoink	Add ahelp typing indicator for admins (#19060)	2023-08-13 18:03:17 -05:00
CustomControls	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
Logs	Fix new players added to admin logs always defaulting to selected (#19104)	2023-08-13 20:53:48 -05:00
ManageSolutions	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
Notes	Fix editing a watchlist note temporarily making it appear as a low severity note (#19100)	2023-08-14 15:05:47 -06:00
SetOutfit	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
SpawnExplosion	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-08 12:54:45 +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	Defibrillator (#15922)	2023-05-03 10:10:19 +10:00
AdminMenuWindow.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
AdminMenuWindowEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
PermissionsEui.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00