Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Content.Client/Lobby/UI/CharacterSetupGui.xaml # Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/GameTicking/GameTicker.Lobby.cs # Content.Server/Objectives/Systems/KillPersonConditionSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json		2024-11-19 18:34:32 +03:00
..
Marker	Replace obsolete EntityWhitelist IsValid usages (#28465)	2024-06-01 23:10:24 -04:00
Melee	фиксы говцена	2024-10-30 14:00:28 +03:00
Misc	fix grappling hooks getting bricked (#32738)	2024-10-17 09:32:32 +11:00
Ranged	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +03:00
Reflect	Новые предметы, фикс супер материи, правки (#515)	2024-10-30 10:19:36 +03:00