PDA next to cartridges, cadet/deputy badges

Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/neck.yml

@@ -107,6 +107,15 @@
   equipment:
     neck: ClothingNeckStethoscope
 
+- type: loadout
+  id: ContractorClothingOuterPoncho
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    neck: ClothingOuterPoncho
+
 - type: loadout
   id: ContractorClothingOuterPonchoClassic
   effects:
@@ -117,13 +126,14 @@
     neck: ClothingOuterPonchoClassic
 
 - type: loadout
-  id: ContractorClothingOuterPoncho
+  id: ContractorCDDogtags
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
   equipment:
-    neck: ClothingOuterPoncho
+    neck: CDDogtags
+
 #T2
 - type: loadout
   id: ContractorClothingNeckCloakCap

Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml

@@ -591,6 +591,7 @@
   - ContractorClothingNeckStethoscope
   - ContractorClothingOuterPoncho
   - ContractorClothingOuterPonchoClassic
+  - ContractorCDDogtags
   - ContractorClothingNeckCloakCap
   - ContractorClothingNeckCloakMiner
   - ContractorClothingNeckCloakMoth

Resources/Prototypes/_NF/Loadouts/role_loadouts.yml

@@ -11,11 +11,11 @@
   - ContractorShoes
   - ContractorFace
   - ContractorGlasses
-  - ContractorPDA
   - ContractorBelt
   - ContractorEars
   - ContractorEncryptionKey
   - ContractorBoxSurvival
+  - ContractorPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorUtility
@@ -36,11 +36,11 @@
   - PilotShoes
   - PilotFace
   - PilotGlasses
-  - PilotPDA
   - ContractorBelt
   - PilotEars
   - ContractorEncryptionKey
   - ContractorBoxSurvival
+  - PilotPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorUtility
@@ -61,11 +61,11 @@
   - MercenaryShoes
   - MercenaryFace
   - MercenaryGlasses
-  - MercenaryPDA
   - MercenaryBelt
   - MercenaryEars
   - ContractorEncryptionKey
   - ContractorBoxSurvival
+  - MercenaryPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorUtility
@@ -165,10 +165,10 @@
   - ContractorShoes
   - ContractorFace
   - ContractorGlasses
-  - StationRepPDA
   - ContractorBelt
   - StationRepEars
   - ContractorBoxSurvival
+  - StationRepPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorFun
@@ -185,10 +185,10 @@
   - SecurityGuardOuterClothing
   - SecurityGuardShoes
   - SecurityGuardFace
-  - SecurityGuardPDA
   - SecurityGuardBelt
   - SecurityGuardEars
   - NfsdBoxSurvival
+  - SecurityGuardPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -201,17 +201,18 @@
   id: JobCadet
   groups:
   - CadetHead
+  - CadetNeck
   - CadetJumpsuit
   - NfsdGlovesBrown
   - NfsdBackpackBrown
   - CadetOuterClothing
   - NfsdShoesBrown
   - NfsdFace
   - NfsdGlasses
-  - CadetPDA
   - NfsdBelt
   - NfsdEarsBrown
   - NfsdBoxSurvival
+  - CadetPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -222,17 +223,18 @@
   id: JobDeputy
   groups:
   - DeputyHead
+  - DeputyNeck
   - DeputyJumpsuit
   - NfsdGlovesBrown
   - NfsdBackpackBrown
   - DeputyOuterClothing
   - NfsdShoesBrown
   - NfsdFace
   - NfsdGlasses
-  - DeputyPDA
   - NfsdBelt
   - NfsdEarsBrown
   - NfsdBoxSurvival
+  - DeputyPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -251,10 +253,10 @@
   - NfsdShoesCream
   - BrigmedicFace
   - BrigmedicGlasses
-  - BrigmedicPDA
   - BrigmedicBelt
   - NfsdEarsCream
   - NfsdBoxSurvival
+  - BrigmedicPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -265,6 +267,7 @@
   id: JobNFDetective
   groups:
   - NFDetectiveHead
+  - NFDetectiveNeck
   - NFDetectiveJumpsuit
   - NFDetectiveGloves
   - NfsdBackpackBrown
@@ -273,10 +276,10 @@
   - NfsdFace
   - NfsdGlasses
   - NFDetectivePDA
+  - ContractorCartridge
   - NfsdBelt
   - NfsdEarsCream
   - NfsdBoxSurvival
-  - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
   - ContractorFun
@@ -293,10 +296,10 @@
   - NfsdShoesBrown
   - ContractorFace
   - NfsdGlasses
-  - PalPDA
   - ContractorBelt
   - NfsdEarsBrown
   - NfsdBoxSurvival
+  - PalPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -314,10 +317,11 @@
   # - NfsdShoesBrown
   # - NfsdFace
   # - NfsdGlasses
-  # - PrisonGuardPDA
   # - NfsdBelt
   # - NfsdEarsGreen
   # - NfsdBoxSurvival
+  # - PrisonGuardPDA
+  # - ContractorCartridge
   # - ContractorImplanter
   # - ContractorEncryptionKey
   # - ContractorFun
@@ -334,10 +338,10 @@
   - NfsdShoesCream
   - NfsdFace
   - NfsdGlasses
-  - BailiffPDA
   - NfsdBelt
   - NfsdEarsAltGreen
   - NfsdBoxSurvival
+  - BailiffPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -355,10 +359,10 @@
   - NfsdShoesBrown
   - NfsdFace
   - NfsdGlasses
-  - SeniorOfficerPDA
   - NfsdBelt
   - NfsdEarsAltBrown
   - NfsdBoxSurvival
+  - SeniorOfficerPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorEncryptionKey
@@ -377,10 +381,10 @@
   - NfsdShoesBrown
   - SheriffFace
   - NfsdGlasses
-  - SheriffPDA
   - NfsdBelt
   - SheriffEars
   - NfsdBoxSurvival
+  - SheriffPDA
   - ContractorCartridge
   - ContractorImplanter
   - ContractorFun
@@ -399,8 +403,8 @@
   - GroupTankHarness # No outer clothing, this left for vox
   - PirateShoes
   - PirateFace
-  - PiratePDA
   - ContractorBoxSurvival
+  - PiratePDA
 
 - type: roleLoadout
   id: JobPirateFirstMate
@@ -413,8 +417,8 @@
   - PirateFirstMateOuterClothing
   - PirateShoes
   - PirateFace
-  - PirateFirstMatePDA
   - ContractorBoxSurvival
+  - PirateFirstMatePDA
 
 - type: roleLoadout
   id: JobPirateCaptain
@@ -428,8 +432,8 @@
 #  - PirateOuterClothing
   - PirateShoes
   - PirateFace
-  - PirateCaptainPDA
   - ContractorBoxSurvival
+  - PirateCaptainPDA
 
 # Prisoner
 
@@ -444,5 +448,5 @@
   - GroupTankHarness # No outer clothing, this left for Vox.
 #  - PrisonerShoes
   - PrisonerFace
-  - PrisonerPDA
   - PrisonerSurvival
+  - PrisonerPDA