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

Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

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/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

@@ -132,17 +132,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/mining/mine_items.dm

@@ -86,6 +86,11 @@ proc/move_mining_shuttle()
 /obj/machinery/computer/mining_shuttle/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 	if (istype(W, /obj/item/weapon/card/emag))
+		var/obj/item/weapon/card/emag/E = W
+		if(E.uses)
+			E.uses--
+		else
+			return
 		src.req_access = list()
 		hacked = 1
 		usr << "You fried the consoles ID checking system. It's now available to everyone!"

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/living/silicon/robot/robot.dm

@@ -421,6 +421,11 @@
 				user << "\red Access denied."
 
 	else if(istype(W, /obj/item/weapon/card/emag))		// trying to unlock with an emag card
+		var/obj/item/weapon/card/emag/E = W
+		if(E.uses)
+			E.uses--
+		else
+			return
 		if(!opened)//Cover is closed
 			if(locked)
 				if(prob(90))

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

code/modules/power/apc.dm

@@ -300,6 +300,12 @@
 			else
 				user << "\red Access denied."
 	else if (istype(W, /obj/item/weapon/card/emag) && !(emagged || malfhack))		// trying to unlock with an emag card
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		if(opened)
 			user << "You must close the cover to swipe an ID card."
 		else if(wiresexposed)
@@ -859,7 +865,7 @@
 				else
 					src.malfai = usr
 				malfai << "Hack complete. The APC is now under your exclusive control."
-				updateicon()
+				updateicon()
 
 	else if (href_list["occupyapc"])
 		malfoccupy(usr)
@@ -876,21 +882,21 @@
 		return
 	if(src.z != 1)
 		return
-	
+
 	src.occupant = new /mob/living/silicon/ai(src,malf.laws,null,1)
 	src.occupant.adjustOxyLoss(malf.getOxyLoss())
 	src.occupant.name = "[malf.name] APC Copy"
-	
+
 	if(malf.parent)
 		src.occupant.parent = malf.parent
 	else
 		src.occupant.parent = malf
-	
+
 	malf.mind.transfer_to(src.occupant)
-	
+
 	if(malf.parent)
 		del(malf)
-	
+
 	src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupant.cancel_camera()
 

code/modules/power/pacman2.dm

@@ -81,6 +81,11 @@
 			O.loc = src
 			user << "\blue You add the plasma tank to the generator."
 		else if (istype(O, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = O
+			if(E.uses)
+				E.uses--
+			else
+				return
 			emagged = 1
 			emp_act(1)
 		else if(!active)

code/modules/power/port_gen.dm

@@ -196,6 +196,11 @@ display round(lastgen) and plasmatank amount
 			del(O)
 			user << "\blue You add a coin to the generator."
 		else if (istype(O, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = O
+			if(E.uses)
+				E.uses--
+			else
+				return
 			emagged = 1
 			emp_act(1)
 		else if(!active)

code/modules/research/rdconsole.dm

@@ -176,6 +176,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			D.loc = src
 			user << "\blue You add the disk to the machine!"
 		else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+			var/obj/item/weapon/card/emag/E = D
+			if(E.uses)
+				E.uses--
+			else
+				return
 			playsound(src.loc, 'sparks4.ogg', 75, 1)
 			emagged = 1
 			user << "\blue You you disable the security protocols"

code/modules/research/server.dm

@@ -326,6 +326,11 @@
 					A.anchored = 1
 					del(src)
 		else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+			var/obj/item/weapon/card/emag/E = D
+			if(E.uses)
+				E.uses--
+			else
+				return
 			playsound(src.loc, 'sparks4.ogg', 75, 1)
 			emagged = 1
 			user << "\blue You you disable the security protocols"