salvage loadout Update

Resources/Locale/ru-RU/ss220/clothing/Head/bandanas.ftl

@@ -1,2 +1,4 @@
 ent-ClothingHeadBandBlueBotany = ботаническая бандана
     .desc = Ботаническая бандана из натуральных волокон, чтобы выглядеть круто.
+ent-ClothingHeadBandSalvage = бандана утилизатора
+    .desc = Бандана, которая поможет вам спастись от шахтерской пыли.

Resources/Locale/ru-RU/ss220/clothing/Head/hardhats.ftl

@@ -0,0 +1,2 @@
+ent-ClothingHeadHatHardhatViolet = фиолетовая каска
+    .desc = Каска, окрашенная в фиолетовый цвет, используется в опасных условиях работы для защиты головы. Поставляется со встроенным фонариком.

Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl

@@ -20,3 +20,7 @@ ent-ClothingHeadPilotCapCap = фуражка пилота
     .desc = Поймайте высоту!
 ent-ClothingHeadWarehouseman = кепка заведующего складом
     .desc = Не самая заурядная кепка главного распределителя станции. Вышита по личному заказу, вас никогда не волновала политика корпорации касаемо конкретного цвета униформы.
+ent-ClothingHeadHatSalvage = кепка утилизатора
+    .desc = Зачем они носят кепки, если работают в пещерах?
+ent-ClothingHeadHatSalvageFlipped = кепка утилизатора
+    .desc = Зачем они носят кепки, если работают в пещерах?

Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl

@@ -28,4 +28,5 @@ ent-ClothingUniformJumpsuitTrustedLawyer = костюм доверенного 
     .desc = Шикарный костюм для тех, кто следит за безупречным исполнением законов компании. Говорят, что вы способны навязать свои требования даже самому Богу.
 ent-ClothingUniformJumpsuitWarehouseman = рабочий комбинезон заведующего складом
     .desc = Практичный, удобный, не стесняющий движения и главное стильный комбинезон. У вас с ним связаны плохие воспоминания о прошлом начальнике
-
+ent-ClothingUniformJumpsuitFlannelSalvage = одежда пустотного труженика
+    .desc = Рубашка в стиле кантри для опытного снабженца. Несмотря на то, что она не соответствует корпоративной форме, руководство закрывает на это глаза из-за высокой производительности её носителя.

Resources/Locale/ru-RU/ss220/clothing/Masks/bandanas.ftl

@@ -1,2 +1,4 @@
 ent-ClothingMaskBandBlueBotany = ботаническая бандана
     .desc = Ботаническая бандана из натуральных волокон, чтобы выглядеть круто.
+ent-ClothingMaskBandSalvage = бандана утилизатора
+    .desc = Бандана, которая поможет вам спастись от шахтерской пыли.

Resources/Locale/ru-RU/ss220/loadout-groups/salvagespecialist.ftl

@@ -1 +1,2 @@
 loadout-group-salvage-specialist-jumpsuit = Утилизатор, комбинезон
+loadout-group-salvage-specialist-head = Утилизатор, голова

Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml

@@ -186,11 +186,16 @@
    components:
    - type: StorageFill
      contents:
-       - id: ClothingBackpack
+       - id: ClothingBackpackSalvage #SS220-Salvage-Loadouts-Update-Begin
+       - id: ClothingBackpackSatchelSalvage
+       - id: ClothingBackpackDuffelSalvage #SS220-Salvage-Loadouts-Update-End
        - id: ClothingShoesBootsSalvage
          amount: 2
        - id: ClothingUniformJumpsuitSalvageSpecialist
          amount: 2
+       - id: ClothingHeadBandSalvage #SS220-Salvage-Loadouts-Update-Begin
+       - id: ClothingHeadHatSalvage
+       - id: ClothingHeadHatHardhatViolet #SS220-Salvage-Loadouts-Update-End
 
  - type: entity
    id: WardrobeAtmosphericsFilled

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -687,6 +687,7 @@
   - SalvageBoots
   - CargoWinterBoots
 
+
 # Engineering
 - type: loadoutGroup
   id: ChiefEngineerHead

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -220,6 +220,7 @@
 - type: roleLoadout
   id: JobSalvageSpecialist
   groups:
+  - SalvageSpecialistHead #SS220-Salvage-Loadouts-Update
   - GroupTankHarness
   - SalvageSpecialistBackpack
   - SalvageSpecialistJumpsuit #SS220-MoreTurtleneck

Resources/Prototypes/SS220/Entities/Clothing/Head/bandanas.yml

@@ -4,4 +4,8 @@
   id: ClothingHeadBandBlueBotany
   name: blue botany bandana
 
-
+# Карго
+- type: entity
+  parent: [ClothingHeadBandBase, ClothingMaskBandSalvage]
+  id: ClothingHeadBandSalvage
+  name: Salvage bandana

