From 72571f1f8538fc92e6994199e0d2ccb144b4e7b7 Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Wed, 25 Sep 2024 20:22:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=BE=20=D1=87=D1=82=D0=BE=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=B7=D0=BC=D0=B6=D0=BD=D0=BE=20=D0=BF=D0=BE=D1=87=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D1=82=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/_Miracle/GulagSystem/GulagSystem.cs | 2 +- Resources/Prototypes/GameRules/roundstart.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/_Miracle/GulagSystem/GulagSystem.cs b/Content.Server/_Miracle/GulagSystem/GulagSystem.cs index cb5f4ea15e..2271221c7b 100644 --- a/Content.Server/_Miracle/GulagSystem/GulagSystem.cs +++ b/Content.Server/_Miracle/GulagSystem/GulagSystem.cs @@ -135,7 +135,7 @@ public sealed partial class GulagSystem : SharedGulagSystem return; } - if (ev.Primary is not KillPlayerSource source || ev.Suicide) + if (ev.Primary is not KillPlayerSource source) { return; } diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index b03470a8ce..c3907e4206 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -69,7 +69,7 @@ noSpawn: true components: - type: GameRule - minPlayers: 15 # Honk + minPlayers: 20 # Honk - type: RandomMetadata #this generates the random operation name cuz it's cool. nameSegments: - operationPrefix @@ -212,7 +212,7 @@ noSpawn: true components: - type: GameRule - minPlayers: 15 # Honk + minPlayers: 20 # Honk delay: min: 600 max: 900 @@ -260,7 +260,7 @@ noSpawn: true components: - type: GameRule - minPlayers: 15 # Honk + minPlayers: 30 # Honk - type: CultRule - type: AntagSelection definitions: @@ -287,7 +287,7 @@ noSpawn: true components: - type: GameRule - minPlayers: 15 # Honk + minPlayers: 20 # Honk - type: RandomMetadata - type: LoadMapRule gameMap: WizardShuttle