From 2f752f2e5946a749b7c3a52661aa31e446a09288 Mon Sep 17 00:00:00 2001 From: ToastEnjoyer Date: Mon, 25 Aug 2025 19:44:01 -0500 Subject: [PATCH] Fixed pacified people using the laser carbine (#39891) --- .../Weapons/Guns/Battery/battery_guns.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 b535c62d11..3b034eafbb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -215,10 +215,10 @@ - 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 @@ -242,23 +242,23 @@ 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 -- 2.51.2