From 0d2784a8d20b1aad6f7517a4c7c5b46ab508afb3 Mon Sep 17 00:00:00 2001 From: Shegare <147345753+Shegare@users.noreply.github.com> Date: Mon, 23 Dec 2024 14:01:09 +0300 Subject: [PATCH] Fix stories content (#34) * moved StoriesSpaceLaw to Stories * moved Stories content to the folders with _ * fix verb make shadowling * canceling moving the config folder * moving and renaming laws --- .../Administration/Systems/AdminVerbSystem.Antags.cs | 2 +- .../game-ticking/setmap-command.ftl | 0 .../players/play-time-commands.ftl | 0 .../Locale/ru-RU/_stories/administration/antag.ftl | 1 + .../{SpaceStoriesLaw.yml => _Stories/SpaceLaw.yml} | 12 ++++++------ .../ServerRules/SpaceLaw}/SpaceStationBRIB.xml | 0 .../ServerRules/SpaceLaw}/SpaceStationLaw.xml | 0 .../ServerRules/SpaceLaw}/SpaceStationSop.xml | 0 .../ServerRules/SpaceLaw}/SpaceStationTableLaw.xml | 0 9 files changed, 8 insertions(+), 7 deletions(-) rename Resources/Locale/en-US/{stories => _stories}/game-ticking/setmap-command.ftl (100%) rename Resources/Locale/en-US/{stories => _stories}/players/play-time-commands.ftl (100%) create mode 100644 Resources/Locale/ru-RU/_stories/administration/antag.ftl rename Resources/Prototypes/Guidebook/{SpaceStoriesLaw.yml => _Stories/SpaceLaw.yml} (54%) rename Resources/ServerInfo/{Guidebook/ServerRules/SpaceStoriesLaw => _Stories/ServerRules/SpaceLaw}/SpaceStationBRIB.xml (100%) rename Resources/ServerInfo/{Guidebook/ServerRules/SpaceStoriesLaw => _Stories/ServerRules/SpaceLaw}/SpaceStationLaw.xml (100%) rename Resources/ServerInfo/{Guidebook/ServerRules/SpaceStoriesLaw => _Stories/ServerRules/SpaceLaw}/SpaceStationSop.xml (100%) rename Resources/ServerInfo/{Guidebook/ServerRules/SpaceStoriesLaw => _Stories/ServerRules/SpaceLaw}/SpaceStationTableLaw.xml (100%) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index f4c67b6194..b40839ceeb 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -157,7 +157,7 @@ private void AddAntagVerbs(GetVerbsEvent args) { Text = Loc.GetString("admin-verb-text-make-shadowling"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("Stories/Mobs/Demons/shadowling.rsi"), "shadowling"), + Icon = new SpriteSpecifier.Rsi(new ResPath("_Stories/Mobs/Demons/shadowling.rsi"), "shadowling"), Act = () => { _antag.ForceMakeAntag(targetPlayer, "Shadowling"); diff --git a/Resources/Locale/en-US/stories/game-ticking/setmap-command.ftl b/Resources/Locale/en-US/_stories/game-ticking/setmap-command.ftl similarity index 100% rename from Resources/Locale/en-US/stories/game-ticking/setmap-command.ftl rename to Resources/Locale/en-US/_stories/game-ticking/setmap-command.ftl diff --git a/Resources/Locale/en-US/stories/players/play-time-commands.ftl b/Resources/Locale/en-US/_stories/players/play-time-commands.ftl similarity index 100% rename from Resources/Locale/en-US/stories/players/play-time-commands.ftl rename to Resources/Locale/en-US/_stories/players/play-time-commands.ftl diff --git a/Resources/Locale/ru-RU/_stories/administration/antag.ftl b/Resources/Locale/ru-RU/_stories/administration/antag.ftl new file mode 100644 index 0000000000..4f6c720ec5 --- /dev/null +++ b/Resources/Locale/ru-RU/_stories/administration/antag.ftl @@ -0,0 +1 @@ +admin-verb-make-shadowling = Сделать цель тенеморфом. diff --git a/Resources/Prototypes/Guidebook/SpaceStoriesLaw.yml b/Resources/Prototypes/Guidebook/_Stories/SpaceLaw.yml similarity index 54% rename from Resources/Prototypes/Guidebook/SpaceStoriesLaw.yml rename to Resources/Prototypes/Guidebook/_Stories/SpaceLaw.yml index 870cc2be46..438d2f6c0f 100644 --- a/Resources/Prototypes/Guidebook/SpaceStoriesLaw.yml +++ b/Resources/Prototypes/Guidebook/_Stories/SpaceLaw.yml @@ -2,7 +2,7 @@ id: SpaceLaw name: Таблица Статей priority: -1 - text: "/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationTableLaw.xml" + text: "/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationTableLaw.xml" children: - SpaceLawSpaceStories - BasicRightsOfIntelligentBeings @@ -10,15 +10,15 @@ - type: guideEntry id: SpaceLawSpaceStories name: Корпоративный Закон - text: "/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationLaw.xml" - + text: "/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationLaw.xml" + - type: guideEntry id: SopSec name: СРП СБ priority: -1 - text: "/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationSop.xml" - + text: "/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationSop.xml" + - type: guideEntry id: BasicRightsOfIntelligentBeings name: ОПРС - text: "/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationBRIB.xml" + text: "/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationBRIB.xml" diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationBRIB.xml b/Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationBRIB.xml similarity index 100% rename from Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationBRIB.xml rename to Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationBRIB.xml diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationLaw.xml b/Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationLaw.xml similarity index 100% rename from Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationLaw.xml rename to Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationLaw.xml diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationSop.xml b/Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationSop.xml similarity index 100% rename from Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationSop.xml rename to Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationSop.xml diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationTableLaw.xml b/Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationTableLaw.xml similarity index 100% rename from Resources/ServerInfo/Guidebook/ServerRules/SpaceStoriesLaw/SpaceStationTableLaw.xml rename to Resources/ServerInfo/_Stories/ServerRules/SpaceLaw/SpaceStationTableLaw.xml