Фракционная война-апдейт (#713)

* Add files via upload * Delete Resources/Prototypes/SS220/Entities/Debugging/debugKnife.yml * Delete Resources/Prototypes/SS220/Entities/Debugging/debugTargets.yml * ebent001 * Update backpacks.yml * Update Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml Co-authored-by: Kit0vras <[email protected]> * Update postament.yml * Delete Resources/Textures/SS220/Clothing/Shoes/Boots/MagSyndieEbent.rsi directory * Add files via upload * Update magboots.yml * Update HardsuitIronSquad.yml * Update magboots.yml * Update CustomItems.yml --------- Co-authored-by: Kit0vras <[email protected]>
SerbiaStrong-220 · Feb 5, 2024 · 3f80239 · 3f80239
1 parent c225305
commit 3f80239
Show file tree

Hide file tree

Showing 165 changed files with 1,289 additions and 450 deletions.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/magboots.ftl
@@ -14,3 +14,5 @@ ent-ActionToggleMagbootsAdvanced = { ent-ActionBaseToggleMagboots }
     .desc = { ent-ActionBaseToggleMagboots.desc }
 ent-ActionToggleMagbootsSyndie = { ent-ActionBaseToggleMagboots }
     .desc = { ent-ActionBaseToggleMagboots.desc }
+ent-ActionToggleMagSyndieEbent = { ent-ActionBaseToggleMagboots }
+    .desc = { ent-ActionBaseToggleMagboots.desc }
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpacks.yml
@@ -6,9 +6,10 @@
   id: ClothingBackpackUSSP
   name: USSP backpack
   description: A standard backpack for USSP Red Army.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: SS220/Clothing/Back/Backpacks/ussp.rsi
   - type: Storage
     grid:
-    - 0,0,8,3
+    - 0,0,12,3
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Ears/ussp_headset.yml b/Resources/Prototypes/SS220/Entities/Clothing/Ears/ussp_headset.yml
@@ -4,6 +4,7 @@
   parent: ClothingHeadset
   id: ClothingHeadsetUSSP
   name: ussp headset
+  suffix: Shitspawn, Ebent, FractWar
   description: You can hear the spirit of communism in them.
   components:
   - type: ContainerFill

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -23,11 +23,13 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Radiation: 0.5
-        Stamina: 0.3
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+        Radiation: 1
+        Caustic: 1
+        Stamina: 1
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -52,11 +54,13 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Radiation: 0.5
-        Stamina: 0.3
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+        Radiation: 1
+        Caustic: 1
+        Stamina: 1
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -81,12 +85,13 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
-        Radiation: 0.5
-        Stamina: 0.3
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+        Radiation: 1
+        Caustic: 1
+        Stamina: 1
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -111,12 +116,13 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
-        Radiation: 0.5
-        Stamina: 0.3
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+        Radiation: 1
+        Caustic: 1
+        Stamina: 1
 
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
@@ -141,10 +147,10 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
-        Radiation: 0.4
-        Caustic: 0.5
-        Stamina: 0.3
+        Blunt: 1
+        Slash: 1
+        Piercing: 1
+        Heat: 1
+        Radiation: 1
+        Caustic: 1
+        Stamina: 1
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Masks/ussp.yml b/Resources/Prototypes/SS220/Entities/Clothing/Masks/ussp.yml
@@ -3,7 +3,7 @@
   id: ClothingMaskGasUssp
   name: противогаз
   description: Стандартный противогаз СССП с защитой от вспышек.
-  suffix: СССП, Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Clothing/Mask/ussp-gas-mask.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml b/Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml
@@ -2,8 +2,8 @@
   parent: ClothingNeckBase
   id: ClothingCloakIronSquadCMO
   name: плащ Главного Врача Железного отряда
-  description: Этот плащ не только нарушает любые санитарные нормы, но и наделяет таким авторитетом надевшего его, что о первом никто не смеет упомянуть.
-  suffix: Ebent
+  description: Этот плащ не только нарушает любые санитарные нормы, но и наделяет владельца таким авторитетом, что его никто не посмеет обсуждать за спиной.
+  suffix: Shitspawn, Ebent, FractWar
   components:
     - type: Sprite
       sprite: SS220/Clothing/Neck/Cloaks/s_cmo.rsi
@@ -13,7 +13,7 @@
   id: ClothingCloakIronSquadCmd
   name: плащ Командира Железного отряда
   description: Надев его, чувствуешь настоящую силу, власть и коварство.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
     - type: Sprite
       sprite: SS220/Clothing/Neck/Cloaks/s_command.rsi
@@ -22,8 +22,8 @@
   parent: ClothingNeckBase
   id: ClothingCloakIronSquadEng
   name: плащ Инженера Железного отряда
-  description: Снаружи жесткая ткань с отчётливо видными следами тления, а внутри слышится стойкий аромат машинного масла.
-  suffix: Ebent
+  description: Снаружи жёсткая ткань с отчётливо видными следами тления, а внутри слышится стойкий аромат машинного масла.
+  suffix: Shitspawn, Ebent, FractWar
   components:
     - type: Sprite
       sprite: SS220/Clothing/Neck/Cloaks/s_eng.rsi
@@ -33,7 +33,7 @@
   id: ClothingCloakIronSquadMed
   name: плащ Полевого медика Железного отряда
   description: Говорят, если на светлом плаще будут видны пятна крови - то врачу понадобится врач.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
     - type: Sprite
       sprite: SS220/Clothing/Neck/Cloaks/s_med.rsi
diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -51,8 +51,8 @@
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
   - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
+    walkModifier: 0.8
+    sprintModifier: 0.8
   - type: Armor
     modifiers:
       coefficients:
@@ -85,8 +85,8 @@
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
   - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
+    walkModifier: 1.1
+    sprintModifier: 1.1
   - type: Armor
     modifiers:
       coefficients:

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/heavy_sssp_hardsuit.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/heavy_sssp_hardsuit.yml
@@ -4,8 +4,8 @@
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitUSSPHeavy
   name: тяжёлый боевой скафандр СССП
-  description: Этот тяжёлый костюм выполнен по всем стандартам ГОСТа советского производства. Обеспечивает отличную защиту и путь в светлое будущее
-  suffix: Ebent
+  description: Этот тяжёлый костюм выполнен по всем стандартам ГОСТа советского производства. Обеспечивает отличную защиту и путь в светлое будущее.
+  suffix: Shitspawn, Ebent
   components:
   - type: Sprite
     sprite: SS220/Clothing/OuterClothing/Hardsuits/sssp_heavy.rsi
@@ -15,8 +15,8 @@
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 10000
   - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 0.65
+    sprintModifier: 0.65
   - type: Armor
     modifiers:
       coefficients:

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/shinel.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/shinel.yml
@@ -3,7 +3,7 @@
   id: ClothingOuterCoatUssp
   name: пальто НКВД
   description: Качественное и дорогое пальто. Защитит от самых суровых морозов в самых дальних уголках Сибири.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Clothing/OuterClothing/Coats/shinel.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml
@@ -3,7 +3,7 @@
   id: ClothingUniformMundir
   name: солдатский мундир
   description: Отражение силы, дисциплины и патриотизма в статной форме.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Clothing/Uniforms/Mundir.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml
@@ -3,7 +3,7 @@
   id: ClothingUniformOfficerMundir
   name: офицерский мундир
   description: Строгий и авторитетный наряд военного.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Clothing/Uniforms/OfficerMundir.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/ussp_uniform.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/ussp_uniform.yml
@@ -3,7 +3,7 @@
   id: ClothingUniformJumpsuitUssp
   name: униформа СССП
   description: Форма, пропитанная кровью, потом и ненавистью к капитализму.
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Clothing/Uniforms/ussp_uniform.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/ussp_pda.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/ussp_pda.yml
@@ -3,7 +3,7 @@
   id: UsspPDA
   name: ПДА СССП
   description: Стандартный ПДА СССП.
-  suffix: СССП
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Pda
     id: UsspIDCard
@@ -30,7 +30,7 @@
   id: UsspMedicalPDA
   name: ПДА врача СССП
   description: Стандартный ПДА врача СССП. Имеет встроенный анализатор здоровья.
-  suffix: СССП
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Pda
     id: UsspIDCard

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Medical/ussp_hypo.yml b/Resources/Prototypes/SS220/Entities/Objects/Medical/ussp_hypo.yml
@@ -3,7 +3,7 @@
   parent: BaseItem
   description: С помощью реверс-инжиниринга технологии NT, СССП выпускает их в ограниченном количестве для нужд армии.
   id: UsspHypo
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Objects/Medical/USSRhypo.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
@@ -1,7 +1,7 @@
 - type: entity
-  parent: AgentIDCard
+  parent: IDCardStandard
   id: UsspIDCard
-  suffix: СССП
+  suffix: Shitspawn, Ebent, FractWar
   name: ID карта СССП
   description: Карта, необходимая для доступа в различные части станций и кораблей.
   components:

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -5,7 +5,7 @@
   description: Взрывное устройство, производимое СССП, используемое, чтобы сеять хаос и разрушения.
   parent: SyndieMiniBomb
   id: UsspMiniBomb
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     sprite: SS220/Objects/Weapons/Grenades/usspnade.rsi

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml b/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml
@@ -3,7 +3,7 @@
   id: UsspComputerComms
   name: консоль связи СССП
   description: Для трансляции коммунизма во все уголки звёздной системы.
-  suffix: СССП
+  suffix: Shitspawn, Ebent, FractWar
   components:
   - type: Sprite
     layers:

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/EventPointCapture/flags.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/EventPointCapture/flags.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: EventCaptureFlagBase
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   name: флаг фракции
   description: Флаг вашей фракции для захвата постаментов.
   abstract: true
@@ -49,7 +49,7 @@
 
 - type: entity
   id: EventCaptureFlagNT
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   name: флаг НаноТрейзен
   description: Флаг вашей фракции для захвата постаментов.
   parent: EventCaptureFlagBase
@@ -69,7 +69,7 @@
 
 - type: entity
   id: EventCaptureFlagSynd
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   name: флаг Синдиката
   description: Флаг вашей фракции для захвата постаментов.
   parent: EventCaptureFlagBase
@@ -89,7 +89,7 @@
 
 - type: entity
   id: EventCaptureFlagUssp
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   name: флаг СССП
   description: Флаг вашей фракции для захвата постаментов.
   parent: EventCaptureFlagBase

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/EventPointCapture/postament.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/EventPointCapture/postament.yml
@@ -1,8 +1,8 @@
 - type: entity
   id: EventCapturablePostament
-  suffix: Ebent
+  suffix: Shitspawn, Ebent, FractWar
   name: постамент
-  description: Постамент для флага. Для захвата установите сюда флаг вашей фракции.
+  description: Постамент для флага. Для захвата установите здесь флаг вашей фракции.  
   placement:
     mode: SnapgridCenter
   components:
@@ -37,4 +37,4 @@
       enum.CapturePointVisuals.Visuals:
         PostamentState:
           True: { state: with_flag }
-          False: { state: without_flag }
+          False: { state: without_flag }
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/ussp.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/ussp.yml
@@ -2,7 +2,7 @@
   id: UsspCloset
   parent: ClosetBase
   name: шкаф СССП
-  suffix: СССП
+  noSpawn: true
   description: Стандартное хранилище СССП для различных вещей.
   components:
   - type: EntityStorageVisuals