diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml new file mode 100644 index 00000000000..201acd04d93 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml @@ -0,0 +1,27 @@ +- type: entity + noSpawn: true + parent: ClothingBeltRevolver + id: ClothingBeltRevolverfilled + components: + - type: StorageFill + contents: + - id: N14WeaponRevolverMagnun + - id: SpeedLoader44 + - id: SpeedLoader44 + - id: SpeedLoader44 + +- type: entity + noSpawn: true + parent: ClothingBeltNCRHarness + id: ClothingBeltNCRHarnessfilled + components: + - type: StorageFill + contents: + - id: N14ChemicalSyringeAntidote + - id: N14ChemicalSyringeAntidote + - id: N14DoctorSyringe + - id: N14Stimpak + - id: N14Stimpak + - id: N14Stimpak + - id: N14Stimpak + - id: N14RadXCanister diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml index 3715707b82e..7b0f099b687 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml @@ -144,12 +144,12 @@ parent: ClothingHeadBase id: N14ClothingHeadHatBrotherhoodFieldCap name: brotherhood of steel field cap - description: A cap worn by scribes of the Brotherhood of Steel during their field duties. + description: A cap worn by paladins of the midwest BoS during their field duties. components: - type: Sprite - sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi + sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi - type: Clothing - sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi + sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi # Enclave - type: entity diff --git a/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml index af25ba32dec..07a283d8b0a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml @@ -207,6 +207,18 @@ layers: - state: green - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointNCRRanger + parent: N14SpawnPointWastelander + name: NCR ranger + components: + - type: SpawnPoint + job_id: NCRRanger + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons - type: entity id: N14SpawnPointNCRSoldier diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml index 2dbe0f55c0a..9756d6b2140 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml @@ -117,6 +117,30 @@ sound: path: /Audio/Effects/unwrap.ogg +- type: entity + name: morale booster 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. + components: + - type: Sprite + state: pointman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPlate + - id: N14ClothingMaskPlate + - id: ClothingBeltNCRPouches + - id: N14WastelandFlagSpear + - id: N14ClothingBackpackSatchelNCR + - id: N14WeaponPistolColt + - id: N14MagazinePistol45 + - id: N14MagazinePistol45 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + - type: entity name: medic kit parent: KitBase @@ -130,7 +154,7 @@ - type: SpawnItemsOnUse items: - id: N14ClothingOuterNCRPouchedVest - - id: ClothingBeltNCRHarness + - id: ClothingBeltNCRHarnessfilled - id: N14ClothingBackpackSatchelNCR - id: N14weapon9mmSMG - id: N14MagazineSMG9mm diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 36ce9cf5bd7..9be5568f41a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -33,7 +33,7 @@ proto: N14CartridgePistol10 - type: entity - name: Magnum revolver + name: magnum revolver parent: BaseWeaponRevolver id: N14WeaponRevolverMagnun description: The Big Iron. Uses .44 magnum ammo. diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 3cc95931081..dd23b98bb29 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -192,6 +192,7 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item + size: Ginormous sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi - type: Wieldable - type: GunWieldBonus diff --git a/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml index 24e7ffb0f62..b218c7f43ad 100644 --- a/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml +++ b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml @@ -13,6 +13,22 @@ - Survivor items: - KitRifleman + +- type: loadout + id: LoadoutNCRKitMorale + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitMorale - type: loadout id: LoadoutNCRKitGunner @@ -132,4 +148,4 @@ - NCROfficer - Survivor items: - - KitSpecialPointman \ No newline at end of file + - KitSpecialPointman diff --git a/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml new file mode 100644 index 00000000000..24c9c7ed53b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -0,0 +1,148 @@ +- type: loadout + id: LoadoutNCRRangerArmor + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingOuterRangerVest + +- type: loadout + id: LoadoutNCRRangerArmorV2 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingOuterRangerArmor + +- type: loadout + id: LoadoutNCRRangerGun1 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14Weapon50NcrRifle + - MagazineBox50 + +- type: loadout + id: LoadoutNCRRangerGun2 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14WeaponCarbine + - LongMagazine5.56Rifle + - LongMagazine5.56Rifle + +- type: loadout + id: LoadoutNCRRangerGun3 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14WeaponLeverRifle + - MagazineBox308 + +- type: loadout + id: LoadoutNCR5.56 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - LongMagazine5.56Rifle + - LongMagazine5.56Rifle + +- type: loadout + id: LoadoutNCR50 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - MagazineBox50 + +- type: loadout + id: LoadoutNCR308 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - MagazineBox308 + +- type: loadout + id: LoadoutNCRmask1 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - ClothingMaskGasRiot + +- type: loadout + id: LoadoutNCRmask2 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - ClothingMaskGasCombat + +- type: loadout + id: LoadoutNCRhelmet + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingHeadHatRangerHelmet + +- type: loadout + id: LoadoutNCRhat + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingHeadHatRanger diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index e7ff0f63820..b64e2873594 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidKnight setPreference: true - name: job-name-bos-mid-knight - description: job-description-bos-mid-knight + name: Midwest knight + description: follow the paladins orders and fight for the brotherhood. playTimeTracker: BoSMidKnight startingGear: BoSMidKnight icon: "JobIconPassenger" @@ -20,7 +20,6 @@ outerClothing: N14ClothingOuterMidwestArmorMK2 hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml index 1a168fa0266..70b301521ee 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidPaladinCommander setPreference: true - name: job-name-bos-mid-paladin-comm - description: job-description-bos-mid-paladin-comm + name: Midwest paladin commander + description: Lead the midwest exploration team, follow the objetives and take decisions to take control over the wasteland. playTimeTracker: BoSMidPaladinCommander startingGear: BoSMidPaladinCommGear icon: "JobIconPassenger" @@ -18,7 +18,7 @@ shoes: N14ClothingBootsCombat hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSMidwest belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml index 7b8b3cfaf00..4f627841d2a 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidPaladin setPreference: true - name: job-name-bos-mid-paladin-comm - description: job-description-bos-mid-paladin + name: Midwest paladin + description: lead the knights and squired during the mission, follow the paladin commander directions and fight for the brotherhood. playTimeTracker: BoSMidPaladin startingGear: BoSMidPaladinGear icon: "JobIconPassenger" @@ -16,9 +16,11 @@ jumpsuit: N14ClothingUniformBosRecon back: N14ClothingBackpackMilitary shoes: N14ClothingBootsCombat + head: N14ClothingHeadHatBrotherhoodFieldCap + outerClothing: N14ClothingOuterMidwestArmorMK2 hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSMidwest #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml index 51bd8dc600b..13f25afacc2 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidScribe setPreference: true - name: job-name-bos-mid-scribe - description: job-description-bos-mid-scribe + name: Midwest scribe + description: Maintain equipment and support the knights and paladins in their mission. playTimeTracker: BoSMidScribe startingGear: BoSMidScribeGear icon: "JobIconPassenger" @@ -19,7 +19,7 @@ shoes: N14ClothingBootsCombat outerClothing: N14ClothingOuterMidwestBoSCoat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetScience #placeholder + ears: N14ClothingHeadsetBOSMidwest belt: N14ClothingBeltUtilityFilled - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index 444cabc58ea..25b80d747bb 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidSquire setPreference: true - name: job-name-bos-mid-squire - description: job-description-bos-mid-squire + name: Midwest squire + description: Follow orders and become the hardened steel the brotherhood wants you to be. playTimeTracker: BoSMidSquire startingGear: BoSMidSquire icon: "JobIconPassenger" @@ -19,7 +19,6 @@ head: N14ClothingHeadHatBrotherhoodMidwestHelmet outerClothing: N14ClothingOuterMidwestArmor id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml index a5555ecd1e9..f1251df3f5e 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonCaptain setPreference: true - name: job-name-bos-washington-captain - description: job-description-bos-washington-captain + name: Washington captain + description: lead the washington troops and make sure the objetives are accomplished, keep on line the troops. playTimeTracker: BoSWashingtonCaptain startingGear: BoSWashingtonCaptainGear icon: "JobIconPassenger" @@ -23,7 +23,7 @@ head: N14ClothingHeadHatBrotherhoodCap outerClothing: N14ClothingOuterCombatArmorBOSMK2 id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSWashington belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml index a6e798de66d..5b4d2b19933 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonCommander setPreference: true - name: job-name-bos-washington-commander - description: job-description-bos-washington-commander + name: Washington commander + description: You have a job to do, complete the mission no matter how much it costs, no matter how much blood needs to be spilled. playTimeTracker: BoSWashingtonCommander weight: 10 startingGear: BoSWashingtonCommanderGear @@ -22,7 +22,7 @@ neck: ClothingNeckCloakBrotherhoodWashington head: N14ClothingHeadHatBrotherhoodBeret id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetAltSecurity #placeholder + ears: N14ClothingHeadsetBOSWashington belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml index 6a9fc8ce45e..40cc92faa18 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonRecruit setPreference: true - name: job-name-bos-washington-recruit - description: job-description-bos-washington-recruit + name: Washington recruit + description: Follow orders and climb the ranks for better a better life, theres no other choice. playTimeTracker: BoSWashingtonRecruit startingGear: BoSWashingtonRecruitGear icon: "JobIconPassenger" @@ -19,7 +19,6 @@ shoes: N14ClothingBootsCombat id: N14IDBrotherhoodHolotag outerClothing: N14ClothingOuterCombatArmorBOS - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml index cc278fb3f4e..50b52be60c8 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonResearcher setPreference: true - name: job-name-bos-washington-researcher - description: job-description-bos-washington-researcher + name: Washington researcher + description: Support the troops and maintain the gear, make sure to stay 10 steps far from the savages of the wasteland. playTimeTracker: BoSWashingtonResearcher startingGear: BoSWashingtonResearcherGear icon: "JobIconScientist" @@ -20,7 +20,7 @@ shoes: N14ClothingBootsCombat outerClothing: N14ClothingOuterBosScribe id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetScience #placeholder + ears: N14ClothingHeadsetBOSWashington belt: N14ClothingBeltUtilityFilled - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml index 84171ad1f87..c796797c761 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonSoldier setPreference: true - name: job-name-bos-washington-soldier - description: job-description-bos-washington-soldier + name: Washington soldier + description: Follow your captain orders, no matter how much death they will cause, you follow orders. playTimeTracker: BoSWashingtonSoldier startingGear: BoSWashingtonSoldierGear icon: "JobIconPassenger" @@ -22,7 +22,6 @@ head: N14ClothingHeadHatBrotherhoodHelmet outerClothing: N14ClothingOuterCombatArmorBOSMK2 id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml index 0ccc363db79..ede19db52ee 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml @@ -1,8 +1,8 @@ - type: job id: NCRCadet setPreference: true - name: job-name-ncr-cadet - description: job-description-ncr-cadet + name: NCR cadet + description: Show your officers that youre ready to become a private of the NCR army. playTimeTracker: NCRCadet startingGear: NCRCadetGear icon: "JobIconSecurityCadet" @@ -18,7 +18,6 @@ jumpsuit: N14ClothingUniformNCR shoes: N14ClothingBootsLeather id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml index 588473f9647..b7789746e05 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml @@ -24,7 +24,6 @@ eyes: ClothingEyesGlassesSunglasses outerClothing: N14ClothingOuterNCRVest id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml index b8eb5720ecb..12245633644 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml @@ -20,7 +20,6 @@ shoes: N14ClothingBootsLeather eyes: ClothingEyesGlassesSunglasses id: N14IDNCRDogtag - ears: ClothingHeadsetAltSecurity #placeholder innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml index e2c20f5e527..1e73a6211a4 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml @@ -1,8 +1,8 @@ - type: job id: NCRSoldier setPreference: true - name: job-name-ncr-soldier - description: job-description-ncr-soldier + name: NCR soldier + description: Follow orders and fight for the republic. playTimeTracker: NCRSoldier startingGear: NCRSoldierGear icon: "JobIconWarden" @@ -17,9 +17,8 @@ equipment: head: N14ClothingHeadHatNCRHelmetMetal jumpsuit: N14ClothingUniformNCR - shoes: ClothingShoesBootsJack + shoes: N14ClothingBootsLeather id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml new file mode 100644 index 00000000000..656b8faac74 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml @@ -0,0 +1,26 @@ +- type: job + id: NCRRanger + setPreference: true + name: republic ranger + description: the most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic. + playTimeTracker: NCRRanger + weight: 10 + startingGear: NCRRangerGear + icon: "JobIconHeadOfSecurity" + requireAdminNotify: true + canBeAntag: false + accessGroups: + - NCR + +- type: startingGear + id: NCRRangerGear + equipment: + jumpsuit: N14ClothingUniformRangerV3 + shoes: N14ClothingBootsCombat + belt: ClothingBeltRevolverfilled + id: N14IDBadgeNCRDesertRanger + back: N14ClothingBackpackMilitaryFilled + innerClothingSkirt: N14ClothingUniformRangerV3 #placeholder + +- type: playTimeTracker + id: NCRRanger diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/equipped-HELMET.png rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/icon.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/icon.png rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/icon.png diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/meta.json rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/meta.json