Fixes shotgun boxes, energy shields, nerfs pressure

Adds energy shields under illegal research.  Because why not.  Fixes
those shotgun boxes I tried to steal earlier.  Latheable for your
convenience.

Pressure nerfs in previous commit, forgot to mention.

code/modules/projectiles/ammunition/boxes.dm

@@ -150,7 +150,7 @@
 	ammo_type = "/obj/item/ammo_casing/chameleon"
 	max_ammo = 0
 	multiple_sprites = 1
-/*
+
 // Tried to steal these from Para.  They're kind of funky.
 
 /obj/item/ammo_magazine/a12mm
@@ -167,19 +167,27 @@
 	ammo_type = "/obj/item/ammo_casing/shotgun"
 	max_ammo = 8
 	m_amt = 100000
-
+/* no buckshots.  never again.  too hard to steal forever.
 /obj/item/ammo_magazine/shotgun/buck
 	name = "Ammunition Box (buckshot)"
 	ammo_type = "/obj/item/ammo_casing/buck"
+*/
 
 /obj/item/ammo_magazine/shotgun/stun
 	name = "Ammunition Box (stun shells)"
-	ammo_type = "/obj/item/ammo_casing/stunshell"
+	ammo_type = "/obj/item/ammo_casing/shotgun/stunshell"
+	max_ammo = 8
 	m_amt = 20000
 
 /obj/item/ammo_magazine/shotgun/beanbag
 	name = "Ammunition Box (beanbag shells)"
-	ammo_type = "/obj/item/ammo_casing/beanbag"
+	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	max_ammo = 8
 	m_amt = 4000
 
-	*/
+/obj/item/ammo_magazine/shotgun/incendiary
+	name = "Ammunition Box (incendiary shells)"
+	ammo_type = "/obj/item/ammo_casing/shotgun/incendiary"
+	max_ammo = 8
+	m_amt = 100000
+

code/modules/projectiles/ammunition/bullets.dm

@@ -36,7 +36,12 @@
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
 	projectile_type = "/obj/item/projectile/bullet/midbullet2"
-
+/* do this later
+/obj/item/ammo_casing/c9mmsilver
+	desc = "A silver 9mm bullet casing."
+	caliber = "9mm"
+	projectile_type = "/obj/item/projectile/bullet/midbullet2"
+*/
 
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
@@ -62,6 +67,13 @@
 	projectile_type = "/obj/item/projectile/bullet"
 	m_amt = 12500
 
+/obj/item/ammo_casing/shotgun/incendiary
+	name = "shotgun shell"
+	desc = "A 12 gauge shell."
+	icon_state = "ishell"
+	projectile_type = "/obj/item/projectile/bullet/incendiary/shell"
+	m_amt = 12500
+
 
 /obj/item/ammo_casing/shotgun/blank
 	name = "shotgun shell"

code/modules/projectiles/guns/energy/laser.dm

@@ -32,6 +32,7 @@
 
 /obj/item/weapon/gun/energy/laser/captain
 	icon_state = "caplaser"
+	name ="antique laser gun"
 	desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
 	force = 10
 	origin_tech = null

code/modules/research/designs.dm

@@ -1413,6 +1413,15 @@ datum/design/implant_free
 	materials = list("$metal" = 50, "$glass" = 50)
 	build_path = "/obj/item/weapon/implantcase/freedom"
 
+datum/design/energy_shield
+	name = "energy shield"
+	desc = "An energy shield."
+	id = "energy_shield"
+	req_tech = list("syndicate" = 4, "materials" = 4, "magnets" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 1000, "$glass" = 3000, "$plasma" = 1000)
+	build_path = "/obj/item/weapon/shield/energy"
+
 datum/design/implant_death_alarm
 	name = "death alarm implant"
 	desc = "Alerts others to your death."
@@ -1629,6 +1638,15 @@ datum/design/stunshell
 	materials = list("$metal" = 4000)
 	build_path = "/obj/item/ammo_casing/shotgun/stunshell"
 
+datum/design/stunshellbox
+	name = "Stun Shell box"
+	desc = "A box full of stun shells."
+	id = "stunshellbox"
+	req_tech = list("combat" = 3, "materials" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 20000)
+	build_path = "/obj/item/ammo_magazine/shotgun/stun"
+
 datum/design/plasmapistol
 	name = "plasma pistol"
 	desc = "A specialized firearm designed to fire lethal bolts of toxins."