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
..
ISSUE_TEMPLATE	Upd issues (#421)	2024-09-30 16:22:11 +03:00
workflows	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
CODEOWNERS	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-09 23:32:58 +03:00
config.yml	Исправления (#488)	2024-10-11 17:11:41 +03:00
labeler.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-09 23:32:58 +03:00
PULL_REQUEST_TEMPLATE.md	Update PULL_REQUEST_TEMPLATE.md (#31046)	2024-09-08 18:57:39 +02:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00