Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits

Syndi hardsuits

code/modules/projectiles/ammunition/magazines.dm

@@ -180,10 +180,10 @@
 	icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
 
 /obj/item/ammo_box/magazine/m12g
-	name = "shotgun magazine (12g taser slugs)"
-	icon_state = "m12gs"
+	name = "shotgun magazine (12g buckshot)"
+	icon_state = "m12gb"
+	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
 	origin_tech = "combat=3;syndicate=1"
-	ammo_type = "/obj/item/ammo_casing/shotgun/stunslug"
 	caliber = "shotgun"
 	max_ammo = 8
 
@@ -192,10 +192,10 @@
 	icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
 
 
-/obj/item/ammo_box/magazine/m12g/buckshot
-	name = "shotgun magazine (12g buckshot)"
-	icon_state = "m12gb"
-	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
+/obj/item/ammo_box/magazine/m12g/stun
+	name = "shotgun magazine (12g taser slugs)"
+	icon_state = "m12gs"
+	ammo_type = "/obj/item/ammo_casing/shotgun/stunslug"
 
 
 /obj/item/ammo_box/magazine/m12g/dragon

code/modules/projectiles/guns/energy.dm

@@ -11,9 +11,8 @@
 	var/modifystate
 
 	emp_act(severity)
-		power_supply.use(round(power_supply.maxcharge / severity))
+		power_supply.use(round(power_supply.charge / severity))
 		update_icon()
-		..()
 
 
 	New()

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

@@ -229,7 +229,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	projectile_type = "/obj/item/projectile/kinetic"
 	fire_sound = 'sound/weapons/Kenetic_accel.ogg'
 	charge_cost = 5000
-	cell_type = "/obj/item/weapon/stock_parts/cell/crap"
+	cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
 	var/overheat = 0
 	var/recent_reload = 1
 
@@ -240,6 +240,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 		recent_reload = 0
 	..()
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
+	return
+
 /obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(var/mob/living/user/L)
 	if(overheat || recent_reload)
 		return
@@ -274,6 +277,11 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	silenced = 0
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
 
+/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large/cyborg
+	desc = "One and done!"
+	icon_state = "crossbowlarge"
+	origin_tech = null
+	m_amt = 0
 
 /obj/item/weapon/gun/energy/disabler
 	name = "disabler"