Merge branch 'master' into fuckatmos

2019-05-25 15:34:06 -04:00
parent 1a3e63dc8f 851072ff23
commit 4fc31f6322
517 changed files with 12177 additions and 1001079 deletions
@@ -200,6 +200,10 @@
 	charge = 0
 	update_icon()

+/obj/item/stock_parts/cell/lascarbine
+	name = "laser carbine power supply"
+	maxcharge = 2500
+
 /obj/item/stock_parts/cell/pulse //200 pulse shots
 	name = "pulse rifle power cell"
 	maxcharge = 40000