Merge resolution.

code/modules/mob/hear_say.dm

@@ -41,7 +41,8 @@
 	var/track = null
 	if(istype(src, /mob/dead/observer))
 		if(italics && client.prefs.toggles & CHAT_GHOSTRADIO)
-			return
+			if(!verb == ("whispers" || " quietly" || " softly"))
+				return
 		if(speaker_name != speaker.real_name && speaker.real_name)
 			speaker_name = "[speaker.real_name] ([speaker_name])"
 		track = "(<a href='byond://?src=\ref[src];track=\ref[speaker]'>follow</a>) "
@@ -70,9 +71,13 @@
 		return
 
 	var/track = null
-
+	var/speaker_name
 	var/style = "body"
 
+	if(!language)
+		language = new /datum/language/common
+//	if(!speaker)
+
 	//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
 	if (language && (language.flags & NONVERBAL))
 		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
@@ -93,13 +98,13 @@
 
 	if(hard_to_hear)
 		message = stars(message)
-
-	var/speaker_name = speaker.name
+	if(speaker)
+		speaker_name = speaker.name
 
 	if(vname)
 		speaker_name = vname
 
-	if(istype(speaker, /mob/living/carbon/human))
+	if(speaker && (istype(speaker, /mob/living/carbon/human)))
 		var/mob/living/carbon/human/H = speaker
 		if(H.voice)
 			speaker_name = H.voice
@@ -113,7 +118,7 @@
 		var/jobname // the mob's "job"
 		var/mob/living/carbon/human/impersonating //The crewmember being impersonated, if any.
 
-		if (ishuman(speaker))
+		if (speaker && (ishuman(speaker)))
 			var/mob/living/carbon/human/H = speaker
 
 			if((H.wear_id && istype(H.wear_id,/obj/item/weapon/card/id/syndicate)) && (H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/gas/voice)))

code/modules/mob/language.dm

@@ -146,6 +146,14 @@
 	key = "4"
 	flags = SIGNLANG
 
+/datum/language/vaurcese
+	name = "Vaurcese"
+	desc = "Vaurca native language made of clicks and sputters, \"It's a bugs life.\""
+	speech_verb = "clicks"
+	colour = "vaurca"
+	key = "p"
+	flags = WHITELISTED
+
 ////////////////////////////////////
 //Not sure if stuff but yeah
 ////////////////////////////////////

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

@@ -133,10 +133,11 @@
 /mob/living/carbon/proc/swap_hand()
 	var/obj/item/item_in_hand = src.get_active_hand()
 	if(item_in_hand) //this segment checks if the item in your hand is twohanded.
-		if(istype(item_in_hand,/obj/item/weapon/twohanded))
+		if(istype(item_in_hand,/obj/item/weapon/twohanded) || istype(item_in_hand,/obj/item/weapon/gun))
 			if(item_in_hand:wielded == 1)
 				usr << "<span class='warning'>Your other hand is too busy holding the [item_in_hand.name]</span>"
 				return
+
 	src.hand = !( src.hand )
 	if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object)
 		if(hand)	//This being 1 means the left hand is in use

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

@@ -39,10 +39,12 @@
 /mob/living/carbon/human/machine/New(var/new_loc)
 	h_style = "blue IPC screen"
 	..(new_loc, "Machine")
+*/
 
 /mob/living/carbon/human/machine/isipc()
 	return 1
 
+/*
 /mob/living/carbon/human/kocasslani/New(var/new_loc)
 	h_style = "Bald"
 	..(new_loc, "Kocasslani")

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

@@ -1857,6 +1857,14 @@
 					holder.icon_state = "hudninja"
 				if("Vampire")
 					holder.icon_state = "hudvampire"
+				if("head_loyalist")
+					holder.icon_state = "loyalist"
+				if("loyalist")
+					holder.icon_state = "loyalist"
+				if("head_mutineer")
+					holder.icon_state = "mutineer"
+				if("mutineer")
+					holder.icon_state = "mutineer"
 
 			hud_list[SPECIALROLE_HUD] = holder
 	hud_updateflag = 0

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

@@ -137,7 +137,7 @@
 		else
 			if(!(stunned >= 4))
 				if(message_mode)
-					if(message_mode in (radiochannels | "department"))
+					if(message_mode in (radiochannels | "department" | "special"))
 						if(l_ear && istype(l_ear,/obj/item/device/radio))
 							l_ear.talk_into(src,message, message_mode, verb, speaking)
 							used_radios += l_ear

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

@@ -42,7 +42,7 @@
 	var/death_message = "seizes up and falls limp, their eyes dead and lifeless..."
 
 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
-	var/poison_type = "plasma"   // Poisonous air.
+	var/poison_type = "toxins"   // Poisonous air.
 	var/exhale_type = "carbon_dioxide"      // Exhaled gas type.
 
 	var/total_health = 100  //Point at which the mob will enter crit.
@@ -483,7 +483,7 @@
 
 	icobase = 'icons/mob/human_races/r_machine.dmi' //placeholders
 	deform = 'icons/mob/human_races/r_machine.dmi' //bloop blop butts
-	language = "Tradeband" //placeholders //vaurcese, :p to speak.  no support on language side yet
+	language = "Vaurcese"
 	unarmed_type = /datum/unarmed_attack/claws //literally butts
 	secondary_unarmed_type = /datum/unarmed_attack/bite/strong
 	rarity_value = 2 //according to the code this does nothing but upset me so i guess it can stay

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

@@ -6,7 +6,7 @@
 		usr << "\red Speech is currently admin-disabled."
 		return
 
-	log_whisper("[src.name]/[src.key] : [message]")
+//	log_whisper("[src.name]/[src.key] : [message]")
 
 	if (src.client)
 		if (src.client.prefs.muted & MUTE_IC)
@@ -99,7 +99,7 @@
 		if (!(M.client))
 			continue
 		if(M.stat == DEAD && M.client && (M.client.prefs.toggles & CHAT_GHOSTEARS))
-			listening |= M //I want to see if this does anything for ghosts
+//			listening |= M //I want to see if this does anything for ghosts
 			M.hear_say(message, verb, speaking, alt_name, italics, src)
 
 	//Pass whispers on to anything inside the immediate listeners.

code/modules/mob/living/login.dm

@@ -17,6 +17,11 @@
 			if("nuclear emergency")
 				if(mind in ticker.mode:syndicates)
 					ticker.mode.update_all_synd_icons()
+
+			if("mutiny")
+				var/datum/game_mode/mutiny/mode = get_mutiny_mode()
+				if(mode)
+					mode.update_all_icons()
 	return .
 
 //This stuff needs to be merged from cloning.dm but I'm not in the mood to be shouted at for breaking all the things :< ~Carn