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
..
Components	Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)	2024-08-09 16:14:07 +10:00
Systems	Фикс энерго мечей. Фикс смены цвета работы каргой агента. карту агента, эсворды, пИИ синдиката и одежду хамелеона больше не могут использовать не синдикаты.	2024-12-02 07:31:30 +03:00
AccessReaderChangeEvent.cs	Pathfinder hotfixes (#8201)	2022-05-16 13:21:00 +10:00
AccessWireAction.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
AddAccessLogCommand.cs	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
LogWireAction.cs	Fix ACC wire light not appearing (#30453)	2024-07-29 23:04:17 -04:00