Morb0 37dc87ad6f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/MassMedia/Systems/NewsSystem.cs # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png # Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png # SpaceStation14.sln # Tools/actions_changelogs_since_last_run.py # Tools/package_client_build.py # Tools/package_server_build.py		2024-01-15 01:56:14 +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	Power switchable refactor (#20419)	2023-10-25 23:57:23 +11: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 UI enhancements (#23777)	2024-01-14 16:08:43 +11:00
PowerMonitoringWindow.xaml	Station Map window edges (#24024)	2024-01-13 16:04:45 +01:00
PowerMonitoringWindow.xaml.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +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