shotgun

code/modules/projectiles/ammunition/magazines.dm

@@ -49,7 +49,7 @@
 	desc = "Oh god, this shouldn't be here"
 	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
 	caliber = "shotgun"
-	max_ammo = 8
+	max_ammo = 6
 	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/cylinder/dualshot

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -76,13 +76,9 @@
 
 // COMBAT SHOTGUN //
 
-/obj/item/weapon/gun/projectile/shotgun/combat
-	name = "combat shotgun"
-	desc = "A traditional shotgun with tactical furniture and an eight-shell capacity underneath."
-	icon_state = "cshotgun"
-	origin_tech = "combat=5;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
-	w_class = 5
+/obj/item/weapon/gun/projectile/shotgun/combat/New() //freaking map freezes
+	new /obj/item/weapon/gun/projectile/shotgun/automatic/combat(get_turf(src))
+	qdel(src)
 
 // RIOT SHOTGUN //
 
@@ -237,7 +233,7 @@
 		return
 	else
 		sawn_state = SAWN_INTACT
-	
+
 /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
 	name = "\improper 'Bulldog' Shotgun"
 	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
@@ -273,3 +269,17 @@
 	..()
 	empty_alarm()
 	return
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/Fire(mob/living/user as mob|obj)
+	..()
+	pump(user)
+
+// COMBAT SHOTGUN //
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/combat
+	name = "combat shotgun"
+	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
+	icon_state = "cshotgun"
+	origin_tech = "combat=5;materials=2"
+	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
+	w_class = 5