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

Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

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

code/modules/DetectiveWork/evidence.dm

@@ -8,7 +8,6 @@
 	item_state = ""
 	w_class = 1
 
-/obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
 /obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user as mob)
 	if(!in_range(I, user))
 		return

code/modules/client/preferences.dm

@@ -91,7 +91,7 @@ datum/preferences
 	// will probably not be able to do this for head and torso ;)
 	var/list/organ_data = list()
 
-	var/list/job_alt_titles = new()		// the default name of a job like "Medical Doctor"
+	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
 
 	var/flavor_text = ""
 	var/med_record = ""
@@ -429,7 +429,7 @@ datum/preferences
 			else
 				HTML += " <font color=red>\[NEVER]</font>"
 			if(job.alt_titles)
-				HTML += "</a><br> <a href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetAltTitle(job)]\]</a></td></tr>"
+				HTML += "</a><br> <a href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></td></tr>"
 			HTML += "</a></td></tr>"
 
 		HTML += "</td'></tr></table>"
@@ -491,18 +491,18 @@ datum/preferences
 		user << browse(HTML, "window=records;size=350x300")
 		return
 
-	proc/GetAltTitle(datum/job/job)
-		return job_alt_titles.Find(job.title) > 0 \
-			? job_alt_titles[job.title] \
+	proc/GetPlayerAltTitle(datum/job/job)
+		return player_alt_titles.Find(job.title) > 0 \
+			? player_alt_titles[job.title] \
 			: job.title
 
-	proc/SetAltTitle(datum/job/job, new_title)
+	proc/SetPlayerAltTitle(datum/job/job, new_title)
 		// remove existing entry
-		if(job_alt_titles.Find(job.title))
-			job_alt_titles -= job.title
+		if(player_alt_titles.Find(job.title))
+			player_alt_titles -= job.title
 		// add one if it's not default
 		if(job.title != new_title)
-			job_alt_titles[job.title] = new_title
+			player_alt_titles[job.title] = new_title
 
 	proc/SetJob(mob/user, role)
 		var/datum/job/job = job_master.GetJob(role)
@@ -642,9 +642,9 @@ datum/preferences
 					var/datum/job/job = locate(href_list["job"])
 					if (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
+						var/choice = input("Pick a title for [job.title].", "Character Generation", GetPlayerAltTitle(job)) as anything in choices | null
 						if(choice)
-							SetAltTitle(job, choice)
+							SetPlayerAltTitle(job, choice)
 							SetChoices(user)
 				if("input")
 					SetJob(user, href_list["text"])

code/modules/client/preferences_savefile.dm

@@ -138,7 +138,7 @@
 	S["sec_record"]			>> sec_record
 	S["be_special"]			>> be_special
 	S["disabilities"]		>> disabilities
-	S["job_alt_titles"]		>> job_alt_titles
+	S["player_alt_titles"]		>> player_alt_titles
 	S["used_skillpoints"]	>> used_skillpoints
 	S["skills"]				>> skills
 	S["skill_specialization"] >> skill_specialization
@@ -182,7 +182,7 @@
 	if(!skills) skills = list()
 	if(!used_skillpoints) used_skillpoints= 0
 	if(isnull(disabilities)) disabilities = 0
-	if(!job_alt_titles) job_alt_titles = new()
+	if(!player_alt_titles) player_alt_titles = new()
 	if(!organ_data) src.organ_data = list()
 	//if(!skin_style) skin_style = "Default"
 
@@ -232,7 +232,7 @@
 	S["flavor_text"]		<< flavor_text
 	S["med_record"]			<< med_record
 	S["sec_record"]			<< sec_record
-	S["job_alt_titles"]		<< job_alt_titles
+	S["player_alt_titles"]		<< player_alt_titles
 	S["be_special"]			<< be_special
 	S["used_skillpoints"]	<< used_skillpoints
 	S["skills"]				<< skills

code/modules/clothing/glasses/hud.dm

@@ -83,17 +83,16 @@
 	var/icon/tempHud = 'icons/mob/hud.dmi'
 	for(var/mob/living/carbon/human/perp in view(M))
 		if(!C) continue
-		var/perpname = "wot"
+		var/perpname = perp.name
 		if(perp.wear_id)
 			var/obj/item/weapon/card/id/I = perp.wear_id.GetID()
 			if(I)
-				C.images += image(tempHud, perp, "hud[ckey(I.GetJobName())]")
+				C.images += image(tempHud, perp, "hud[ckey(I.GetJobRealName())]")
 				perpname = I.registered_name
 			else
 				perpname = perp.name
 				C.images += image(tempHud, perp, "hudunknown")
 		else
-			perpname = perp.name
 			C.images += image(tempHud, perp, "hudunknown")
 
 		for(var/datum/data/record/E in data_core.general)

code/modules/mining/satchel_ore_boxdm.dm

@@ -28,6 +28,7 @@
 	var/amt_plasma = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
+	var/amt_strange = 0
 
 
 	for (var/obj/item/weapon/ore/C in contents)
@@ -47,6 +48,8 @@
 			amt_uranium++;
 		if (istype(C,/obj/item/weapon/ore/clown))
 			amt_clown++;
+		if (istype(C,/obj/item/weapon/ore/strangerock))
+			amt_strange++;
 
 	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
 	if (amt_gold)
@@ -65,6 +68,8 @@
 		dat += text("Uranium ore: [amt_uranium]<br>")
 	if (amt_clown)
 		dat += text("Bananium ore: [amt_clown]<br>")
+	if (amt_strange)
+		dat += text("Strange rocks: [amt_strange]<br>")
 
 	dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
 	user << browse("[dat]", "window=orebox")

code/modules/mob/dead/observer/observer.dm

@@ -258,3 +258,31 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		see_invisible = SEE_INVISIBLE_OBSERVER
 	else
 		see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
+
+/mob/dead/observer/verb/become_mouse()
+	set name = "Become mouse"
+	set category = "Ghost"
+
+	//find a viable mouse candidate
+	var/mob/living/simple_animal/mouse/host
+	var/list/mouse_candidates = list()
+	for(var/mob/living/simple_animal/mouse/M in world)
+		if(!M.ckey && !M.stat)
+			mouse_candidates.Add(M)
+	if(mouse_candidates.len)
+		host = pick(mouse_candidates)
+	else
+		var/obj/machinery/atmospherics/unary/vent_pump/vent_found
+		var/list/found_vents = list()
+		for(var/obj/machinery/atmospherics/unary/vent_pump/v in world)
+			if(!v.welded && v.z == src.z)
+				found_vents.Add(v)
+		if(found_vents.len)
+			vent_found = pick(found_vents)
+			host = new /mob/living/simple_animal/mouse(vent_found.loc)
+		else
+			src << "<span class='warning'>Unable to find any live mice, or unwelded vents to spawn one at.</span>"
+
+	if(host)
+		host.ckey = src.ckey
+		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"

code/modules/mob/living/silicon/pai/hud.dm

@@ -10,7 +10,7 @@
 		var/turf/T = get_turf_or_move(src.loc)
 		for(var/mob/living/carbon/human/perp in view(T))
 			if(perp.wear_id)
-				client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]")
+				client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobRealName())]")
 				var/perpname = "wot"
 				if(istype(perp.wear_id,/obj/item/weapon/card/id))
 					perpname = perp.wear_id:registered_name

code/modules/mob/new_player/new_player.dm

@@ -319,8 +319,9 @@
 			if(job && IsJobAvailable(job.title))
 				var/active = 0
 				// Only players with the job assigned and AFK for less than 10 minutes count as active
-				for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_job == job && M.client.inactivity <= 10 * 60 * 10)
-					active++
+				for(var/mob/M in player_list)
+					if(M.mind && M.mind.assigned_job == job && M.client && M.client.inactivity <= 10 * 60 * 10)
+						active++
 				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
 
 		dat += "</center>"

code/modules/projectiles/gun.dm

@@ -75,6 +75,7 @@
 			return
 		if(!load_into_chamber())
 			user << "\red *click*";
+			playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 			return
 
 		if(!in_chamber)

code/modules/projectiles/guns/projectile/revolver.dm

@@ -143,6 +143,7 @@
 
 	if(!loaded.len)
 		user.visible_message("\red *click*", "\red *click*")
+		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 		return
 
 	if(isliving(target) && isliving(user))
@@ -153,6 +154,7 @@
 				var/obj/item/ammo_casing/AC = loaded[1]
 				if(!load_into_chamber())
 					user.visible_message("\red *click*", "\red *click*")
+					playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 					return
 				if(!in_chamber)
 					return

code/modules/research/xenoarchaeology/finds.dm

@@ -79,6 +79,8 @@
 				R.source_rock = src.source_rock
 				R.geological_data = src.geological_data
 			user << "\blue You take a core sample of the [src]."
+	else
+		..()
 
 /*Code does not work, likely due to removal/change of acid_act proc
 //Strange rocks currently melt to gooey grey w/ acid application (see reactions)