Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
AdminRemarks	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
BanPanel	Make banpanel defaults use cvars (#27168)	2024-04-20 18:18:26 +02:00
Bwoink	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
CustomControls	Fix PlayerListControl re-raising selection changed when repopulated. (#25412)	2024-02-20 14:01:28 +01:00
Logs	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
ManageSolutions	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Notes	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
SetOutfit	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
SpawnExplosion	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-17 12:43:04 +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