From fd251d3dd2ce7b39193f276d8eaacd0bfcfb6ed0 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 1 May 2019 15:15:29 -0400
Subject: [PATCH 1/3] Update laser.dm

---
 code/modules/projectiles/guns/energy/laser.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 4e97d0a9b3..a5e2cb6651 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -42,6 +42,7 @@
 /obj/item/gun/energy/laser/carbine
 	name = "laser carbine"
 	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun."
+	icon = 'icons/obj/guns/energy.dmi'
 	icon_state = "lasernew"
 	item_state = "laser"
 	force = 10

From 150db880def14cbf647e165813ae6227ff6808e0 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 1 May 2019 16:07:11 -0400
Subject: [PATCH 2/3] Update laser.dm

---
 code/modules/projectiles/guns/energy/laser.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index a5e2cb6651..cd0dd53d48 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -51,6 +51,9 @@
 	cell_type = /obj/item/stock_parts/cell/lascarbine
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
+/obj/item/gun/energy/laser/carbine/nopin
+	pin = null
+
 /obj/item/gun/energy/laser/captain/scattershot
 	name = "scatter shot laser rifle"
 	icon_state = "lasercannon"

From 831e450b3f09097a9b409976ebd35bc1001d8023 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Wed, 1 May 2019 16:08:17 -0400
Subject: [PATCH 3/3] Update weapon_designs.dm

---
 code/modules/research/designs/weapon_designs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 4e31fe50a9..03c0582245 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -145,7 +145,7 @@
 	id = "lasercarbine"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 15000, MAT_GLASS = 10000, MAT_GOLD = 2500, MAT_SILVER = 2500)
-	build_path = /obj/item/gun/energy/laser/carbine
+	build_path = /obj/item/gun/energy/laser/carbine/nopin
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY