Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -10,9 +10,9 @@
 	icon = 'icons/obj/machines/magic_emitter.dmi'
 	icon_state = "wabbajack_statue"
 	icon_state_on = "wabbajack_statue_on"
+	active = FALSE
 	var/list/active_tables = list()
 	var/tables_required = 2
-	active = FALSE

 /obj/machinery/power/emitter/energycannon/magical/Initialize()
 	. = ..()