Polaris sync

code/_helpers/game.dm

@@ -156,7 +156,7 @@
 // It will keep doing this until it checks every content possible. This will fix any problems with mobs, that are inside objects,
 // being unable to hear people due to being in a box within a bag.
 
-/proc/recursive_content_check(var/atom/O,  var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_mobs = 1, var/include_objects = 1)
+/proc/recursive_content_check(var/atom/O,  var/list/L = list(), var/recursion_limit = 3, var/client_check = 1, var/sight_check = 1, var/include_mobs = 1, var/include_objects = 1, var/ignore_show_messages = 0)
 
 	if(!recursion_limit)
 		return L
@@ -176,7 +176,7 @@
 
 		else if(istype(I,/obj/))
 			var/obj/check_obj = I
-			if(check_obj.show_messages)
+			if(ignore_show_messages || check_obj.show_messages)
 				if(!sight_check || isInSight(I, O))
 					L |= recursive_content_check(I, L, recursion_limit - 1, client_check, sight_check, include_mobs, include_objects)
 					if(include_objects)

code/_helpers/mobs.dm

@@ -119,27 +119,12 @@ proc/age2agedescription(age)
 		if(70 to INFINITY)	return "elderly"
 		else				return "unknown"
 
-proc/RoundHealth(health)
-	switch(health)
-		if(100 to INFINITY)
-			return "health100"
-		if(70 to 100)
-			return "health80"
-		if(50 to 70)
-			return "health60"
-		if(30 to 50)
-			return "health40"
-		if(18 to 30)
-			return "health25"
-		if(5 to 18)
-			return "health10"
-		if(1 to 5)
-			return "health1"
-		if(-99 to 0)
-			return "health0"
-		else
-			return "health-100"
-	return "0"
+/proc/RoundHealth(health)
+	var/list/icon_states = icon_states('icons/mob/hud_med.dmi')
+	for(var/icon_state in icon_states)
+		if(health >= text2num(icon_state))
+			return icon_state
+	return icon_states[icon_states.len] // If we had no match, return the last element
 
 /*
 Proc for attack log creation, because really why not

code/_helpers/unsorted.dm

@@ -1037,12 +1037,6 @@ proc/get_mob_with_client_list()
 	else if (zone == "r_foot") return "right foot"
 	else return zone
 
-//gets the turf the atom is located in (or itself, if it is a turf).
-//returns null if the atom is not in a turf.
-/proc/get_turf(atom/movable/A)
-	if(isturf(A)) return A
-	if(A && A.locs.len) return A.locs[1]
-
 /proc/get(atom/loc, type)
 	while(loc)
 		if(istype(loc, type))