Бронежилет инквизитора (#243)

* Sith vest sprite * Balance for Sith armor * Contraband fix * fix desc v1 * Gear for Kylo * Fix Sith vest * delete shit contraband --------- Co-authored-by: Shegare <[email protected]>
Space-Stories · Nov 8, 2024 · fa71fe9 · fa71fe9
1 parent 3c68e8f
commit fa71fe9
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 12 deletions.
diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml
@@ -2,7 +2,7 @@
   parent: ClothingNeckBase
   id: ClothingNeckCloakSith
   name: плащ инквизитора
-  description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. Заряжен неведомой энергией.
+  description: Невероятное произведение искусства, защищающее от космических невзгод. Заряжен неведомой энергией.
   components:
   - type: TemperatureProtection
     heatingCoefficient: 0.005
@@ -15,14 +15,9 @@
     radius: 1.5
     energy: 0.45
     softness: 3
-  - type: ExplosionResistance
-    damageCoefficient: 0.2
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.3
         Heat: 0.4
         Radiation: 0.25
         Caustic: 0.4
@@ -44,22 +39,17 @@
   parent: ClothingNeckBase
   id: ClothingNeckCloakKylo
   name: плащ кайло рена
-  description: Невероятное произведение искусства, объединяющее в себе прочность и легкость.
+  description: Тёмный плащ, поглощает огненный урон и защищает от космических невзгод.
   components:
   - type: TemperatureProtection
     heatingCoefficient: 0.005
     coolingCoefficient: 0.005
   - type: PressureProtection
     highPressureMultiplier: 0.02
     lowPressureMultiplier: 1000
-  - type: ExplosionResistance
-    damageCoefficient: 0.2
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.3
         Heat: 0.4
         Radiation: 0.25
         Caustic: 0.4

diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml
@@ -42,3 +42,25 @@
       sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi
     - type: Clothing
       sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi
+
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterVestSith
+  name: бронежилет инквизитора
+  description: Грозный бронежилет, обеспечивающий высокую защиту от механических повреждений.
+  components:
+  - type: ExplosionResistance
+    damageCoefficient: 0.2
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.3
+  - type: Tag
+    tags:
+    - ForceRecallEquipment
+  - type: Sprite
+    sprite: Stories/Clothing/OuterClothing/Vests/sith_armor.rsi
+  - type: Clothing
+    sprite: Stories/Clothing/OuterClothing/Vests/sith_armor.rsi
diff --git a/Resources/Prototypes/Stories/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Stories/Roles/Jobs/Fun/misc_startinggear.yml
@@ -6,6 +6,7 @@
     neck: ClothingNeckCloakSith
     eyes: ClothingEyesHudSyndicate
     gloves: ClothingHandsGlovesSith
+    outerClothing: ClothingOuterVestSith
     shoes: ClothingShoesSith
     id: AgentIDCard
     back: JetpackBlackFilled
@@ -21,6 +22,7 @@
     mask: ClothingMaskGasSyndicate
     neck: ClothingNeckCloakKylo
     gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterVestSith
     shoes: ClothingShoesSith
     id: AgentIDCard
     back: JetpackBlackFilled

diff --git a/.../Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/equipped-OUTERCLOTHING.png b/.../Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/icon.png b/Resources/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/icon.png
diff --git a/...es/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/inhand-left.png b/...es/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/inhand-left.png
diff --git a/...s/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/inhand-right.png b/...s/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/inhand-right.png
diff --git a/Resources/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/meta.json b/Resources/Textures/Stories/Clothing/OuterClothing/Vests/sith_armor.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Shegare(discord:shegare), based on a sprite from RustedTim(discord:helloo4771), for SpaceStories(Server SS14)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}