faint 076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/LateJoin/LateJoinGui.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png # RobustToolbox		2023-07-10 07:03:24 +03:00
..
APC	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00
SMES	Resolves SmesVisualizer is Obsolete (#13899)	2023-05-07 13:43:41 +10:00
Visualizers	Resolves PowerDeviceVisualizer is Obsolete (#13900)	2023-04-22 19:37:40 +10:00
PowerMonitoringWindow.xaml	Power Monitoring Console (#7849)	2022-05-04 10:59:40 -07:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
SolarControlWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
SolarControlWindow.xaml.cs	Cleaner BoundUserInterfaces (#17736)	2023-07-09 02:02:17 +10:00