Cloak and hat for captain and HoS plus some extra. (#5601)

* Cloaks and hats for captain and HoS

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Removed time requirement

* evil

* Added fix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml

@@ -7,8 +7,10 @@
     ClothingHeadHatCentcom: 3
     ClothingHeadHatBeretCentcomm: 3 # DeltaV - Centcomm Drip
     ClothingHeadHatCentcomcap: 3
+    ClothingHeadHatCentcommCavalier: 3 # DeltaV - Centcomm Drip
     ClothingNeckCloakCentcom: 3
     ClothingNeckMantleCentcom: 3 # DeltaV - Centcomm Drip
+    ClothingNeckCentcommCloakBoat: 3 # DeltaV - Centcomm Drip
     ClothingUniformJumpsuitCentcomOfficial: 3
     ClothingUniformJumpskirtCentcomOfficial: 3 # DeltaV - Centcomm Drip
     ClothingUniformJumpsuitCentcomAgent: 3

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -144,7 +144,10 @@
   loadouts:
   - CaptainHead
   - CaptainCap
-  - CaptainBeret # DeltaV
+  # Begin DeltaV changes
+  - CaptainBeret
+  - CaptainCavalier
+  # End DeltaV changes
 
 - type: loadoutGroup
   id: CaptainJumpsuit
@@ -163,6 +166,7 @@
   - CaptainCloak
   - CaptainCloakFormal
   - CaptainMantle
+  - CaptainBoatCloak # DeltaV
 
 - type: loadoutGroup
   id: CaptainBackpack
@@ -1397,6 +1401,7 @@
   loadouts:
   - HeadofSecurityHead
   - HeadofSecurityBeret
+  - HeadofSecurityCavalier # DeltaV
 
 - type: loadoutGroup
   id: HeadofSecurityJumpsuit
@@ -1429,6 +1434,7 @@
   - ScarfBlack
   - SecurityPoncho
   - HeadOfSecurityRobe
+  - HeadOfSecurityCloakBoat
   # End DeltaV changes
 
 - type: loadoutGroup

Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml

@@ -124,7 +124,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTLeader
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled
@@ -148,7 +148,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTSecurity
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled
@@ -172,7 +172,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTMedical
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled
@@ -196,7 +196,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTJanitor
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled
@@ -220,7 +220,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTEngineer
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled
@@ -244,7 +244,7 @@
   table: !type:AllSelector
     children:
     - id: ClothingOuterHardsuitERTChaplain
-    - id: JetpackSecurityFilled
+    - id: ClothingShoesBootsERTMagboots
     - id: ClothingMaskGasERT
     - id: HandheldGPSBasic
     - id: OxygenTankERTFilled

Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml

@@ -60,3 +60,37 @@
     node: prescdiaghud
   - type: VisionCorrection
     correctionPower: 1.75 # The hud part decreases efficiency
+
+# ERT
+
+- type: entity
+  parent: [ClothingEyesBase, BaseCentcommContraband]
+  id: ClothingEyesERTInformationHud
+  name: ERT information hud
+  description: State-of-the-art information hud with strong flash protection. These ones bear ERT markings.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Eyes/Hud/erthud.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Eyes/Hud/erthud.rsi
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: ShowJobIcons
+  - type: ShowMindShieldIcons
+  - type: ShowCriminalRecordIcons
+  - type: ShowContrabandDetails
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - BiologicalMetaphysical
+    - Inorganic
+    - Silicon
+    - HumanoidSilicon
+  - type: IdentityBlocker
+    coverage: EYES
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - HighRiskItem
+  - type: StaticPrice
+    price: 2500

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

@@ -387,3 +387,48 @@
     sprite: _DV/Clothing/Head/Hats/beret_paramedic.rsi
   - type: Clothing
     sprite: _DV/Clothing/Head/Hats/beret_paramedic.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHeadOfSecurityCavalier
+  name: head of security cavalier hat
+  description: A well-made cavalier hat made of the finest materials for all your flamboyant needs..
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/hoscavalier.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/hoscavalier.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.12"
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCaptainCavalier
+  name: captain cavalier hat
+  description: A well-made cavalier hat made of the finest materials for all your flamboyant needs..
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/captaincavalier.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/captaincavalier.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.12"
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCentcommCavalier
+  name: centcomm cavalier hat
+  description: A well-made cavalier hat made of the finest materials for all your flamboyant needs..
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/centcommcavalier.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/centcommcavalier.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+        offset: "0, 0.12"

Resources/Prototypes/_DV/Entities/Clothing/Neck/cloaks.yml

@@ -115,3 +115,31 @@
     sprite: _DV/Clothing/Neck/Cloaks/cmo_shawl.rsi
   - type: StealTarget
     stealGroup: HeadCloak
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCentcommCloakBoat
+  name: central command boat cloak
+  description: A emerald greeen durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Neck/Cloaks/boatcloakcc.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Neck/Cloaks/boatcloakcc.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckHeadOfSecurityCloakBoat
+  name: head of security boat cloak
+  description: A rish gray durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Neck/Cloaks/boatcloakhos.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Neck/Cloaks/boatcloakhos.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon

Resources/Prototypes/_DV/Entities/Clothing/Shoes/magboots.yml

@@ -8,3 +8,38 @@
     sprite: _DV/Clothing/Shoes/Boots/magboots-security.rsi
   - type: Clothing
     sprite: _DV/Clothing/Shoes/Boots/magboots-security.rsi
+
+# ERT
+
+- type: entity
+  parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseCentcommContraband]
+  id: ClothingShoesBootsERTMagboots
+  name: ERT magboots
+  description: State-of-the-art magnetic boots, that do not slow down their wearer and have integrated thrusters. It can hold 0.75 L of gas. These ones bear ERT markings.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Shoes/Boots/magbootsert.rsi
+    state: icon
+  - type: Clothing
+    sprite: _DV/Clothing/Shoes/Boots/magbootsert.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - HighRiskItem
+  - type: GasTank
+    outputPressure: 42.6
+    air:
+      # 2 minutes of thrust
+      volume: 0.75
+      temperature: 293.15
+      moles:
+        Oxygen: 0.153853429 # oxygen
+        Nitrogen: 0.153853429 # nitrogen
+  - type: Item
+    sprite: null
+    size: Normal
+  - type: StaticPrice
+    price: 2500

Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml

