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
..
cargo_gifts.yml	Звук оповещения из сс13	2024-11-29 03:23:45 +03:00
events.yml	Культ плоти (#871)	2025-01-01 08:02:29 +03:00
meteorswarms.yml	Звук оповещения из сс13	2024-11-29 03:23:45 +03:00
midround.yml	ворам не могут стать не гуманоиды	2025-01-10 21:42:42 +03:00
pests.yml	fix: Snail event wasnt tabled (#31884)	2024-09-06 17:27:51 -06:00
random_sentience.yml	Re-add improved random sentience event (#29123)	2024-08-18 17:41:12 -06:00
roundstart.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
unknown_shuttles.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
variation.yml	make GameRule use entity category (#28294)	2024-06-03 08:39:25 -04:00