Morb0 b70efe1fa8 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png # Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png # Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Windows/directional.rsi/meta.json		2024-03-08 16:05:59 +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	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +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