Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
Commands	Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)	2024-05-12 20:34:52 -04:00
Components	Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)	2024-12-11 17:21:04 +01:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
Events	Revert "add breakers to power batteries" (#17632)	2023-07-08 12:47:38 +10:00
Generation/Teg	Fix TEG acting as infinite energy source on destruction (#29972)	2024-09-19 12:15:44 +10:00
Generator	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
NodeGroups	Make PACMANs a little better (#24604)	2024-01-26 21:53:43 -05:00
Nodes	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
Pow3r	Add CVar to disable pow3r parallel processing (#28488)	2024-06-04 16:54:22 +02:00
SMES	Remove AllComponentsOneEntityDeleteTest (#19965)	2023-09-09 19:35:05 -05:00
PowerWireAction.cs	electrification hud	2024-11-22 00:43:02 +01:00
SetBatteryPercentCommand.cs	Remove all obsolete BatteryComponent method calls (#25871)	2024-03-06 16:34:50 +11:00