Morb0 92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Resources/Locale/en-US/chat/sanitizer-replacements.ftl # Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png		2024-02-17 12:43:04 +03:00
..
DiskConsoleBoundUserInterface.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
DiskConsoleMenu.xaml	Technology Disks (#13077)	2022-12-20 16:39:57 -06:00
DiskConsoleMenu.xaml.cs	Technology Disks (#13077)	2022-12-20 16:39:57 -06:00
MiniTechnologyCardControl.xaml	Remove custom tooltip timings (#19604)	2023-09-11 13:53:35 +10:00
MiniTechnologyCardControl.xaml.cs	Avoid emptying and recreating all UI cards on every update (#21990)	2023-11-29 14:49:44 -05:00
ResearchClientBoundUserInterface.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
ResearchClientServerSelectionMenu.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
ResearchClientServerSelectionMenu.xaml.cs	Research Servers now have proper IDs, and can be selected in lathe menu (#9949)	2022-07-21 17:16:14 -05:00
ResearchConsoleBoundUserInterface.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
ResearchConsoleMenu.xaml	Wide research computer ui (#1401)	2023-09-09 18:13:16 +03:00
ResearchConsoleMenu.xaml.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
TechnologyCardControl.xaml	Fix PDA capitalization to be PascalCase (#17335)	2023-06-15 11:44:28 +10:00
TechnologyCardControl.xaml.cs	make rnd console require science access (#17671)	2023-06-29 14:19:19 -04:00