Morb0 1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/fland.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Textures/Tiles/attributions.yml		2023-08-29 05:58:14 +03:00
..
ISSUE_TEMPLATE	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
workflows	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-29 05:58:14 +03:00
CODEOWNERS	Update CODEOWNERS (#19457)	2023-08-23 16:23:06 -05:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Fix labeler localization path	2022-06-21 01:24:26 +03:00
PULL_REQUEST_TEMPLATE.md	Update pull request template (#18900)	2023-08-18 09:22:00 -08:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00