Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem

code/modules/admin/player_panel.dm

@@ -462,6 +462,24 @@
 					dat += "<tr><td><i>Traitor not found!</i></td></tr>"
 			dat += "</table>"
 
+		if(ticker.mode.shadows.len)
+			dat += "<br><table cellspacing=5><tr><td><B>Shadowlings</B></td><td></td></tr>"
+			for(var/datum/mind/N in ticker.mode.shadows)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td></tr>"
+			dat += "</table>"
+
+		if(ticker.mode.thralls.len)
+			dat += "<br><table cellspacing=5><tr><td><B>Shadowling Thralls</B></td><td></td></tr>"
+			for(var/datum/mind/N in ticker.mode.thralls)
+				var/mob/M = N.current
+				if(M)
+					dat += "<tr><td><a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
+					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td></tr>"
+			dat += "</table>"
+
 		if(istype(ticker.mode, /datum/game_mode/blob))
 			var/datum/game_mode/blob/mode = ticker.mode
 			dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"

code/modules/client/preferences.dm

@@ -16,7 +16,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"blob" = /datum/game_mode/blob,					//9
 	"ninja",										//10
 	"monkey" = /datum/game_mode/monkey,				//11
-	"gangster" = /datum/game_mode/gang				//12
+	"gangster" = /datum/game_mode/gang,				//12
+	"shadowling" = /datum/game_mode/shadowling		//13
 )
 
 

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

@@ -0,0 +1,33 @@
+/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