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 1fad62ec963..74a616bed85 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -55,6 +55,8 @@ id: N14WeaponRevolverCaptainMagnun description: A true freedom fighter carries his flag everywhere, even on his gun. Uses .44 magnum ammo. components: + - type: Gun + fireRate: 2 - type: Sprite sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi - type: Clothing @@ -89,6 +91,8 @@ id: N14Weaponwildwhisper description: Its said that after a troublemaker get shoot down with this revolver some words are whispered to their ears, no one knows what the question is, but the awnser is always "innocent". Uses .45-70 gov't ammo. components: + - type: Gun + fireRate: 2 - type: Sprite sprite: _Nuclear14/Objects/Weapons/Guns/Revolvers/wild_whisper.rsi - type: Clothing 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 1b7fa268df0..a9570d28dda 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -27,7 +27,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - type: ItemSlots @@ -85,9 +85,9 @@ maxAngle: -38 - type: Gun minAngle: 24 - maxAngle: 45 + maxAngle: 50 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg @@ -144,7 +144,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg selectedMode: FullAuto @@ -204,7 +204,7 @@ minAngle: 24 maxAngle: 45 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg fireRate: 5 @@ -259,10 +259,10 @@ minAngle: -21 maxAngle: -43 - type: Gun - minAngle: 24 - maxAngle: 45 + minAngle: 18 + maxAngle: 40 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg @@ -316,13 +316,13 @@ autoEject: true - type: Wieldable - type: GunWieldBonus - minAngle: -22 - maxAngle: -59 + minAngle: -23 + maxAngle: -56 - type: Gun minAngle: 24 maxAngle: 60 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 2 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg @@ -375,12 +375,12 @@ - type: Wieldable - type: GunWieldBonus minAngle: -21 - maxAngle: -43 + maxAngle: -40 - type: Gun minAngle: 24 - maxAngle: 45 + maxAngle: 48 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 fireRate: 4 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index ae86072001d..37cfc2a9e6a 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,15 +20,15 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi - type: Gun - fireRate: 10 + fireRate: 9 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg selectedMode: Fullauto availableModes: - Fullauto minAngle: 8 - maxAngle: 16 - angleIncrease: 4 + maxAngle: 48 + angleIncrease: 6 angleDecay: 16 - type: Wieldable - type: GunWieldBonus @@ -82,7 +82,7 @@ availableModes: - FullAuto minAngle: 12 - maxAngle: 24 + maxAngle: 40 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -142,7 +142,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 56 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -202,7 +202,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 56 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -317,7 +317,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 24 angleIncrease: 4 angleDecay: 16 - type: Wieldable @@ -374,7 +374,7 @@ availableModes: - Fullauto minAngle: 8 - maxAngle: 16 + maxAngle: 30 angleIncrease: 4 angleDecay: 16 - type: Wieldable diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 4249141d511..fd465f15514 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -18,13 +18,15 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge308Rifle capacity: 10 proto: N14Cartridge308Rifle + - type: Gun + fireRate: 2 - type: entity name: Anti-Materiel rifle @@ -51,9 +53,11 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 + - type: Gun + fireRate: 1.2 - type: entity - name: .50 NCR rifle + name: .50 NCR rifle parent: N14WeaponAntiMateriel id: N14Weapon50NcrRifle description: A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. @@ -89,8 +93,8 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 - fireRate: 1 + angleDecay: 16 + fireRate: 2 - type: BallisticAmmoProvider whitelist: tags: @@ -111,7 +115,7 @@ - type: Item sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Gun - fireRate: 1 + fireRate: 1.2 - type: entity name: brush gun @@ -150,7 +154,7 @@ tags: - N14Cartridge308Rifle capacity: 1 - proto: N14Cartridge308Rifle + proto: N14Cartridge308Rifle - type: entity name: varmint rifle @@ -172,10 +176,12 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 - type: BallisticAmmoProvider whitelist: tags: - N14Cartridge5.56Rifle capacity: 15 proto: N14Cartridge5.56Rifle + - type: Gun + fireRate: 2 diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml index b07a1b1e3ef..84643b6c106 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml @@ -4,6 +4,7 @@ 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 + setPreference: false requirements: - !type:DepartmentTimeRequirement department: NCR diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml index 9313c7dcd65..3038b29d073 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger_veteran.yml @@ -4,6 +4,7 @@ name: Republic Ranger Veteran 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: NCRRangerVeteran + setPreference: false requirements: - !type:DepartmentTimeRequirement department: NCR