Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

code/modules/mob/living/simple_animal/friendly/fox.dm

@@ -30,4 +30,4 @@
 	icon_living = "Syndifox"
 	icon_dead = "Syndifox_dead"
 	flags = IS_SYNTHETIC|NO_BREATHE
-	faction = list("syndicate")
+	faction = list("syndicate")

code/modules/mob/login.dm

@@ -57,18 +57,20 @@
 			client.verbs |= H.species.abilities
 
 	CallHook("Login", list("client" = src.client, "mob" = src))
-	
+
 	//Update morgues on login/logout
 	if (stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
 		if (istype(src,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = src
+			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
+				return
 			if (G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
 		else if (istype(src,/mob/living/carbon/human))
 			C = src
-		
+
 		if (C) //We found our corpse, is it inside a morgue?
 			if (istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc
@@ -78,4 +80,4 @@
 					Morgue = B.loc
 			if (Morgue)
 				Morgue.update()
-	
+

code/modules/mob/logout.dm

@@ -10,18 +10,20 @@
 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
 				send2adminirc("[key_name(src)] logged out - no more admins online.")
 	..()
-	
+
 	//Update morgues on login/logout
 	if (stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
 		var/mob/living/carbon/human/C = null
 		if (istype(src,/mob/dead/observer)) //We're a ghost, let's find our corpse
 			var/mob/dead/observer/G = src
+			if(!G.mind) //This'll probably break morgue sprites, but the line under the next If statement causes runtimes with Assume Direct Control.
+				return 1
 			if (G.can_reenter_corpse && G.mind.current)
 				C = G.mind.current
 		else if (istype(src,/mob/living/carbon/human))
 			C = src
-		
+
 		if (C) //We found our corpse, is it inside a morgue?
 			if (istype(C.loc,/obj/structure/morgue))
 				Morgue = C.loc

code/modules/mob/mob.dm

@@ -899,6 +899,9 @@ var/list/slot_equipment_priority = list( \
 					continue
 				statpanel(listed_turf.name, null, A)
 
+	if(mind && mind.changeling)
+		add_stings_to_statpanel(mind.changeling.purchasedpowers)
+
 	if(spell_list && spell_list.len)
 		for(var/obj/effect/proc_holder/spell/wizard/S in spell_list)
 			switch(S.charge_type)
@@ -909,6 +912,11 @@ var/list/slot_equipment_priority = list( \
 				if("holdervar")
 					statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S)
 
+
+/mob/proc/add_stings_to_statpanel(var/list/stings)
+	for(var/obj/effect/proc_holder/changeling/S in stings)
+		if(S.chemical_cost >=0 && S.can_be_used_by(src))
+			statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S)
 	/* // Why have a duplicate set of turfs in the stat panel?
 	if(listed_turf)
 		if(get_dist(listed_turf,src) > 1)