Morb0 2329662efd Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json		2024-04-18 07:04:01 +03:00
..
APC	Fix APC turning invisible after emagging (#20245)	2023-09-23 11:27:51 -08:00
Generation/Teg	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Generator	Adds signal control to portable generators (#24157)	2024-01-29 15:56:29 +01:00
SMES	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Visualizers	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
PowerMonitoringConsoleBoundUserInterface.cs	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
PowerMonitoringConsoleNavMapControl.cs	Navmap rework (#26713)	2024-04-17 12:59:31 -05:00
PowerMonitoringWindow.xaml	Station Map window edges (#24024)	2024-01-13 16:04:45 +01:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-18 07:04:01 +03:00
PowerMonitoringWindow.xaml.Widgets.cs	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11: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