Fully complete facewear loadouts, add torn scarves, more coifs (RMC-1…

…4#5348)

Content.Shared/Clothing/EntitySystems/ClothingSystem.cs

@@ -200,7 +200,7 @@ private void OnItemStripped(Entity<ClothingComponent> ent, ref BeforeItemStrippe
         args.Additive += ent.Comp.StripDelay;
     }
 
-    private void CheckEquipmentForLayerHide(EntityUid equipment, EntityUid equipee)
+    public void CheckEquipmentForLayerHide(EntityUid equipment, EntityUid equipee)
     {
         if (TryComp(equipment, out HideLayerClothingComponent? clothesComp) && TryComp(equipee, out HumanoidAppearanceComponent? appearanceComp))
             ToggleVisualLayers(equipee, clothesComp.Slots, appearanceComp.HideLayersOnEquip);

Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs

@@ -67,5 +67,7 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
                 hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
 
         }
+
+        _clothingSystem.CheckEquipmentForLayerHide(ent.Owner, Transform(ent.Owner).ParentUid); // RMC14
     }
 }

Resources/Prototypes/_RMC14/Entities/Clothing/Masks/masks.yml

@@ -56,30 +56,138 @@
 
 - type: entity
   parent: CMBaseMask
+  id: RMCMaskRebreather
+  name: rebreather
+  description: A close-fitting device that instantly heats or cools down air when you inhale so it doesn't damage your lungs.
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/rebreather.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/rebreather.rsi
+    slots:
+    - Mask
+  - type: Item
+    size: Small
+
+# Coifs
+- type: entity
+  parent: [ClothingMaskBase, BaseFoldable]
   id: CMMaskCoif
   name: heat absorbent coif
   description: A close-fitting cap that covers the top, back, and sides of the head. Can also be adjusted to cover the lower part of the face so it keeps the user warm in harsh conditions.
   components:
   - type: Sprite
     sprite: _RMC14/Objects/Clothing/Mask/coif.rsi
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon
+      map: ["foldedLayer"]
+      visible: false
+  - type: HideLayerClothing
   - type: Clothing
     sprite: _RMC14/Objects/Clothing/Mask/coif.rsi
   - type: IdentityBlocker
     coverage: MOUTH
   - type: Item
     storedRotation: -90
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+  - type: FoldableClothing
+    foldedEquippedPrefix: up
+    foldedHeldPrefix: up
+    foldedHideLayers:
+    - Hair
+    - HeadTop
+    - HeadSide
+    unfoldedHideLayers:
+    - Hair
+    - HeadTop
+    - HeadSide
+    - Snout
+
+- type: entity
+  parent: CMMaskCoif
+  id: RMCMaskCoifGreen
+  name: UNMC green balaclava
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/green_coif.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/green_coif.rsi
+
+- type: entity
+  parent: CMMaskCoif
+  id: RMCMaskCoifGrey
+  name: UNMC grey balaclava
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/grey_coif.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/grey_coif.rsi
+
+- type: entity
+  parent: CMMaskCoif
+  id: RMCMaskCoifTan
+  name: UNMC tan balaclava
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/tan_coif.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/tan_coif.rsi
 
+# Balaclavas
 - type: entity
   parent: CMBaseMask
-  id: RMCMaskRebreather
-  name: rebreather
-  description: A close-fitting device that instantly heats or cools down air when you inhale so it doesn't damage your lungs.
+  id: RMCMaskBalaclava
+  name: balaclava
+  description: A basic single eye-hole balaclava, available in almost every sporting goods, outdoor supply, or military surplus store in existence, protects your face from the cold almost as well as it conceals it. This one is in a standard black color.
   components:
   - type: Sprite
-    sprite: _RMC14/Objects/Clothing/Mask/rebreather.rsi
+    sprite: _RMC14/Objects/Clothing/Mask/balaclava.rsi
   - type: Clothing
-    sprite: _RMC14/Objects/Clothing/Mask/rebreather.rsi
-    slots:
-    - Mask
+    sprite: _RMC14/Objects/Clothing/Mask/balaclava.rsi
+  - type: IdentityBlocker
+    coverage: MOUTH
   - type: Item
-    size: Small
+    storedRotation: -90
+  - type: HideLayerClothing
+    slots:
+    - HeadTop
+    - HeadSide
+    - Hair
+    - Snout
+
+- type: entity
+  parent: RMCMaskBalaclava
+  id: RMCMaskBalaclavaGreen
+  name: green balaclava
+  description: A basic single eye-hole balaclava, available in almost every sporting goods, outdoor supply, or military surplus store in existence, protects your face from the cold almost as well as it conceals it. This one is in a non-standard green color.
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/swatclava.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/swatclava.rsi
+
+- type: entity
+  parent: RMCMaskBalaclava
+  id: RMCMaskBalaclavaSkullBlue
+  name: skull balaclava
+  description: The face of your nightmares. Or at least that's how you imagined it'd be. Additionally protects against the cold.
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/skull_coif_blue.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/skull_coif_blue.rsi
+
+- type: entity
+  parent: RMCMaskBalaclavaSkullBlue
+  id: RMCMaskBalaclavaSkullBlack
+  description: The face of your nightmares. Or at least that's how you imagined it'd be. Now in black!
+  suffix: Black
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/skull_coif.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/skull_coif.rsi

