VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
ISSUE_TEMPLATE	Update issue templates (#19458)	2023-08-23 16:50:49 -05:00
workflows	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
CODEOWNERS	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-23 21:07:25 +03:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Makes the labeller automatically label PRs with shader changes (#30316)	2024-07-28 13:46:22 +10: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