Merge branch 'master' into fixes-for-yaml-linter

Space-Stories · Sep 24, 2024 · e878f62 · e878f62
2 parents fab804a + e908535
commit e878f62
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 282,065 deletions.
diff --git a/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl b/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl
@@ -0,0 +1,44 @@
+# АВД
+
+loadout-group-AII-jumpsuit = Агент Внутренних Дел, комбинезон
+
+# Тюрьма
+
+loadout-group-HeadOfPrison-head = Начальник тюрьмы, голова
+
+loadout-group-PRISON-Gloves = Тюрьма, перчатки
+
+loadout-group-PRISON-OuterClothing = Тюрьма, верхняя одежда
+
+loadout-group-PRISON-Backpack = Тюрьма, рюкзак
+
+loadout-group-PRISON-Shoes = Тюрьма, обувь
+
+loadout-group-PRISON-Belt = Тюрьма, пояс
+
+loadout-group-PRISON-head = Тюрьма, голова
+
+# Спонсор Рюказки
+
+loadout-group-sponsor-Backpack = Спонсор, рюкзаки
+
+# Страж
+
+loadout-group-Jedi-head = Страж, голова
+
+loadout-group-Jedi-mask = Страж, маска
+
+loadout-group-Jedi-shoes = Страж, обувь
+
+loadout-group-Jedi-belt = Страж, пояс
+
+loadout-group-Jedi-neck = Страж, шея
+
+loadout-group-Jedi-jumpsuits = Страж, комбинезон
+
+loadout-group-Jedi-backpack = Страж, рюкзак
+
+# Детектив
+
+loadout-group-detective-belt = Детектив, пояс
+
diff --git a/Resources/Maps/Stories/corvax_pilgrim.yml b/Resources/Maps/Stories/corvax_pilgrim.yml
diff --git a/Resources/Maps/Stories/corvax_silly.yml b/Resources/Maps/Stories/corvax_silly.yml
diff --git a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml
@@ -0,0 +1,30 @@
+## Вставка группы в лодаут роли
+- type: roleLoadout
+  id: JobIAA
+  groups:
+  - GroupTankHarness
+  - AIIJumpsuit
+  - CommonBackpack
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
+## Группы для вещей
+- type: loadoutGroup
+  id: AIIJumpsuit
+  name: Агент Внутренних Дел, комбинезон
+  loadouts:
+  - AIIJumpsuit
+  - AIIJumpskirt
+
+## Сюда прописывать вещь
+- type: loadout
+  id: AIIJumpsuit
+  equipment:
+   jumpsuit: ClothingUniformJumpsuitLawyerBlack
+
+- type: loadout
+  id: AIIJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtLawyerBlack
diff --git a/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml
@@ -1,6 +1,6 @@
 - type: loadoutGroup
   id: DetectiveBelt
-  name: Детектив, пояс
+  name:  loadout-group-detective-belt
   loadouts:
   - ClothingBeltHolsterFilled
   - StoriesClothingBeltHolsterFilled

diff --git a/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml
@@ -16,21 +16,21 @@
 
 - type: loadoutGroup
   id: JediNtHead
-  name: Страж Клинка, голова
+  name: loadout-group-Jedi-head
   minLimit: 0
   loadouts:
   - ClothingHeadHatExe
 
 - type: loadoutGroup
   id: JediNtMask
-  name: Страж Клинка, маска
+  name: loadout-group-Jedi-mask
   minLimit: 0
   loadouts:
   - ClothingMaskGasExe
 
 - type: loadoutGroup
   id: JediNtShoes
-  name: Страж Клинка, обувь
+  name: loadout-group-Jedi-shoes
   loadouts:
   - ClothingShoesBootsExe
   - ClothingShoesBootsJackJediNomad
@@ -39,15 +39,15 @@
 
 - type: loadoutGroup
   id: JediNtBelt
