Merge remote-tracking branch 'origin/master' into magrifles_again

This commit is contained in:
kevinz000
2019-10-21 00:47:03 -07:00
2558 changed files with 107307 additions and 77068 deletions
+1 -1
View File
@@ -191,7 +191,7 @@
/obj/item/stock_parts/cell/secborg
name = "security borg rechargeable D battery"
maxcharge = 1750 //35/17/8 disabler/laser/taser shots.
maxcharge = 1250 //25/12/6 disabler/laser/taser shots.
materials = list(MAT_GLASS=40)
/obj/item/stock_parts/cell/secborg/empty/Initialize()