new-frontiers-14 · ErhardSteinhauer · Sep 18, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 17, 2024
diff --git a/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
@@ -2,6 +2,7 @@
 
 loadout-group-contractor-gloves = gloves
 loadout-group-contractor-head = head
+loadout-group-contractor-ears = ears
 loadout-group-contractor-jumpsuit = jumpsuit
 loadout-group-contractor-outerclothing = outer clothing
 loadout-group-contractor-belt = belt

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -9098,13 +9098,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-15.5
       parent: 1
-- proto: IntercomService
-  entities:
-  - uid: 1792
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 1
 - proto: LampGold
   entities:
   - uid: 692

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -163,7 +163,7 @@
       - id: ClothingMaskClown
       - id: BikeHorn
       - id: ClownPDA
-      - id: ClothingHeadsetService
+#      - id: ClothingHeadsetService # Frontier
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -111,7 +111,6 @@
 #      - id: ClothingUniformOveralls # Frontier
 #      - id: ClothingHeadHatTrucker # Frontier
 #        prob: 0.1
-      - id: ClothingHeadsetService # Frontier
 
 - type: entity
   id: LockerBotanistLoot

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -5,7 +5,7 @@
     ClothingHeadHatTophat: 2
     ClothingEyesHudBeer: 2
     ClothingEyesEyepatchHudBeer: 2
-    ClothingHeadsetService: 2
+#    ClothingHeadsetService: 2 # Frontier
     ClothingOuterApronBar: 2
     ClothingOuterWinterBar: 2
     ClothingUniformJumpsuitBartender: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -28,7 +28,7 @@
     ClothingNeckScarfChaplainStole: 3 # Frontier
     ClothingNeckStoleChaplain: 3
     ClothingBeltChaplainSash: 3 # Frontier
-    ClothingHeadsetService: 4
+#    ClothingHeadsetService: 4 # Frontier
     RubberStampChaplain: 3
     Bible: 3
     BoxCandle: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -2,7 +2,7 @@
   id: ChefDrobeInventory
   startingInventory:
     ClothingOuterEVASuitServiceWorker: 2 # Frontier
-    ClothingHeadsetService: 2
+#    ClothingHeadsetService: 2 # Frontier
     ClothingOuterApronChef: 3
     ClothingOuterWinterChef: 2
     ClothingOuterJacketChef: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -13,5 +13,5 @@
     ClothingUniformJumpsuitLibrarian: 3
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+#    ClothingHeadsetService: 2 # Frontier
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -14,7 +14,7 @@
     ClothingNeckScarfStripedGreen: 3
     ClothingHeadBandBotany: 3
     ClothingHeadHatTrucker: 3 # Frontier
-    ClothingHeadsetService: 3
+#    ClothingHeadsetService: 3 # Frontier
     ClothingOuterWinterHydro: 3
     ClothingHandsGlovesLeather: 3 # Frontier
     ClothingShoesColorBrown: 3 # Frontier

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -8,7 +8,7 @@
     ClothingShoesColorBlack: 2
     ClothingHeadHatPurplesoft: 2
     ClothingBeltJanitor: 2
-    ClothingHeadsetService: 2
+#    ClothingHeadsetService: 2 # Frontier
     ClothingOuterWinterJani: 2
     ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots
     ClothingNeckScarfStripedPurple: 3

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+#    ClothingHeadsetService: 2 # Frontier
     ClothingNeckLawyerbadge: 2
     RubberStampLawyer: 2
     BriefcaseBrown: 2

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -133,8 +133,9 @@
   - JanitorNFOuterClothing # Frontier
   - ContractorFace # Frontier
   - ContractorGlasses # Frontier
-  - ContractorBoxSurvival # Frontier
+  - ContractorEars # Frontier
   - ContractorEncryptionKey # Frontier
+  - ContractorBoxSurvival # Frontier
   - ContractorImplanter # Frontier
   - ContractorFun # Frontier
   - ContractorTrinkets # Frontier

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml
@@ -11,7 +11,6 @@
     ClothingHeadMailCarrier: 2
     ClothingEyesHudMail: 2 # Frontier
     MailBag: 2
-    ClothingHeadsetService: 2 # Frontier ClothingHeadsetCargo<ClothingHeadsetService
     ClothingOuterWinterCoatMail: 2
     ClothingShoesColorBlack: 2
     RubberStampApproved: 3 # Frontier 1<3

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml
@@ -15,4 +15,3 @@
     ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2
     RadioHandheldNF: 2 # Frontier: RadioHandheld<RadioHandheldNF
-    ClothingHeadsetService: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Civilian/valet.yml
@@ -33,11 +33,12 @@
     outerClothing: ClothingOuterVestValet
     gloves: ClothingHandsGlovesColorWhite
     id: ValetPDA
-    ears: ClothingHeadsetService
+#    ears: ClothingHeadsetService # Frontier
   # innerClothingSkirt: ClothingUniformJumpskirtValet
   # satchel: ClothingBackpackSatchelFilled
   # duffelbag: ClothingBackpackDuffelFilled
   # messenger: ClothingBackpackMessengerFilled # Frontier
   storage: # Frontier
     back: # Frontier
+    - EncryptionKeyService # Frontier
     - ShipVoucherFrontierValet # Frontier
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Service/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Service/mail_carrier.yml
@@ -32,9 +32,10 @@
     head: ClothingHeadMailCarrier
     eyes: ClothingEyesHudMail
     id: CourierPDA
