Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again
This commit is contained in:
@@ -1,2 +0,0 @@
|
||||
/obj/item/projectile/energy/electrode
|
||||
stamina = 36
|
||||
Reference in New Issue
Block a user