Da First

Vault-Overseers · Jan 10, 2025 · cd36390 · cd36390
1 parent dfb1853
commit cd36390
Show file tree

Hide file tree

Showing 26 changed files with 1,087 additions and 349 deletions.
diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
@@ -9,76 +9,191 @@ undecided-loadout-window-approve-button = Approve
 undecided-loadout-button-select = Select [  ]
 undecided-loadout-button-deselect = Select [X]
 
-# Sets
+# NCRA Cadet Sets
 
-undecided-loadout-category-rifleman-name = Rifleman Kit
-undecided-loadout-category-rifleman-description =
+undecided-loadout-category-cadet-rifleman-name = Cadet Rifleman Kit
+undecided-loadout-category-cadet-rifleman-description =
     A crate containing all a NCR soldier needs to patrol on the wasteland.
-    Includes 1 NCR leather vest, 1 NCR pouches bandolier, 1 service Rifle,
-    4 5.56 service rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, 1 combat knife,
-    and a C ration MRE.
-
-undecided-loadout-category-gunner-name = Gunner Kit
-undecided-loadout-category-gunner-description =
-    A crate containing all a NCR machine gunner needs to patrol on the wasteland.
-    Includes 1 NCR leather vest, 1 NCR belt, 1 LMG, 2 LMG magazines, 1 9mm pistol,
-    2 9mm magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-marksman-name = Marksman Kit
-undecided-loadout-category-marksman-description =
-    A crate containing all a NCR marksman needs to patrol on the wasteland.
-    Includes 1 NCR leather vest, 1 NCR bandolier, 1 lever action rifle, 1 box of .308,
-    1 9mm pistol, 2 9mm magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-pointman-name = Pointman Kit
-undecided-loadout-category-pointman-description =
-    A crate containing all a NCR pointman needs to patrol on the wasteland.
-    Includes 1 NCR leather vest, 1 NCR bandolier, 1 shotgun, 1 box of 12 gauge,
-    1 9mm pistol, 2 9mm magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-morale-name = Morale Booster Kit
-undecided-loadout-category-morale-description =
-    Only the most loyal troops of the NCR carry low quality equipment,
-    a special troop made only to boost the morale during suicide charges.
-    Includes 1 NCR plate armor, 1 plate mask, 1 NCR pouches bandolier,
-    1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 combat knife,
-    and a C ration MRE.
-
-undecided-loadout-category-medic-name = Combat Lifesaver Kit
-undecided-loadout-category-medic-description =
-    A crate containing all an NCR CLS needs to patrol the wasteland.
-    Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG,
-    4 9mm SMG magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-engineer-name = Engineer Kit
-undecided-loadout-category-engineer-description =
-    A crate containing all a NCR pointman needs to patrol on the wasteland.
-    Includes 1 NCR leather vest, 1 Filled Toolbelt, 1 shotgun, 1 box of 12 gauge,
-    1 9mm pistol, 2 9mm magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-special-rifleman-name = Special Rifleman Kit
-undecided-loadout-category-special-rifleman-description =
-    A crate containing advance weaponry for high rank troops and veterans.
-    Includes 1 battle rifle, 5 .308 battle rifle magazines, 1 9mm pistol, 2 9mm magazines,
-    1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-special-assault-name = Special Assault Kit
-undecided-loadout-category-special-assault-description =
-    A crate containing advance weaponry for high rank troops and veterans.
-    Includes 1 assault carbine, 3 5.56 assault carbine magazines, 1 9mm pistol,
-    2 9mm pistol magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-special-gunner-name = Special Gunner Kit
-undecided-loadout-category-special-gunner-description =
-    A crate containing advance weaponry for high rank troops and veterans.
-    Includes 1 automatic rifle, 2 .308 automatic rifle magazines, 1 9mm pistol,
-    2 9mm pistol magazines, 1 combat knife, and a C ration MRE.
-
-undecided-loadout-category-special-pointman-name = Special Pointman Kit
-undecided-loadout-category-special-pointman-description =
-    A crate containing advance weaponry for high rank troops and veterans.
-    Includes 1 riot shotgun, 3 20 gauge ammo drums, 1 9mm pistol, 2 9mm pistol magazines,
-    1 combat knife, and a C ration MRE.
+    Includes 1 NCR leather vest, 1 NCR pouches bandolier, 1 service rifle,
+    3 5.56 service rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-cadet-storm-name = Cadet Stormtrooper Kit
+undecided-loadout-category-cadet-storm-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 NCR leather vest, 1 NCR pouches bandolier, 1 butchered service rifle,
+    3 5.56 service rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-cadet-scout-name = Cadet Scout Kit
+undecided-loadout-category-cadet-scout-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 NCR leather vest, 1 NCR pouches bandolier, 1 lever-action carbine,
+    1 box of .44 ammo, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X, 1 bandage pack and a flare.
+
+# NCRA Soldier Sets
+
+undecided-loadout-category-soldier-rifleman-name = Soldier Rifleman Kit
+undecided-loadout-category-soldier-rifleman-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 NCR belt, 1 service rifle,
+    3 5.56 service rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-soldier-storm-name = Soldier Stormtrooper Kit
+undecided-loadout-category-soldier-storm-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 NCR belt, 1 butchered service rifle,
+    3 5.56 service rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-soldier-scout-name = Soldier Scout Kit
+undecided-loadout-category-soldier-scout-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 NCR belt, 1 lever-action carbine,
+    1 box of .44 ammo, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-soldier-point-name = Soldier Pointman Kit
+undecided-loadout-category-soldier-point-description =
+    A crate containing all a NCR soldier needs to patrol on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 NCR belt, 1 pump-action shotgun,
+    1 box of 12 gauge ammo, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+undecided-loadout-category-soldier-morale-name = Morale Booster Kit
+undecided-loadout-category-soldier-morale-description =
+    A crate containing all a trooper needs to engage the enemy in glorious melee combat.
+    Includes 1 NCR plate armor, 1 plate mask, 1 NCR belt, 1 hatchet,
+    1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 Psycho,
+    C ration MRE, 1 stimpak, 1 Rad-X pill, 1 bandage pack and a flare.
+
+# NCRA Engineer Kits
+
+undecided-loadout-category-engi-mechanic-name = Engineer Mechanic Kit
+undecided-loadout-category-engi-mechanic-description =
+    A crate containing all a NCR engineer to perform their job at peak efficiency.
+    Includes 1 pouched NCR leather vest, 1 utility belt, 1 9mm SMG, 3 9mm SMG magazines,
+    1 9mm pistol, 2 9mm pistol magazines, 30 iron scrap, 10 glass sheet, 30 wood planks,
+    C ration MRE, 1 stimpak, 1 Radaway, 1 bandage pack and a flare.
+
+undecided-loadout-category-engi-demo-name = Engineer Demolition Kit
+undecided-loadout-category-engi-demo-description =
+    A crate containing all a NCR engineer needs to rip and blow stuff up!
+    Includes 1 pouched NCR leather vest, 1 utility belt, 1 ripper, 1 pump-action shotgun,
+    1 box of 12 gauge shells, 1 9mm pistol, 2 9mm pistol magazines, 1 C4,
+    C ration MRE, 1 stimpak, 1 Radaway, 1 bandage pack and a flare.
+
+undecided-loadout-category-engi-breach-name = Engineer Breacher Kit
+undecided-loadout-category-engi-breach-description =
+    A crate containing all a NCR engineer needs to get any door open!
+    Includes 1 pouched NCR leather vest, 1 NCR belt, 1 combat shotgun,
+    3 12 gauge drum mags, 1 9mm pistol, 2 9mm pistol magazines, 1 toolbox,
+    C ration MRE, 1 stimpak, 1 Radaway, 1 bandage pack and a flare.
+
+# NCRA Medic Kits
+
+undecided-loadout-category-med-surg-name = Medic Surgeon Kit
+undecided-loadout-category-med-surg-description =
+    A crate containing all a NCR medic needs to take care of other troops.
+    Includes 1 lab coat, 1 medic beret, nitrile gloves, 1 medical belt, 9mm SMG,
+    3 9mm SMG magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 set of bruise packs, 1 pack of ointments, 1 stack of bloodbags, 1 antidote bottle,
+    1 super stimpack, 1 stimpak, 1 Radaway, 2 bandage packs and a flare.
+
+undecided-loadout-category-med-doc-name = Medic Field Kit
+undecided-loadout-category-med-doc-description =
+    A crate containing all a NCR medic needs to take care of other troops.
+    Includes 1 lab coat, 1 medic beret, nitrile gloves, 1 medical belt, 9mm SMG,
+    3 9mm SMG magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stack of bloodbags, 1 antidote bottle,
+    1 stimpak, 1 Radaway, 2 bandage packs and a flare.
+
+undecided-loadout-category-med-combat-name = Medic Combat Kit
+undecided-loadout-category-med-combat-description =
+    A crate containing all a NCR medic needs to take care of other troops.
+    Includes 1 pouched NCR leather vest, 1 medic metal helmet, 1 medical belt,
+    1 pump-action shotgun, 1 box of 12 gauge shells, 1 9mm pistol, 2 9mm pistol magazines,
+    C ration MRE, 1 stack of bloodbags, 1 antidote injector,
+    2 stimpaks, 1 Radaway, 2 bandage packs and a flare.
+
+# NCRA Weapon Specialist Kits
+
+undecided-loadout-category-ws-gunner-name = Specialist Gunner Kit
+undecided-loadout-category-ws-gunner-description =
+    A crate containing all a NCR soldier needs to pin down enemy combatants.
+    Includes 1 pouched NCR leather vest, 1 metal helmet, 1 NCR belt, 1 NCR cloak, 1 LMG,
+    3 5.56 LMG magazines, 1 9mm pistol, 2 9mm pistol magazines,
+    C ration MRE, 1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-ws-grenadier-name = Specialist Grenadier Kit
+undecided-loadout-category-ws-grenadier-description =
+    A crate containing all a NCR soldier needs to blow stuff (and people) up!
+    Includes 1 pouched NCR leather vest, 1 metal helmet 1 NCR belt, 1 NCR cloak,
+    1 grenade rifle, 4 40mm grenades, 1 .45 handgun, 2 .45 pistol magazines, 1 smoke grenade,
+    C ration MRE, 1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-ws-sniper-name = Specialist Sniper Kit
+undecided-loadout-category-ws-sniper-description =
+    A crate containing all a NCR soldier needs to take people out from afar.
+    Includes 1 pouched NCR leather vest, 1 recon beret, 1 NCR belt, 1 NCR cloak,
+    1 .50 sniper rifle, 1 box of .50 rounds, 1 9mm pistol, 2 9mm pistol magazines,
+    C ration MRE, 1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+# NCRA Sergeant Kits
+
+undecided-loadout-category-sgt-rifleman-name = Sergeant Rifleman Kit
+undecided-loadout-category-sgt-rifleman-description =
+    A crate containing all a NCR sergeant needs to lead patrols on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 metal helmet, 1 NCR belt, 1 assault carbine,
+    3 5.56 carbine magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-sgt-gunner-name = Sergeant Gunner Kit
+undecided-loadout-category-sgt-gunner-description =
+    A crate containing all a NCR sergeant needs to lead patrols on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 metal helmet, 1 NCR belt, 1 automated rifle,
+    3 .308 rifle magazines, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-sgt-scout-name = Sergeant Scout Kit
+undecided-loadout-category-sgt-scout-description =
+    A crate containing all a NCR sergeant needs to lead patrols on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 recon beret, 1 NCR belt, 1 battle rifle,
+    6 .308 clips, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-sgt-point-name = Sergeant Pointman Kit
+undecided-loadout-category-sgt-point-description =
+    A crate containing all a NCR sergeant needs to lead patrols on the wasteland.
+    Includes 1 pouched NCR leather vest, 1 metal helmet, 1 NCR belt, 1 combat shotgun,
+    3 12 gauge drum mags, 1 9mm pistol, 2 9mm pistol magazines, C ration MRE,
+    1 stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+# NCRA Lieutenant Kits
+
+undecided-loadout-category-lt-pencil-name = LT's Pencilpusher Kit
+undecided-loadout-category-lt-pencil-description =
+    A crate containing all a NCR soldier needs to lead troopers across the wasteland.
+    Includes 1 NCR trench coat, 1 officer revolver, 3 .44 speedloaders
+    1 holster, 1 lever-action carbine, 1 box of .44 rounds, C ration MRE,
+    1 super stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-lt-scout-name = LT's Veteran Scout Kit
+undecided-loadout-category-lt-scout-description =
+    A crate containing all a NCR soldier needs to lead troopers across the wasteland.
+    Includes 1 NCR trench coat, 1 magnum revolver, 3 .44 speedloaders
+    1 holster, 1 battle rifle, 6 .308 clips, C ration MRE,
+    1 super stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+undecided-loadout-category-lt-tactical-name = LT's Tactical Kit
+undecided-loadout-category-lt-tactical-description =
+    Includes 1 NCR combat armor, 1 magnum revolver, 3 .44 speedloaders
+    1 holster, 1 assault carbine, 3 5.56 carbine magazines, C ration MRE,
+    1 super stimpak, 1 Radaway inhaler, 1 bandage pack and a flare.
+
+# Ranger stuff thingies
 
 undecided-loadout-category-ranger-service-name = Ranger Service Kit
 undecided-loadout-category-ranger-service-description =

