Morb0 1f35458078 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Player/diona.yml # Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png # Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/dark_plastic.png # Resources/Textures/Tiles/plastic.png # Resources/Textures/Tiles/steel_dirty.png # Resources/Textures/Tiles/white_plastic.png		2023-08-05 05:10:09 +03:00
..
ISSUE_TEMPLATE	Add SECURITY.md (#14551)	2023-03-09 16:01:40 -06:00
workflows	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-05 05:10:09 +03:00
CODEOWNERS	Add EmoGarbage to codeowners (#18424)	2023-07-29 09:42:37 -04: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	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-01-13 05:38:06 +03:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00