]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixed pacified people using the laser carbine (#39891)
authorToastEnjoyer <masondoesgamingyes@gmail.com>
Tue, 26 Aug 2025 00:44:01 +0000 (19:44 -0500)
committerGitHub <noreply@github.com>
Tue, 26 Aug 2025 00:44:01 +0000 (17:44 -0700)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

index b535c62d116f55ac94d1859d73e9510d09b4bb0e..3b034eafbbf528878f2b76a4eef15c70cefabe0e 100644 (file)
   - type: Appearance
 
 - type: entity
-  name: practice laser carbine
+  name: laser carbine
   parent: [BaseWeaponBattery, BaseGunWieldable]
-  id: WeaponLaserCarbinePractice
-  description: This modified laser carbine fires nearly harmless beams in the 40-watt range, for target practice.
+  id: WeaponLaserCarbine
+  description: Favoured by Nanotrasen Security for being cheap and easy to use.
   components:
   - type: Item
     size: Large
     availableModes:
     - SemiAuto
   - type: HitscanBatteryAmmoProvider
-    proto: RedLaserPractice
+    proto: RedLaser
     fireCost: 62.5
   - type: StaticPrice
-    price: 300
-  - type: PacifismAllowedGun
+    price: 420
 
 - type: entity
-  name: laser carbine
-  parent: [WeaponLaserCarbinePractice, BaseGunWieldable, BaseSecurityContraband]
-  id: WeaponLaserCarbine
-  description: Favoured by Nanotrasen Security for being cheap and easy to use.
+  name: practice laser carbine
+  parent: [WeaponLaserCarbine, BaseGunWieldable]
+  id: WeaponLaserCarbinePractice
+  description: This modified laser carbine fires nearly harmless beams in the 40-watt range, for target practice.
   components:
   - type: StaticPrice
-    price: 420
+    price: 300
   - type: HitscanBatteryAmmoProvider
-    proto: RedLaser
+    proto: RedLaserPractice
     fireCost: 62.5
+  - type: PacifismAllowedGun
 
 - type: entity
   name: pulse pistol