diff --git a/Resources/Prototypes/Maps/N14/sunnyvale.yml b/Resources/Prototypes/Maps/N14/sunnyvale.yml
@@ -41,8 +41,8 @@
             NCRWS: [ 2, 2 ]
             NCREngineer: [ 2, 2 ]
             NCRMedic: [ 1, 2 ] 
-            NCRSoldier: [ 3, 6 ]
-            NCRCadet: [ 2, 5 ]
+            NCRSoldier: [ 2, 4 ]
+            NCRCadet: [ 2, 3 ]
             CaravanLeader: [ 1, 1 ]
             CaravanTrader: [ 1, 1 ]
             CaravanGuard: [ 2, 2 ]

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -234,7 +234,6 @@
   components:
     - type: StorageFill
       contents:
-        - id: N14BoxPlasticFilledMilitaryNCR
         - id: N14NewYearsGift
           prob: 0.5
           orGroup: Gift

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml
@@ -33,10 +33,11 @@
       - id: N14Bandage
         amount: 2
       - id: Brutepack
-        amount: 2
       - id: Ointment
-        amount: 2
       - id: N14Stimpak
+      - id: N14ChemicalSyringeAntidote
+      - id: N14RadAwayBloodbag
+      - id: Bloodpack
 
 - type: entity
   id: N14ClothingBeltPlantFilled

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/misc.yml
@@ -1,3 +1,13 @@
+- type: entity
+  id: N14ClothingBootsLeatherFilled
+  parent: N14ClothingBootsLeather
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - N14CombatKnife
+
 - type: entity
   id: N14ClothingBootsCombatFilled
   parent: N14ClothingBootsCombat

diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/toolboxes.yml
@@ -14,6 +14,21 @@
       - id: N14Welder
       - id: trayScanner
       - id: ClothingHandsGlovesColorYellow
+
+- type: entity
+  id: N14ToolboxMechanical
+  name: toolbox
+  suffix: Filled, always
+  parent: ToolboxMechanical
+  components:
+  - type: StorageFill
+    contents:
+      - id: N14Screwdriver
+      - id: Crowbar
+      - id: N14Wirecutter
+      - id: N14Wrench
+      - id: N14Multitool
+      - id: N14Welder
 
 - type: entity
   id: N14ToolboxFilled2

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml
@@ -123,6 +123,9 @@
     fiberMaterial: fibers-leather
     fiberColor: fibers-black
   - type: FingerprintMask
+  - type: GloveHeatResistance
+    heatResistance: 1000
+  - type: Insulated
   # - type: ClothingSpecialModifier
     # enduranceModifier: 1
 

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml
@@ -318,6 +318,8 @@
         Piercing: 0.95
         Heat: 0.9
         Caustic: 0.75
+  - type: ClothingSpecialModifier
+    intelligenceModifier: 1
 
 - type: entity
   parent: [ClothingOuterStorageFoldableBaseOpened, N14ClothingOuterCoatLab]
@@ -458,7 +460,7 @@
     strengthModifier: 1
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: N14ClothingOuterBattlecoatCoat
   id: N14ClothingOuterNCRTrenchCoat
   name: NCR officer trench coat
   description: Warm and comfy, this nice white coat is used by officers of the 3rd battalion to warm themselves.
@@ -467,8 +469,6 @@
     sprite: _Nuclear14/Clothing/OuterClothing/Coats/ncr_trenchcoat.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/OuterClothing/Coats/ncr_trenchcoat.rsi
-  - type: ClothingSpecialModifier
-    charismaModifier: 2
 
 - type: entity
   parent: ClothingOuterStorageBase

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml
@@ -693,6 +693,26 @@
   - type: ExplosionResistance
     damageCoefficient: 0.9
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: N14ClothingOuterNCRPouchedVestSnow
+  name: pouched leather NCR vest
+  description: A leather vest with a light ballistic plate inside, this vest comes with a pack of pouches to hold any kind of things. It's uncomfy to move with it.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.8
+        Heat: 0.8
+  - type: ExplosionResistance
+    damageCoefficient: 0.9
+
 - type: entity
   parent: ClothingOuterStorageBase
   id: N14ClothingOuterNCRLightPouchedVest