@@ -4,12 +4,22 @@
   equipment:
     head: ClothingHeadHatBeretCap
 
+- type: loadout
+  id: CaptainCavalier
+  equipment:
+    head: ClothingHeadHatCaptainCavalier
+
 # Neck
 - type: loadout
   id: CaptainCloakFormal
   equipment:
     neck: ClothingNeckCloakCapFormal
 
+- type: loadout
+  id: CaptainBoatCloak
+  equipment:
+    neck: ClothingNeckCloakBoat
+
 # Gloves
 - type: loadout
   id: CaptainGloves

Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml

@@ -29,6 +29,12 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSParadeMale
 
+# Head
+- type: loadout
+  id: HeadofSecurityCavalier
+  equipment:
+    head: ClothingHeadHatHeadOfSecurityCavalier
+
 # OuterClothing
 - type: loadout
   id: StasecWinterCoatHoS
@@ -62,3 +68,8 @@
       time: 180000
   equipment:
     neck: ClothingNeckHosRobe
+
+- type: loadout
+  id: HeadOfSecurityCloakBoat
+  equipment:
+    neck: ClothingNeckHeadOfSecurityCloakBoat

Resources/Prototypes/_DV/Roles/Jobs/CentComm/EmergencyResponseTeam.yml

@@ -6,7 +6,7 @@
     back: ClothingBackpackERTLeaderReducedVisual
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTLeader
-    eyes: ClothingEyesGlassesCommand
+    eyes: ClothingEyesERTInformationHud
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterArmorBasicSlim
     id: ERTLeaderPDA
@@ -25,7 +25,7 @@
   parent: ERTLeaderGearAmber
   id: ERTLeaderGearRed
   equipment:
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     outerClothing: ClothingOuterHardsuitERTLeaderBase
     belt: ClothingBeltSecurityFilled
@@ -46,7 +46,6 @@
   parent: ERTLeaderGearRed
   id: ERTLeaderGearGamma
   equipment:
-    shoes: ClothingShoesBootsMagAdv
     outerClothing: ClothingOuterHardsuitERTLeaderElite
     pocket2: WeaponPistolUniversal
   inhand:
@@ -71,7 +70,7 @@
     jumpsuit: ClothingUniformJumpsuitERTChaplain
     back: ClothingBackpackERTChaplainReducedVisual
     shoes: ClothingShoesLeather
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesERTInformationHud
     neck: ClothingNeckStoleChaplain
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterVestPlateCarrierAdv
@@ -95,7 +94,7 @@
   parent: ERTChaplainGearAmber
   id: ERTChaplainGearRed
   equipment:
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     outerClothing: ClothingOuterHardsuitERTChaplainBase
   inhand:
