Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again

This commit is contained in:
kevinz000
2019-10-24 18:36:04 -07:00
276 changed files with 6538 additions and 3974 deletions
@@ -1,2 +0,0 @@
/obj/item/projectile/energy/electrode
stamina = 36