From 2aedf8afe6585b2f7af845ebfb33d0eba4efc936 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 14:34:01 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C?= =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=20=D0=BD=D0=B5=20=D1=81=D0=BB=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D1=86=D0=B5=D0=BD=D1=82=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Shuttles/Components/StationCentcommComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Components/StationCentcommComponent.cs b/Content.Server/Shuttles/Components/StationCentcommComponent.cs index 4ea7d313a1..3655920195 100644 --- a/Content.Server/Shuttles/Components/StationCentcommComponent.cs +++ b/Content.Server/Shuttles/Components/StationCentcommComponent.cs @@ -16,7 +16,7 @@ public sealed partial class StationCentcommComponent : Component public float ShuttleIndex; [DataField] - public ResPath Map = new("/Maps/centcomm.yml"); + public ResPath Map = new("/Maps/_Honk/Stations/centcomm.yml"); // Amour /// /// Centcomm entity that was loaded. From ab063997f715ebb03449868b228597ae186de521 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 14:37:57 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B2=D1=8B=20=D1=8D=D1=82=D0=BE=20=D1=83?= =?UTF-8?q?=D0=B2=D0=B8=D0=B4=D0=B8=D1=82=D0=B5,=20=D0=BD=D0=BE=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B7=D0=B6=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_White/Entities/Objects/Weapons/Guns/Modules/modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml index 762b65951e..231f5bb349 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml @@ -143,5 +143,5 @@ module_type: "shutter_module" tag: Grenade - type: Sprite - sprite: White\Objects\Weapons\modulesOnWeapon.rsi + sprite: White/Objects/Weapons/modulesOnWeapon.rsi state: telescopic From 2f9a2ed9ec86a313967191a9e7ccd3dc97fcca02 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 14:44:49 +0300 Subject: [PATCH 3/3] forcemap update --- .../GameTicking/Commands/ForceMapCommand.cs | 15 +++++++++++++-- .../en-US/game-ticking/forcemap-command.ftl | 2 ++ .../ru-RU/game-ticking/forcemap-command.ftl | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs index 5d2191fb52..a005e011eb 100644 --- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs +++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs @@ -28,11 +28,22 @@ namespace Content.Server.GameTicking.Commands var gameMap = IoCManager.Resolve(); var name = args[0]; + // WD EDIT START AHEAD OF WIZDEN + // An empty string clears the forced map + if (!string.IsNullOrEmpty(name) && !gameMap.CheckMapExists(name)) + { + shell.WriteLine(Loc.GetString("forcemap-command-map-not-found", ("map", name))); + return; + } _configurationManager.SetCVar(CCVars.GameMap, name); - shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name))); - } + if (string.IsNullOrEmpty(name)) + shell.WriteLine(Loc.GetString("forcemap-command-cleared")); + else + shell.WriteLine(Loc.GetString("forcemap-command-success", ("map", name))); + // WD EDIT END AHEAD OF WIZDEN + } public CompletionResult GetCompletion(IConsoleShell shell, string[] args) { if (args.Length == 1) diff --git a/Resources/Locale/en-US/game-ticking/forcemap-command.ftl b/Resources/Locale/en-US/game-ticking/forcemap-command.ftl index df2ca68786..573aa78a28 100644 --- a/Resources/Locale/en-US/game-ticking/forcemap-command.ftl +++ b/Resources/Locale/en-US/game-ticking/forcemap-command.ftl @@ -3,5 +3,7 @@ forcemap-command-description = Forces the game to start with a given map next round. forcemap-command-help = forcemap forcemap-command-need-one-argument = forcemap takes one argument, the path to the map file. +forcemap-command-map-not-found = No eligible map exists with name { $map }. forcemap-command-success = Forced the game to start with map { $map } next round. +forcemap-command-cleared = Cleared the forced map setting. forcemap-command-arg-map = diff --git a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl index 224d2bf1b7..3dc203cf82 100644 --- a/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl +++ b/Resources/Locale/ru-RU/game-ticking/forcemap-command.ftl @@ -3,5 +3,7 @@ forcemap-command-description = Заставляет игру начать с заданной карты в следующем раунде. forcemap-command-help = forcemap forcemap-command-need-one-argument = forcemap принимает один аргумент — путь к файлу карты. +forcemap-command-map-not-found = Не существует подходящей карты с названием { $map }. forcemap-command-success = В следующем раунде игра принудительно начнется с карты { $map }. +forcemap-command-cleared = Настройки принудительной карты сброшены. forcemap-command-arg-map =