From: Dae <60460608+ZeroDayDaemon@users.noreply.github.com> Date: Fri, 5 Apr 2024 03:15:01 +0000 (-0400) Subject: Make practice projectiles consistent in damage (#26731) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=77c4e40fc6523f3f8944966af2c94932f9cff8c9;p=space-station-14.git Make practice projectiles consistent in damage (#26731) * Make practice weapon damage consistent to 1 * Add book reference to description --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index c4736ad356..529e883638 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -228,7 +228,7 @@ name: practice laser rifle parent: WeaponLaserCarbine id: WeaponLaserCarbinePractice - description: This modified laser rifle fires harmless beams in the 40-watt range, for target practice. + description: This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice. components: - type: HitscanBatteryAmmoProvider proto: RedLaserPractice @@ -488,7 +488,7 @@ name: practice disabler parent: WeaponDisabler id: WeaponDisablerPractice - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets. + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/practice_disabler.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 99c4a7bdf2..3f37d308db 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -35,7 +35,7 @@ id: RedLaserPractice damage: types: - Heat: 0 + Heat: 1 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_laser diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index a28d527535..91fdaa6481 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -102,7 +102,7 @@ - type: Projectile damage: types: - Blunt: 2 + Blunt: 1 - type: entity id: BaseBulletRubber @@ -288,7 +288,7 @@ fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide - damage: 5 + damage: 1 - type: Projectile impactEffect: BulletImpactEffectDisabler damage: @@ -641,7 +641,7 @@ shader: unshaded - type: AnomalousParticle particleType: Sigma - + - type: entity parent: AnomalousParticleSigma id: AnomalousParticleSigmaStrong @@ -650,7 +650,7 @@ components: - type: AnomalousParticle particleType: Sigma - + # Launcher projectiles (grenade / rocket) - type: entity id: BulletRocket