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

Syndi hardsuits

code/game/gamemodes/nuclear/nuclear.dm

@@ -278,9 +278,6 @@ proc/issyndicate(mob/living/M as mob)
 	U.hidden_uplink.uses = 20
 	synd_mob.equip_to_slot_or_del(U, slot_in_backpack)
 
-	var/obj/item/clothing/suit/space/rig/syndi/new_suit = new(synd_mob)
-	var/obj/item/clothing/head/helmet/space/rig/syndi/new_helmet = new(synd_mob)
-
 	if(synd_mob.species)
 
 		/*
@@ -293,28 +290,12 @@ proc/issyndicate(mob/living/M as mob)
 		var/race = synd_mob.species.name
 
 		switch(race)
-			if("Unathi")
-				new_suit.species_restricted = list("Unathi")
-				new_helmet.species_restricted = list("Unathi")
-			if("Tajaran")
-				new_suit.species_restricted = list("Tajaran")
-				new_helmet.species_restricted = list("Tajaran")
-			if("Skrell")
-				new_suit.species_restricted = list("Skrell")
-				new_helmet.species_restricted = list("Skrell")
 			if("Vox" || "Vox Armalis")
-				synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(synd_mob), slot_wear_mask)
+				synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
 				synd_mob.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(synd_mob), slot_l_hand)
 				synd_mob.internal = synd_mob.l_hand
 				if (synd_mob.internals)
 					synd_mob.internals.icon_state = "internal1"
-				new_suit.species_restricted = list ("Vox", "Vox Armalis")
-				new_helmet.species_restricted = list ("Vox", "Vox Armalis")
-
-
-	synd_mob.equip_to_slot_or_del(new_suit, slot_wear_suit)
-	synd_mob.equip_to_slot_or_del(new_helmet, slot_head)
-
 
 	var/obj/item/weapon/implant/dexplosive/E = new/obj/item/weapon/implant/dexplosive(synd_mob)
 	E.imp_in = synd_mob

code/game/objects/items/weapons/melee/energy.dm

@@ -50,7 +50,7 @@
 	edge = 1
 
 /obj/item/weapon/melee/energy/sword/cyborg
-	var/hitcost = 500
+	var/hitcost = 250
 
 /obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
 	if(R.cell)

code/game/objects/items/weapons/power_cells.dm

@@ -119,3 +119,19 @@
 	rating = 3
 	m_amt = 0
 	g_amt = 0
+
+/obj/item/weapon/stock_parts/cell/emproof
+	name = "\improper EMP-proof cell"
+	desc = "An EMP-proof cell."
+	maxcharge = 5000
+	rating = 2
+
+/obj/item/weapon/stock_parts/cell/emproof/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/stock_parts/cell/emproof/emp_act(severity)
+	return
+
+/obj/item/weapon/stock_parts/cell/emproof/corrupt()
+	return

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -13,8 +13,7 @@
 	..()
 	sleep(2)
 	new /obj/item/clothing/under/syndicate(src)
-	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/clothing/head/helmet/swat/syndicate(src)
+	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/weapon/storage/belt/military(src)
 	new /obj/item/weapon/crowbar/red(src)
@@ -26,8 +25,10 @@
 /obj/structure/closet/syndicate/suits/New()
 	..()
 	sleep(2)
-	new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
+	new /obj/item/clothing/head/helmet/space/rig/syndi(src)
 	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/clothing/suit/space/rig/syndi(src)
+	new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
 	new /obj/item/clothing/shoes/magboots/syndie(src)
 
 /obj/structure/closet/syndicate/nuclear