Morb0 6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Telephone/TelephoneSystem.cs # LICENSE.TXT # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/ServerInfo/Guidebook/Chemicals.xml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json		2025-01-12 19:59:31 +03:00
..
ISSUE_TEMPLATE	Delete toolshed-feature-request.md (#1615)	2023-12-08 16:35:24 +03:00
workflows	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-12 19:59:31 +03:00
CODEOWNERS	Add crazybrain23 to CODEOWNERS (#34038)	2024-12-24 03:14:42 +01:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-26 00:30:02 +03:00
PULL_REQUEST_TEMPLATE.md	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-09-11 10:56:49 +03:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00