Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	html/changelog.html

code/game/dna.dm

@@ -331,7 +331,7 @@
 	if(!M)	return
 	var/num
 	var/newdna
-	num = rand(1,STRUCDNASIZE-1)
+	num = rand(1,UNIDNASIZE)
 	M.dna.check_integrity()
 	newdna = setblock(M.dna.uni_identity,num,add_zero2(num2hex(rand(1,4095),1),3),3)
 	M.dna.uni_identity = newdna

code/game/jobs/job/job.dm

@@ -4,8 +4,8 @@
 	var/title = "NOPE"
 
 	//Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access
-	var/minimal_access = list()		//Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population)
-	var/access = list()				//Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
+	var/list/minimal_access = list()		//Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population)
+	var/list/access = list()				//Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
 
 	//Bitflags for the job
 	var/flag = 0
@@ -46,12 +46,12 @@
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
-		return src.minimal_access
+		return src.minimal_access.Copy()
 
 	if(config.jobs_have_minimal_access)
-		return src.minimal_access
+		return src.minimal_access.Copy()
 	else
-		return src.access
+		return src.access.Copy()
 
 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
 /datum/job/proc/player_old_enough(client/C)

code/game/machinery/cloning.dm

@@ -197,6 +197,7 @@
 	if(H.dna)
 		H.dna.mutantrace = mrace
 		H.update_mutantrace()
+		H.update_mutantrace_languages()
 	H.suiciding = 0
 	src.attempting = 0
 	return 1

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -120,8 +120,8 @@
 /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob)
 	on = !on
 	if(on)
-		user.visible_message("\red You extend the baton.",\
-		"\red With a flick of their wrist, [user] extends their telescopic baton.",\
+		user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\
+		"\red You extend the baton.",\
 		"You hear an ominous click.")
 		icon_state = "telebaton_1"
 		item_state = "telebaton_1"
@@ -129,8 +129,8 @@
 		force = 15//quite robust
 		attack_verb = list("smacked", "struck", "slapped")
 	else
-		user.visible_message("\blue You collapse the baton.",\
-		"\blue [user] collapses their telescopic baton.",\
+		user.visible_message("\blue [user] collapses their telescopic baton.",\
+		"\blue You collapse the baton.",\
 		"You hear a click.")
 		icon_state = "telebaton_0"
 		item_state = "telebaton_0"

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

@@ -48,9 +48,6 @@
 
 
 /mob/living/carbon/human/death(gibbed)
-	if(halloss > 0 && !gibbed)
-		halloss = 0
-		return
 	if(stat == DEAD)	return
 	if(healths)		healths.icon_state = "health5"
 	stat = DEAD

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

@@ -823,6 +823,15 @@
 		else if(src.dna.mutantrace == "tajaran")
 			return "Tajaran"
 
+/mob/living/carbon/proc/update_mutantrace_languages()
+	if(src.dna)
+		if(src.dna.mutantrace == "lizard")
+			src.soghun_talk_understand = 1
+		else if(src.dna.mutantrace == "skrell")
+			src.skrell_talk_understand = 1
+		else if(src.dna.mutantrace == "tajaran")
+			src.tajaran_talk_understand = 1
+
 /mob/living/carbon/human/proc/play_xylophone()
 	if(!src.xylophone)
 		visible_message("\red [src] begins playing his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.")

code/modules/mob/living/say.dm

@@ -402,7 +402,7 @@ var/list/department_radio_keys = list(
 				var/deaf_message = ""
 				var/deaf_type = 1
 				if(M != src)
-					deaf_message = "<span class='name'>[name][alt_name]</span> talks but you cannot hear them."
+					deaf_message = "<span class='name'>[name]</span>[alt_name] talks but you cannot hear them."
 				else
 					deaf_message = "<span class='notice'>You cannot hear yourself!</span>"
 					deaf_type = 2 // Since you should be able to hear yourself without looking
@@ -416,12 +416,12 @@ var/list/department_radio_keys = list(
 			message_b = voice_message
 		else
 			message_b = stars(message)
-			message_b = say_quote(message_b)
+			message_b = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"
 
-		rendered = "<span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[message_b]</span></span>"
+		rendered = "<span class='game say'><span class='name'>[name]</span>[alt_name] <span class='message'>[message_b]</span></span>" //Voice_name isn't too useful. You'd be able to tell who was talking presumably.
 
 
 		for (var/M in heard_b)

code/modules/mob/living/silicon/robot/robot.dm

@@ -210,14 +210,14 @@
 /mob/living/silicon/robot/verb/Namepick()
 	if(custom_name)
 		return 0
+	spawn(0)
+		var/newname
+		newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
+		if (newname != "")
+			custom_name = newname
 
-	var/newname
-	newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
-	if (newname != "")
-		custom_name = newname
-
-	updatename("Default")
-	updateicon()
+		updatename("Default")
+		updateicon()
 
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
 	set category = "Robot Commands"

code/setup.dm

@@ -304,6 +304,7 @@ var/MAX_EXPLOSION_RANGE = 14
 // mob/var/list/mutations
 
 #define STRUCDNASIZE 27
+#define UNIDNASIZE 13
 
 	// Generic mutations:
 #define	TK				1