@@ -105,7 +104,7 @@
   parent: ERTChaplainGearAmber # Doesn't inherit from Red due to energy gun.
   id: ERTChaplainGearGamma
   equipment:
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     outerClothing: ClothingOuterHardsuitERTChaplainElite
   inhand:
@@ -121,7 +120,7 @@
     back: ClothingBackpackERTEngineerReducedVisual
     shoes: ClothingShoesBootsMag
     head: ClothingHeadHelmetERTEngineer
-    eyes: ClothingEyesGlassesMeson
+    eyes: ClothingEyesERTInformationHud
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTEngineerBase
     id: ERTEngineerPDA
@@ -143,7 +142,7 @@
   parent: ERTEngineerGearAmber
   id: ERTEngineerGearRed
   equipment:
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     pocket1: WeaponEnergyGunPistol
   inhand:
@@ -182,7 +181,7 @@
     back: ClothingBackpackERTSecurityReducedVisual
     shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTSecurity
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesERTInformationHud
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterVestPlateCarrierAdv
     id: ERTSecurityPDA
@@ -203,7 +202,7 @@
   parent: ERTSecurityGearAmber
   id: ERTSecurityGearRed
   equipment:
-    shoes: ClothingShoesBootsSecurityMagboots
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     outerClothing: ClothingOuterHardsuitERTSecurityBase
     pocket1: WeaponEnergyGunPistol
@@ -219,7 +218,6 @@
   parent: ERTSecurityGearRed
   id: ERTSecurityGearGamma
   equipment:
-    shoes: ClothingShoesBootsMagAdv
     outerClothing: ClothingOuterHardsuitERTSecurityElite
     pocket1: CrowbarRed
   inhand:
@@ -239,7 +237,7 @@
     back: ClothingBackpackERTMedicalReducedVisual
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTMedic
-    eyes: ClothingEyesHudMedical
+    eyes: ClothingEyesERTInformationHud
     gloves: ClothingHandsGlovesNitrile
     outerClothing: ClothingOuterVestPlateCarrierAdv
     id: ERTMedicPDA
@@ -261,9 +259,8 @@
   parent: ERTMedicalGearAmber
   id: ERTMedicalGearRed
   equipment:
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesCorpsman
     outerClothing: ClothingOuterHardsuitERTMedicalBase
   inhand:
   - WeaponEnergyGun
@@ -282,7 +279,6 @@
   parent: ERTMedicalGearRed
   id: ERTMedicalGearGamma
   equipment:
-    shoes: ClothingShoesBootsMagAdv
     outerClothing: ClothingOuterHardsuitERTMedicalElite
   inhand:
   - WeaponEnergyGunPistol
@@ -306,7 +302,7 @@
     back: ClothingBackpackERTJanitorReducedVisual
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesERTInformationHud
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterVestPlateCarrierAdv
     id: ERTJanitorPDA
@@ -326,7 +322,7 @@
   parent: ERTJanitorGearAmber
   id: ERTJanitorGearRed
   equipment:
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsERTMagboots
     mask: ClothingMaskGasERT
     outerClothing: ClothingOuterHardsuitERTJanitorBase
     pocket1: WeaponEnergyGunMini
@@ -345,6 +341,5 @@
   parent: ERTJanitorGearRed
   id: ERTJanitorGearGamma
   equipment:
-    shoes: ClothingShoesBootsMagAdv
     outerClothing: ClothingOuterHardsuitERTJanitorElite
     pocket1: WeaponEnergyGunPistol

Resources/Textures/_DV/Clothing/Eyes/Hud/erthud.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Field Command: Modified thermal from https://github.com/DeltaV-Station/Delta-v/tree/master/Resources/Textures/_White/Clothing/Eyes/Goggles/thermal.rsi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-arachnid",
+            "directions": 4
+        },
+        {
+            "name": "equipped-EYES-moth",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/captaincavalier.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by @Stxcking (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/centcommcavalier.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by @Stxcking (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Head/Hats/hoscavalier.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by @Stxcking (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Neck/Cloaks/boatcloakcc.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Field Command: Modified boatcloak from https://github.com/DeltaV-Station/Delta-v/tree/master/Resources/Textures/_DV/Clothing/Neck/Cloaks/boatcloak.rsi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Neck/Cloaks/boatcloakhos.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Field Command: Modified boatcloak from https://github.com/DeltaV-Station/Delta-v/tree/master/Resources/Textures/_DV/Clothing/Neck/Cloaks/boatcloak.rsi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-NECK",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_DV/Clothing/Shoes/Boots/magbootsert.rsi/meta.json

@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Field Command: Modified magboots-advanced from https://github.com/DeltaV-Station/Delta-v/tree/master/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}