diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 63c45280811d..3129b3efac8d 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1401,7 +1401,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "el" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "em" = (
@@ -1650,8 +1650,8 @@
 "fc" = (
 /obj/structure/closet/crate,
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
-/obj/item/gun/energy/laser/captain/scattershot,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/gun/energy/laser,
 /obj/item/grenade/syndieminibomb/concussion,
 /obj/item/grenade/syndieminibomb/concussion,
@@ -1726,7 +1726,7 @@
 	},
 /obj/item/paper/fluff/awaymissions/caves/shipment_receipt,
 /obj/item/organ/eyes/robotic/thermals,
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /obj/item/slimepotion/fireproof,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
@@ -1789,7 +1789,7 @@
 	},
 /area/awaymission/caves/BMP_asteroid/level_two)
 "fw" = (
-/obj/item/gun/energy/laser/captain/scattershot,
+/obj/item/gun/energy/laser/scattershot,
 /turf/open/floor/plating/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14"
 	},
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 40d784f5321b..1f45cebf731c 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -18388,7 +18388,7 @@
 	dir = 8
 	},
 /obj/item/gun/energy/gravity_gun,
-/obj/item/gun/energy/laser/captain/scattershot{
+/obj/item/gun/energy/laser/scattershot{
 	pixel_y = 8
 	},
 /obj/item/gun/energy/wormhole_projector{
diff --git a/code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm b/code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm
index 269a446e1e1e..47a27c2ae52c 100644
--- a/code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm
+++ b/code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm
@@ -381,7 +381,7 @@
 	. = ..()
 	for(var/i in 1 to 5)
 		if(prob(10))
-			weighted_feature_spawn_list[/obj/item/gun/energy/laser/captain/scattershot ]++
+			weighted_feature_spawn_list[/obj/item/gun/energy/laser/scattershot ]++
 		else
 			weighted_feature_spawn_list[/obj/item/melee/spear/bonespear/chitinspear]++
 
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 5f1407c322ff..f61a550088ac 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -43,16 +43,19 @@
 	desc = "The NT-S01 laser gun is NTs first attempt to provide an inbuilt recharger, and is the first in its line as an 'S' or special class weapon given to space station command members. Due to how expensive it is to produce, and that the material used to do so deteriorates quickly, it was decommissioned, and the few models left are used as prizes meant to never see the light of day."
 	force = 10
 	ammo_x_offset = 3
-	selfcharge = 1
+	selfcharge = TRUE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
-/obj/item/gun/energy/laser/captain/scattershot
+/obj/item/gun/energy/laser/scattershot
 	name = "scatter shot laser rifle"
 	icon_state = "lasercannon"
-	item_state = LASER
 	desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+	ammo_x_offset = 3
+	force = 10
+	selfcharge = TRUE
 	shaded_charge = FALSE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/item/gun/energy/laser/cyborg
 	can_charge = FALSE