Arthur Asimov b97dcf215a Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # .github/labeler.yml # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/static.png		2024-08-02 11:29:44 +03:00
..
ISSUE_TEMPLATE	Delete toolshed-feature-request.md (#1615)	2023-12-08 16:35:24 +03:00
workflows	Use FORK_ID env	2024-07-29 07:08:26 +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	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-08-02 11:29:44 +03:00
PULL_REQUEST_TEMPLATE.md	Add PR guidelines checkbox to PR template (#30283)	2024-08-02 16:02:24 +10:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00