nukes cev-eris style helmets, adds ERT helmets, eva helmet inhand fix (#17808)

Resources/Prototypes/Catalog/Fills/Crates/security.yml

@@ -13,7 +13,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetHelmet
+      - id: ClothingHeadHelmetBasic
         amount: 3
 
 - type: entity

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

@@ -129,8 +129,6 @@
           prob: 0.20
         - id: DrinkSpaceGlue
           prob: 0.20
-        - id: DrinkSpaceLube
-          prob: 0.20
 
 - type: entity
   id: ClosetWallMaintenanceFilledRandom

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

@@ -58,7 +58,7 @@
         prob: 0.8
       - id: ClothingUniformJumpsuitSecGrey
         prob: 0.3
-      - id: ClothingHeadHelmetHelmet
+      - id: ClothingHeadHelmetBasic
       - id: ClothingOuterArmorBulletproof
       - id: ClothingBeltSecurityFilled
       - id: Flash

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

@@ -159,7 +159,7 @@
        - id: ClothingBackpackSecurity
        - id: ClothingShoesBootsJack
        - id: ClothingEyesGlassesSecurity
-       - id: ClothingHeadHelmetHelmetOld
+       - id: ClothingHeadHelmetBasic
        - id: ClothingOuterVestKevlar
        - id: ClothingUniformJumpskirtSec
 

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

@@ -1,9 +1,9 @@
-#(Security) Helmet
+#Basic Helmet (Security Helmet)
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHelmetHelmet
+  id: ClothingHeadHelmetBasic
   name: helmet
-  description: A usual helmet.
+  description: Standard security gear. Protects the head from impacts.
   components:
   - type: Sprite
     sprite: Clothing/Head/Helmets/security.rsi
@@ -18,24 +18,11 @@
         Heat: 0.8
   - type: Tag
     tags:
-    - HamsterWearable
     - WhitelistChameleon
 
-#Old (Security) Helmet
-- type: entity
-  parent: ClothingHeadHelmetHelmet
-  id: ClothingHeadHelmetHelmetOld
-  name: helmet
-  description: Standard Security gear. Protects the head from impacts.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/securityold.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/securityold.rsi
-
 #Mercenary Helmet
 - type: entity
-  parent: ClothingHeadHelmetHelmet
+  parent: ClothingHeadHelmetBasic
   id: ClothingHeadHelmetMerc
   name: mercenary helmet
   description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
@@ -95,9 +82,9 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.8
+        Blunt: 0.70
-        Slash: 0.8
+        Slash: 0.80
-        Piercing: 0.8
+        Piercing: 0.85
 
 #Bombsuit Helmet
 - type: entity
@@ -298,3 +285,64 @@
         Slash: 0.5
         Piercing: 0.5
         Heat: 0.9
+
+#ERT HELMETS
+#ERT Leader Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetERTLeader
+  name: ERT leader helmet
+  description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ert_leader.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ert_leader.rsi
+
+#ERT Security Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetERTSecurity
+  name: ERT security helmet
+  description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ert_security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ert_security.rsi
+
+#ERT Medic Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetERTMedic
+  name: ERT medic helmet
+  description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ert_medic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ert_medic.rsi
+
+#ERT Engineer Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetERTEngineer
+  name: ERT engineer helmet
+  description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ert_engineer.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ert_engineer.rsi
+
+#ERT Janitor Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetERTJanitor
+  name: ERT janitor helmet
+  description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ert_janitor.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ert_janitor.rsi

Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml

@@ -18,7 +18,7 @@
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackERTLeaderFilled
     shoes: ClothingShoesBootsJack
-    head: ClothingHeadHelmetHelmet
+    head: ClothingHeadHelmetERTLeader
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterVestKevlar
@@ -63,7 +63,7 @@
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackERTEngineerFilled
     shoes: ClothingShoesBootsWork
-    head: ClothingHeadHelmetHelmet
+    head: ClothingHeadHelmetERTEngineer
     eyes: ClothingEyesGlassesMeson
     gloves: ClothingHandsGlovesColorYellow
     outerClothing: ClothingOuterVestKevlar
@@ -108,7 +108,7 @@
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackERTSecurityFilled
     shoes: ClothingShoesBootsJack
-    head: ClothingHeadHelmetHelmet
+    head: ClothingHeadHelmetERTSecurity
     eyes: ClothingEyesGlassesSecurity
     gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterVestKevlar
@@ -153,7 +153,7 @@
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackERTMedicalFilled
     shoes: ClothingShoesBootsJack
-    head: ClothingHeadHelmetHelmet
+    head: ClothingHeadHelmetERTMedic
     eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterVestKevlar
@@ -200,7 +200,7 @@
     jumpsuit: ClothingUniformJumpsuitERTJanitor
     back: ClothingBackpackERTJanitorFilled
     shoes: ClothingShoesGaloshes
-    head: ClothingHeadHelmetHelmet
+    head: ClothingHeadHelmetERTJanitor
     gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterVestKevlar
     id: ERTLeaderPDA

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -25,7 +25,7 @@
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsJack
     eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHelmetHelmetOld
+    head: ClothingHeadHelmetBasic
     outerClothing: ClothingOuterVestKevlar
     id: SecurityPDA
     ears: ClothingHeadsetSecurity

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,14 +14,6 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "light-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "lighton-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

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

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14",
+  "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/Clothing/Head/Helmets/ert_leader.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14",
+  "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/Clothing/Head/Helmets/ert_medic.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14",
+  "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/Clothing/Head/Helmets/ert_security.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14",
+  "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/Clothing/Head/Helmets/security.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -15,7 +15,11 @@
       "directions": 4
     },
     {
-      "name": "equipped-HELMET-hamster",
+      "name": "light-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "lighton-equipped-HELMET",
       "directions": 4
     },
     {

Resources/migration.yml

@@ -94,3 +94,7 @@ WindoorScienceLocked: WindoorSecureScienceLocked
 WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked
 WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked
 WindoorParamedicLocked: WindoorSecureParamedicLocked
+
+# 2023-07-03
+ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic
+ClothingHeadHelmetHelmetOld: ClothingHeadHelmetBasic