Resources/Prototypes/_RMC14/Entities/Clothing/Masks/scarfs.yml

@@ -228,3 +228,65 @@
   parent: [RMCBaseScarfDown, RMCMaskScarfTan]
   id: RMCMaskScarfTanDown
   name: tan tactical wrap
+
+# Torn Scarf
+- type: entity
+  parent: ClothingMaskBaseButcherable
+  id: RMCMaskTornScarfBlack
+  name: tactical scarf
+  description: A tactical scarf used to keep warm in the cold.
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/black.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/black.rsi
+
+- type: entity
+  parent: RMCMaskTornScarfBlack
+  id: RMCMaskTornScarfDesert
+  name: desert tactical scarf
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/desert.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/desert.rsi
+
+- type: entity
+  parent: RMCMaskTornScarfBlack
+  id: RMCMaskTornScarfGreen
+  name: green tactical scarf
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/green.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/green.rsi
+
+- type: entity
+  parent: RMCMaskTornScarfBlack
+  id: RMCMaskTornScarfGrey
+  name: grey tactical scarf
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/grey.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/grey.rsi
+
+- type: entity
+  parent: RMCMaskTornScarfBlack
+  id: RMCMaskTornScarfUrban
+  name: urban tactical scarf
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/urban.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/urban.rsi
+
+- type: entity
+  parent: RMCMaskTornScarfBlack
+  id: RMCMaskTornScarfSnow
+  name: snow tactical scarf
+  components:
+  - type: Sprite
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/snow.rsi
+  - type: Clothing
+    sprite: _RMC14/Objects/Clothing/Mask/TornScarfs/snow.rsi

Resources/Prototypes/_RMC14/Roles/Loadouts/Items/masks.yml

@@ -1,4 +1,18 @@
 # Masks
+- type: loadout
+  id: BalaclavaRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskBalaclava
+
+- type: loadout
+  id: BalaclavaGreenRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskBalaclavaGreen
+
 - type: loadout
   id: CoifRMC
   cost: 2
@@ -54,3 +68,80 @@
   storage:
     back:
     - RMCMaskScarfTan
+
+- type: loadout
+  id: TornScarfBlackRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfBlack
+
+- type: loadout
+  id: TornScarfDesertRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfDesert
+
+- type: loadout
+  id: TornScarfGreenRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfGreen
+
+- type: loadout
+  id: TornScarfGreyRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfGrey
+
+- type: loadout
+  id: TornScarfUrbanRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfUrban
+
+- type: loadout
+  id: TornScarfSnowRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskTornScarfSnow
+
+- type: loadout
+  id: CoifGreenRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskCoifGreen
+
+- type: loadout
+  id: CoifGreyRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskCoifGrey
+
+- type: loadout
+  id: CoifTanRMC
+  cost: 2
+  storage:
+    back:
+    - RMCMaskCoifTan
+
+- type: loadout
+  id: BalaclavaSkullBlueRMC
+  cost: 4
+  storage:
+    back:
+    - RMCMaskBalaclavaSkullBlue
+
+- type: loadout
+  id: BalaclavaSkullBlackRMC
+  cost: 4
+  storage:
+    back:
+    - RMCMaskBalaclavaSkullBlack

Resources/Prototypes/_RMC14/Roles/Loadouts/loadout_groups.yml

@@ -66,16 +66,29 @@
   id: MasksRMC
   name: rmc-loadout-group-masks
   minLimit: 0
-  maxLimit: 8
+  maxLimit: 21
   loadouts:
+  - BalaclavaRMC
+  - BalaclavaGreenRMC
   - CoifRMC
-  - GasMaskRMC
   - MaskScarfSquadRMC
   - MaskScarfRedRMC
   - MaskScarfBlackRMC
   - MaskScarfGrayRMC
   - MaskScarfGreenRMC
   - MaskScarfTanRMC
+  - GasMaskRMC
+  - TornScarfBlackRMC
+  - TornScarfDesertRMC
+  - TornScarfGreenRMC
+  - TornScarfGreyRMC
+  - TornScarfUrbanRMC
+  - TornScarfSnowRMC
+  - CoifGreenRMC
+  - CoifGreyRMC
+  - CoifTanRMC
+  - BalaclavaSkullBlueRMC
+  - BalaclavaSkullBlackRMC
 
 # Headwear
 - type: loadoutGroup

Resources/Textures/_RMC14/Objects/Clothing/Mask/TornScarfs/black.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CM-SS13 at https://github.com/cmss13-devs/cmss13/blob/0525b5ada7da1afcd9b260e76d5fea01500d9c8d/icons/mob/humans/onmob/clothing/masks/scarves.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_RMC14/Objects/Clothing/Mask/TornScarfs/desert.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CM-SS13 at https://github.com/cmss13-devs/cmss13/blob/0525b5ada7da1afcd9b260e76d5fea01500d9c8d/icons/mob/humans/onmob/clothing/masks/scarves.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    }
+  ]
+}