Merge branch 'master' into patch-118

2019-05-12 02:03:32 -04:00
parent db74544a7c 8200e09fa2
commit 62e5037eab
43 changed files with 1120 additions and 34 deletions
@@ -74,10 +74,12 @@
 /obj/item/stock_parts/cell/magrifle_e
 	name = "magrifle power supply"
 	maxcharge = 14400
+	chargerate = 3520

 /obj/item/stock_parts/cell/magpistol_e
 	name = "magpistol power supply"
 	maxcharge = 6000
+	chargerate = 1000

 ///sci designs///