Merge pull request #8301 from Trilbyspaceclone/hell

[Ready] Mag gun rework MK II
2019-04-30 05:24:16 -07:00
parent 5802c75389 60a9544a6b
commit 218fd09102
4 changed files with 290 additions and 8 deletions
@@ -15,7 +15,9 @@
 		/obj/item/gun/energy,
 		/obj/item/melee/baton,
 		/obj/item/ammo_box/magazine/recharge,
-		/obj/item/modular_computer))
+		/obj/item/modular_computer,
+		/obj/item/gun/ballistic/automatic/magrifle_e,
+		/obj/item/gun/ballistic/automatic/pistol/mag_e))

 /obj/machinery/recharger/RefreshParts()
 	for(var/obj/item/stock_parts/capacitor/C in component_parts)