testmerge feedback

This commit is contained in:
Shadowlight213
2016-08-07 00:01:50 -07:00
parent 2b381baa25
commit 2f330babb7
4 changed files with 8 additions and 9 deletions
@@ -23,7 +23,7 @@
desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 1500."
icon_state = "battery_super"
origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3)
hardware_size = 2
hardware_size = 1 //temp for testmerge
battery_rating = 1500
/obj/item/weapon/computer_hardware/battery_module/ultra