Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/admin/admin.dm

@@ -335,7 +335,7 @@
 		jobs += "<a href='?src=\ref[src];newjobban2=Chemist_RD_CMO;jobban4=\ref[M]'>Chemist+RD+CMO</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=Geneticist_RD_CMO;jobban4=\ref[M]'>Geneticist+RD+CMO</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=MD_CMO;jobban4=\ref[M]'>MD+CMO</a> <br>"
-		jobs += "<a href='?src=\ref[src];newjobban2=Virologist_RD_CMO;jobban4=\ref[M]'>Virologist+RD+CMO</a> <br>"
+		/*jobs += "<a href='?src=\ref[src];newjobban2=Virologist_RD_CMO;jobban4=\ref[M]'>Virologist+RD+CMO</a> <br>"*/
 		jobs += "<a href='?src=\ref[src];newjobban2=Scientist_RD;jobban4=\ref[M]'>Scientist+RD</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=AI_Cyborg;jobban4=\ref[M]'>AI+Cyborg</a> <br>"
 		jobs += "<a href='?src=\ref[src];newjobban2=Detective_HoS;jobban4=\ref[M]'>Detective+HoS</a> <br><br>"

code/modules/admin/admin_verbs.dm

@@ -784,74 +784,77 @@
 	switch(alert("You sure you wish to edit this mob's appearance?",,"Yes","No"))
 		if("No")
 			return
-	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_facial = hex2num(copytext(new_facial, 2, 4))
-		M.g_facial = hex2num(copytext(new_facial, 4, 6))
-		M.b_facial = hex2num(copytext(new_facial, 6, 8))
+	if(istype(M,/mob/living/carbon/human/tajaran))
+		usr << "\red Tajarans do not have an editable appearance... yet!"
+	else
+		var/new_facial = input("Please select facial hair color.", "Character Generation") as color
+		if(new_facial)
+			M.r_facial = hex2num(copytext(new_facial, 2, 4))
+			M.g_facial = hex2num(copytext(new_facial, 4, 6))
+			M.b_facial = hex2num(copytext(new_facial, 6, 8))
 
-	var/new_hair = input("Please select hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_hair = hex2num(copytext(new_hair, 2, 4))
-		M.g_hair = hex2num(copytext(new_hair, 4, 6))
-		M.b_hair = hex2num(copytext(new_hair, 6, 8))
+		var/new_hair = input("Please select hair color.", "Character Generation") as color
+		if(new_facial)
+			M.r_hair = hex2num(copytext(new_hair, 2, 4))
+			M.g_hair = hex2num(copytext(new_hair, 4, 6))
+			M.b_hair = hex2num(copytext(new_hair, 6, 8))
 
-	var/new_eyes = input("Please select eye color.", "Character Generation") as color
-	if(new_eyes)
-		M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
-		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
-		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
+		var/new_eyes = input("Please select eye color.", "Character Generation") as color
+		if(new_eyes)
+			M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
+			M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
+			M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
 
-	var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation")  as text
+		var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation")  as text
 
-	if (new_tone)
-		M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
-		M.s_tone =  -M.s_tone + 35
+		if (new_tone)
+			M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
+			M.s_tone =  -M.s_tone + 35
 
-	// hair
-	var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
-	var/list/hairs = list()
+		// hair
+		var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
+		var/list/hairs = list()
 
-	// loop through potential hairs
-	for(var/x in all_hairs)
-		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
-		hairs.Add(H.name) // add hair name to hairs
-		del(H) // delete the hair after it's all done
+		// loop through potential hairs
+		for(var/x in all_hairs)
+			var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
+			hairs.Add(H.name) // add hair name to hairs
+			del(H) // delete the hair after it's all done
 
-	var/new_style = input("Please select hair style", "Character Generation")  as null|anything in hairs
+		var/new_style = input("Please select hair style", "Character Generation")  as null|anything in hairs
 
-	// if new style selected (not cancel)
-	if (new_style)
-		M.h_style = new_style
+		// if new style selected (not cancel)
+		if (new_style)
+			M.h_style = new_style
 
-		for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
-			var/datum/sprite_accessory/hair/H = new x // create new hair datum
-			if(H.name == new_style)
-				M.hair_style = H // assign the hair_style variable a new hair datum
-				break
-			else
-				del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry
+			for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
+				var/datum/sprite_accessory/hair/H = new x // create new hair datum
+				if(H.name == new_style)
+					M.hair_style = H // assign the hair_style variable a new hair datum
+					break
+				else
+					del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry
 
-	// facial hair
-	var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
-	var/list/fhairs = list()
+		// facial hair
+		var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
+		var/list/fhairs = list()
 
-	for(var/x in all_fhairs)
-		var/datum/sprite_accessory/facial_hair/H = new x
-		fhairs.Add(H.name)
-		del(H)
-
-	new_style = input("Please select facial style", "Character Generation")  as null|anything in fhairs
-
-	if(new_style)
-		M.f_style = new_style
 		for(var/x in all_fhairs)
 			var/datum/sprite_accessory/facial_hair/H = new x
-			if(H.name == new_style)
-				M.facial_hair_style = H
-				break
-			else
-				del(H)
+			fhairs.Add(H.name)
+			del(H)
+
+		new_style = input("Please select facial style", "Character Generation")  as null|anything in fhairs
+
+		if(new_style)
+			M.f_style = new_style
+			for(var/x in all_fhairs)
+				var/datum/sprite_accessory/facial_hair/H = new x
+				if(H.name == new_style)
+					M.facial_hair_style = H
+					break
+				else
+					del(H)
 
 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
 	if (new_gender)

code/modules/admin/verbs/randomverbs.dm

@@ -315,6 +315,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!record_found)//We have to pick their role if they have no record.
 		if(G_found.mind&&G_found.mind.assigned_role)//But they may have an assigned role already.
 			new_character.mind.assigned_role = G_found.mind.assigned_role//Also makes sure our MODE people are equipped right later on.
