Fix merge conflicts

🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.

code/datums/datacore.dm

@@ -316,7 +316,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		preview_icon.Blend(eyes_s, ICON_OVERLAY)
 	if(clothes_s)
 		preview_icon.Blend(clothes_s, ICON_OVERLAY)
-	del(eyes_s)
-	del(clothes_s)
+	qdel(eyes_s)
+	qdel(clothes_s)
 
 	return preview_icon

code/datums/mind.dm

@@ -825,7 +825,7 @@ datum/mind
 						ticker.mode.changelings -= src
 						special_role = null
 						current.remove_changeling_powers()
-						if(changeling)	del(changeling)
+						if(changeling)	qdel(changeling)
 						current << "<FONT color='red' size = 3><B>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-changeling'ed [current].")
 				if("changeling")
@@ -855,7 +855,7 @@ datum/mind
 						ticker.mode.vampires -= src
 						special_role = null
 						current.remove_vampire_powers()
-						if(vampire)  del(vampire)
+						if(vampire)  qdel(vampire)
 						current << "<FONT color='red' size = 3><B>You grow weak and lose your powers! You are no longer a vampire and are stuck in your current form!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-vampired [current].")
 				if("vampire")
@@ -1021,7 +1021,7 @@ datum/mind
 						A.malf_picker.remove_verbs(A)
 
 						A.make_laws()
-						del(A.malf_picker)
+						qdel(A.malf_picker)
 						A.show_laws()
 						A.icon_state = "ai"
 

code/datums/recipe.dm

@@ -142,3 +142,12 @@
 		return byproduct
 	else
 		return null
+
+/datum/recipe/proc/count_n_items()
+	var/count = 0
+	if(items && items.len)
+		count += items.len
+	if(fruit && fruit.len)
+		for(var/ktag in fruit)
+			count += fruit[ktag]
+	return count

code/datums/sun.dm

@@ -1,61 +0,0 @@
-#define SOLAR_UPDATE_TIME 600 //duration between two updates of the whole sun/solars positions
-
-var/global/datum/sun/sun
-
-/datum/sun
-	var/angle
-	var/dx
-	var/dy
-	var/rate
-	var/list/solars			// for debugging purposes, references solars_list at the constructor
-	var/solar_next_update	// last time the sun position was checked and adjusted
-
-/datum/sun/New()
-
-	solars = solars_list
-	rate = rand(50,200)/100			// 50% - 200% of standard rotation
-	if(prob(50))					// same chance to rotate clockwise than counter-clockwise
-		rate = -rate
-	solar_next_update = world.time	// init the timer
-	angle = rand (0,360)			// the station position to the sun is randomised at round start
-
-/* HANDLED IN PROCESS SCHEDULER
-/hook/startup/proc/createSun()
-	sun = new /datum/sun()
-	return 1
-*/
-// calculate the sun's position given the time of day
-// at the standard rate (100%) the angle is increase/decreased by 6 degrees every minute.
-// a full rotation thus take a game hour in that case
-/datum/sun/proc/calc_position()
-
-	if(world.time < solar_next_update) //if less than 60 game secondes have passed, do nothing
-		return;
-
-	angle = (360 + angle + rate * 6) % 360	 // increase/decrease the angle to the sun, adjusted by the rate
-
-	solar_next_update += SOLAR_UPDATE_TIME // since we updated the angle, set the proper time for the next loop
-
-	// now calculate and cache the (dx,dy) increments for line drawing
-
-	var/s = sin(angle)
-	var/c = cos(angle)
-
-	// Either "abs(s) < abs(c)" or "abs(s) >= abs(c)"
-	// In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions
-
-	if( abs(s) < abs(c))
-
-		dx = s / abs(c)
-		dy = c / abs(c)
-
-	else
-		dx = s/abs(s)
-		dy = c / abs(s)
-
-	//now tell the solar control computers to update their status and linked devices
-	for(var/obj/machinery/power/solar_control/SC in solars_list)
-		if(!SC.powernet)
-			solars_list.Remove(SC)
-			continue
-		SC.update()