Up to date with -tg-

- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.

code/modules/mob/living/carbon/human/examine.dm

@@ -419,6 +419,8 @@
 		msg += "<span class='warning'><b>[src] has \a [implant] sticking out of [t_his] flesh!</span>\n"
 	if(digitalcamo)
 		msg += "[t_He] [t_is] repulsively uncanny!\n"
+	if(!wear_mask && is_thrall(src) && in_range(usr,src))
+		msg += "Their features seem unnaturally tight and drawn.\n"
 	if(decaylevel == 1)
 		msg += "[t_He] [t_is] starting to smell.\n"
 	if(decaylevel == 2)

code/modules/mob/living/carbon/human/life.dm

@@ -748,11 +748,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 		if(isturf(loc)) //else, there's considered to be no light
 			var/turf/T = loc
-			var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-			if(L)
-				light_amount = (L.get_clamped_lum()*10) - 5 //hardcapped so it's not abused by having a ton of flashlights
-			else
-				light_amount =  5
+			light_amount = min(T.get_lumcount()*10, 5)  //hardcapped so it's not abused by having a ton of flashlights
 		nutrition += light_amount
 		traumatic_shock -= light_amount
 
@@ -770,11 +766,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		var/light_amount = 0
 		if(isturf(loc))
 			var/turf/T = loc
-			var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
-			if(L)
-				light_amount = L.get_clamped_lum()*10
-			else
-				light_amount =  10
+			light_amount = T.get_lumcount()*10
 		if(light_amount > species.light_dam) //if there's enough light, start dying
 			if(species.light_effect_amp)
 				adjustFireLoss(5) //This gets doubled by Shadowling's innate fire weakness, so it ends up being 10.

code/modules/mob/living/silicon/robot/login.dm

@@ -3,4 +3,5 @@
 	regenerate_icons()
 	show_laws(0)
 	if(mind)	ticker.mode.remove_revolutionary(mind)
+	if(mind)	ticker.mode.remove_thrall(mind,0)
 	return