Vigers Ray 38889342ad Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Shared/Weapons/Ranged/Components/GunComponent.cs # Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json		2024-11-13 04:35:52 +03:00
..
ISSUE_TEMPLATE	Upd issues (#421)	2024-09-30 16:22:11 +03:00
workflows	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-13 04:35:52 +03:00
CODEOWNERS	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00
config.yml	Исправления (#488)	2024-10-11 17:11:41 +03:00
labeler.yml	Правки в валидаторе локализаций (#494)	2024-10-12 17:39:13 +03: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