From ec7ca3bdeaee166c7f43c4729f80fd9fa06745f4 Mon Sep 17 00:00:00 2001
From: ToastEnjoyer <masondoesgamingyes@gmail.com>
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     | 31 ++++++++++---------
 .../Weapons/Guns/Battery/emergencylaser.yml   |  2 +-
 2 files changed, 18 insertions(+), 15 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 d3c73834d6..ca3866f4bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -227,10 +227,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
@@ -257,20 +257,23 @@
     proto: RedLaserPractice
     fireCost: 50 #Delta-V was 62.5
   - type: StaticPrice
-    price: 300
-  - type: PacifismAllowedGun
-
-- type: entity
-  name: laser carbine
-  parent: [WeaponLaserCarbinePractice, BaseGunWieldable, BaseSecurityContraband]
-  id: WeaponLaserCarbine
-  description: Favoured by Nanotrasen Security for being cheap and easy to use.
-  components:
+    price: 420
+    proto: RedLaser
+    fireCost: 62.5
   - type: StaticPrice
     price: 420
+
+- type: entity
+  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: 300
   - type: HitscanBatteryAmmoProvider
-    proto: RedLaser
-    fireCost: 50 #Delta-V was 62.5
+    proto: RedLaserPractice
+    fireCost: 62.5
 
 - type: entity
   name: pulse pistol
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml
index 2c154bb234..97ce3c16f6 100644
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml
@@ -13,7 +13,7 @@
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: StaticPrice
-    price: 420
+    price: 300
   - type: HitscanBatteryAmmoProvider
     proto: EmergencyRedLaser
     fireCost: 50