another fix

TheDenSS14 · Jan 10, 2025 · b0b8816 · b0b8816
1 parent 3c3f0ab
commit b0b8816
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 92 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -8,7 +8,7 @@
     ClothingUniformJumpsuitCargoDark: 3 # CD
     ClothingUniformJumpskirtCargoLight: 3 # CD
     ClothingUniformJumpskirtCargoDark: 3 # CD
-    ClothingUniformJumpsuitCargoPants: 3 # CD
+    # ClothingUniformJumpsuitCargoPants: 3 # CD
     ClothingShoesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
     ClothingHandsGlovesMechanic: 3 # CD

diff --git a/Resources/Prototypes/_CD/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/_CD/Entities/Clothing/Masks/bandanas.yml
@@ -1,73 +1,5 @@
 - type: entity
-  parent: [ClothingMaskBaseButcherable, BaseFoldable]
-  id: ClothingMaskDepartBandanaBase
-  abstract: true
-  components:
-  - type: Appearance
-  - type: Foldable
-    canFoldInsideContainer: true
-  - type: FoldableClothing
-    foldedSlots:
-    - NECK
-    unfoldedSlots:
-    - MASK
-    foldedHideLayers: []
-    unfoldedHideLayers:
-    - Snout
-  - type: Mask
-    disableOnFolded: true
-  - type: IngestionBlocker
-  - type: IdentityBlocker
-    coverage: MOUTH
-  - type: Sprite
-    layers:
-    - state: icon
-      map: [ "unfoldedLayer" ]
-    - state: icon_neck
-      map: ["foldedLayer"]
-      visible: false
-  - type: Tag
-    tags:
-    - Bandana
-  - type: HideLayerClothing
-    slots:
-    - Snout
-    hideOnToggle: true
-
-- type: entity
-  parent: [ClothingNeckBase, BaseFoldable]
-  id: ClothingMaskDepartBandanaBaseDown
-  abstract: true
-  components:
-  - type: Foldable
-    folded: true
-  - type: Mask
-    isToggled: true
-    enabled: false
-    disableOnFolded: true
-  - type: IngestionBlocker
-    enabled: false
-  - type: IdentityBlocker
-    enabled: false
-    coverage: MOUTH
-  - type: Sprite # needed for vendor inventory icons
-    layers:
-    - state: icon_neck
-      map: ["foldedLayer"]
-      visible: true
-    - state: icon
-      map: [ "unfoldedLayer" ]
-      visible: false
-  - type: HideLayerClothing # needed since head bandana inherits from mask bandana
-    slots: []
-  - type: Tag
-    tags:
-    - Bandana
-
-## This is all an affront to god ^
-
-- type: entity
-  parent: ClothingMaskDepartBandanaBase
+  parent: ClothingMaskBandanaBase
   id: ClothingMaskBandCargo
   name: cargo bandana
   description: A cargo-coloured bandana to cover your face. You feel hidden behind it.
@@ -76,9 +8,3 @@
     sprite: _CD/Clothing/Mask/cargo_bandana.rsi
   - type: Clothing
     sprite: _CD/Clothing/Mask/cargo_bandana.rsi
-
-- type: entity
-  parent: [ClothingMaskDepartBandanaBaseDown, ClothingMaskBandCargo]
-  id: ClothingNeckBandCargo
-  name: cargo bandana
-  description: A cargo-coloured bandana to cover your face.
diff --git a/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-reptilian.png b/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-reptilian.png
diff --git a/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-vox.png b/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-vox.png
diff --git a/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-vulpkanin.png b/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK-vulpkanin.png
diff --git a/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK.png b/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/meta.json b/Resources/Textures/_CD/Clothing/Mask/cargo_bandana.rsi/meta.json
@@ -29,22 +29,6 @@
       "name": "equipped-MASK-vox",
       "directions": 4
     },
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK-vulpkanin",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK-vox",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4