+			new_character.mind.role_alt_title = G_found.mind.role_alt_title
 		else
 			var/assigned_role = input("Please specify which job the character will be respawned as.", "Assigned role") as null|anything in get_all_jobs()
 			if(!assigned_role)	new_character.mind.assigned_role = "Assistant"//Defaults to assistant.

code/modules/chemical/Chemistry-Tools.dm

@@ -156,17 +156,27 @@
 							playsound(src.loc, 'Crowbar.ogg', 50, 1)
 							user << "\blue You remove the remote signalling device."
 							src.state = 3
-							new /obj/item/device/assembly/signaler( src.loc, 1 )
+							var/obj/item/device/assembly/signaler/S = locate() in src
+							if(S)
+								S.loc = src.loc
+							else
+								new /obj/item/device/assembly/signaler( src.loc, 1 )
 						if(isprox(W) && motion == 0)
 //							if(W:amount >= 1)
 							playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 //								W:use(1)
 							user << "\blue You attach the proximity sensor."
+							user.drop_item()
+							W.loc = src
 							motion = 1
 						if(istype(W, /obj/item/weapon/crowbar) && motion)
 							playsound(src.loc, 'Crowbar.ogg', 50, 1)
 							user << "\blue You remove the proximity sensor."
-							new /obj/item/device/assembly/prox_sensor( src.loc, 1 )
+							var/obj/item/device/assembly/prox_sensor/S = locate() in src
+							if(S)
+								S.loc = src.loc
+							else
+								new /obj/item/device/assembly/prox_sensor( src.loc, 1 )
 							motion = 0
 						if(istype(W, /obj/item/stack/sheet/glass))
 							if(W:amount >= 1)

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

@@ -115,17 +115,14 @@
 		handle_health_updates()
 			// if the mob has enough health, she should slowly heal
 			if(health >= 0)
-				var/pr = 5
+				var/pr = 10
 				if(stat == 1) // sleeping means faster healing
-					pr += 3
+					pr += 5
 				if(prob(pr))
 					heal_organ_damage(1,1)
 					adjustToxLoss(-1)
 			else if(health < 0)
-				var/pr = 8
-				// sleeping means slower damage
-				if(stat == 1)
-					pr = 3
+				var/pr = 80
 				if(prob(pr))
 					adjustToxLoss(1)
 
@@ -1203,4 +1200,4 @@
 		else if(shock_stage == 40)
 			src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
 		else if(shock_stage == 80)
-			src << "<font color='red'><b>"+pick("You see a light at the end of the tunnel!", "You feel like you could die any moment now.", "You're about to lose consciousness.")
+			src << "<font color='red'><b>"+pick("You see a light at the end of the tunnel!", "You feel like you could die any moment now.", "You're about to lose consciousness.")

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

@@ -1,7 +1,4 @@
 /mob/living/carbon/human/say(var/message)
-	if(src.mutantrace == "lizard")
-		if(copytext(message, 1, 2) != "*")
-			message = dd_replaceText(message, "s", stutter("ss"))
 	if(src.mutantrace == "metroid" && prob(5))
 		if(copytext(message, 1, 2) != "*")
 			if(copytext(message, 1, 2) == ";")

code/modules/mob/new_player/new_player.dm

@@ -253,9 +253,9 @@
 			src << alert("[rank] is not available. Please try another.")
 			return 0
 
