Vigers Ray 3c2672efe9 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/IoC/ServerContentIoC.cs # Resources/Locale/en-US/_strings/administration/multi-server-kick.ftl # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml		2025-01-22 05:27:53 +03:00
..
EntryPoint.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-22 05:27:53 +03:00
IgnoredComponents.cs	HolidayClothingSwap для новогодних замен спрайтов одежды	2024-12-30 01:11:08 +03:00