Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	code/modules/power/apc.dm

code/modules/power/apc.dm

@@ -873,18 +873,23 @@
 /obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)
 	if(!istype(malf))
 		return
-	if(src.z != 1)
-		return
+	if(src.z != 1)
+		return
+	
 	src.occupant = new /mob/living/silicon/ai(src,malf.laws,null,1)
 	src.occupant.adjustOxyLoss(malf.getOxyLoss())
 	src.occupant.name = "[malf.name] APC Copy"
+	
 	if(malf.parent)
 		src.occupant.parent = malf.parent
 	else
 		src.occupant.parent = malf
+	
 	malf.mind.transfer_to(src.occupant)
+	
 	if(malf.parent)
 		del(malf)
+	
 	src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupant.cancel_camera()
 

code/modules/power/tracker.dm

@@ -16,8 +16,7 @@
 
 
 	// called by datum/sun/calc_position() as sun's angle changes
-	proc/set_angle()
-		var/angle = sun.angle
+	proc/set_angle(angle)
 
 		//set icon dir to show sun illumination
 		dir = turn(NORTH, -angle - 22.5)	// 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST