Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268

2017-05-21 00:44:08 -05:00
parent 94b7e560ab 9785b94cc5
commit 186ed2acbb
149 changed files with 5040 additions and 2255 deletions
@@ -140,6 +140,8 @@
 	item_state = "plasmaman_tank_belt"
 	slot_flags = SLOT_BELT
 	force = 5
+	volume = 3
+	w_class = WEIGHT_CLASS_SMALL //thanks i forgot this

 /obj/item/weapon/tank/internals/plasmaman/belt/full/New()
 	..()