Ports in #86867 from tgstation

code/datums/components/crafting/ranged_weapon.dm

@@ -307,8 +307,7 @@
 		/obj/item/stack/rods = 4,
 		/obj/item/stock_parts/micro_laser = 1,
 		/obj/item/stock_parts/capacitor = 1,
-		/obj/item/clothing/glasses/regular = 1,
-		/obj/item/reagent_containers/cup/glass/drinkingglass = 1,
+		/obj/item/reagent_containers/cup/glass/drinkingglass = 2,
 	)
 	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	time = 10 SECONDS

code/datums/components/crank_recharge.dm

@@ -14,9 +14,11 @@
 	var/charge_sound_cooldown_time
 	/// Are we currently charging
 	var/is_charging = FALSE
+	/// Should you be able to move while charging, use IGNORE_USER_LOC_CHANGE if you want to move and crank
+	var/charge_move = NONE
 	COOLDOWN_DECLARE(charge_sound_cooldown)
 
-/datum/component/crank_recharge/Initialize(charging_cell, spin_to_win = FALSE, charge_amount = 500, cooldown_time = 2 SECONDS, charge_sound = 'sound/weapons/laser_crank.ogg', charge_sound_cooldown_time = 1.8 SECONDS)
+/datum/component/crank_recharge/Initialize(charging_cell, spin_to_win = FALSE, charge_amount = 500, cooldown_time = 2 SECONDS, charge_sound = 'sound/items/weapons/laser_crank.ogg', charge_sound_cooldown_time = 1.8 SECONDS, charge_move = NONE)
 	. = ..()
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
@@ -28,7 +30,7 @@
 	src.cooldown_time = cooldown_time
 	src.charge_sound = charge_sound
 	src.charge_sound_cooldown_time = charge_sound_cooldown_time
-
+	src.charge_move = charge_move
 /datum/component/crank_recharge/RegisterWithParent()
 	. = ..()
 	RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
@@ -57,7 +59,7 @@
 		COOLDOWN_START(src, charge_sound_cooldown, charge_sound_cooldown_time)
 		playsound(source, charge_sound, 40)
 	source.balloon_alert(user, "charging...")
-	if(!do_after(user, cooldown_time, source, interaction_key = DOAFTER_SOURCE_CHARGE_CRANKRECHARGE))
+	if(!do_after(user, cooldown_time, source, interaction_key = DOAFTER_SOURCE_CHARGE_CRANKRECHARGE, timed_action_flags = charge_move))
 		is_charging = FALSE
 		return
 	charging_cell.give(charge_amount)

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

@@ -38,6 +38,8 @@
 
 /obj/item/ammo_casing/energy/laser/musket/prime
 	projectile_type = /obj/projectile/beam/laser/musket/prime
+	pellets = 3
+	variance = 10
 
 /obj/item/ammo_casing/energy/laser/practice
 	projectile_type = /obj/projectile/beam/practice

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

@@ -13,14 +13,14 @@
 
 /obj/item/gun/energy/laser/musket/Initialize(mapload)
 	. = ..()
-	AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_wielded = 10)
 	AddComponent( \
 		/datum/component/crank_recharge, \
 		charging_cell = get_cell(), \
 		charge_amount = 500, \
 		cooldown_time = 2 SECONDS, \
-		charge_sound = 'sound/weapons/laser_crank.ogg', \
+		charge_sound = 'sound/items/weapons/laser_crank.ogg', \
 		charge_sound_cooldown_time = 1.8 SECONDS, \
+		charge_move = IGNORE_USER_LOC_CHANGE, \
 	)
 
 /obj/item/gun/energy/laser/musket/update_icon_state()
@@ -52,8 +52,9 @@
 		charging_cell = get_cell(), \
 		charge_amount = 1000, \
 		cooldown_time = 2 SECONDS, \
-		charge_sound = 'sound/weapons/laser_crank.ogg', \
+		charge_sound = 'sound/items/weapons/laser_crank.ogg', \
 		charge_sound_cooldown_time = 1.8 SECONDS, \
+		charge_move = IGNORE_USER_LOC_CHANGE, \
 	)
 
 /obj/item/gun/energy/disabler/smoothbore/add_seclight_point()

code/modules/projectiles/projectile/beams.dm

@@ -70,15 +70,15 @@
 	name = "low-power laser"
 	icon_state = "laser_musket"
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
-	damage = 25
-	stamina = 40
+	damage = 28
+	stamina = 35
 	light_color = COLOR_STRONG_VIOLET
 	weak_against_armour = TRUE
 
 /obj/projectile/beam/laser/musket/prime
 	name = "mid-power laser"
-	damage = 30
-	stamina = 45
+	damage = 25
+	stamina = 20
 	weak_against_armour = FALSE
 
 /obj/projectile/beam/weak