-    ears: ClothingHeadsetService # Frontier - ClothingHeadsetCargo<ClothingHeadsetService
+#    ears: ClothingHeadsetService # Frontier - ClothingHeadsetCargo<ClothingHeadsetService
     belt: MailBag
   storage:
     back:
+    - EncryptionKeyService # Frontier
     - HandheldCrewMonitor # Frontier
     - ShipVoucherFrontierMailCarrier # Frontier
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -34,10 +34,11 @@
   equipment:
     shoes: ClothingShoesGaloshes
     id: JanitorPDA
-    ears: ClothingHeadsetService
+#    ears: ClothingHeadsetService # Frontier
     belt: ClothingBeltJanitorFilled
   storage:
     back:
+    - EncryptionKeyService # Frontier
     - ShipVoucherFrontierJanitor # Frontier
 
 - type: startingGear

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/service.yml
@@ -6,7 +6,6 @@
   - type: StorageFill
     contents:
       - id: ClothingBeltJanitorFilled
-      - id: ClothingHeadsetService
       - id: MopItem
       - id: BoxMousetrap
       - id: BoxTrashbag
@@ -21,7 +20,6 @@
   - type: StorageFill
     contents:
       - id: ClownRecorder
-      - id: ClothingHeadsetService
       - id: BikeHorn
       - id: CrayonRainbow
       - id: RubberStampClown

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/valetdrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/valetdrobe.yml
@@ -1,7 +1,6 @@
 - type: vendingMachineInventory
   id: ValetDrobeInventory
   startingInventory:
-    ClothingHeadsetService: 2
     ClothingUniformJumpsuitValet: 2
     ClothingUniformJumpskirtValet: 2
     ClothingHeadHatBellhop: 2

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
@@ -1,32 +1,17 @@
 - type: entity
   id: ClothingHeadsetCommon
-  suffix: Common
+  name: headset
+  description: An updated, modular intercom that fits over the head. Takes encryption keys.
   abstract: true
   components:
   - type: ContainerFill
     containers:
       key_slots:
       - EncryptionKeyCommon
 
-- type: entity
-  parent: [ClothingHeadsetCommon, ClothingHeadsetSecurity]
-  id: ClothingHeadsetSecurityCommon # Ask SR or Sheriff for keys
-
-- type: entity
-  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdBrown]
-  id: ClothingHeadsetNfsdBrownCommon # Ask SR or Sheriff for keys
-
-- type: entity
-  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdGreen]
-  id: ClothingHeadsetNfsdGreenCommon # Ask SR or Sheriff for keys
-
-- type: entity
-  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdCream]
-  id: ClothingHeadsetNfsdCreamCommon # Ask SR or Sheriff for keys
-
 - type: entity
   parent: ClothingHeadset
-  id: ClothingHeadsetNfsdBrown # Ask SR or Sheriff for keys
+  id: ClothingHeadsetNfsdBrown
   name: nfsd headset
   components:
   - type: Sprite
@@ -36,12 +21,12 @@
   - type: ContainerFill
     containers:
       key_slots:
-      - EncryptionKeyNfsd
       - EncryptionKeyCommon
+      - EncryptionKeyNfsd
 
 - type: entity
   parent: ClothingHeadsetNfsdBrown
-  id: ClothingHeadsetNfsdGreen # Ask SR or Sheriff for keys
+  id: ClothingHeadsetNfsdGreen
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi
@@ -50,21 +35,83 @@
 
 - type: entity
   parent: ClothingHeadsetNfsdBrown
-  id: ClothingHeadsetNfsdCream # Ask SR or Sheriff for keys
+  id: ClothingHeadsetNfsdCream
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi
   - type: Clothing
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi
 
+# Common Versions - Frontier
 - type: entity
-  parent: ClothingHeadsetNfsdCream
-  id: ClothingHeadsetNfsdCreamMed # Ask SR or Sheriff for keys
+  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdBrown]
+  id: ClothingHeadsetNfsdBrownCommon # Ask SR or Sheriff for keys
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdGreen]
+  id: ClothingHeadsetNfsdGreenCommon # Ask SR or Sheriff for keys
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetNfsdCream]
+  id: ClothingHeadsetNfsdCreamCommon # Ask SR or Sheriff for keys
+
+# Common Versions - Upstream
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetGrey]
+  id: ClothingHeadsetGreyCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetCargo]
+  id: ClothingHeadsetCargoCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetMining]
+  id: ClothingHeadsetMiningCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetCommand]
+  id: ClothingHeadsetCommandCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetEngineering]
+  id: ClothingHeadsetEngineeringCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetMedical]
+  id: ClothingHeadsetMedicalCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetScience]
+  id: ClothingHeadsetScienceCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetMedicalScience]
+  id: ClothingHeadsetMedicalScienceCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetRobotics]
+  id: ClothingHeadsetRoboticsCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetSecurity]
+  id: ClothingHeadsetSecurityCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetBrigmedic]
+  id: ClothingHeadsetBrigmedicCommon
+  categories: [ HideSpawnMenu ]
+
+- type: entity
+  parent: [ClothingHeadsetCommon, ClothingHeadsetService]
+  id: ClothingHeadsetServiceCommon
   categories: [ HideSpawnMenu ]
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyNfsd
-      - EncryptionKeyCommon
-      - EncryptionKeyMedical