Dev merge.

This commit is contained in:
Zuhayr
2015-05-11 18:35:02 +09:30
182 changed files with 2647 additions and 2741 deletions

View File

@@ -105,7 +105,7 @@
icon_state = "furnace"
density = 1
anchored = 1
luminosity = 3
light_range = 3
var/obj/machinery/mineral/input = null
var/obj/machinery/mineral/output = null
var/obj/machinery/mineral/console = null
@@ -238,4 +238,4 @@
else
continue
console.updateUsrDialog()
console.updateUsrDialog()