Vigers Ray 5c219f5105 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Resources/Locale/en-US/_strings/administration/antag.ftl # Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl # Resources/Locale/en-US/_strings/mind/role-types.ftl # Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml # Resources/Prototypes/Entities/Mobs/Player/dragon.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-01-14 18:46:45 +03:00
..
ISSUE_TEMPLATE	Upd issues (#421)	2024-09-30 16:22:11 +03:00
workflows	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
CODEOWNERS	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-25 03:30:50 +03:00
config.yml	Исправления (#488)	2024-10-11 17:11:41 +03:00
labeler.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-09 23:32:58 +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