Removes the IHS voidsuit, adds the ancient voidsuit (#16988)

* removes IHS voidsuit, adds ancient voidsuit

* remove ihs gloves

* fix

* fucjk

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

@@ -55,6 +55,19 @@
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskGas
 
+#NTSRA Voidsuit
+- type: entity
+  id: SuitStorageNTSRA
+  parent: SuitStorageBase
+  suffix: Ancient EVA
+  components:
+  - type: StorageFill
+    contents:
+        - id: JetpackVoidFilled
+        - id: ClothingOuterHardsuitAncientEVA
+        - id: ClothingHeadHelmetAncient
+        - id: ClothingMaskBreath
+        
 #HARDSUITS
 #Engineering hardsuit
 - type: entity

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -108,20 +108,6 @@
     fiberColor: fibers-regal-blue
   - type: FingerprintMask
 
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsGlovesIhscombat
-  name: IHS combat gloves
-  description: These tactical gloves are somewhat fire and impact resistant.
-  components:
-  - type: Sprite
-    sprite: Clothing/Hands/Gloves/ihscombat.rsi
-  - type: Clothing
-    sprite: Clothing/Hands/Gloves/ihscombat.rsi
-  - type: Fiber
-    fiberMaterial: fibers-durathread
-  - type: FingerprintMask
-
 #### Medical
 - type: entity
   parent: ClothingHandsBase
@@ -172,7 +158,7 @@
   parent: ClothingHandsBase
   id: ClothingHandsGlovesPowerglove
   name: power gloves
-  description: Now I'm playin' with power! Wait, they are turned off. # Use Now I'm playin' with power! BAM! for when they're turned on
+  description: Now I'm playin' with power! Wait... they're turned off. #Use "Now I'm playin' with power! BAM!" for when they're turned on
   components:
   - type: Sprite
     sprite: Clothing/Hands/Gloves/powerglove.rsi
@@ -297,7 +283,7 @@
   parent: ClothingHandsBase
   id: ClothingHandsGlovesNorthStar
   name: gloves of the north star
-  description: These gloves allow you to punch incredibly fast
+  description: These gloves allow you to punch incredibly fast.
   components:
   - type: Sprite
     sprite: Clothing/Hands/Gloves/northstar.rsi

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

@@ -110,21 +110,6 @@
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
 
-- type: entity
-  parent: HatBase
-  id: ClothingHeadHelmetIHSVoidHelm
-  noSpawn: true
-  name: IHS voidhelm
-  description: A robust, tactical IHS helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ihsvoid.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.3
-    lowPressureMultiplier: 10000
-
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitMedical

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

@@ -301,3 +301,18 @@
         Slash: 0.95
         Heat: 0.90
         Radiation: 0.75
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetAncient
+  name: NTSRA void helmet
+  description: An ancient space helmet, designed by the NTSRA branch of CentCom.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
+  - type: IngestionBlocker
+  - type: Tag
+    tags:
+    - HelmetEVA

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

@@ -152,23 +152,18 @@
 
 #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.
 - type: entity
-  parent: ClothingOuterHardsuitBase
+  parent: ClothingOuterEVASuitBase
-  id: IHSVoidsuit
+  id: ClothingOuterHardsuitAncientEVA
-  name: IHS voidsuit
+  name: NTSRA voidsuit #Nanotrasen Space Research Association
-  description: A special void suit that protects against hazardous, low pressure environments.
+  description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+    sprite: Clothing/OuterClothing/Suits/ancientvoidsuit.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/ihsvoid.rsi
+    sprite: Clothing/OuterClothing/Suits/ancientvoidsuit.rsi
   - type: ClothingSpeedModifier
-    walkModifier: 0.8
+    walkModifier: 0.85
-    sprintModifier: 0.8
+    sprintModifier: 0.85
-  - type: PressureProtection
-    highPressureMultiplier: 0.3
-    lowPressureMultiplier: 10000
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetIHSVoidHelm
 
 - type: entity
   parent: ClothingOuterEVASuitBase

Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.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 https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14",
   "size": {
     "x": 32,
     "y": 32
@@ -10,9 +10,6 @@
     {
       "name": "icon"
     },
-    {
-      "name": "icon-on"
-    },
     {
       "name": "equipped-HELMET",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Hardsuits/ihsvoid.rsi/meta.json

@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
-  "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/OuterClothing/Suits/ancientvoidsuit.rsi/meta.json

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

Resources/migration.yml

@@ -52,3 +52,8 @@ BulletAntiMaterial: BulletAntiMateriel
 FoodCondimentBottleSmallHotsauce: FoodCondimentBottleHotsauce
 FoodBakedCookieFortune: FoodSnackCookieFortune
 GunSafeSubMachineGunVector: GunSafeSubMachineGunDrozd
+
+# 2023-05-31
+IHSVoidsuit: null
+ClothingHeadHelmetIHSVoidHelm: null
+ClothingHandsGlovesIhscombat: null