Merge remote-tracking branch 'upstream/dev' into power-net

This commit is contained in:
mwerezak
2014-07-27 20:25:57 -04:00
46 changed files with 5606 additions and 5080 deletions
+1 -1
View File
@@ -489,7 +489,7 @@ var/list/liftable_structures = list(\
/obj/machinery/autolathe, \
/obj/machinery/constructable_frame, \
/obj/machinery/hydroponics, \
/obj/machinery/portable_atmospherics/hydroponics, \
/obj/machinery/computer, \
/obj/machinery/optable, \
/obj/structure/dispenser, \