diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl index aac4eb6f184..954816e9114 100644 --- 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 index 787976eb0fd..105866f5770 100644 --- 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 index 5f8c196dd53..42e8da6d8c7 100644 --- 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 index feb4fcdb206..00003a6bd43 100644 --- 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 index 29ecd734fbf..4e06498d3c3 100644 --- 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 index 1889d60a1ec..ea8a3d9c694 100644 --- 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 index 127d69889fb..894727ed8b1 100644 --- 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 index a5b1c6cad41..7294bfe3ce5 100644 --- 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 index 4a5c1699aff..193b73d4234 100644 --- 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 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml index 3f1bf1fc924..1dbe0486f31 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml @@ -83,6 +83,15 @@ spawned: - id: N14MaterialLeather1 amount: 2 + - type: Matchbox + - type: ItemSlots + slots: + item: + name: clothing-boots-sidearm + whitelist: + tags: + - Knife + - Sidearm - type: entity parent: ClothingShoesBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml index 3ae954e1a3d..fc2c06472c1 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml @@ -1,8 +1,10 @@ #MARK: Undecided Loadout Backpacks + +# New California Republic Army - type: entity - id: NCRtrooperloadoutkits - name: Undecided NCR Trooper Loadout Kit - description: Please only take one.. + id: NCRcadetloadoutkits + name: Undecided NCRA Cadet Loadout Kit + description: Please only take one. parent: BaseItem components: - type: Sprite @@ -11,11 +13,9 @@ - type: UndecidedLoadoutBackpack transformAfterSelect: AlwaysPoweredWallLight possibleSets: - - RiflemanSet - - MarksmanSet - - PointmanSet - - MoraleSet - - MedicSet + - NCRA_CadetRiflemanSet + - NCRA_CadetStormSet + - NCRA_CadetScoutSet - type: ActivatableUI key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UserInterface @@ -23,86 +23,108 @@ - key: enum.UndecidedLoadoutBackpackUIKey.Key type: UndecidedLoadoutBackpackBoundUserInterface -# Engineer Kits +- type: entity + id: NCRtrooperloadoutkits + name: Undecided NCRA Trooper Loadout Kit + description: Please only take one. + parent: NCRcadetloadoutkits + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + - type: UndecidedLoadoutBackpack + possibleSets: + - NCRA_RiflemanSet + - NCRA_StormSet + - NCRA_ScoutSet + - NCRA_PointSet + - NCRA_MoraleSet + - type: entity id: NCRengineerloadoutkits - name: Undecided NCR Engineer Loadout Kit - description: Please only take one.. - parent: BaseItem + name: Undecided NCRA Engineer Loadout Kit + description: Please only take one. + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: pointman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - - EngineerSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface + - NCRA_MechanicSet + - NCRA_DemolitionSet + - NCRA_BreacherSet + +- type: entity + id: NCRmedicloadoutkits + name: Undecided NCRA Medic Loadout Kit + description: Please only take one. + parent: NCRcadetloadoutkits + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: medic + - type: UndecidedLoadoutBackpack + possibleSets: + - NCRA_SurgeonSet + - NCRA_DoctorSet + - NCRA_ComMedSet -# WS Kits - type: entity id: NCRwsloadoutkits - name: Undecided NCR Weapon Specalist Loadout Kit - description: Please only take one.. - parent: BaseItem + name: Undecided NCRA Weapon Specalist Loadout Kit + description: Please only take one. + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: gunner - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - - GunnerSet - #- GrenadierSet #TODO - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface + - NCRA_GunnerSet + - NCRA_GrenadierSet + - NCRA_SniperSet - type: entity id: NCRSGTloadoutkits - name: Undecided NCR SGT Loadout Kit + name: Undecided NCRA Sergeant Loadout Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + - type: UndecidedLoadoutBackpack + possibleSets: + - NCRA_SGTRiflemanSet + - NCRA_SGTGunnerSet + - NCRA_SGTScoutSet + - NCRA_SGTPointSet + +- type: entity + id: NCRLTloadoutkits + name: Undecided NCRA Lieutenant Loadout Kit + description: Please only take one. + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - - RiflemanSet - - GunnerSet - - MarksmanSet - - PointmanSet - - MoraleSet - - MedicSet - - SpecialRiflemanSet - - SpecialAssaultSet - - SpecialGunnerSet - - SpecialPointmanSet + - NCRA_LTPencilSet + - NCRA_LTScoutSet + - NCRA_LTTacticalSet - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface +# New California Republic Rangers - type: entity id: NCRrangerloadoutkits name: Undecided NCR Ranger Loadout Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack transformAfterSelect: AlwaysPoweredWallLight @@ -112,24 +134,17 @@ - RangerMarksmanSet - RangerCQBSet - RangerTrailmanSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface - type: entity id: NCRveteranrangerloadoutkits name: Undecided NCR Veteran Ranger Loadout Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - RangerServiceSet - RangerRiflemanSet @@ -141,267 +156,349 @@ - VeteranRangerHeavySniperSet - VeteranRangerAssaultSet - VeteranRangerMarksmanSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface #MARK: Knights - type: entity id: NCRBoSMidwestkits name: Undecided BoS Midwest Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSDefaultSet - BoSCarbineSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface - type: entity id: NCRBoSWashingtonkits name: Undecided Washington BoS Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSWashingtonDefaultSet - BoSWashingtonCarbineSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface #MARK: Scribes - type: entity id: NCRBoSMidwestScribekits name: Undecided BoS Scribe Midwest Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSScribeMedicalSet - BoSScribeFieldSet - BoSScribeEngineerSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface - type: entity id: NCRBoSWashingtonScribekits name: Undecided BoS Scribe Washington Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSWashingtonScribeMedicalSet - BoSWashingtonScribeFieldSet - BoSWashingtonScribeEngineerSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface #MARK: Paladins - type: entity id: NCRBoSMidwestPaladinkits name: Undecided BoS Paladin Midwest Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSDefaultSet - BoSRangedSet - BoSLaserSet # - BoSPlasmaSet - BoSAssaultSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface - type: entity id: NCRBoSWashingtonPaladinkits name: Undecided BoS Paladin Washington Kit description: Please only take one. - parent: BaseItem + parent: NCRcadetloadoutkits components: - type: Sprite sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman - type: UndecidedLoadoutBackpack - transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSWashingtonDefaultSet - BoSWashingtonRangedSet - BoSWashingtonPlasmaSet - BoSWashingtonAssaultSet - - type: ActivatableUI - key: enum.UndecidedLoadoutBackpackUIKey.Key - - type: UserInterface - interfaces: - - key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UndecidedLoadoutBackpackBoundUserInterface -#MARK: Trooper Kits +# Here do the individual ALREADY DECIDED kits start +# NCRA Cadet Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_CadetRiflemanSet + name: undecided-loadout-category-cadet-rifleman-name + description: undecided-loadout-category-cadet-rifleman-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + content: + - KitNCR_CadetRifleman + +- type: UndecidedLoadoutBackpackSet + id: NCRA_CadetStormSet + name: undecided-loadout-category-cadet-storm-name + description: undecided-loadout-category-cadet-storm-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + content: + - KitNCR_CadetStorm - type: UndecidedLoadoutBackpackSet - id: RiflemanSet - name: undecided-loadout-category-rifleman-name - description: undecided-loadout-category-rifleman-description + id: NCRA_CadetScoutSet + name: undecided-loadout-category-cadet-scout-name + description: undecided-loadout-category-cadet-scout-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: marksman + content: + - KitNCR_CadetScout + +# NCRA Soldier / Trooper Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_RiflemanSet + name: undecided-loadout-category-soldier-rifleman-name + description: undecided-loadout-category-soldier-rifleman-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman content: - - KitRifleman + - KitNCR_Rifleman - type: UndecidedLoadoutBackpackSet - id: GunnerSet - name: undecided-loadout-category-gunner-name - description: undecided-loadout-category-gunner-description + id: NCRA_StormSet + name: undecided-loadout-category-soldier-storm-name + description: undecided-loadout-category-soldier-storm-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi - state: gunner + state: rifleman content: - - KitGunner + - KitNCR_Storm - type: UndecidedLoadoutBackpackSet - id: MarksmanSet - name: undecided-loadout-category-marksman-name - description: undecided-loadout-category-marksman-description + id: NCRA_ScoutSet + name: undecided-loadout-category-soldier-scout-name + description: undecided-loadout-category-soldier-scout-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: marksman content: - - KitMarksman + - KitNCR_Scout - type: UndecidedLoadoutBackpackSet - id: PointmanSet - name: undecided-loadout-category-pointman-name - description: undecided-loadout-category-pointman-description + id: NCRA_PointSet + name: undecided-loadout-category-soldier-point-name + description: undecided-loadout-category-soldier-point-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: pointman content: - - KitPointman + - KitNCR_Point - type: UndecidedLoadoutBackpackSet - id: MoraleSet - name: undecided-loadout-category-morale-name - description: undecided-loadout-category-morale-description + id: NCRA_MoraleSet + name: undecided-loadout-category-soldier-morale-name + description: undecided-loadout-category-soldier-morale-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: pointman content: - - KitMorale + - KitNCR_Morale +# NCRA Engineer Kits - type: UndecidedLoadoutBackpackSet - id: MedicSet - name: undecided-loadout-category-medic-name - description: undecided-loadout-category-medic-description + id: NCRA_MechanicSet + name: undecided-loadout-category-engi-mechanic-name + description: undecided-loadout-category-engi-mechanic-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi - state: medic + state: rifleman content: - - KitMedic + - KitNCR_EngiMechanic -#MARK: Engineer Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_DemolitionSet + name: undecided-loadout-category-engi-demo-name + description: undecided-loadout-category-engi-demo-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: pointman + content: + - KitNCR_EngiDemo - type: UndecidedLoadoutBackpackSet - id: EngineerSet - name: undecided-loadout-category-engineer-name - description: undecided-loadout-category-engineer-description + id: NCRA_BreacherSet + name: undecided-loadout-category-engi-breach-name + description: undecided-loadout-category-engi-breach-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: pointman content: - - KitEngineer + - KitNCR_EngiBreach -#MARK: WS Kits -#TODO: Grendeir Specific Kit +# NCRA Medic Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_SurgeonSet + name: undecided-loadout-category-med-surg-name + description: undecided-loadout-category-med-surg-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: medic + content: + - KitNCR_MedSurgeon -#MARK: Special Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_DoctorSet + name: undecided-loadout-category-med-doc-name + description: undecided-loadout-category-med-doc-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: medic + content: + - KitNCR_MedDoctor - type: UndecidedLoadoutBackpackSet - id: SpecialRiflemanSet - name: undecided-loadout-category-special-rifleman-name - description: undecided-loadout-category-special-rifleman-description + id: NCRA_ComMedSet + name: undecided-loadout-category-med-combat-name + description: undecided-loadout-category-med-combat-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: medic + content: + - KitNCR_MedCombat + +# NCRA Weapon Specialist Kits +- type: UndecidedLoadoutBackpackSet + id: NCRA_GunnerSet + name: undecided-loadout-category-ws-gunner-name + description: undecided-loadout-category-ws-gunner-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: gunner + content: + - KitNCR_WSGunner + +- type: UndecidedLoadoutBackpackSet + id: NCRA_GrenadierSet + name: undecided-loadout-category-ws-grenadier-name + description: undecided-loadout-category-ws-grenadier-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: pointman + content: + - KitNCR_WSGrenadier + +- type: UndecidedLoadoutBackpackSet + id: NCRA_SniperSet + name: undecided-loadout-category-ws-sniper-name + description: undecided-loadout-category-ws-sniper-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: marksman content: - - KitSpecialRifleman + - KitNCR_WSSniper +# NCRA Sergeant Kits - type: UndecidedLoadoutBackpackSet - id: SpecialAssaultSet - name: undecided-loadout-category-special-assault-name - description: undecided-loadout-category-special-assault-description + id: NCRA_SGTRiflemanSet + name: undecided-loadout-category-sgt-rifleman-name + description: undecided-loadout-category-sgt-rifleman-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman content: - - KitSpecialAssault + - KitNCR_SGTRifleman - type: UndecidedLoadoutBackpackSet - id: SpecialGunnerSet - name: undecided-loadout-category-special-gunner-name - description: undecided-loadout-category-special-gunner-description + id: NCRA_SGTGunnerSet + name: undecided-loadout-category-sgt-gunner-name + description: undecided-loadout-category-sgt-gunner-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: gunner + content: + - KitNCR_SGTGunner + +- type: UndecidedLoadoutBackpackSet + id: NCRA_SGTScoutSet + name: undecided-loadout-category-sgt-scout-name + description: undecided-loadout-category-sgt-scout-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: marksman content: - - KitSpecialGunner + - KitNCR_SGTScout + +- type: UndecidedLoadoutBackpackSet + id: NCRA_SGTPointSet + name: undecided-loadout-category-sgt-point-name + description: undecided-loadout-category-sgt-point-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: pointman + content: + - KitNCR_SGTPoint +# NCRA Lieutenant Kits - type: UndecidedLoadoutBackpackSet - id: SpecialPointmanSet - name: undecided-loadout-category-special-pointman-name - description: undecided-loadout-category-special-pointman-description + id: NCRA_LTPencilSet + name: undecided-loadout-category-lt-pencil-name + description: undecided-loadout-category-lt-pencil-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: pointman content: - - KitSpecialPointman + - KitNCR_LTPencil + +- type: UndecidedLoadoutBackpackSet + id: NCRA_LTScoutSet + name: undecided-loadout-category-lt-scout-name + description: undecided-loadout-category-lt-scout-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: marksman + content: + - KitNCR_LTScout + +- type: UndecidedLoadoutBackpackSet + id: NCRA_LTTacticalSet + name: undecided-loadout-category-lt-tactical-name + description: undecided-loadout-category-lt-tactical-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + content: + - KitNCR_LTTactical + #MARK: Ranger Kits - type: UndecidedLoadoutBackpackSet diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml index 9d92217e01c..7d74313500d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml @@ -1,4 +1,3 @@ -#MARK: Basic Kits - type: entity name: rifleman kit parent: BaseItem @@ -16,11 +15,13 @@ sound: path: /Audio/Effects/unwrap.ogg +#M NCRA Cadet Kits + - type: entity - name: rifleman kit + name: cadet's rifleman kit parent: KitBase - id: KitRifleman - description: A crate containing all an NCR Soldier needs to patrol the wasteland. + id: KitNCR_CadetRifleman + description: A crate containing all an NCR trooper needs to patrol the wasteland. components: - type: Sprite state: rifleman @@ -32,45 +33,51 @@ - id: ClothingBeltNCRPouches - id: N14WeaponRifle556Service - id: Magazine556Rifle - amount: 4 + amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: gunner kit + name: cadet's stormtrooper kit parent: KitBase - id: KitGunner - description: A crate containing all an NCR Machine Gunner needs to patrol the wasteland. + id: KitNCR_CadetStorm + description: A crate containing all an NCR trooper needs to patrol the wasteland. components: - type: Sprite - state: gunner + state: rifleman - type: Item size: Huge - type: SpawnItemsOnUse items: - - id: N14ClothingOuterNCRVestSnow - - id: ClothingBeltNCR - - id: N14WeaponLMG - - id: LMGMagazine556Rifle + - id: N14ClothingOuterNCRVestWoods + - id: ClothingBeltNCRPouches + - id: N14WeaponRifle556Butchered + - id: Magazine556Rifle amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: marksman kit + name: cadet's scout kit parent: KitBase - id: KitMarksman - description: A crate containing all an NCR Marksman needs to patrol the wasteland. + id: KitNCR_CadetScout + description: A crate containing all an NCR trooper needs to patrol the wasteland. components: - type: Sprite state: marksman @@ -80,21 +87,109 @@ items: - id: N14ClothingOuterNCRVestSnow - id: ClothingBeltNCRBandolier - - id: N14WeaponSniper308LeverRifle - - id: MagazineBox308 + - id: N14WeaponSniper44LeverCarbine + - id: MagazineBox44 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg +# NCRA Soldier Kits + - type: entity - name: pointman kit + name: soldier's rifleman kit parent: KitBase - id: KitPointman - description: A crate containing all an NCR Pointman needs to patrol the wasteland. + id: KitNCR_Rifleman + description: A crate containing all an NCR trooper needs to patrol the wasteland. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestSnow + - id: ClothingBeltNCR + - id: N14WeaponRifle556Service + - id: Magazine556Rifle + amount: 3 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: soldier's stormtrooper kit + parent: KitBase + id: KitNCR_Storm + description: A crate containing all an NCR trooper needs to patrol the wasteland. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: ClothingBeltNCR + - id: N14WeaponRifle556Butchered + - id: Magazine556Rifle + amount: 3 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: soldier's scout kit + parent: KitBase + id: KitNCR_Scout + description: A crate containing all an NCR trooper needs to patrol the wasteland. + components: + - type: Sprite + state: marksman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestSnow + - id: ClothingBeltNCR + - id: N14WeaponSniper44LeverCarbine + - id: MagazineBox44 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: soldier's pointman kit + parent: KitBase + id: KitNCR_Point + description: A crate containing all an NCR trooper needs to patrol the wasteland. components: - type: Sprite state: pointman @@ -102,23 +197,26 @@ size: Huge - type: SpawnItemsOnUse items: - - id: N14ClothingOuterNCRVestSnow + - id: N14ClothingOuterNCRVestWoods - id: ClothingBeltNCRBandolier - id: N14WeaponShotgun - id: MagazineBox12gauge - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: morale booster kit + name: soldier's charger kit parent: KitBase - id: KitMorale - 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. + id: KitNCR_Morale + description: A crate containing all an NCR trooper needs to engage the enemy in glorious melee combat! components: - type: Sprite state: pointman @@ -128,45 +226,60 @@ items: - id: N14ClothingOuterNCRPlateWoods - id: N14ClothingMaskPlate - - id: ClothingBeltNCRPouches + - id: ClothingBeltNCR - id: N14WastelandFlagSpear + - id: N14ClothingHandsGlovesBlackBiker + - id: N14Hatchet - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife + - id: N14Psycho - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadXPill + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg +# NCRA Engineer Kit + - type: entity - name: combat lifesaver kit + name: engineer's mechanic kit parent: KitBase - id: KitMedic - description: A crate containing all an NCR CLS needs to patrol the wasteland. + id: KitNCR_EngiMechanic + description: A crate containing all an NCR engineer needs to perform their job. components: - type: Sprite - state: medic + state: rifleman - type: Item size: Huge - type: SpawnItemsOnUse items: - - id: N14ClothingOuterNCRPouchedVestWoods - - id: ClothingBeltMedicalfilled + - id: N14ClothingOuterNCRPouchedVestSnow + - id: N14ClothingBeltUtilityFilled - id: N14WeaponSMG9mm - id: N14MagazineSMG9mm - amount: 4 - - id: N14CombatKnife - - id: N14ClothingHeadHatNCRHelmetMetalMedic + amount: 3 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14Scrap + - id: SheetGlass10 + - id: MaterialWoodPlank - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg -#MARK: Enginner Kits - type: entity - name: engineer kit + name: engineer's demolition kit parent: KitBase - id: KitEngineer - description: A crate containing all an NCR engineer needs to patrol the wasteland. + id: KitNCR_EngiDemo + description: A crate containing all an NCR engineer needs to perform their job. components: - type: Sprite state: pointman @@ -174,52 +287,257 @@ size: Huge - type: SpawnItemsOnUse items: - - id: N14ClothingOuterNCRVestSnow - - id: N14ClothingBeltUtilityFilled + - id: N14ClothingOuterNCRPouchedVestSnow + - id: ClothingBeltNCR - id: N14WeaponShotgun - id: MagazineBox12gauge + - id: N14ToolboxMechanical + - id: C4 + - id: N14ripper + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: engineer's breacher kit + parent: KitBase + id: KitNCR_EngiBreach + description: A crate containing all an NCR engineer needs to perform their job. + components: + - type: Sprite + state: pointman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: ClothingBeltNCR + - id: N14WeaponShotgunAuto + - id: N14MagazineShotgun12 + amount: 3 + - id: N14ToolboxMechanical - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: SheetSteel10 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg -#MARK: WS Kits -# TODO: Grenadier Kit +# NCRA Medic Kits -#MARK: Special Kits +- type: entity + name: medic's sugeon kit + parent: KitBase + id: KitNCR_MedSurgeon + description: A crate containing all an NCR medic needs to perform their job. + components: + - type: Sprite + state: medic + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterCoatLab + - id: N14ClothingBeltMedicalFilled + - id: N14ClothingHandsGlovesNitrile + - id: N14ClothingHeadHatNCRBeretMedic + - id: N14WeaponSMG9mm + - id: N14MagazineSMG9mm + amount: 3 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14SuperStimpak + - id: Brutepack + - id: Ointment + - id: Bloodpack + - id: N14Antidote + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg - type: entity - name: special rifleman kit + name: medic's field kit parent: KitBase - id: KitSpecialRifleman - description: A crate containing advanced weaponry for high ranking troops and veterans. + id: KitNCR_MedDoctor + description: A crate containing all an NCR medic needs to perform their job. components: - type: Sprite - state: marksman + state: medic - type: Item size: Huge - type: SpawnItemsOnUse items: - - id: N14WeaponRifle308Battle - - id: ClipMagazine308Rifle - amount: 5 + - id: N14ClothingOuterNCRPouchedVestWoods + - id: N14ClothingBeltMedicalFilled + - id: N14ClothingHandsGlovesNitrile + - id: N14ClothingHeadHatNCRBeretMedic + - id: N14WeaponSMG9mm + - id: N14MagazineSMG9mm + amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife + - id: Brutepack + - id: Ointment + - id: Bloodpack + - id: N14Antidote - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + amount: 2 + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: special assault kit + name: medic's combat kit parent: KitBase - id: KitSpecialAssault - description: A crate containing advanced weaponry for high ranking troops and veterans. + id: KitNCR_MedCombat + description: A crate containing all an NCR medic needs to perform their job. + components: + - type: Sprite + state: medic + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: N14ClothingBeltMedicalFilled + - id: N14ClothingHeadHatNCRHelmetMetalMedic + - id: N14WeaponShotgun + - id: MagazineBox12gauge + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14ChemicalSyringeAntidote + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + amount: 2 + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +# NCRA Weapon Specialist Kits + +- type: entity + name: specialist's gunner kit + parent: KitBase + id: KitNCR_WSGunner + description: A crate containing all an NCR weapon specialist needs to perform their job. + components: + - type: Sprite + state: gunner + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestSnow + - id: ClothingBeltNCR + - id: N14ClothingHeadHatNCRHelmetMetalWoods + - id: N14ClothingNeckCloakNCRWoods + - id: N14WeaponLMG + - id: LMGMagazine556Rifle + amount: 3 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: specialist's grenadier kit + parent: KitBase + id: KitNCR_WSGrenadier + description: A crate containing all an NCR weapon specialist needs to perform their job. + components: + - type: Sprite + state: pointman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: ClothingBeltNCR + - id: N14ClothingHeadHatNCRHelmetMetalWoods + - id: N14ClothingNeckCloakNCRSnow + - id: N14WeaponRifleGrenade + - id: 40mmGrenadeFrag + amount: 4 + - id: SmokeGrenade + - id: N14WeaponPistol45Colt + - id: N14MagazinePistol45 + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: specialist's sniper kit + parent: KitBase + id: KitNCR_WSSniper + description: A crate containing all an NCR weapon specialist needs to perform their job. + components: + - type: Sprite + state: pointman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: ClothingBeltNCR + - id: N14ClothingHeadHatNCRBeretRecon + - id: N14ClothingNeckCloakNCRSnow + - id: N14WeaponSniper50NCRRifle + - id: MagazineBox50 + - id: N14WeaponPistol45Colt + - id: N14MagazinePistol45 + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +# NCRA Sergeant Kits + +- type: entity + name: sergeant's assault kit + parent: KitBase + id: KitNCR_SGTRifleman + description: A crate containing all an NCR sergeant needs to patrol the wasteland. components: - type: Sprite state: rifleman @@ -227,45 +545,86 @@ size: Huge - type: SpawnItemsOnUse items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: N14ClothingHeadHatNCRHelmetMetalSnow + - id: ClothingBeltNCR - id: N14WeaponRifle556Carbine - id: LongMagazine556Rifle amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: special gunner kit + name: sergeant's gunner kit parent: KitBase - id: KitSpecialGunner - description: A crate containing advanced weaponry for high ranking troops and veterans. + id: KitNCR_SGTGunner + description: A crate containing all an NCR sergeant needs to patrol the wasteland. components: - type: Sprite - state: marksman + state: gunner - type: Item size: Huge - type: SpawnItemsOnUse items: + - id: N14ClothingOuterNCRPouchedVestWoods + - id: N14ClothingHeadHatNCRHelmetMetalSnow + - id: ClothingBeltNCR - id: N14WeaponLMGAutoRifle - id: Magazine308Rifle amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: sergeant's scout kit + parent: KitBase + id: KitNCR_SGTScout + description: A crate containing all an NCR sergeant needs to patrol the wasteland. + components: + - type: Sprite + state: marksman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPouchedVestSnow + - id: N14ClothingHeadHatNCRBeretRecon + - id: ClothingBeltNCR + - id: N14WeaponRifle308Battle + - id: ClipMagazine308Rifle + amount: 6 + - id: N14WeaponPistol9mm + - id: N14MagazinePistol9mm + amount: 2 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg - type: entity - name: special pointman kit + name: sergeant's pointman kit parent: KitBase - id: KitSpecialPointman - description: A crate containing advanced weaponry for high ranking troops and veterans. + id: KitNCR_SGTPoint + description: A crate containing all an NCR sergeant needs to patrol the wasteland. components: - type: Sprite state: pointman @@ -273,18 +632,107 @@ size: Huge - type: SpawnItemsOnUse items: - - id: N14WeaponShotgunRiot - - id: N14MagazineShotgun20 + - id: N14ClothingOuterNCRPouchedVestWoods + - id: N14ClothingHeadHatNCRHelmetMetalWoods + - id: ClothingBeltNCR + - id: N14WeaponShotgunAuto + - id: N14MagazineShotgun12 amount: 3 - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 - - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +# NCRA Lieutenant Kits + +- type: entity + name: lieutenant's basic kit + parent: KitBase + id: KitNCR_LTPencil + description: A crate containing all an NCR lieutenant needs to administrate their troops. + components: + - type: Sprite + state: medic + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRTrenchCoat + - id: ClothingBeltRevolverCaptainfilled + - id: N14WeaponSniper44LeverCarbine + - id: MagazineBox44 + - id: LuxuryPen + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14SuperStimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: lieutenant's scout kit + parent: KitBase + id: KitNCR_LTScout + description: A crate containing all an NCR lieutenant needs to administrate their troops. + components: + - type: Sprite + state: medic + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRTrenchCoat + - id: ClothingBeltRevolverfilled + - id: N14WeaponRifle308Battle + - id: ClipMagazine308Rifle + amount: 6 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14SuperStimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: lieutenant's tactical kit + parent: KitBase + id: KitNCR_LTTactical + description: A crate containing all an NCR lieutenant needs to administrate their troops. + components: + - type: Sprite + state: medic + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRCombatArmor + - id: ClothingBeltRevolverfilled + - id: N14WeaponRifle556Carbine + - id: LongMagazine556Rifle + amount: 3 + - id: N14BoxCardboardMREBoxCFilled + - id: N14Stimpak + - id: N14SuperStimpak + - id: N14RadAwayBloodbag + - id: N14Bandage + amount: 2 + - id: N14Flare sound: path: /Audio/Effects/unwrap.ogg -#MARK: Ranger Kits +#MARK: NCR Ranger Kits - type: entity name: ranger service kit diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 1c522e1e1ed..1ef27434190 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -899,16 +899,19 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun - minAngle: 20 - maxAngle: 49 - angleIncrease: 4 + minAngle: 26 + maxAngle: 50 + angleIncrease: 6 angleDecay: 16 fireRate: 4 soundGunshot: collection: N14ServiceGunshot - selectedMode: SemiAuto + selectedMode: FullAuto availableModes: - - SemiAuto + - FullAuto + - type: GunWieldBonus + minAngle: -23 + maxAngle: -40 - type: ItemSlots slots: gun_magazine: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml index 5818a118725..63508ad876e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/longblades.yml @@ -101,8 +101,8 @@ - type: DamageOtherOnHit damage: types: - Slash: 15 - Pierce: 15 + Slash: 18 + Pierce: 9 - type: Sharp - type: MeleeWeapon autoAttack: true @@ -111,9 +111,9 @@ attackRate: 4 damage: types: - Slash: 3 + Slash: 6 Piercing: 3 - Structural: 4 + Structural: 8 soundHit: path: /Audio/Weapons/chainsaw.ogg soundSwing: diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml index 6b5416d0ac3..96419393409 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml @@ -31,8 +31,8 @@ head: N14ClothingHeadHatNCRSidecap back: N14ClothingBackpackNCRFilled jumpsuit: N14ClothingUniformNCRSnow - shoes: N14ClothingBootsLeather - pocket1: NCRtrooperloadoutkits + shoes: N14ClothingBootsLeatherFilled + pocket1: NCRcadetloadoutkits id: N14IDNCRDogtag innerClothingSkirt: N14ClothingUniformNCRSnow #placeholder satchel: N14ClothingBackpackSatchelNCRFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_engineer.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_engineer.yml index 5dddbbc1cf1..2ad02de8d01 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_engineer.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_engineer.yml @@ -32,7 +32,8 @@ head: N14ClothingHeadHatNCRHelmetMetalSnow back: N14ClothingBackpackNCRFilled jumpsuit: N14ClothingUniformNCRSnow - shoes: N14ClothingBootsLeather + shoes: N14ClothingBootsLeatherFilled + gloves: N14ClothingHandsGlovesCombat id: N14IDNCRDogtagEngineer pocket1: NCRengineerloadoutkits innerClothingSkirt: N14ClothingUniformNCRSnow #placeholder diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml index 8377ddd54c1..240c7535481 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_lt.yml @@ -37,11 +37,10 @@ head: N14ClothingHeadHatNCRBeretOfficer back: N14ClothingBackpackNCRFilled jumpsuit: N14ClothingOfficerUniformNCRSnow - shoes: N14ClothingBootsLeather - belt: ClothingBeltRevolverCaptainfilled - outerClothing: N14ClothingOuterNCRTrenchCoat + shoes: N14ClothingBootsCombatFilled eyes: ClothingEyesGlassesSunglasses - pocket1: NCRSGTloadoutkits + ears: N14ClothingHeadsetNCR + pocket1: NCRLTloadoutkits pocket2: RadioHandheld id: N14IDNCRDogtagOfficer innerClothingSkirt: N14ClothingOfficerUniformNCRSnow #placeholder diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml index 3f97220b140..42cea79ed52 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_medic.yml @@ -31,17 +31,12 @@ - type: startingGear id: NCRMedicGear equipment: - jumpsuit: N14ClothingOfficerUniformNCRSnow + jumpsuit: N14ClothingUniformNCRSnow back: N14ClothingBackpackNCRFilled - head: N14ClothingHeadHatNCRBeretMedic - shoes: N14ClothingShoesBlack - gloves: N14ClothingHandsGlovesNitrile - belt: ClothingBeltMedicalfilled + shoes: N14ClothingBootsLeatherFilled id: N14IDNCRDogtagDoctor - pocket1: N14WeaponPistol9mm - pocket2: NCRtrooperloadoutkits - outerClothing: N14ClothingOuterCoatLab - innerClothingSkirt: N14ClothingOfficerUniformNCRSnow + pocket2: NCRmedicloadoutkits + innerClothingSkirt: N14ClothingUniformNCRSnow satchel: N14ClothingBackpackSatchelNCRFilled - type: playTimeTracker diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml index 2680f49c101..5ea3957e127 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_sgt.yml @@ -30,13 +30,11 @@ - type: startingGear id: NCRSGTGear equipment: - head: N14ClothingHeadHatNCRHelmetMetalSnow back: N14ClothingBackpackNCRFilled + gloves: N14ClothingHandsGlovesCombat jumpsuit: N14ClothingOfficerUniformNCRSnow - shoes: N14ClothingBootsLeather + shoes: N14ClothingBootsCombatFilled neck: N14ClothingNeckMantleNCR - belt: ClothingBeltNCR - outerClothing: N14ClothingOuterNCRVestSnow pocket1: NCRSGTloadoutkits pocket2: RadioHandheld id: N14IDNCRDogtagNCO diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml index ec0cfd3f554..8e2f7475ee8 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml @@ -32,7 +32,7 @@ head: N14ClothingHeadHatNCRHelmetMetalSnow back: N14ClothingBackpackNCRFilled jumpsuit: N14ClothingUniformNCRSnow - shoes: N14ClothingBootsLeather + shoes: N14ClothingBootsLeatherFilled id: N14IDNCRDogtag pocket1: NCRtrooperloadoutkits innerClothingSkirt: N14ClothingUniformNCRSnow #placeholder diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml index ca0af8aad32..5566bea33e1 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/ncr_ws.yml @@ -29,10 +29,9 @@ - type: startingGear id: NCRWSGear equipment: - head: N14ClothingHeadHatNCRHelmetMetalSnow back: N14ClothingBackpackNCRFilled jumpsuit: N14ClothingUniformNCRSnow - shoes: N14ClothingBootsLeather + shoes: N14ClothingBootsLeatherFilled pocket1: NCRwsloadoutkits id: N14IDNCRDogtagWS innerClothingSkirt: N14ClothingUniformNCRSnow #placeholder diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..5ae7b3d675c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/icon.png new file mode 100644 index 00000000000..1623aa0d4c4 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-left.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-left.png new file mode 100644 index 00000000000..f6be74c011d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-right.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-right.png new file mode 100644 index 00000000000..037fd646617 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/meta.json new file mode 100644 index 00000000000..2ac782c0b5e --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/falloutNCRwebvest3.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Kitbashed by TheDoktorZ for Nuclear 14 using assets of PatoGrone (who also made them for N14)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}