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

# Conflicts:
#	code/__DEFINES/misc.dm

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

@@ -62,27 +62,38 @@
 	return ..()
 
 /mob/living/carbon/human/proc/HasVoiceChanger()
-	if(istype(back,/obj/item/rig))
+	if(istype(back, /obj/item/rig))
 		var/obj/item/rig/rig = back
 		if(rig.speech && rig.speech.voice_holder && rig.speech.voice_holder.active && rig.speech.voice_holder.voice)
 			return rig.speech.voice_holder.voice
 
-	for(var/obj/item/gear in list(wear_mask,wear_suit,head))
+	for(var/obj/item/gear in list(wear_mask, wear_suit, head))
 		if(!gear)
 			continue
+
 		var/obj/item/voice_changer/changer = locate() in gear
-		if(changer && changer.active && changer.voice)
-			return changer.voice
-	return 0
+		if(changer && changer.active)
+			if(changer.voice)
+				return changer.voice
+			else if(wear_id)
+				var/obj/item/card/id/idcard = wear_id.GetID()
+				if(istype(idcard))
+					return idcard.registered_name
+
+	return FALSE
 
 /mob/living/carbon/human/GetVoice()
 	var/has_changer = HasVoiceChanger()
+
 	if(has_changer)
 		return has_changer
+
 	if(mind && mind.changeling && mind.changeling.mimicing)
 		return mind.changeling.mimicing
+
 	if(GetSpecialVoice())
 		return GetSpecialVoice()
+
 	return real_name
 
 /mob/living/carbon/human/IsVocal()
@@ -124,7 +135,6 @@
 		span = mind.speech_span
 	if((COMIC in mutations) \
 		|| (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs) \
-		|| istype(get_item_by_slot(slot_wear_mask), /obj/item/clothing/mask/gas/voice/clown) \
 		|| GetComponent(/datum/component/jestosterone))
 		span = "sans"
 

code/modules/mob/mob_defines.dm

@@ -195,6 +195,7 @@
 	var/list/permanent_huds = list()
 
 	var/list/actions = list()
+	var/list/datum/action/chameleon_item_actions
 
 	var/list/progressbars = null	//for stacking do_after bars
 

code/modules/mob/new_player/new_player.dm

@@ -464,8 +464,7 @@
 				dat += " [a.title]. </font><br>"
 
 
-	dat += "Choose from the following open positions:<br><br>"
-
+	var/num_jobs_available = 0
 	var/list/activePlayers = list()
 	var/list/categorizedJobs = list(
 		"Command" = list(jobs = list(), titles = command_positions, color = "#aac1ee"),
@@ -480,6 +479,7 @@
 		)
 	for(var/datum/job/job in SSjobs.occupations)
 		if(job && IsJobAvailable(job.title) && !job.barred_by_disability(client))
+			num_jobs_available++
 			activePlayers[job] = 0
 			var/categorized = 0
 			// Only players with the job assigned and AFK for less than 10 minutes count as active
@@ -502,23 +502,27 @@
 			if(!categorized)
 				categorizedJobs["Miscellaneous"]["jobs"] += job
 
-	dat += "<table><tr><td valign='top'>"
-	for(var/jobcat in categorizedJobs)
-		if(categorizedJobs[jobcat]["colBreak"])
-			dat += "</td><td valign='top'>"
-		if(length(categorizedJobs[jobcat]["jobs"]) < 1)
-			continue
-		var/color = categorizedJobs[jobcat]["color"]
-		dat += "<fieldset style='border: 2px solid [color]; display: inline'>"
-		dat += "<legend align='center' style='color: [color]'>[jobcat]</legend>"
-		for(var/datum/job/job in categorizedJobs[jobcat]["jobs"])
-			if(job in SSjobs.prioritized_jobs)
-				dat += "<a href='byond://?src=[UID()];SelectedJob=[job.title]'><font color='lime'><B>[job.title] ([job.current_positions]) (Active: [activePlayers[job]])</B></font></a><br>"
-			else
-				dat += "<a href='byond://?src=[UID()];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [activePlayers[job]])</a><br>"
-		dat += "</fieldset><br>"
+	if(num_jobs_available)
+		dat += "Choose from the following open positions:<br><br>"
+		dat += "<table><tr><td valign='top'>"
+		for(var/jobcat in categorizedJobs)
+			if(categorizedJobs[jobcat]["colBreak"])
+				dat += "</td><td valign='top'>"
+			if(length(categorizedJobs[jobcat]["jobs"]) < 1)
+				continue
+			var/color = categorizedJobs[jobcat]["color"]
+			dat += "<fieldset style='border: 2px solid [color]; display: inline'>"
+			dat += "<legend align='center' style='color: [color]'>[jobcat]</legend>"
+			for(var/datum/job/job in categorizedJobs[jobcat]["jobs"])
+				if(job in SSjobs.prioritized_jobs)
+					dat += "<a href='byond://?src=[UID()];SelectedJob=[job.title]'><font color='lime'><B>[job.title] ([job.current_positions]) (Active: [activePlayers[job]])</B></font></a><br>"
+				else
+					dat += "<a href='byond://?src=[UID()];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [activePlayers[job]])</a><br>"
+			dat += "</fieldset><br>"
 
-	dat += "</td></tr></table></center>"
+		dat += "</td></tr></table></center>"
+	else
+		dat += "<br><br><center>Unfortunately, there are no job slots free currently.<BR>Wait a few minutes, then try again.<BR>Or, try observing the round.</center>"
 	// Removing the old window method but leaving it here for reference
 //		src << browse(dat, "window=latechoices;size=300x640;can_close=1")
 	// Added the new browser window method