Fix cloaks (SerbiaStrong-220#518)

* move cloaks to correct location * remove wrong delays * fix floppa hat location * remove mask * mask is back * move files * remove nonexisting tags * fix cloack name
Werzet · Nov 13, 2023 · 4495308 · 4495308
1 parent 796a14b
commit 4495308
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 88 deletions.
diff --git a/.../Entities/Clothing/FloppaCloak/Floopa.yml → ...Entities/Clothing/Cloaks/FloopaCloack.yml b/.../Entities/Clothing/FloppaCloak/Floopa.yml → ...Entities/Clothing/Cloaks/FloopaCloack.yml
@@ -6,7 +6,7 @@
   suffix: Sponsor
   components:
   - type: Sprite
-    sprite: SS220\Clothing\CloakF.rsi
+    sprite: SS220/Clothing/Neck/Cloaks/FloppaCloak.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatFloppa
     requiredSlot:

diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Cloaks/Heart.yml b/Resources/Prototypes/SS220/Entities/Clothing/Cloaks/Heart.yml
@@ -5,7 +5,7 @@
   description: Огромное доброе сердце, запечатанное в куске ткани.
   components:
   - type: Sprite
-    sprite: SS220/Clothing/Cloaks.rsi
+    sprite: SS220/Clothing/Neck/Cloaks/AlisaCloak.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodHeartFinaly
     requiredSlot:

diff --git a/...20/Entities/Clothing/FloppaHood/HoodF.yml → ...S220/Entities/Clothing/Head/FloppaHat.yml b/...20/Entities/Clothing/FloppaHood/HoodF.yml → ...S220/Entities/Clothing/Head/FloppaHat.yml
@@ -5,8 +5,6 @@
   description: Шлёпашон
   components:
   - type: Sprite
-    sprite: SS220\Clothing\HoodF.rsi
+    sprite: SS220/Clothing/Head/Hats/FloppaHat.rsi
   - type: Clothing
-    sprite: SS220\Clothing\HoodF.rsi
-    tags:
-    - HidesHair
+    sprite: SS220/Clothing/Head/Hats/FloppaHat.rsi
diff --git a/...es/SS220/Entities/Clothing/hoods/Hood.yml → ...S220/Entities/Clothing/Head/HeartHood.yml b/...es/SS220/Entities/Clothing/hoods/Hood.yml → ...S220/Entities/Clothing/Head/HeartHood.yml
@@ -5,8 +5,6 @@
   description: Капюшон.
   components:
   - type: Sprite
-    sprite: SS220/Clothing/hoods.rsi
+    sprite: SS220/Clothing/Head/Hats/HeartHood.rsi
   - type: Clothing
-    sprite: SS220/Clothing/hoods.rsi
-    tags:
-    - HidesHair
+    sprite: SS220/Clothing/Head/Hats/HeartHood.rsi
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/blueshield_lockers.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/blueshield_lockers.yml
@@ -23,7 +23,7 @@
     - id: WeaponDisabler
     - id: MedkitAdvancedFilled
     - id: ClothingUniformJumpsuitBlueShield2 #SS220 new jumpsuit
-    - id: ClothingCloakBlueShield2 #SS220 new cloak
+    - id: ClothingCloakBlueShield #SS220 new cloak
     - id: ExpensiveLighterShield #SS220-Zippo
 
 - type: entity

diff --git a/...20/Clothing/HoodF.rsi/equipped-HELMET.png → ...ad/Hats/FloppaHat.rsi/equipped-HELMET.png b/...20/Clothing/HoodF.rsi/equipped-HELMET.png → ...ad/Hats/FloppaHat.rsi/equipped-HELMET.png
diff --git a/...extures/SS220/Clothing/HoodF.rsi/icon.png → ...Clothing/Head/Hats/FloppaHat.rsi/icon.png b/...extures/SS220/Clothing/HoodF.rsi/icon.png → ...Clothing/Head/Hats/FloppaHat.rsi/icon.png
diff --git a/...xtures/SS220/Clothing/HoodF.rsi/meta.json → ...lothing/Head/Hats/FloppaHat.rsi/meta.json b/...xtures/SS220/Clothing/HoodF.rsi/meta.json → ...lothing/Head/Hats/FloppaHat.rsi/meta.json
diff --git a/...20/Clothing/hoods.rsi/equipped-HELMET.png → ...ad/Hats/HeartHood.rsi/equipped-HELMET.png b/...20/Clothing/hoods.rsi/equipped-HELMET.png → ...ad/Hats/HeartHood.rsi/equipped-HELMET.png
diff --git a/...extures/SS220/Clothing/hoods.rsi/icon.png → ...Clothing/Head/Hats/HeartHood.rsi/icon.png b/...extures/SS220/Clothing/hoods.rsi/icon.png → ...Clothing/Head/Hats/HeartHood.rsi/icon.png
diff --git a/...xtures/SS220/Clothing/hoods.rsi/meta.json → ...lothing/Head/Hats/HeartHood.rsi/meta.json b/...xtures/SS220/Clothing/hoods.rsi/meta.json → ...lothing/Head/Hats/HeartHood.rsi/meta.json
diff --git a/...sk/Blue-shield-mask.rsi/equipped-MASK.png → ...sk/blue-shield-mask.rsi/equipped-MASK.png b/...sk/Blue-shield-mask.rsi/equipped-MASK.png → ...sk/blue-shield-mask.rsi/equipped-MASK.png
diff --git a/...othing/Mask/Blue-shield-mask.rsi/icon.png → ...othing/Mask/blue-shield-mask.rsi/icon.png b/...othing/Mask/Blue-shield-mask.rsi/icon.png → ...othing/Mask/blue-shield-mask.rsi/icon.png
diff --git a/...Mask/Blue-shield-mask.rsi/inhand-left.png → ...Mask/blue-shield-mask.rsi/inhand-left.png b/...Mask/Blue-shield-mask.rsi/inhand-left.png → ...Mask/blue-shield-mask.rsi/inhand-left.png
diff --git a/...ask/Blue-shield-mask.rsi/inhand-right.png → ...ask/blue-shield-mask.rsi/inhand-right.png b/...ask/Blue-shield-mask.rsi/inhand-right.png → ...ask/blue-shield-mask.rsi/inhand-right.png
diff --git a/...thing/Mask/Blue-shield-mask.rsi/meta.json → ...thing/Mask/blue-shield-mask.rsi/meta.json b/...thing/Mask/Blue-shield-mask.rsi/meta.json → ...thing/Mask/blue-shield-mask.rsi/meta.json
diff --git a/...220/Clothing/Cloaks.rsi/equipped-NECK.png → ...k/Cloaks/AlisaCloak.rsi/equipped-NECK.png b/...220/Clothing/Cloaks.rsi/equipped-NECK.png → ...k/Cloaks/AlisaCloak.rsi/equipped-NECK.png
diff --git a/...xtures/SS220/Clothing/Cloaks.rsi/icon.png → ...thing/Neck/Cloaks/AlisaCloak.rsi/icon.png b/...xtures/SS220/Clothing/Cloaks.rsi/icon.png → ...thing/Neck/Cloaks/AlisaCloak.rsi/icon.png
diff --git a/...tures/SS220/Clothing/Cloaks.rsi/meta.json → ...hing/Neck/Cloaks/AlisaCloak.rsi/meta.json b/...tures/SS220/Clothing/Cloaks.rsi/meta.json → ...hing/Neck/Cloaks/AlisaCloak.rsi/meta.json
@@ -8,83 +8,7 @@
   },
   "states": [
     {
-      "name": "icon",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "icon"
     },
     {
       "name": "equipped-NECK",

diff --git a/...220/Clothing/CloakF.rsi/equipped-NECK.png → .../Cloaks/FloppaCloak.rsi/equipped-NECK.png b/...220/Clothing/CloakF.rsi/equipped-NECK.png → .../Cloaks/FloppaCloak.rsi/equipped-NECK.png
diff --git a/...xtures/SS220/Clothing/CloakF.rsi/icon.png → ...hing/Neck/Cloaks/FloppaCloak.rsi/icon.png b/...xtures/SS220/Clothing/CloakF.rsi/icon.png → ...hing/Neck/Cloaks/FloppaCloak.rsi/icon.png
diff --git a/...SS220/Clothing/CloakF.rsi/inhand-left.png → ...ck/Cloaks/FloppaCloak.rsi/inhand-left.png b/...SS220/Clothing/CloakF.rsi/inhand-left.png → ...ck/Cloaks/FloppaCloak.rsi/inhand-left.png
diff --git a/...S220/Clothing/CloakF.rsi/inhand-right.png → ...k/Cloaks/FloppaCloak.rsi/inhand-right.png b/...S220/Clothing/CloakF.rsi/inhand-right.png → ...k/Cloaks/FloppaCloak.rsi/inhand-right.png
diff --git a/...tures/SS220/Clothing/CloakF.rsi/meta.json → ...ing/Neck/Cloaks/FloppaCloak.rsi/meta.json b/...tures/SS220/Clothing/CloakF.rsi/meta.json → ...ing/Neck/Cloaks/FloppaCloak.rsi/meta.json