Merge e28e9a3392 into c3c6a6abd9

Resources/Locale/en-US/_DV/store/uplink/wearables.ftl

@@ -18,3 +18,6 @@ uplink-night-vision-goggles-desc = High-tech goggles that allow you to see in th
 
 uplink-thermal-goggles-name = Thermal Goggles
 uplink-thermal-goggles-desc = High-tech goggles that allow you to see heat signatures. These ones look like Night Vision Goggles to avoid detection.
+
+uplink-voice-mask-name = Voice Mask
+uplink-voice-mask-desc = A gas mask that lets you adjust your voice to whoever you can think of. Also utilizes cutting-edge chameleon technology.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1646,15 +1646,20 @@
   description: uplink-voice-mask-implanter-desc
   icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
   productEntity: VoiceMaskImplanter
-  # Begin DeltaV Removals
-  # discountCategory: usualDiscounts
-  # discountDownTo:
-  #   Telecrystal: 1
-  # End DeltaV Removals
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
   cost:
-    Telecrystal: 1 # DeltaV - was 2
+    Telecrystal: 2
   categories:
   - UplinkImplants
+# Begin DeltaV additions
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
+# End DeltaV additions
 
 # Wearables
 
@@ -1912,6 +1917,23 @@
   categories:
     - UplinkWearables
 
+#DeltaV - add back Voice Mask
+- type: listing
+  id: UplinkVoiceMask
+  name: uplink-voice-mask-name
+  description: uplink-voice-mask-desc
+  productEntity: ClothingMaskGasVoiceChameleon
+  # Begin DeltaV Removals
+  # discountCategory: usualDiscounts
+  # discountDownTo:
+  #   Telecrystal: 1
+  # End DeltaV Removals
+  cost:
+    Telecrystal: 1  # DeltaV - was 2
+  categories:
+  - UplinkWearables
+# DeltaV - end of changes
+
  # Pointless
 
 - type: listing

Resources/Prototypes/Roles/Antags/nukeops.yml

@@ -70,7 +70,7 @@
     - WeaponPistolViper
     - PinpointerSyndicateNuclear
     # - DeathAcidifierImplanter # DeltaV - more TC less acid
-    - BionicVoiceMaskImplanter # DeltaV - Voice masking implant
+    - VoiceMaskImplanter # DeltaV - Voice masking implant
 
 #Nuclear Operative Gear
 - type: startingGear

Resources/Prototypes/_DV/Catalog/Fills/Items/briefcases.yml

@@ -44,7 +44,7 @@
         - id: CyberPen
         - id: RubberStampTrader
         - id: RubberStampSyndicate
-        - id: BionicVoiceMaskImplanter
+        - id: VoiceMaskImplanter
         - id: EncryptionKeyCommon
         - id: RagItem
         - id: SoapSyndie

Resources/Prototypes/_DV/Catalog/Uplink/implants.yml

@@ -1,20 +1,20 @@
-- type: listing
-  id: UplinkBionicSyrinxImplanter
-  name: uplink-bionic-syrinx-implanter-name
-  description: uplink-bionic-syrinx-implanter-desc
-  productEntity: BionicVoiceMaskImplanter
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 1
-  cost:
-    Telecrystal: 2
-  categories:
-  - UplinkImplants
-  conditions:
-  - !type:BuyerWhitelistCondition
-    blacklist:
-      components:
-      - SurplusBundle
+#- type: listing
+#  id: UplinkBionicSyrinxImplanter
+#  name: uplink-bionic-syrinx-implanter-name
+#  description: uplink-bionic-syrinx-implanter-desc
+#  productEntity: BionicVoiceMaskImplanter
+#  discountCategory: usualDiscounts
+#  discountDownTo:
+#    Telecrystal: 1
+#  cost:
+#    Telecrystal: 2
+#  categories:
+#  - UplinkImplants
+#  conditions:
+#  - !type:BuyerWhitelistCondition
+#    blacklist:
+#      components:
+#      - SurplusBundle
 
 - type: listing
   id: UplinkSyndicateRadioImplanterBundle