diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 5dba7d27f1..7ec4651dc8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -11,11 +11,19 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: GunWieldBonus + minAngle: -20 + maxAngle: -50 - type: Gun - fireRate: 2 + minAngle: 21 + maxAngle: 54 + angleIncrease: 6 + angleDecay: 24 + fireRate: 6 selectedMode: SemiAuto availableModes: - SemiAuto + - Burst - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index d37555c344..0cc9588b60 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -1,3 +1,4 @@ +# pretty sure this is unused lmao - type: entity id: BulletHeavyRifle name: bullet (.20 rifle) @@ -8,7 +9,7 @@ damage: types: Piercing: 19 - +# least minigun still exists - type: entity id: BulletMinigun name: minigun bullet (.10 rifle) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 7e0a19c448..60028646a3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -1,17 +1,18 @@ +# Used by the Vulcan, L6SAW, Mark 1, Ceremonial Mark 1, and the AKMS. Basically just all .30 rifles. - type: entity id: BulletLightRifle - name: bullet (.20 rifle) + name: bullet (.30 rifle) parent: BaseBullet categories: [ HideSpawnMenu ] components: - type: Projectile damage: types: - Piercing: 19 + Piercing: 24 - type: entity id: BulletLightRiflePractice - name: bullet (.20 rifle practice) + name: bullet (.30 rifle practice) parent: BaseBulletPractice categories: [ HideSpawnMenu ] components: @@ -22,7 +23,7 @@ - type: entity id: BulletLightRifleRubber - name: bullet (.20 rifle rubber) + name: bullet (.30 rifle rubber) parent: BaseBulletRubber categories: [ HideSpawnMenu ] components: @@ -40,8 +41,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 16 + Blunt: 5 + Heat: 19 - type: entity id: BulletLightRifleUranium @@ -52,5 +53,6 @@ - type: Projectile damage: types: - Radiation: 9 - Piercing: 10 + Radiation: 10 + Piercing: 5 + ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 3e1d49ddc0..d799976760 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 17 + Piercing: 24 - type: entity id: BulletRiflePractice @@ -40,9 +40,9 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 15 - + Blunt: 4 + Heat: 20 + - type: entity id: BulletRifleUranium parent: BaseBulletUranium @@ -52,6 +52,6 @@ - type: Projectile damage: types: - Radiation: 7 - Piercing: 8 - + Radiation: 10 + Piercing: 5 + ignoreResistances: true