Morb0 da333a1972 Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie ... # Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png		2024-06-27 13:40:52 +03:00
..
ISSUE_TEMPLATE	Delete toolshed-feature-request.md (#1615)	2023-12-08 16:35:24 +03:00
workflows	Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie	2024-06-27 13:40:52 +03:00
CODEOWNERS	Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326)	2024-06-22 22:16:08 -04:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Add corvax folder to maps label (#2170)	2024-06-07 13:15:01 +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