Formal Clothing, Cloaks, Atmos, and Hardsuit Stat Revision (#7166)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

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

@@ -81,6 +81,9 @@
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskBreath
       - id: OxygenTankFilled
+      - id: ClothingOuterSuitAtmosFire
+      - id: ClothingHeadHelmetAtmosFire
+      - id: GasAnalyzer
 
 - type: entity
   id: LockerEngineerFilled

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

@@ -51,8 +51,6 @@
         prob: 1
       - id: TaserGun
         prob: 1
-      - id: ClothingShoesColorBlack
-        prob: 0.7
       - id: ClothingHeadHelmetHardsuitCap
         prob: 1
       - id: CommsComputerCircuitboard
@@ -67,6 +65,9 @@
         prob: 0.25
       - id: ClothingBeltSheathFilled
       - id: DoorRemoteCommand
+      - id: ClothingNeckCloakCapFormal
+      - id: ClothingUniformJumpsuitCapFormal
+      - id: ClothingUniformJumpskirtCapFormalDress
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -212,3 +213,5 @@
       - id: CigarGoldCase
         prob: 0.50
       - id: DoorRemoteSecurity
+      - id: ClothingUniformJumpskirtHosFormal
+      - id: ClothingUniformJumpsuitHosFormal

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -173,4 +173,18 @@
     cellSlot:
       startingItem: PowerCellSmallHigh
   - type: TemperatureProtection
-    coefficient: 0.01
+    coefficient: 0.01
+    
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection
+  id: ClothingHeadHelmetAtmosFire
+  name: atmos fire helmet
+  description: An atmos fire helmet, able to keep the user cool in any situation.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/atmos_firehelmet.rsi
+  - type: IngestionBlocker
+  - type: TemperatureProtection
+    coefficient: 0.005    

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

@@ -96,4 +96,37 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/nanotrasen.rsi
   - type: Clothing
-    sprite: Clothing/Neck/Cloaks/nanotrasen.rsi
+    sprite: Clothing/Neck/Cloaks/nanotrasen.rsi
+    
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakCapFormal
+  name: captain's formal cloak
+  description: A lavish and decorated cloak for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/capcloakformal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Cloaks/capcloakformal.rsi
+    
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakAdmin
+  name: Admin Cloak
+  description: Weh!
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/admin.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Cloaks/admin.rsi
+    
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakMiner
+  name: Miner's Cloak
+  description: Worn by the most skilled miners, for one who has moved mountains and filled valleys.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/miner.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Cloaks/miner.rsi    

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -9,15 +9,18 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
   - type: PressureProtection
-    highPressureMultiplier: 0.5
+    highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: ClothingSpeedModifier
+    walkModifier: 0.65
+    sprintModifier: 0.65 #less armor than engineering but slightly higher move speed so they can get to breaches a bit faster
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.9
-        Slash: 0.9
+        Blunt: 0.95 #less physical protection but significantly more atmospheric protections than engi
+        Slash: 0.95
         Piercing: 0.95
-        Heat: 0.8 #All default but having a little better heat prot makes sense based on the description
+        Heat: 0.35
         Radiation: 0.25
 
 - type: entity
@@ -83,14 +86,17 @@
   - type: PressureProtection
     highPressureMultiplier: 0.65
     lowPressureMultiplier: 100
+  - type: ClothingSpeedModifier
+    walkModifier: 0.65
+    sprintModifier: 0.55 #slightly slower than magboot walking
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.90
-        Piercing: 0.95
-        Heat: 0.90
-        Radiation: 0.05 #all default, rad armor is higher
+        Blunt: 0.9 #higher physical protections than atmo but less enviro 
+        Slash: 0.85
+        Piercing: 0.9
+        Heat: 0.85
+        Radiation: 0.35 
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -105,13 +111,16 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: ClothingSpeedModifier
+    walkModifier: 0.65
+    sprintModifier: 0.75 #It's the advanced hardsuit it should be a little faster than engineering imo
   - type: Armor
     modifiers:
       coefficients:
         Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.95
-        Heat: 0.8
+        Slash: 0.85
+        Piercing: 0.9
+        Heat: 0.55
         Radiation: 0.05 #combines the engi and atmos bonuses
 
 #The voidsuit and eva suit are not techically 'hardsuits' but this seems to be the place for all EVA-capable outer clothing. This may be worth reevaluating when we have a lot more items.
@@ -126,8 +135,9 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
   - type: PressureProtection
-    highPressureMultiplier: 1
-    lowPressureMultiplier: 100
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -194,6 +204,9 @@
     lowPressureMultiplier: 100
   - type: DiseaseProtection
     protection: 0.2
+  - type: ClothingSpeedModifier
+    walkModifier: 0.7 #higher speed to reflect description but not as high as cap/eva
+    sprintModifier: 0.7
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -214,8 +227,11 @@
         Blunt: 0.6 #increased blunt as per description, for bomb survival
         Slash: 0.9
         Piercing: 0.95
-        Heat: 0.9
+        Heat: 0.65 #increased enviro due to science getting increasingly involved with artifact testing
         Radiation: 0.25
+  - type: ClothingSpeedModifier
+    walkModifier: 0.65 #heavier armor but still a bit faster than engineering
+    sprintModifier: 0.6
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -230,6 +246,17 @@
   - type: PressureProtection
     highPressureMultiplier: 0.75
     lowPressureMultiplier: 100
+  - type: ClothingSpeedModifier
+    walkModifier: 0.65 #higher move speed because ive seen salvage teams straight up stealing eva to go about salvaging faster
+    sprintModifier: 0.55
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85 #closer stats to what the mining suit had in 13
+        Slash: 0.85
+        Piercing: 0.9
+        Heat: 0.9
+        Radiation: 0.5
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -266,7 +293,18 @@
   - type: PressureProtection
     highPressureMultiplier: 0.75
     lowPressureMultiplier: 100
-
+  - type: ClothingSpeedModifier
+    walkModifier: 0.7 #faster than sec hardsuit because HoS hardsuit should be better imo, sec hardsuit retains default hardsuit movespeed to discourage continual wear
+    sprintModifier: 0.55
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7 #slightly higher than sec hardsuit
+        Slash: 0.75
+        Piercing: 0.7
+        Heat: 0.8 
+        Radiation: 0.25
+        
 - type: entity
   parent: ClothingOuterHardsuitBase
   id: ClothingOuterHardsuitSyndie
@@ -287,7 +325,7 @@
     modifiers:
       coefficients:
         Blunt: 0.6
-        Slash: 0.6
+        Slash: 0.55
         Piercing: 0.4
         Heat: 0.4 #all the combat numbers are pumped up here
         Radiation: 0.20
@@ -314,5 +352,5 @@
         Blunt: 0.6
         Slash: 0.6
         Piercing: 0.4
-        Heat: 0.4 #same as the nukie suit
+        Heat: 0.25 #higher heat resist due to spell casting
         Radiation: 0.20

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -49,7 +49,7 @@
     highPressureMultiplier: 0.85
     lowPressureMultiplier: 25
   - type: TemperatureProtection
-    coefficient: 0.01
+    coefficient: 0.03
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/fire.rsi
   - type: Armor
@@ -124,3 +124,24 @@
     sprite: Clothing/OuterClothing/Suits/monkey.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/monkey.rsi
+
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitAtmosFire
+  name: atmos fire suit
+  description: An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.65
+    lowPressureMultiplier: 25
+  - type: TemperatureProtection
+    coefficient: 0.01
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.9
+        Heat: 0.5

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -486,3 +486,37 @@
     sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCapFormalDress
+  name: captain's formal dress
+  description: A dress for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/capformaldress.rsi
+    
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCentcomFormalDress
+  name: central command formal dress
+  description: A dress for special occasions
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi   
+    
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtHosFormal
+  name: hos's formal dress
+  description: A dress for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi      
+    

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

@@ -712,3 +712,37 @@
     sprite: Clothing/Uniforms/Jumpsuit/nanotrasen.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/nanotrasen.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCapFormal
+  name: captain's formal suit
+  description: A suit for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
+    
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCentcomFormal
+  name: central command formal suit
+  description: A suit for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi 
+    
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitHosFormal
+  name: hos's formal suit
+  description: A suit for special occasions.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi 
+     

Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+	{
+      "name": "icon-flash"
+    },
+    {
+      "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/Clothing/Neck/Cloaks/admin.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made by emisse and inspired by weh plushie",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/obj/clothing/cloaks.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/capformaldress.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}