Merge branch 'upstream-master' into upstream-development

This commit is contained in:
Werner
2018-11-04 13:49:40 +01:00
25 changed files with 137 additions and 27 deletions
@@ -15,8 +15,8 @@
desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100."
icon_state = "battery_advanced"
origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
hardware_size = 3
battery_rating = 1100
hardware_size = 2
/obj/item/weapon/computer_hardware/battery_module/super
name = "super battery"