Merge branch 'master' 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
@@ -1,2 +0,0 @@
|
||||
/obj/item/projectile/energy/electrode
|
||||
stamina = 36
|
||||