-  name: Страж Клинка, пояс
+  name: loadout-group-Jedi-belt
   loadouts:
   - SecurityBelt
   - ClothingBeltJedi
   - ClothingBeltSheathExe
 
 - type: loadoutGroup
   id: JediNtNeck
-  name: Страж Клинка, шея
+  name: loadout-group-Jedi-neck
   minLimit: 0
   loadouts:
   - ClothingNeckCloakExe
@@ -56,7 +56,7 @@
 
 - type: loadoutGroup
   id: JediNtJumpsuit
-  name: Страж Клинка, комбинезон
+  name: loadout-group-Jedi-jumpsuits
   minLimit: 1
   loadouts:
   - ClothingUniformJumpsuitExe
@@ -66,7 +66,7 @@
 
 - type: loadoutGroup
   id: JediNtBackpack
-  name: Страж Клинка, рюкзак
+  name: loadout-group-Jedi-backpack
   loadouts:
   # Stories-partners - start
   # Handbag

diff --git a/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml b/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml
@@ -1,7 +1,7 @@
 - type: loadoutGroup
   id: PartnersBackpacks
   minLimit: 0
-  name: Спонсор, рюкзак
+  name: loadout-group-sponsor-Backpack
   loadouts:
   # Помогите!
   - ClothingBackpackHandbagAdidos

diff --git a/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml
@@ -56,7 +56,7 @@
 
 - type: loadoutGroup
   id: PRISONHeadOfPrisonHead
-  name: Начальник тюрьмы, голова
+  name: loadout-group-HeadOfPrison-head
   minLimit: 0
   loadouts:
   - PRISONCapHeadOfPrison
@@ -76,7 +76,7 @@
 
 - type: loadoutGroup
   id: PRISONGloves
-  name: Тюрьма, перчатки
+  name: loadout-group-PRISON-Gloves
   minLimit: 0
   loadouts:
   - PRISONGloves
@@ -99,7 +99,7 @@
 
 - type: loadoutGroup
   id: PRISONOuterClothing
-  name: Тюрьма, верхняя одежда
+  name: loadout-group-PRISON-OuterClothing
   loadouts:
   - PRISONArmorVest
 
@@ -112,7 +112,7 @@
 
 - type: loadoutGroup
   id: PRISONBackpack
-  name: Тюрьма, рюкзак
+  name: loadout-group-PRISON-Backpack
   loadouts:
   - PRISONBackpack
   - PRISONSatchel
@@ -163,7 +163,7 @@
 
 - type: loadoutGroup
   id: PRISONHead
-  name: Тюрьма, голова
+  name: loadout-group-PRISON-head
   minLimit: 0
   loadouts:
   - PRISONCap
@@ -183,7 +183,7 @@
 
 - type: loadoutGroup
   id: PRISONShoes
-  name: Тюрьма, обувь
+  name: loadout-group-PRISON-Shoes
   loadouts:
   - CombatBoots
   - JackBoots
@@ -199,7 +199,7 @@
 
 - type: loadoutGroup
   id: PRISONBelt
-  name: Тюрьма, пояс
+  name: loadout-group-PRISON-Belt
   loadouts:
   - SecurityBelt
   - PRISONWebbing

diff --git a/Resources/Prototypes/Stories/Maps/Pools/default.yml b/Resources/Prototypes/Stories/Maps/Pools/default.yml
@@ -16,7 +16,5 @@
   - CorvaxAstra
   - CorvaxAvrite
   - CorvaxDelta
-  - CorvaxSilly
-  - CorvaxPilgrim
   - CorvaxPaper
-  - CorvaxSplit
+  - CorvaxSplit
diff --git a/Resources/Prototypes/Stories/Maps/pilgrim.yml b/Resources/Prototypes/Stories/Maps/pilgrim.yml
diff --git a/Resources/Prototypes/Stories/Maps/silly.yml b/Resources/Prototypes/Stories/Maps/silly.yml