+		job_master.AssignRole(src, rank, 1)
 		var/mob/living/carbon/human/character = create_character()
 		var/icon/char_icon = getFlatIcon(character,0)//We're creating out own cache so it's not needed.
-		job_master.AssignRole(character, rank, 1)
 		job_master.EquipRank(character, rank, 1)
 		EquipCustomItems(character)
 		character.loc = pick(latejoin)
@@ -327,7 +327,7 @@
 			L.fields["sex"] = H.gender
 			L.fields["age"] = H.age
 			L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]")
-			L.fields["rank"] = H.mind.assigned_role
+			L.fields["rank"] = H.mind.role_alt_title ? H.mind.role_alt_title : H.mind.assigned_role
 			L.fields["b_type"] = H.dna.b_type
 			L.fields["b_dna"] = H.dna.unique_enzymes
 			L.fields["enzymes"] = H.dna.struc_enzymes

code/modules/mob/new_player/preferences.dm

@@ -104,6 +104,8 @@ datum/preferences
 		job_engsec_med = 0
 		job_engsec_low = 0
 
+		list/job_alt_titles = new()		// the default name of a job like "Medical Doctor"
+
 		flavor_text = ""
 
 		// slot stuff
@@ -213,6 +215,19 @@ datum/preferences
 	proc/closesave(mob/user)
 		user << browse(null, "window=saves;size=300x640")
 
+	proc/GetAltTitle(datum/job/job)
+		return job_alt_titles.Find(job.title) > 0 \
+			? job_alt_titles[job.title] \
+			: job.title
+
+	proc/SetAltTitle(datum/job/job, new_title)
+		// remove existing entry
+		if(job_alt_titles.Find(job.title))
+			job_alt_titles -= job.title
+		// add one if it's not default
+		if(job.title != new_title)
+			job_alt_titles[job.title] = new_title
+
 	proc/SetChoices(mob/user, changedjob)
 		var/HTML = "<body>"
 		HTML += "<tt><center>"
@@ -246,14 +261,17 @@ datum/preferences
 				HTML += "<font color=orange>\[Low]</font>"
 			else
 				HTML += "<font color=red>\[NEVER]</font>"
-			HTML += "</a><br>"
+			if(job.alt_titles)
+				HTML += "</a> <a href=\"byond://?src=\ref[user];preferences=1;alt_title=1;job=\ref[job]\">\[[GetAltTitle(job)]\]</a><br>"
+			else
+				HTML += "</a><br>"
 
 		HTML += "<br>"
 		HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=0;job=cancel\">\[Done\]</a>"
 		HTML += "</center></tt>"
 
 		user << browse(null, "window=preferences")
-		user << browse(HTML, "window=mob_occupation;size=320x600")
+		user << browse(HTML, "window=mob_occupation;size=350x600")
 		return
 
 
@@ -378,6 +396,14 @@ datum/preferences
 
 			return 1
 
+		if(link_tags["alt_title"] && link_tags["job"])
+			var/datum/job/job = locate(link_tags["job"])
+			var/choices = list(job.title) + job.alt_titles
+			var/choice = input("Pick a title for [job.title].", "Character Generation", GetAltTitle(job)) as anything in choices | null
+			if(choice)
+				SetAltTitle(job, choice)
+				SetChoices(user)
+
 		if(link_tags["real_name"])
 			var/new_name
 
@@ -638,6 +664,7 @@ datum/preferences
 			job_engsec_high = 0
 			job_engsec_med = 0
 			job_engsec_low = 0
+			job_alt_titles = new()
 			underwear = 1
 			be_special = 0
 			be_random_name = 0

code/modules/mob/new_player/savefile.dm

@@ -115,6 +115,8 @@ datum/preferences/proc/savefile_save(mob/user, slot)
 	F["job_engsec_med"] << src.job_engsec_med
 	F["job_engsec_low"] << src.job_engsec_low
 
+	F["job_alt_titles"] << job_alt_titles
+
 	//Body data
 	F["hair_red"] << src.r_hair
 	F["hair_green"] << src.g_hair
@@ -212,6 +214,10 @@ datum/preferences/proc/savefile_load(mob/user, slot)
 	F["job_engsec_med"] >> src.job_engsec_med
 	F["job_engsec_low"] >> src.job_engsec_low
 
+	F["job_alt_titles"] >> job_alt_titles
+	if(!job_alt_titles)
+		job_alt_titles = new()
+
 	//NOTE: Conversion things go inside this if statement
 	//When updating the save file remember to add 1 to BOTH the savefile constants
 	//Also take the old conversion things that no longer apply out of this if