Resources/Prototypes/SS220/Entities/Clothing/Head/hardhats.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingHeadHatHardhatBase
+  id: ClothingHeadHatHardhatViolet
+  name: violet hard hat
+  description: A hard hat, painted in violet, used in dangerous working conditions to protect the head. Comes with a built-in flashlight.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Head/Hardhats/violet.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Head/Hardhats/violet.rsi

Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml

@@ -216,3 +216,20 @@
     sprite: SS220/Clothing/Head/Hats/qm_warehouseman.rsi
   - type: Clothing
     sprite: SS220/Clothing/Head/Hats/qm_warehouseman.rsi
+
+  # Утилизатор
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingHeadHatSalvage
+  name: salvage cap
+  description: "Why they wear caps if they dig in caves?"
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Head/Hats/salvagehat.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Head/Hats/salvagehat.rsi
+
+- type: entity
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSalvage]
+  id: ClothingHeadHatSalvageFlipped
+  name: salvage cap

Resources/Prototypes/SS220/Entities/Clothing/Masks/bandanas.yml

@@ -13,3 +13,19 @@
     tags:
     - ClothMade
     - WhitelistChameleon
+
+# Карго
+- type: entity
+  parent: ClothingMaskBandanaBase
+  id: ClothingMaskBandSalvage
+  name: salvage bandana
+  description: A bandana that helps protect you from mine dust.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Head/Bandanas/salvage.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Head/Bandanas/salvage.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon

Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml

@@ -206,6 +206,18 @@
   - type: Clothing
     sprite: SS220/Clothing/Uniforms/Jumpsuit/qm_warehouseman.rsi
 
+  # Утилизатор
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitFlannelSalvage
+  name: void salvage clothes
+  description: A country-style shirt worn by an experienced supply department worker. It is actually a violation of the uniform rules, but the corporation turns a blind eye to it because of the benefit it brings to the wearer.
+  components:
+  - type: Sprite
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi
+  - type: Clothing
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi
+
 # Syndicate
 
 - type: entity
@@ -217,4 +229,4 @@
   - type: Sprite
     sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi
   - type: Clothing
-    sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi
+    sprite: SS220/Clothing/Uniforms/Jumpsuit/syndicate_diplomatist.rsi

Resources/Prototypes/SS220/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -8,6 +8,16 @@
       role: JobSalvageSpecialist
       time: 108000 # 30 hrs
 
+# Flannel Salvage Time
+- type: loadoutEffectGroup
+  id: UniformJumpsuitFlannelSalvage
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 252000 # 70 hrs
+
 # Jumpsuit
 - type: loadout
   id: UniformJumpsuitSalvageSpecialist
@@ -21,3 +31,43 @@
     proto: SalvageSpecialistTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialistTurtleneck
+
+- type: loadout
+  id: UniformJumpsuitFlannelSalvage
+  equipment: UniformJumpsuitFlannelSalvage
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: UniformJumpsuitFlannelSalvage
+
+- type: startingGear
+  id: UniformJumpsuitFlannelSalvage
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitFlannelSalvage
+
+# Head
+- type: loadout
+  id: ClothingHeadHatSalvage
+  equipment: ClothingHeadHatSalvage
+
+- type: startingGear
+  id: ClothingHeadHatSalvage
+  equipment:
+    head: ClothingHeadHatSalvage
+
+- type: loadout
+  id: ClothingHeadBandSalvage
+  equipment: ClothingHeadBandSalvage
+
+- type: startingGear
+  id: ClothingHeadBandSalvage
+  equipment:
+    head: ClothingHeadBandSalvage
+
+- type: loadout
+  id: ClothingHeadHatHardhatViolet
+  equipment: ClothingHeadHatHardhatViolet
+
+- type: startingGear
+  id: ClothingHeadHatHardhatViolet
+  equipment:
+    head: ClothingHeadHatHardhatViolet

Resources/Prototypes/SS220/Loadouts/loadout_groups.yml

@@ -280,6 +280,16 @@
   loadouts:
   - UniformJumpsuitSalvageSpecialist
   - SalvageSpecialistJumpsuitTurtleneck
+  - UniformJumpsuitFlannelSalvage
+
+- type: loadoutGroup
+  id: SalvageSpecialistHead
+  name: loadout-group-salvage-specialist-head
+  minLimit: 0
+  loadouts:
+  - ClothingHeadHatSalvage
+  - ClothingHeadBandSalvage
+  - ClothingHeadHatHardhatViolet
 
 # Wildcards
 

Resources/Textures/SS220/Clothing/Head/Bandanas/salvage.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "sprited by dinazewwr (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_mask"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Head/Hardhats/violet.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "sprited by dinazewwr (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	  {
+      "name": "light-icon"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/SS220/Clothing/Head/Hats/salvagehat.rsi/meta.json

@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "sprited by dinazewwr (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_flipped"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
+    }
+  ]
+}
+

Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/flannel_salvage.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "sprited by dinazewwr (Discord) for SS220",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}