Separating captain's laser and old retro laser types.

Author: MistakeNot4892

code/datums/supplypacks/science.dm

@@ -43,7 +43,7 @@
 					/obj/item/clothing/gloves/thick,
 					/obj/item/clothing/shoes/color/black,
 					/obj/item/scanner/gas,
-					/obj/item/ore,
+					/obj/item/ore_satchel,
 					/obj/item/flashlight/lantern,
 					/obj/item/tool/shovel,
 					/obj/item/tool/pickaxe,

code/game/machinery/portable_turret.dm

@@ -95,7 +95,7 @@
 			iconholder = 1
 			eprojectile = /obj/item/projectile/beam
 
-		if(/obj/item/gun/energy/captain)
+		if(/obj/item/gun/energy/retro/captain)
 			iconholder = 1
 
 		if(/obj/item/gun/energy/lasercannon)

code/modules/mob/living/silicon/robot/robot.dm

@@ -700,7 +700,7 @@
 /mob/living/silicon/robot/Move(a, b, flag)
 	. = ..()
 	if(. && module && isturf(loc))
-		var/obj/item/ore/orebag = locate() in get_held_items()
+		var/obj/item/stack/material/ore/orebag = locate() in get_held_items()
 		if(orebag)
 			loc.attackby(orebag, src)
 		module.handle_turf(loc, src)

code/modules/projectiles/gun.dm

@@ -46,6 +46,8 @@
 	pickup_sound = 'sound/foley/pickup2.ogg'
 	can_be_twohanded = TRUE // also checks one_hand_penalty
 	needs_attack_dexterity = DEXTERITY_WEAPONS
+	wieldsound = 'sound/weapons/TargetOn.ogg'
+	unwieldsound = 'sound/weapons/TargetOff.ogg'
 
 	var/fire_verb = "fire"
 	var/waterproof = FALSE
@@ -94,6 +96,7 @@
 /obj/item/gun/Initialize()
 	// must have firemodes initialized prior to any update_icon_calls
 	// including reconsider_single_icon(), which is done in ..()
+	LAZYINITLIST(firemodes)
 	for(var/i in 1 to firemodes.len)
 		firemodes[i] = new /datum/firemode(src, firemodes[i])
 	. = ..()

code/modules/projectiles/guns/energy/laser.dm

@@ -54,18 +54,29 @@
 			desc += " The optical pathway is melted and useless."
 			projectile_type = null
 
-/obj/item/gun/energy/captain
-	name = "antique laser gun"
+/obj/item/gun/energy/retro
+	name = "retro laser pistol"
 	icon = 'icons/obj/guns/caplaser.dmi'
+	desc = "A now-obsolete handheld laser weapon, still popular with some for ease of maintenance."
 	icon_state = ICON_STATE_WORLD
-	desc = "A rare weapon, handcrafted by a now defunct specialty manufacturer on Luna for a small fortune. It's certainly aged well."
-	slot_flags = SLOT_LOWER_BODY //too unusually shaped to fit in a holster
 	w_class = ITEM_SIZE_NORMAL
 	projectile_type = /obj/item/projectile/beam
 	origin_tech = null
 	max_shots = 5 //to compensate a bit for self-recharging
 	one_hand_penalty = 1 //a little bulky
+
+/obj/item/gun/energy/retro/empty/Initialize(ml, material_key)
+	. = ..()
+	var/obj/item/cell/cell = get_cell()
+	if(cell)
+		cell.charge = 0
+		update_icon()
+
+/obj/item/gun/energy/retro/captain
+	name = "antique laser gun"
+	desc = "A rare weapon, handcrafted by a now defunct specialty manufacturer on Luna for a small fortune. It's certainly aged well."
 	self_recharge = 1
+	slot_flags = SLOT_LOWER_BODY //too unusually shaped to fit in a holster
 
 /obj/item/gun/energy/lasercannon
 	name = "laser cannon"

code/modules/xenoarcheaology/finds/find_types/guns.dm

@@ -47,7 +47,7 @@
 		/obj/item/gun/energy/laser/practice,
 		/obj/item/gun/energy/laser,
 		/obj/item/gun/energy/xray,
-		/obj/item/gun/energy/captain
+		/obj/item/gun/energy/retro/captain
 	)
 	var/egun_icons = list(
 		'icons/obj/guns/xenoarch/egun_1.dmi',

maps/away/bearcat/bearcat-2.dmm

@@ -75,7 +75,7 @@
 	id_tag = "scraplock";
 	name = "External Lockdown"
 	},
-/obj/item/gun/energy/captain,
+/obj/item/gun/energy/retro/captain,
 /turf/floor/tiled/dark/usedup,
 /area/ship/scrap/command/bridge)
 "am" = (

maps/away/yacht/yacht.dmm

@@ -92,7 +92,7 @@
 /obj/structure/safe,
 /obj/item/chems/pill/cyanide,
 /obj/item/rig/medical/equipped,
-/obj/item/gun/energy/captain,
+/obj/item/gun/energy/retro/captain,
 /obj/effect/spider/stickyweb,
 /obj/effect/decal/cleanable/dirt/visible,
 /turf/floor/laminate/walnut,

maps/~mapsystem/maps_antagonism.dm

@@ -1,6 +1,6 @@
 /datum/map
 	var/list/potential_theft_targets = list(
-		"the captain's antique laser gun"    = /obj/item/gun/energy/captain,
+		"the captain's antique laser gun"    = /obj/item/gun/energy/retro/captain,
 		"an RCD"                             = /obj/item/rcd,
 		"a jetpack"                          = /obj/item/tank/jetpack,
 		"a captain's jumpsuit"               = /obj/item/clothing/jumpsuit/captain,

mods/content/corporate/random_ruins/exoplanet_ruins/oldpod/oldpod.dmm

@@ -266,7 +266,7 @@
 /area/map_template/oldpod)
 "aJ" = (
 /obj/abstract/landmark/corpse/pirate,
-/obj/item/gun/energy/captain,
+/obj/item/gun/energy/retro/captain,
 /obj/effect/decal/cleanable/dirt/visible,
 /obj/effect/decal/cleanable/dirt/visible,
 /turf/floor/tiled/monotile,