July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -31,7 +31,6 @@
 	if(battery_module && battery_module.battery)
 		return battery_module.battery

-
 // Used in following function to reduce copypaste
 /obj/item/device/modular_computer/proc/power_failure()
 	if(enabled) // Shut down the computer