July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -321,3 +321,16 @@

 /obj/item/weapon/stock_parts/cell/emproof/corrupt()
 	return
+
+/obj/item/weapon/stock_parts/cell/beam_rifle
+	name = "beam rifle capacitor"
+	desc = "A high powered capacitor that can provide huge amounts of energy in an instant"
+	maxcharge = 50000
+	chargerate = 5000	//Extremely energy intensive
+	rating = 4
+
+/obj/item/weapon/stock_parts/cell/beam_rifle/corrupt()
+	return
+
+/obj/item/weapon/stock_parts/cell/beam_rifle/emp_act(severity)
+	charge = Clamp((charge-(10000/severity)),0,maxcharge)