Merge pull request #8315 from Trilbyspaceclone/patch-115

Maybe fixes laser carbine sprites

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
@@ -50,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"

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