diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 5ce729187b..64ac55c295 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -199,6 +199,17 @@
 	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/practice(src)
 
+/obj/item/weapon/storage/box/empshells
+	name = "box of emp shells"
+	desc = "It has a picture of a gun and several warning symbols on the front."
+	icon_state = "empshot_box"
+	item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
+
+/obj/item/weapon/storage/box/empshells/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/ammo_casing/shotgun/emp(src)
+
 /obj/item/weapon/storage/box/sniperammo
 	name = "box of 14.5mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index d10280854f..51652c4ccf 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -144,6 +144,14 @@
 	projectile_type = /obj/item/projectile/energy/flash/flare
 	matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
 
+
+/obj/item/ammo_casing/shotgun/emp
+	name = "ion shell"
+	desc = "An advanced shotgun round that creates a small EMP when it strikes a target."
+	icon_state = "empshell"
+	projectile_type = /obj/item/projectile/bullet/shotgun/ion
+	matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
+
 /obj/item/ammo_casing/a762
 	desc = "A 7.62mm bullet casing."
 	caliber = "a762"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 8bbd31aed0..835a097267 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -168,6 +168,19 @@
 	range_step = 1
 	spread_step = 10
 
+//EMP shotgun 'slug', it's basically a beanbag that pops a tiny emp when it hits.
+/obj/item/projectile/bullet/shotgun/ion
+	name = "ion slug"
+	damage = 15
+	embed = 0
+	sharp = 0
+	check_armour = "melee"
+
+/obj/item/projectile/bullet/shotgun/ion/on_hit(var/atom/target, var/blocked = 0)
+	..()
+	empulse(target, 0, 0)	//Only affects what it hits
+	return 1
+
 /* "Rifle" rounds */
 
 /obj/item/projectile/bullet/rifle
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index b567512a05..8ce0360c10 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -14,7 +14,6 @@
 		empulse(target, 1, 1)
 		return 1
 
-
 /obj/item/projectile/bullet/gyro
 	name ="explosive bolt"
 	icon_state= "bolter"
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 104565119e..a129056404 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