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	fix(Commands): Improve Localization of commands. Standardize some behaviors. (#30362)	2024-08-11 19:46:57 +10:00
Components	Goliath mob (#30839)	2024-08-18 12:22:36 -04:00
Events	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTN	upstream	2024-09-16 12:40:23 +03:00
Pathfinding	.NET 9 forward compatibility changes (#33421)	2024-11-20 11:17:45 +11:00
Queries	Added Firebots - Real (#32482)	2024-09-30 20:13:16 -07:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
UI
NPCBlackboard.cs	Goliath mob (#30839)	2024-08-18 12:22:36 -04:00
NPCBlackboardSerializer.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00