Merge pull request #1603 from TheDZD/shadowling

Shadowling Updates

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,12 +766,8 @@ 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
-		if(light_amount > species.light_dam) //if there's enough light, start dying
+			light_amount = T.get_lumcount()*10
+		if(light_amount > species.light_dam && !incorporeal_move) //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.
 			else
@@ -1805,9 +1797,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					holder.icon_state = "mutineer"
 				if("mutineer")
 					holder.icon_state = "mutineer"
-				if("Shadowling")
+				if("shadowling")
 					holder.icon_state = "hudshadowling"
-				if("Shadowling Thrall")
+				if("shadowling thrall")
 					holder.icon_state = "hudshadowlingthrall"
 
 			hud_list[SPECIALROLE_HUD] = holder

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

code/modules/mob/living/simple_animal/ascendant_shadowling.dm

@@ -1,33 +0,0 @@
-/mob/living/simple_animal/ascendant_shadowling
-	name = "Ascendant Shadowling"
-	desc = "A large, floating eldritch horror. It has pulsing markings all about its body and large horns. It seems to be floating without any form of support."
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "shadowling_ascended"
-	icon_living = "shadowling_ascended"
-	speak_emote = list("telepathically thunders", "telepathically booms")
-	force_threshold = INFINITY //Can't die by normal means
-	health = 100000
-	maxHealth = 100000
-	speed = 0
-	var/phasing = 0
-	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
-
-	response_help   = "stares at"
-	response_disarm = "flails at"
-	response_harm   = "flails at"
-
-	harm_intent_damage = 0
-	melee_damage_lower = 35
-	melee_damage_upper = 35
-	attacktext = "claws at"
-	attack_sound = 'sound/weapons/slash.ogg'
-
-	minbodytemp = 0
-	maxbodytemp = INFINITY
-	environment_smash = 2
-
-	faction = list("faithless")
-
-/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0)
-	return 1 //copypasta from carp code