diff --git a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
index 758a3f197e8..5bf2e20a64e 100644
--- a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
+++ b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
@@ -236,7 +236,7 @@
 	shots_in_gun = 12
 	fire_sound = 'sound/items/weapons/thermalpistol.ogg'
 	last_fire_sound = 'sound/items/weapons/thermalpistol.ogg'
-	projectile_type = /obj/projectile/beam/laser/musket/repeater
+	projectile_type = /obj/projectile/beam/laser/repeater
 	loaded_gun = TRUE
 	fully_loaded_gun = TRUE
 	fire_delay = 1
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 4ae41e99ce9..d15bcf2ab04 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -62,12 +62,16 @@
 	variance = 10
 
 /obj/item/ammo_casing/energy/laser/musket/repeater
-	projectile_type = /obj/projectile/beam/laser/musket/repeater
+	projectile_type = /obj/projectile/beam/laser/repeater
 	pellets = 2
 	variance = 10
 	fire_sound = 'sound/items/weapons/thermalpistol.ogg'
 	e_cost = LASER_SHOTS(6, STANDARD_CELL_CHARGE)
 
+/obj/item/ammo_casing/energy/laser/musket/repeater/handheld
+	pellets = 1
+	e_cost = LASER_SHOTS(12, STANDARD_CELL_CHARGE)
+
 /obj/item/ammo_casing/energy/laser/practice
 	projectile_type = /obj/projectile/beam/practice
 	select_name = "practice"
diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm
index 1a2e785cd39..e2405192fb7 100644
--- a/code/modules/projectiles/guns/energy/crank_guns.dm
+++ b/code/modules/projectiles/guns/energy/crank_guns.dm
@@ -7,6 +7,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/musket)
 	slot_flags = ITEM_SLOT_BACK
 	obj_flags = UNIQUE_RENAME
+	weapon_weight = WEAPON_HEAVY
 	custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 8, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.2, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.2)
 	light_color = COLOR_PURPLE
 
@@ -152,13 +153,15 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/nanite/cryo)
 
 /obj/item/gun/energy/laser/musket/repeater
-	name = "Iconoclast's Repeater"
+	name = "iconoclast's repeater"
 	desc = "A weapon of incredible bulk, this ratvarian repeater has been permanently severed from its stand to be carried by hand. Cumbersome, Yes - but powerful."
 	icon_state = "repeater"
 	inhand_icon_state = "repeater"
 	slowdown = 1
+	burst_size = 2
+	fire_delay = 0.5
 	w_class = WEIGHT_CLASS_HUGE
-	ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/repeater)
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/repeater/handheld)
 	spread = 20
 	charge_sections = 1
 	item_flags = SLOWS_WHILE_IN_HAND | IMMUTABLE_SLOW
@@ -173,13 +176,16 @@
 	AddComponent( \
 		/datum/component/crank_recharge, \
 		charging_cell = get_cell(), \
-		charge_amount = STANDARD_CELL_CHARGE, \
-		cooldown_time = 3 SECONDS, \
+		charge_amount = LASER_SHOTS(6, STANDARD_CELL_CHARGE), \
+		cooldown_time = 0.4 SECONDS, \
 		charge_sound = 'sound/machines/clockcult/integration_cog_install.ogg', \
 		charge_sound_cooldown_time = 3 SECONDS, \
-		charge_move = IGNORE_USER_LOC_CHANGE, \
 	)
 	AddComponent(/datum/component/automatic_fire, 0.5 SECONDS)
+
+/obj/item/gun/energy/laser/musket/repeater/add_deep_lore()
+	return
+
 // The Deep Lore //
 
 // Laser Musket
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 4a8a13b05a4..a694f7a9163 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -118,14 +118,13 @@
 	stamina = 20
 	weak_against_armour = FALSE
 
-/obj/projectile/beam/laser/musket/repeater
+/obj/projectile/beam/laser/repeater
 	name = "clockwork laser"
 	icon_state = "laser_repeater"
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/yellow_laser
-	damage = 28
-	stamina = 35
-	weak_against_armour = TRUE
+	damage = 15
 	light_color = COLOR_DARK_ORANGE
+	weak_against_armour = TRUE
 
 /obj/projectile/beam/weak
 	damage = 15