Merge remote-tracking branch 'origin/master'

MutantMan2040 · Jul 5, 2024 · 47bb484 · 47bb484
2 parents 79bf25e + 552ad00
commit 47bb484
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 4 deletions.
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml
@@ -20,6 +20,8 @@
     pocket2: N14WeaponPistol10mm
     outerClothing: N14ClothingOuterLightMetalArmor
     suitstorage: N14WeaponRifleR91
+  satchel: N14ClothingBackpackSatchelCaravanFilled
+  duffelbag: N14ClothingBackpackDuffelCaravanFilled
 
 - type: playTimeTracker
   id: CaravanGuard
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml
@@ -19,6 +19,8 @@
     shoes: N14ClothingBootsLeather
     id: N14IDPassportCaravan
   innerClothingSkirt: N14ClothingUniformJumpsuitTrader #placeholder
+  satchel: N14ClothingBackpackSatchelCaravanFilled
+  duffelbag: N14ClothingBackpackDuffelCaravanFilled
 
 - type: playTimeTracker
   id: CaravanTrader
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml
@@ -19,6 +19,7 @@
     shoes: N14ClothingBootsLeather
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCRCadet
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml
@@ -7,7 +7,10 @@
   startingGear: NCRDoctorGear
   icon: "JobIconPassenger"
   supervisors: job-supervisors-ncr-nco
-
+  canBeAntag: false
+  access:
+  - NCRCadet
+  - NCRSoldier
 - type: startingGear
   id: NCRDoctorGear
   equipment:
@@ -21,7 +24,7 @@
     pocket1: N14WeaponPistol9mm
     outerClothing: ClothingOuterCoatLab
   innerClothingSkirt: N14ClothingUniformNCR
-  satchel: N14ClothingBackpackSatchelWastelanderFilled
+  satchel: N14ClothingBackpackSatchelNCRFilled
   duffelbag: N14ClothingBackpackDuffelFilled  # N14TODO: Doctors Bag
 
 - type: playTimeTracker

diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_mp.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_mp.yml
@@ -12,7 +12,7 @@
   - NCRCadet
   - NCRSoldier
   - NCRNCO
-  
+
 - type: startingGear
   id: NCRMPGear
   equipment:
@@ -24,6 +24,7 @@
     outerClothing: N14ClothingOuterNCRLightPouchedVest
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingMPUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCRMP
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml
@@ -12,7 +12,7 @@
   - NCRCadet
   - NCRSoldier
   - NCRNCO
-  
+
 - type: startingGear
   id: NCRNCOGear
   equipment:
@@ -25,6 +25,7 @@
     outerClothing: N14ClothingOuterNCRVest
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCRNCO
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml
@@ -22,6 +22,7 @@
     eyes: ClothingEyesGlassesSunglasses
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCROfficer
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml
@@ -20,6 +20,7 @@
     shoes: N14ClothingBootsLeather
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCRQM
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml
@@ -20,6 +20,7 @@
     shoes: N14ClothingBootsLeather
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelNCRFilled
 
 - type: playTimeTracker
   id: NCRSoldier
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml
@@ -7,6 +7,7 @@
   weight: 5
   startingGear: NCRRangerGear
   icon: JobIconSecurityOfficer
+  requireAdminNotify: true
   canBeAntag: false
   access:
   - NCRCadet
@@ -29,6 +30,8 @@
     id: N14IDBadgeNCRDesertRanger
     back: N14ClothingBackpackMilitaryFilled
   innerClothingSkirt: N14ClothingUniformRangerV3 #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: NCRRanger
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml
@@ -29,6 +29,8 @@
     id: N14IDBadgeNCRDesertRangerElite
     back: N14ClothingBackpackMilitaryFilled
   innerClothingSkirt: N14ClothingUniformRangerModif #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: NCRRangerVeteran
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger.yml
@@ -30,6 +30,8 @@
     outerClothing: N14ClothingOuterRangerCombatDesert
     id: N14IDBadgeNCRDesertRanger
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: Ranger
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_chief.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_chief.yml
@@ -28,6 +28,8 @@
     outerClothing: N14ClothingOuterRangerElite
     id: N14IDBadgeNCRDesertRangerChief
   innerClothingSkirt: N14ClothingUniformRangerVeteran #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: RangerChief
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml
@@ -27,6 +27,8 @@
     outerClothing: N14ClothingOuterRangerCombat
     id: N14IDBadgeNCRDesertRangerRecruit
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: RangerRecruit
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_veteran.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_veteran.yml
@@ -29,6 +29,8 @@
     outerClothing: N14ClothingOuterRangerEliteOld
     id: N14IDBadgeNCRDesertRangerElite
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder
+  satchel: N14ClothingBackpackSatchelMilitaryFilled
+  duffelbag: N14ClothingBackpackDuffelMilitaryFilled
 
 - type: playTimeTracker
   id: RangerVeteran