Ranger mask modifications / Removal of experimental loadouts (#445)

Vault-Overseers · Aug 7, 2024 · da862be · da862be
1 parent eaad926
commit da862be
Show file tree

Hide file tree

Showing 24 changed files with 181 additions and 205 deletions.
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
@@ -239,7 +239,7 @@
   - type: Clothing
     sprite: _Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmetmarine.rsi
 
-# NCR
+#MARK: NCR
 - type: entity
   parent: N14ClothingHeadHatBaseHelmetMetal
   id: N14ClothingHeadHatNCRHelmetMetal
@@ -269,7 +269,7 @@
     sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmetmedic.rsi
 
 - type: entity
-  parent: N14ClothingHeadHatBaseHelmetmarine
+  parent: N14ClothingHeadHatBaseHelmetMK2
   id: N14ClothingHeadHatRangerHelmet
   name: ranger combat helmet
   description: A helmet offering advanced protection, this one is commonly used by rangers.
@@ -382,9 +382,9 @@
 
 - type: entity
   parent: N14ClothingHeadHatBaseHelmetmarine
-  id: N14ClothingHeadHatRangerHelmetEliteModif
+  id: N14ClothingHeadHatRangerHelmetModif
   name: modified ranger combat helmet
-  description: A thicker than average helmet worn by rangers out in the field. This one appears have its mask welded to helmet with some unique modifications.
+  description: A thicker than average helmet worn by rangers out in the field.
   components:
   - type: Sprite
     sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi
@@ -393,10 +393,10 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.7
-        Slash: 0.6
-        Piercing: 0.7
-        Heat: 0.6
+        Blunt: 0.65
+        Slash: 0.65
+        Piercing: 0.75
+        Heat: 0.65
   - type: Tag
     tags:
     - HidesHair

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml
@@ -66,6 +66,10 @@
         Slash: 0.95
         Piercing: 0.95
         Heat: 0.95
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - HidesHair
 
 - type: entity
   parent: ClothingMaskGasCombat
@@ -81,15 +85,12 @@
     sprite: _Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi
-  - type: GenericVisualizer
-    visuals:
-      enum.NightVisionItemVisuals.Active:
-        nightVisionItemLayer:
-          True: { state: icon }
-          False: { state: icon }
+  - type: Tag
+    tags:
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingMaskGas
+  parent: ClothingMaskGasCombat
   id: ClothingMaskGasRanger
   name: ranger gas mask
   description: The last in pre-war military gas masks technology, with extra protection.
@@ -117,9 +118,6 @@
     sprite: _Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi
-  - type: Tag
-    tags:
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingMaskGasCombat
@@ -142,9 +140,6 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: Tag
-    tags:
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingMaskGas
@@ -166,9 +161,6 @@
         Slash: 0.95
         Piercing: 0.95
         Heat: 0.95
-  - type: Tag
-    tags:
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingMaskGasCombat
@@ -191,9 +183,6 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: Tag
-    tags:
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingMaskGas
@@ -216,6 +205,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - HidesHair
 
 - type: entity
   parent: ClothingMaskGasCombat
@@ -238,6 +228,25 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: Tag
-    tags:
-    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingMaskGasCombat
+  id: ClothingMaskGasRangerModif
+  name: modified ranger gas mask
+  description: A thicker than average mask worn by rangers out in the field.
+  components:
+  - type: Item
+    size: Tiny
+  - type: FlashImmunity
+  - type: EyeProtection
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml
@@ -578,7 +578,7 @@
       coefficients:
         Blunt: 0.6
         Slash: 0.6
-        Piercing: 0.6
+        Piercing: 0.55
         Heat: 0.6
 
 - type: entity
@@ -596,7 +596,7 @@
       coefficients:
         Blunt: 0.6
         Slash: 0.6
-        Piercing: 0.6
+        Piercing: 0.5
         Heat: 0.6
 
 #MARK: Veteran