[FEATURE] - арахны могут носить броники (#1044)

* Update arachne.yml * BroneArachne
Rxup · Feb 10, 2025 · 0286a1e · 0286a1e
1 parent 26ac2de
commit 0286a1e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 16 deletions.
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/vests.yml
@@ -8,6 +8,9 @@
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec.rsi
     - type: Clothing
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec.rsi
+    - type: Tag
+      tags:
+        - BroneArachne
 
 - type: entity
   parent: ClothingOuterArmorBasic
@@ -19,6 +22,9 @@
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi
     - type: Clothing
       sprite: Corvax/Clothing/OuterClothing/Vests/armor_sec_med.rsi
+    - type: Tag
+      tags:
+      - BroneArachne
 
 - type: entity
   parent: ClothingOuterBase
@@ -30,3 +36,6 @@
       sprite: Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi
     - type: Clothing
       sprite: Corvax/Clothing/OuterClothing/Vests/vest_security_medic.rsi
+    - type: Tag
+      tags:
+      - BroneArachne
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -23,6 +23,10 @@
         ArmorPiercing: 0.90
   - type: ExplosionResistance
     damageCoefficient: 0.90
+  - type: Tag
+    tags:
+      - BroneArachne
+
 
 #Standard armor vest, allowed for security and bartenders
 - type: entity

diff --git a/Resources/Prototypes/_Backmen/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/_Backmen/Entities/Mobs/Species/arachne.yml
@@ -266,15 +266,25 @@
       slotTexture: uniform
       slotFlags: INNERCLOTHING
       stripTime: 6
-      uiWindowPos: 0,2
+      uiWindowPos: 1,1
       strippingWindowPos: 0,2
       displayName: Jumpsuit
+    - name: outerClothing
+      whitelist:
+        tags:
+          - BroneArachne
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      stripTime: 6
+      uiWindowPos: 0,1
+      strippingWindowPos: 1,2
+      displayName: Suit
   #backmen:underclothing-start
     - name: undershirt
       slotTexture: undershirt
       slotFlags: UNDERSHIRT
       stripTime: 8
-      uiWindowPos: 4,1
+      uiWindowPos: 3,1
       strippingWindowPos: 3,1
       displayName: Undershirt
 #    - name: underpants
@@ -295,41 +305,49 @@
     - name: gloves
       slotTexture: gloves
       slotFlags: GLOVES
-      uiWindowPos: 2,2
+      uiWindowPos: 2,0
       strippingWindowPos: 2,2
       displayName: Gloves
     - name: neck
       slotTexture: neck
       slotFlags: NECK
-      uiWindowPos: 0,1
+      uiWindowPos: 2,1
       strippingWindowPos: 0,1
       displayName: Neck
     - name: mask
       slotTexture: mask
       slotFlags: MASK
-      uiWindowPos: 1,1
+      uiWindowPos: 3,2
       strippingWindowPos: 1,1
       displayName: Mask
     - name: eyes
       slotTexture: glasses
       slotFlags: EYES
       stripTime: 3
-      uiWindowPos: 0,0
+      uiWindowPos: 0,2
       strippingWindowPos: 0,0
       displayName: Eyes
     - name: ears
       slotTexture: ears
       slotFlags: EARS
       stripTime: 3
-      uiWindowPos: 2,0
+      uiWindowPos: 1,2
       strippingWindowPos: 2,0
       displayName: Ears
     - name: head
       slotTexture: head
       slotFlags: HEAD
-      uiWindowPos: 1,0
+      uiWindowPos: 2,2
       strippingWindowPos: 1,0
       displayName: Head
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags:   SUITSTORAGE
+      stripTime: 3
+      uiWindowPos: 1,0
+      strippingWindowPos: 2,5
+      dependsOn: outerClothing
+      displayName: Suit Storage
     - name: pocket1
       slotTexture: pocket
       slotFlags: POCKET
@@ -350,14 +368,6 @@
       dependsOn: jumpsuit
       displayName: Pocket 2
       stripHidden: true
-    - name: suitstorage
-      slotTexture: suit_storage
-      slotFlags:   SUITSTORAGE
-      stripTime: 3
-      uiWindowPos: 2,0
-      strippingWindowPos: 2,5
-      dependsOn: outerClothing
-      displayName: Suit Storage
     - name: id
       slotTexture: id
       slotFlags: IDCARD

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
@@ -30,6 +30,9 @@
 - type: Tag
   id: ArtifactFragment
 
+- type: Tag
+  id: BroneArachne
+
 - type: Tag
   id: ATVKeys