diff --git a/.gitignore b/.gitignore
index c824a920cd..c8846bcb8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Thumbs.db
 data/
 cfg/
 
+code/global.dm
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 5dd745231c..418c9f30f4 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -198,9 +198,21 @@
 	mag_type = MAGAZINE
 	caliber = "shotgun"
 	matter = list(DEFAULT_WALL_MATERIAL = 2200)
-	ammo_type = /obj/item/ammo_casing/shotgun/pellet
+	ammo_type = /obj/item/ammo_casing/shotgun
 	max_ammo = 24
 	multiple_sprites = 1
 
+/obj/item/ammo_magazine/g12/beanbag
+	name = "magazine (12 gauge beanbag)"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+
+/obj/item/ammo_magazine/g12/pellet
+	name = "magazine (12 gauge pellet)"
+	ammo_type = /obj/item/ammo_casing/shotgun/pellet
+
+/obj/item/ammo_magazine/g12/flash
+	name = "magazine (12 gauge flash)"
+	ammo_type = /obj/item/ammo_casing/shotgun/flash
+
 /obj/item/ammo_magazine/g12/empty
 	initial_ammo = 0
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 949df7af07..1a45d6a781 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -235,7 +235,7 @@
 	name = "\improper AS-24 automatic shotgun"
 	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
 	icon_state = "ashot"
-	item_state = null
+	item_state = "arifle"
 	w_class = 4
 	force = 10
 	caliber = "shotgun"