]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Make practice projectiles consistent in damage (#26731)
authorDae <60460608+ZeroDayDaemon@users.noreply.github.com>
Fri, 5 Apr 2024 03:15:01 +0000 (23:15 -0400)
committerGitHub <noreply@github.com>
Fri, 5 Apr 2024 03:15:01 +0000 (23:15 -0400)
* Make practice weapon damage consistent to 1

* Add book reference to description

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

index c4736ad356f2d11c04fab0f5b1a17fa4ec1147be..529e883638b2471abbde53ce38ab26611c0d8a2a 100644 (file)
   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
   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
index 99c4a7bdf21f2cc85f359e583963fa7f462f1c04..3f37d308db53baa73b01a98197b9c523e70974a2 100644 (file)
@@ -35,7 +35,7 @@
   id: RedLaserPractice
   damage:
     types:
-      Heat: 0
+      Heat: 1
   muzzleFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: muzzle_laser
index a28d527535f6da5c5fc7ce070665447a2bd0755b..91fdaa648112fa62ed2d729b86e20f8549d70d5c 100644 (file)
   - type: Projectile
     damage:
       types:
-        Blunt: 2
+        Blunt: 1
 
 - type: entity
   id: BaseBulletRubber
       fly-by: *flybyfixture
   - type: Ammo
   - type: StaminaDamageOnCollide
-    damage: 5
+    damage: 1
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
         shader: unshaded
   - type: AnomalousParticle
     particleType: Sigma
-    
+
 - type: entity
   parent: AnomalousParticleSigma
   id: AnomalousParticleSigmaStrong
   components:
   - type: AnomalousParticle
     particleType: Sigma
-    
+
 # Launcher projectiles (grenade / rocket)
 - type: entity
   id: BulletRocket