Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm

code/modules/power/lighting.dm

@@ -135,6 +135,7 @@
 	idle_power_usage = 2
 	active_power_usage = 20
 	power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
+	gfi_layer_rotation = GFI_ROTATION_DEFDIR
 	var/on = 0					// 1 if on, 0 if off
 	var/on_gs = 0
 	var/brightness_range = 8	// luminosity when on, also used in power calculation

code/modules/power/tesla/energy_ball.dm

@@ -58,6 +58,8 @@
 			tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
 	else
 		energy = 0 // ensure we dont have miniballs of miniballs
+	if(energy == 0)
+		qdel(src)
 
 /obj/singularity/energy_ball/examine(mob/user)
 	..()