Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze

code/modules/admin/admin.dm

@@ -169,17 +169,29 @@ var/global/floorIsLava = 0
 				<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>
 				<br>
 			"}
-
-	if (M.client)
-		body += {"<br><br>
+	body += {"<br><br>
 			<b>Other actions:</b>
 			<br>
-			<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> |
+			<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A>
+			"}
+	if (M.client)
+		body += {" |
 			<A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> |
 			<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> |
 			<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
 			<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> |
 		"}
+	// language toggles
+	body += "<br><br><b>Languages:</b><br>"
+	var/f = 1
+	for(var/k in all_languages)
+		var/datum/language/L = all_languages[k]
+		if(!f) body += " | "
+		else f = 0
+		if(L in M.languages)
+			body += "<a href='?src=\ref[src];toglang=\ref[M];lang=[html_encode(k)]' style='color:#006600'>[k]</a>"
+		else
+			body += "<a href='?src=\ref[src];toglang=\ref[M];lang=[html_encode(k)]' style='color:#ff0000'>[k]</a>"
 
 	body += {"<br>
 		</body></html>

code/modules/admin/topic.dm

@@ -1496,14 +1496,11 @@
 			//open a browse window listing the contents instead
 			var/data = ""
 			var/obj/item/weapon/paper_bundle/B = fax
-			
+
 			for (var/page = 1, page <= B.amount, page++)
 				var/obj/pageobj = B.contents[page]
 				data += "<A href='?src=\ref[src];AdminFaxViewPage=[page];paper_bundle=\ref[B]'>Page [page] - [pageobj.name]</A><BR>"
-			
-			world << data
-			world << "usr = [usr]"
-			
+
 			usr << browse(data, "window=[B.name]")
 		else
 			usr << "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]"
@@ -1511,9 +1508,9 @@
 	else if (href_list["AdminFaxViewPage"])
 		var/page = text2num(href_list["AdminFaxViewPage"])
 		var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"])
-		
+
 		if (!bundle) return
-		
+
 		if (istype(bundle.contents[page], /obj/item/weapon/paper))
 			var/obj/item/weapon/paper/P = bundle.contents[page]
 			P.show_content(src.owner, 1)
@@ -1530,13 +1527,13 @@
 		if(!input)	return
 
 		var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
-		
+
 		// Create the reply message
 		var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us
 		P.name = "[command_name()]- [customname]"
 		P.info = input
 		P.update_icon()
-		
+
 		// Stamps
 		var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
 		stampoverlay.icon_state = "paper_stamp-cent"
@@ -1552,7 +1549,7 @@
 			message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)]", 1)
 		else
 			src.owner << "\red Message reply failed."
-		
+
 		spawn(100)
 			del(P)
 		return
@@ -2757,6 +2754,24 @@
 			if(href_list["vsc"] == "default")
 				vsc.SetDefault(usr)
 
+	else if(href_list["toglang"])
+		if(check_rights(R_SPAWN))
+			var/mob/M = locate(href_list["toglang"])
+			if(!istype(M))
+				usr << "[M] is illegal type, must be /mob!"
+				return
+			var/lang2toggle = href_list["lang"]
+			var/datum/language/L = all_languages[lang2toggle]
+
+			if(L in M.languages)
+				if(!M.remove_language(lang2toggle))
+					usr << "Failed to remove language '[lang2toggle]' from \the [M]!"
+			else
+				if(!M.add_language(lang2toggle))
+					usr << "Failed to add language '[lang2toggle]' from \the [M]!"
+
+			show_player_panel(M)
+
 	// player info stuff
 
 	if(href_list["add_player_info"])

code/modules/admin/verbs/adminhelp.dm

@@ -1,9 +1,18 @@
-
+#define AHELP_ADMIN 1
+#define AHELP_MENTOR 2
+#define AHELP_DEV 3
 
 //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
 var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")
 
-/client/verb/adminhelp(msg as null|text)
+var/list/adminhelp_categories = list("Mentor - Gameplay/Roleplay question" = AHELP_MENTOR,\
+									 "Admin - Rule/Gameplay issue" = AHELP_ADMIN,\
+									 "Dev - Bug report" = AHELP_DEV)
+
+/client/proc/adminhelp_admin(message)
+	adminhelp("Admin - Rule/Gameplay issue", message)
+
+/client/verb/adminhelp(selected_type in adminhelp_categories, msg as text)
 	set category = "Admin"
 	set name = "Adminhelp"
 
@@ -24,12 +33,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
 		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
 	**/
-	var/list/type = list ("Gameplay/Roleplay question", "Rule/Gameplay issue", "Bug report")
-	var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type
-	if(!selected_type)
-		return
-	if(!msg)
-		msg = input("Please enter your message:", "Admin Help", null, null) as text
 
 	if(!msg || alert("The following message will be sent to staff that administers\n the '[selected_type]' category:\n\n[msg]\n", "Admin Help", "Ok", "Cancel") == "Cancel")
 		return
@@ -130,8 +133,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 			if(X.is_afk())
 				admin_number_afk++
 
-	switch(selected_type)
-		if("Gameplay/Roleplay question")
+	switch(adminhelp_categories[selected_type])
+		if(AHELP_MENTOR)
 			if(mentorholders.len)
 				for(var/client/X in mentorholders) // Mentors get a message without buttons and no character name
 					if(X.prefs.toggles & SOUND_ADMINHELP)
@@ -142,13 +145,13 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 					if(X.prefs.toggles & SOUND_ADMINHELP)
 						X << 'sound/effects/adminhelp.ogg'
 					X << msg
-		if("Rule/Gameplay issue")
+		if(AHELP_ADMIN)
 			if(adminholders.len)
 				for(var/client/X in adminholders) // Admins of course get everything in their helps
 					if(X.prefs.toggles & SOUND_ADMINHELP)
 						X << 'sound/effects/adminhelp.ogg'
 					X << msg
-		if("Bug report")
+		if(AHELP_DEV)
 			if(debugholders.len)
 				for(var/client/X in debugholders)
 					if(R_ADMIN | R_MOD & X.holder.rights) // Admins get every button & special highlights in theirs
@@ -183,3 +186,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
+
+#undef AHELP_ADMIN
+#undef AHELP_MENTOR
+#undef AHELP_DEV

code/modules/admin/verbs/adminpm.dm

@@ -96,7 +96,7 @@
 					if(sender)
 						C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
 					else
-						adminhelp(reply)													//sender has left, adminhelp instead
+						adminhelp_admin(reply)													//sender has left, adminhelp instead
 				return
 	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "PM", src) + " to <span class='name'>[get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"
 	C << "<span class='pm'><span class='in'>" + create_text_tag("pm_in", "", C) + " <b>\[[recieve_pm_type] PM\]</b> <span class='name'>[get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]</span>: <span class='message'>[msg]</span></span></span>"

code/modules/assembly/holder.dm

@@ -211,11 +211,11 @@
 		return 1
 
 
-/obj/item/device/assembly_holder/hear_talk(mob/living/M as mob, msg)
+/obj/item/device/assembly_holder/hear_talk(mob/living/M as mob, msg, verb, datum/language/speaking)
 	if(a_right)
-		a_right.hear_talk(M,msg)
+		a_right.hear_talk(M,msg,verb,speaking)
 	if(a_left)
-		a_left.hear_talk(M,msg)
+		a_left.hear_talk(M,msg,verb,speaking)
 
 
 

code/modules/client/preferences.dm

@@ -73,6 +73,7 @@ datum/preferences
 	var/g_eyes = 0						//Eye color
 	var/b_eyes = 0						//Eye color
 	var/species = "Human"               //Species datum to use.
+	var/species_preview                 //Used for the species selection window.
 	var/language = "None"				//Secondary language
 	var/list/gear						//Custom/fluff item loadout.
 
@@ -138,7 +139,7 @@ datum/preferences
 				if(load_character())
 					return
 	gender = pick(MALE, FEMALE)
-	real_name = random_name(gender)
+	real_name = random_name(gender,species)
 
 	gear = list()
 
@@ -302,7 +303,7 @@ datum/preferences
 	dat += "<br><table><tr><td><b>Body</b> "
 	dat += "(<a href='?_src_=prefs;preference=all;task=random'>&reg;</A>)"
 	dat += "<br>"
-	dat += "Species: <a href='byond://?src=\ref[user];preference=species;task=input'>[species]</a><br>"
+	dat += "Species: <a href='?src=\ref[user];preference=species;task=change'>[species]</a><br>"
 	dat += "Secondary Language:<br><a href='byond://?src=\ref[user];preference=language;task=input'>[language]</a><br>"
 	dat += "Blood Type: <a href='byond://?src=\ref[user];preference=b_type;task=input'>[b_type]</a><br>"
 	dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
@@ -507,6 +508,8 @@ datum/preferences
 				HTML += " <font color=green>\[Yes]</font>"
 			else
 				HTML += " <font color=red>\[No]</font>"
+			if(job.alt_titles) //Blatantly cloned from a few lines down.
+				HTML += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'><a>&nbsp</a></td><td><a href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></td></tr>"
 			HTML += "</a></td></tr>"
 			continue
 
@@ -586,6 +589,62 @@ datum/preferences
 	user << browse(HTML, "window=records;size=350x300")
 	return
 
+/datum/preferences/proc/SetSpecies(mob/user)
+	if(!species_preview || !(species_preview in all_species))
+		species_preview = "Human"
+	var/datum/species/current_species = all_species[species_preview]
+	var/dat = "<body>"
+	dat += "<center><h2>[current_species.name] \[<a href='?src=\ref[user];preference=species;task=change'>change</a>\]</h2></center><hr/>"
+	dat += "<table padding='8px'>"
+	dat += "<tr>"
+	dat += "<td width = 400>[current_species.blurb]</td>"
+	dat += "<td width = 200 align='center'>"
+	if("preview" in icon_states(current_species.icobase))
+		usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
+		dat += "<img src='species_preview_[current_species.name].png' width='64px' height='64px'><br/><br/>"
+	dat += "<b>Language:</b> [current_species.language]<br/>"
+	dat += "<small>"
+	if(current_species.flags & IS_WHITELISTED)
+		dat += "</br><b>Whitelist restricted.</b>"
+	if(current_species.flags & NO_BLOOD)
+		dat += "</br><b>Does not have blood.</b>"
+	if(current_species.flags & NO_BREATHE)
+		dat += "</br><b>Does not breathe.</b>"
+	if(current_species.flags & NO_SCAN)
+		dat += "</br><b>Does not have DNA.</b>"
+	if(current_species.flags & NO_PAIN)
+		dat += "</br><b>Does not feel pain.</b>"
+	if(current_species.flags & NO_SLIP)
+		dat += "</br><b>Has excellent traction.</b>"
+	if(current_species.flags & NO_POISON)
+		dat += "</br><b>Immune to most poisons.</b>"
+	if(current_species.flags & HAS_SKIN_TONE)
+		dat += "</br><b>Has a variety of skin tones.</b>"
+	if(current_species.flags & HAS_SKIN_COLOR)
+		dat += "</br><b>Has a variety of skin colours.</b>"
+	if(current_species.flags & HAS_EYE_COLOR)
+		dat += "</br><b>Has a variety of eye colours.</b>"
+	if(current_species.flags & IS_PLANT)
+		dat += "</br><b>Has a plantlike physiology.</b>"
+	if(current_species.flags & IS_SYNTHETIC)
+		dat += "</br><b>Is machine-based.</b>"
+	dat += "</small></td>"
+	dat += "</tr>"
+	dat += "</table><center><hr/>"
+
+	var/restricted
+	if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
+		if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(user,current_species))
+			restricted = 1
+	if(restricted)
+		dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='http://baystation12.net/forums/viewtopic.php?f=46&t=5319'>the forums</a>.</small></b></font>"
+	else
+		dat += "\[<a href='?src=\ref[user];preference=species;task=input;newspecies=[species_preview]'>select</a>\]"
+	dat += "</center></body>"
+
+	user << browse(null, "window=preferences")
+	user << browse(dat, "window=species;size=700x400")
+
 /datum/preferences/proc/SetAntagoptions(mob/user)
 	if(uplinklocation == "" || !uplinklocation)
 		uplinklocation = "PDA"
@@ -1076,10 +1135,18 @@ datum/preferences
 					break
 
 	switch(href_list["task"])
+		if("change")
+			if(href_list["preference"] == "species")
+				// Actual whitelist checks are handled elsewhere, this is just for accessing the preview window.
+				var/choice = input("Which species would you like to look at?") as null|anything in whitelisted_species
+				if(!choice) return
+				species_preview = choice
+				SetSpecies(user)
+
 		if("random")
 			switch(href_list["preference"])
 				if("name")
-					real_name = random_name(gender)
+					real_name = random_name(gender,species)
 				if("age")
 					age = rand(AGE_MIN, AGE_MAX)
 				if("hair")
@@ -1131,24 +1198,11 @@ datum/preferences
 					var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
 					if(new_age)
 						age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
+
 				if("species")
-
-					var/list/new_species = list("Human")
+					user << browse(null, "window=species")
 					var/prev_species = species
-					var/whitelisted = 0
-
-					if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
-						for(var/S in whitelisted_species)
-							if(is_alien_whitelisted(user,S))
-								new_species += S
-								whitelisted = 1
-						if(!whitelisted)
-							alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
-					else //Not using the whitelist? Aliens for everyone!
-						new_species = whitelisted_species
-
-					species = input("Please select a species", "Character Generation", null) in new_species
-
+					species = href_list["newspecies"]
 					if(prev_species != species)
 						//grab one of the valid hair styles for the newly chosen species
 						var/list/valid_hairstyles = list()
@@ -1551,7 +1605,7 @@ datum/preferences
 
 /datum/preferences/proc/copy_to(mob/living/carbon/human/character, safety = 0)
 	if(be_random_name)
-		real_name = random_name(gender)
+		real_name = random_name(gender,species)
 
 	if(config.humans_need_surnames)
 		var/firstspace = findtext(real_name, " ")

code/modules/clothing/suits/storage.dm

@@ -24,8 +24,8 @@
 	pockets.emp_act(severity)
 	..()
 
-/obj/item/clothing/suit/storage/hear_talk(mob/M, var/msg)
-	pockets.hear_talk(M, msg)
+/obj/item/clothing/suit/storage/hear_talk(mob/M, var/msg, verb, datum/language/speaking)
+	pockets.hear_talk(M, msg, verb, speaking)
 	..()
 
 //Jackets with buttons, used for labcoats, IA jackets, First Responder jackets, and brown jackets.

code/modules/clothing/under/ties.dm

@@ -347,8 +347,8 @@
 	hold.emp_act(severity)
 	..()
 
-/obj/item/clothing/tie/storage/hear_talk(mob/M, var/msg)
-	hold.hear_talk(M, msg)
+/obj/item/clothing/tie/storage/hear_talk(mob/M, var/msg, verb, datum/language/speaking)
+	hold.hear_talk(M, msg, verb, speaking)
 	..()
 
 /obj/item/clothing/tie/storage/attack_self(mob/user as mob)

code/modules/mining/mine_items.dm

@@ -68,80 +68,80 @@
 
 	var/excavation_amount = 100
 
-	hammer
-		name = "sledgehammer"
-		//icon_state = "sledgehammer" Waiting on sprite
-		desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
+/obj/item/weapon/pickaxe/hammer
+	name = "sledgehammer"
+	//icon_state = "sledgehammer" Waiting on sprite
+	desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
 
-	silver
-		name = "silver pickaxe"
-		icon_state = "spickaxe"
-		item_state = "spickaxe"
-		digspeed = 30
-		origin_tech = "materials=3"
-		desc = "This makes no metallurgic sense."
+/obj/item/weapon/pickaxe/silver
+	name = "silver pickaxe"
+	icon_state = "spickaxe"
+	item_state = "spickaxe"
+	digspeed = 30
+	origin_tech = "materials=3"
+	desc = "This makes no metallurgic sense."
 
-	drill
-		name = "mining drill" // Can dig sand as well!
-		icon_state = "handdrill"
-		item_state = "jackhammer"
-		digspeed = 30
-		origin_tech = "materials=2;powerstorage=3;engineering=2"
-		desc = "Yours is the drill that will pierce through the rock walls."
-		drill_verb = "drilling"
+/obj/item/weapon/pickaxe/drill
+	name = "mining drill" // Can dig sand as well!
+	icon_state = "handdrill"
+	item_state = "jackhammer"
+	digspeed = 30
+	origin_tech = "materials=2;powerstorage=3;engineering=2"
+	desc = "Yours is the drill that will pierce through the rock walls."
+	drill_verb = "drilling"
 
-	jackhammer
-		name = "sonic jackhammer"
-		icon_state = "jackhammer"
-		item_state = "jackhammer"
-		digspeed = 20 //faster than drill, but cannot dig
-		origin_tech = "materials=3;powerstorage=2;engineering=2"
-		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
-		drill_verb = "hammering"
+/obj/item/weapon/pickaxe/jackhammer
+	name = "sonic jackhammer"
+	icon_state = "jackhammer"
+	item_state = "jackhammer"
+	digspeed = 20 //faster than drill, but cannot dig
+	origin_tech = "materials=3;powerstorage=2;engineering=2"
+	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+	drill_verb = "hammering"
 
-	gold
-		name = "golden pickaxe"
-		icon_state = "gpickaxe"
-		item_state = "gpickaxe"
-		digspeed = 20
-		origin_tech = "materials=4"
-		desc = "This makes no metallurgic sense."
+/obj/item/weapon/pickaxe/gold
+	name = "golden pickaxe"
+	icon_state = "gpickaxe"
+	item_state = "gpickaxe"
+	digspeed = 20
+	origin_tech = "materials=4"
+	desc = "This makes no metallurgic sense."
 
-	plasmacutter
-		name = "plasma cutter"
-		icon_state = "plasmacutter"
-		item_state = "gun"
-		w_class = 3.0 //it is smaller than the pickaxe
-		damtype = "fire"
-		digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
-		origin_tech = "materials=4;phorontech=3;engineering=3"
-		desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
-		drill_verb = "cutting"
+/obj/item/weapon/pickaxe/plasmacutter
+	name = "plasma cutter"
+	icon_state = "plasmacutter"
+	item_state = "gun"
+	w_class = 3.0 //it is smaller than the pickaxe
+	damtype = "fire"
+	digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
+	origin_tech = "materials=4;phorontech=3;engineering=3"
+	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+	drill_verb = "cutting"
 
-	diamond
-		name = "diamond pickaxe"
-		icon_state = "dpickaxe"
-		item_state = "dpickaxe"
-		digspeed = 10
-		origin_tech = "materials=6;engineering=4"
-		desc = "A pickaxe with a diamond pick head, this is just like minecraft."
+/obj/item/weapon/pickaxe/diamond
+	name = "diamond pickaxe"
+	icon_state = "dpickaxe"
+	item_state = "dpickaxe"
+	digspeed = 10
+	origin_tech = "materials=6;engineering=4"
+	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
 
-	diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
-		name = "diamond mining drill"
-		icon_state = "diamonddrill"
-		item_state = "jackhammer"
-		digspeed = 5 //Digs through walls, girders, and can dig up sand
-		origin_tech = "materials=6;powerstorage=4;engineering=5"
-		desc = "Yours is the drill that will pierce the heavens!"
-		drill_verb = "drilling"
+/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
+	name = "diamond mining drill"
+	icon_state = "diamonddrill"
+	item_state = "jackhammer"
+	digspeed = 5 //Digs through walls, girders, and can dig up sand
+	origin_tech = "materials=6;powerstorage=4;engineering=5"
+	desc = "Yours is the drill that will pierce the heavens!"
+	drill_verb = "drilling"
 
-	borgdrill
-		name = "cyborg mining drill"
-		icon_state = "diamonddrill"
-		item_state = "jackhammer"
-		digspeed = 15
-		desc = ""
-		drill_verb = "drilling"
+/obj/item/weapon/pickaxe/borgdrill
+	name = "cyborg mining drill"
+	icon_state = "diamonddrill"
+	item_state = "jackhammer"
+	digspeed = 15
+	desc = ""
+	drill_verb = "drilling"
 
 /*****************************Shovel********************************/
 

code/modules/mining/mine_turfs.dm

@@ -14,6 +14,7 @@
 	var/mineral/mineral
 	var/mined_ore = 0
 	var/last_act = 0
+	var/emitter_blasts_taken = 0 // EMITTER MINING! Muhehe.
 
 	var/datum/geosample/geologic_data
 	var/excavation_level = 0
@@ -52,6 +53,16 @@
 			mined_ore = 2 //some of the stuff gets blown up
 			GetDrilled()
 
+/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
+
+	// Emitter blasts
+	if(istype(Proj, /obj/item/projectile/beam/emitter))
+		emitter_blasts_taken++
+
+		if(emitter_blasts_taken > 2) // 3 blasts per tile
+			mined_ore = 1
+			GetDrilled()
+
 /turf/simulated/mineral/Bumped(AM)
 	. = ..()
 	if(istype(AM,/mob/living/carbon/human))

code/modules/mob/emote.dm

@@ -24,6 +24,8 @@
 	if (message)
 		log_emote("[name]/[key] : [message]")
 
+		var/list/seeing_obj = list() //For objs that need to see emotes.  You can use see_emote(), which is based off of hear_talk()
+
  //Hearing gasp and such every five seconds is not good emotes were not global for a reason.
  // Maybe some people are okay with that.
 
@@ -37,10 +39,21 @@
 			if(M.stat == 2 && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null)))
 				M.show_message(message)
 
+		for(var/I in view(world.view, get_turf(usr))) //get_turf is needed to stop weirdness with x-ray.
+			if(istype(I, /mob/))
+				var/mob/M = I
+				for(var/obj/O in M.contents)
+					seeing_obj |= O
+			else if(istype(I, /obj/))
+				var/obj/O = I
+				seeing_obj |= O
 
 		// Type 1 (Visual) emotes are sent to anyone in view of the item
 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			//for (var/mob/O in viewers(src, null))
+			for (var/mob/O in viewers(get_turf(src), null)) //This may break people with x-ray being able to see emotes across walls,
+															//but this saves many headaches down the road, involving mechs and pAIs.
+															//x-ray is so rare these days anyways.
 
 				if(O.status_flags & PASSEMOTES)
 
@@ -52,8 +65,13 @@
 
 				O.show_message(message, m_type)
 
+			for(var/obj/O in seeing_obj)
+				spawn(0)
+					if(O) //It's possible that it could be deleted in the meantime.
+						O.see_emote(src, message, 1)
+
 		// Type 2 (Audible) emotes are sent to anyone in hear range
-		// of the *LOCATION* -- this is important for pAIs to be heard
+		// of the *LOCATION* -- this is important for AIs/pAIs to be heard
 		else if (m_type & 2)
 			for (var/mob/O in hearers(get_turf(src), null))
 
@@ -67,6 +85,11 @@
 
 				O.show_message(message, m_type)
 
+			for(var/obj/O in seeing_obj)
+				spawn(0)
+					if(O) //It's possible that it could be deleted in the meantime.
+						O.see_emote(src, message, 2)
+
 /mob/proc/emote_dead(var/message)
 
 	if(client.prefs.muted & MUTE_DEADCHAT)

code/modules/mob/hear_say.dm

@@ -25,22 +25,21 @@
 		hear_sleep(message)
 		return
 
-	var/style = "body"
-
 	//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)))
 			message = stars(message)
 
-	if(!say_understands(speaker,language))
-		if(istype(speaker,/mob/living/simple_animal))
-			var/mob/living/simple_animal/S = speaker
-			message = pick(S.speak)
-		else
-			message = stars(message)
-
-	if(language)
-		style = language.colour
+	if(!(language && (language.flags & INNATE))) // skip understanding checks for INNATE languages
+		if(!say_understands(speaker,language))
+			if(istype(speaker,/mob/living/simple_animal))
+				var/mob/living/simple_animal/S = speaker
+				message = pick(S.speak)
+			else
+				if(language)
+					message = language.scramble(message)
+				else
+					message = stars(message)
 
 	var/speaker_name = speaker.name
 	if(istype(speaker, /mob/living/carbon/human))
@@ -61,12 +60,16 @@
 			message = "<b>[message]</b>"
 
 	if(sdisabilities & DEAF || ear_deaf)
-		if(speaker == src)
-			src << "<span class='warning'>You cannot hear yourself speak!</span>"
-		else
-			src << "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear \him."
+		if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set
+			if(speaker == src)
+				src << "<span class='warning'>You cannot hear yourself speak!</span>"
+			else
+				src << "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear \him."
 	else
-		src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][verb], <span class='message'><span class='[style]'>\"[message]\"</span></span></span>"
+		if(language)
+			src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][language.format_message(message, verb)]</span>"
+		else
+			src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][verb], <span class='message'><span class='body'>\"[message]\"</span></span></span>"
 		if (speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
 			var/turf/source = speaker? get_turf(speaker) : get_turf(src)
 			src.playsound_local(source, speech_sound, sound_vol, 1)
@@ -83,29 +86,28 @@
 
 	var/track = null
 
-	var/style = "body"
-
 	//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)))
 			message = stars(message)
 
-	if(!say_understands(speaker,language))
-		if(istype(speaker,/mob/living/simple_animal))
-			var/mob/living/simple_animal/S = speaker
-			if(S.speak && S.speak.len)
-				message = pick(S.speak)
+	if(!(language && (language.flags & INNATE))) // skip understanding checks for INNATE languages
+		if(!say_understands(speaker,language))
+			if(istype(speaker,/mob/living/simple_animal))
+				var/mob/living/simple_animal/S = speaker
+				if(S.speak && S.speak.len)
+					message = pick(S.speak)
+				else
+					return
 			else
-				return
-		else
+				if(language)
+					message = language.scramble(language)
+				else
+					message = stars(message)
+
+		if(hard_to_hear)
 			message = stars(message)
 
-	if(language)
-		style = language.colour
-
-	if(hard_to_hear)
-		message = stars(message)
-
 	var/speaker_name = speaker.name
 
 	if(vname)
@@ -165,13 +167,18 @@
 			speaker_name = "[speaker.real_name] ([speaker_name])"
 		track = "[speaker_name] (<a href='byond://?src=\ref[src];track=\ref[speaker]'>follow</a>)"
 
+	var/formatted
+	if(language)
+		formatted = language.format_message_radio(message, verb)
+	else
+		formatted = "[verb], <span class=\"body\">\"[message]\"</span>"
 	if(sdisabilities & DEAF || ear_deaf)
 		if(prob(20))
 			src << "<span class='warning'>You feel your headset vibrate but can hear nothing from it!</span>"
 	else if(track)
-		src << "[part_a][track][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
+		src << "[part_a][track][part_b][formatted]</span></span>"
 	else
-		src << "[part_a][speaker_name][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
+		src << "[part_a][speaker_name][part_b][formatted]</span></span>"
 
 /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null)
 	if(!client)

code/modules/mob/language.dm

@@ -10,28 +10,79 @@
 	var/exclaim_verb = "exclaims"    // Used when sentence ends in a !
 	var/whisper_verb                 // Optional. When not specified speech_verb + quietly/softly is used instead.
 	var/signlang_verb = list()       // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags
-	var/colour = "body"         // CSS style to use for strings in this language.
+	var/colour = "body"              // CSS style to use for strings in this language.
 	var/key = "x"                    // Character used to speak in language eg. :o for Unathi.
 	var/flags = 0                    // Various language flags.
 	var/native                       // If set, non-native speakers will have trouble speaking.
+	var/list/syllables               // Used when scrambling text for a non-speaker.
+	var/list/space_chance = 55       // Likelihood of getting a space in the random scramble string.
+
+/datum/language/proc/get_random_name(var/gender, name_count=2, syllable_count=4)
+	if(!syllables || !syllables.len)
+		if(gender==FEMALE)
+			return capitalize(pick(first_names_female)) + " " + capitalize(pick(last_names))
+		else
+			return capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
+
+	var/full_name = ""
+	var/new_name = ""
+
+	for(var/i = 0;i<name_count;i++)
+		new_name = ""
+		for(var/x = rand(Floor(syllable_count/2),syllable_count);x>0;x--)
+			new_name += pick(syllables)
+		full_name += " [capitalize(lowertext(new_name))]"
+
+	return "[trim(full_name)]"
+
+/datum/language/proc/scramble(var/input)
+
+	if(!syllables || !syllables.len)
+		return stars(input)
+
+	var/input_size = length(input)
+	var/scrambled_text = ""
+	var/capitalize = 1
+
+	while(length(scrambled_text) < input_size)
+		var/next = pick(syllables)
+		if(capitalize)
+			next = capitalize(next)
+			capitalize = 0
+		scrambled_text += next
+		var/chance = rand(100)
+		if(chance <= 5)
+			scrambled_text += ". "
+			capitalize = 1
+		else if(chance > 5 && chance <= space_chance)
+			scrambled_text += " "
+
+	scrambled_text = trim(scrambled_text)
+	var/ending = copytext(scrambled_text, length(scrambled_text))
+	if(ending == ".")
+		scrambled_text = copytext(scrambled_text,1,length(scrambled_text)-1)
+	scrambled_text += copytext(input, length(input))
+	return scrambled_text
+
+/datum/language/proc/format_message(message, verb)
+	return "[verb], <span class='message'><span class='[colour]'>\"[capitalize(message)]\"</span></span>"
+
+/datum/language/proc/format_message_radio(message, verb)
+	return "[verb], <span class='[colour]'>\"[capitalize(message)]\"</span>"
+
+/datum/language/proc/get_talkinto_msg_range(message)
+	// if you yell, you'll be heard from two tiles over instead of one
+	return (copytext(message, length(message)) == "!") ? 2 : 1
 
 /datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
-
 	log_say("[key_name(speaker)] : ([name]) [message]")
 
+	if(!speaker_mask) speaker_mask = speaker.name
+	var/msg = "<i><span class='game say'>[name], <span class='name'>[speaker_mask]</span> [format_message(message, get_spoken_verb(message))]</span></i>"
+
 	for(var/mob/player in player_list)
-
-		var/understood = 0
-
-		if(istype(player,/mob/dead))
-			understood = 1
-		else if((src in player.languages) && check_special_condition(player))
-			understood = 1
-
-		if(understood)
-			if(!speaker_mask) speaker_mask = speaker.name
-			var/msg = "<i><span class='game say'>[name], <span class='name'>[speaker_mask]</span> <span class='message'>[speech_verb], \"<span class='[colour]'>[message]</span><span class='message'>\"</span></span></i>"
-			player << "[msg]"
+		if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player)))
+			player << msg
 
 /datum/language/proc/check_special_condition(var/mob/other)
 	return 1
@@ -44,6 +95,23 @@
 			return ask_verb
 	return speech_verb
 
+// Noise "language", for audible emotes.
+/datum/language/noise
+	name = "Noise"
+	desc = "Noises"
+	key = ""
+	flags = RESTRICTED|NONGLOBAL|INNATE|NO_TALK_MSG
+
+/datum/language/noise/format_message(message, verb)
+	return "<span class='message'><span class='[colour]'>[message]</span></span>"
+
+/datum/language/noise/format_message_radio(message, verb)
+	return "<span class='[colour]'>[message]</span>"
+
+/datum/language/noise/get_talkinto_msg_range(message)
+	// if you make a loud noise (screams etc), you'll be heard from 4 tiles over instead of two
+	return (copytext(message, length(message)) == "!") ? 4 : 2
+
 /datum/language/unathi
 	name = "Sinta'unathi"
 	desc = "The common language of Moghes, composed of sibilant hisses and rattles. Spoken natively by Unathi."
@@ -53,6 +121,14 @@
 	colour = "soghun"
 	key = "o"
 	flags = WHITELISTED
+	syllables = list("ss","ss","ss","ss","skak","seeki","resh","las","esi","kor","sh")
+
+/datum/language/unathi/get_random_name()
+
+	var/new_name = ..()
+	while(findtextEx(new_name,"sss",1,null))
+		new_name = replacetext(new_name, "sss", "ss")
+	return capitalize(new_name)
 
 /datum/language/tajaran
 	name = "Siik'tajr"
@@ -63,6 +139,19 @@
 	colour = "tajaran"
 	key = "j"
 	flags = WHITELISTED
+	syllables = list("rr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr", \
+	"mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r", \
+	"ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", \
+	"hal","ket","jurl","mah","tul","cresh","azu","ragh")
+
+/datum/language/tajaran/get_random_name(var/gender)
+
+	var/new_name = ..(gender,1)
+	if(prob(80))
+		new_name += " [pick(list("Hadii","Kaytam","Zhan-Khazan","Hharar","Njarir'Akhan"))]"
+	else
+		new_name += ..(gender,1)
+	return new_name
 
 /datum/language/skrell
 	name = "Skrellian"
@@ -73,6 +162,7 @@
 	colour = "skrell"
 	key = "k"
 	flags = WHITELISTED
+	syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
 
 /datum/language/vox
 	name = "Vox-pidgin"
@@ -82,7 +172,12 @@
 	exclaim_verb = "SHRIEKS"
 	colour = "vox"
 	key = "5"
-	flags = RESTRICTED
+	flags = WHITELISTED
+	syllables = list("ti","ti","ti","hi","hi","ki","ki","ki","ki","ya","ta","ha","ka","ya","chi","cha","kah", \
+	"SKRE","AHK","EHK","RAWK","KRA","AAA","EEE","KI","II","KRI","KA")
+
+/datum/language/vox/get_random_name()
+	return ..(FEMALE,1,6)
 
 /datum/language/diona
 	name = "Rootspeak"
@@ -93,6 +188,12 @@
 	colour = "soghun"
 	key = "q"
 	flags = RESTRICTED
+	syllables = list("hs","zt","kr","st","sh")
+
+/datum/language/diona/get_random_name()
+	var/new_name = "[pick(list("To Sleep Beneath","Wind Over","Embrace of","Dreams of","Witnessing","To Walk Beneath","Approaching the"))]"
+	new_name += " [pick(list("the Void","the Sky","Encroaching Night","Planetsong","Starsong","the Wandering Star","the Empty Day","Daybreak","Nightfall","the Rain"))]"
+	return new_name
 
 /datum/language/common
 	name = "Galactic Common"
@@ -101,6 +202,7 @@
 	whisper_verb = "whispers"
 	key = "0"
 	flags = RESTRICTED
+	syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")
 
 //TODO flag certain languages to use the mob-type specific say_quote and then get rid of these.
 /datum/language/common/get_spoken_verb(var/msg_end)
@@ -116,9 +218,10 @@
 	desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system."
 	speech_verb = "says"
 	whisper_verb = "whispers"
-	colour = "rough"
+	colour = "solcom"
 	key = "1"
 	flags = RESTRICTED
+	syllables = list("tao","shi","tzu","yi","com","be","is","i","op","vi","ed","lec","mo","cle","te","dis","e")
 
 /datum/language/human/get_spoken_verb(var/msg_end)
 	switch(msg_end)
@@ -135,6 +238,15 @@
 	speech_verb = "enunciates"
 	colour = "say_quote"
 	key = "2"
+	space_chance = 100
+	syllables = list("lorem", "ipsum", "dolor", "sit", "amet", "consectetur", "adipiscing", "elit",
+					 "sed", "do", "eiusmod", "tempor", "incididunt", "ut", "labore", "et", "dolore",
+					 "magna", "aliqua", "ut", "enim", "ad", "minim", "veniam", "quis", "nostrud", 
+					 "exercitation", "ullamco", "laboris", "nisi", "ut", "aliquip", "ex", "ea", "commodo", 
+					 "consequat", "duis", "aute", "irure", "dolor", "in", "reprehenderit", "in", 
+					 "voluptate", "velit", "esse", "cillum", "dolore", "eu", "fugiat", "nulla", 
+					 "pariatur", "excepteur", "sint", "occaecat", "cupidatat", "non", "proident", "sunt", 
+					 "in", "culpa", "qui", "officia", "deserunt", "mollit", "anim", "id", "est", "laborum")
 
 /datum/language/gutter
 	name = "Gutter"
@@ -142,6 +254,7 @@
 	speech_verb = "growls"
 	colour = "rough"
 	key = "3"
+	syllables = list ("gra","ba","ba","breh","bra","rah","dur","ra","ro","gro","go","ber","bar","geh","heh", "gra")
 
 /datum/language/xenocommon
 	name = "Xenomorph"
@@ -152,6 +265,7 @@
 	exclaim_verb = "hisses"
 	key = "4"
 	flags = RESTRICTED
+	syllables = list("sss","sSs","SSS")
 
 /datum/language/xenos
 	name = "Hivemind"
@@ -286,15 +400,14 @@
 	return 1
 
 /mob/proc/remove_language(var/rem_language)
-
-	languages.Remove(all_languages[rem_language])
-
-	return 0
+	var/datum/language/L = all_languages[rem_language]
+	. = (L in languages)
+	languages.Remove(L)
 
 // Can we speak this language, as opposed to just understanding it?
 /mob/proc/can_speak(datum/language/speaking)
 
-	return (universal_speak || speaking in src.languages)
+	return (universal_speak || (speaking && speaking.flags & INNATE) || speaking in src.languages)
 
 //TBD
 /mob/verb/check_languages()
@@ -305,7 +418,8 @@
 	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
 
 	for(var/datum/language/L in languages)
-		dat += "<b>[L.name] (:[L.key])</b><br/>[L.desc]<br/><br/>"
+		if(!(L.flags & NONGLOBAL))
+			dat += "<b>[L.name] (:[L.key])</b><br/>[L.desc]<br/><br/>"
 
 	src << browse(dat, "window=checklanguage")
 	return

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

@@ -15,21 +15,12 @@
 	if(copytext(message,1,2) == "*")
 		return emote(copytext(message,2))
 
-	var/datum/language/speaking = null
-
-	if(length(message) >= 2)
-		var/channel_prefix = copytext(message, 1 ,3)
-		if(languages.len)
-			for(var/datum/language/L in languages)
-				if(lowertext(channel_prefix) == ":[L.key]")
-					verb = L.speech_verb
-					speaking = L
-					break
+	var/datum/language/speaking = parse_language(message)
 
 	if(speaking)
-		message = trim(copytext(message,3))
+		message = copytext(message, 2+length(speaking.key))
 
-	message = capitalize(trim_left(message))
+	message = trim(message)
 
 	if(!message || stat)
 		return

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

@@ -18,7 +18,7 @@
 	return
 
 /obj/item/device/mmi
-	name = "Man-Machine Interface"
+	name = "man-machine interface"
 	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "mmi_empty"
@@ -116,7 +116,7 @@
 			return
 
 /obj/item/device/mmi/radio_enabled
-	name = "Radio-enabled Man-Machine Interface"
+	name = "radio-enabled man-machine interface"
 	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio."
 	origin_tech = "biotech=4"
 
@@ -165,4 +165,4 @@
 				brainmob.emp_damage += rand(10,20)
 			if(3)
 				brainmob.emp_damage += rand(0,10)
-	..()
+	..()

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

@@ -2,10 +2,23 @@
 /mob/living/carbon/brain/say(var/message)
 	if (silent)
 		return
-
-	if(!(container && istype(container, /obj/item/device/mmi)))
+
+	if(!(container && istype(container, /obj/item/device/mmi)))
 		return //No MMI, can't speak, bucko./N
 	else
+		var/datum/language/speaking = parse_language(message)
+		if(speaking)
+			message = copytext(message, 2+length(speaking.key))
+		var/verb = "says"
+		var/ending = copytext(message, length(message))
+		if (speaking)
+			verb = speaking.get_spoken_verb(ending)
+		else
+			if(ending=="!")
+				verb=pick("exclaims","shouts","yells")
+			if(ending=="?")
+				verb="asks"
+
 		if(prob(emp_damage*4))
 			if(prob(10))//10% chane to drop the message entirely
 				return
@@ -14,5 +27,5 @@
 		if(istype(container, /obj/item/device/mmi/radio_enabled))
 			var/obj/item/device/mmi/radio_enabled/R = container
 			if(R.radio)
-				spawn(0) R.radio.hear_talk(src, sanitize(message))
+				spawn(0) R.radio.hear_talk(src, trim(sanitize(message)), verb, speaking)
 		..()

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

@@ -33,7 +33,7 @@
 	//parse the language code and consume it
 	var/datum/language/speaking = parse_language(message)
 	if(speaking)
-		message = copytext(message,3)
+		message = copytext(message,2+length(speaking.key))
 	else if(species.default_language)
 		speaking = all_languages[species.default_language]
 
@@ -55,7 +55,7 @@
 	if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
 		return
 
-	message = capitalize(trim(message))
+	message = trim(message)
 
 	if(speech_problem_flag)
 		var/list/handle_r = handle_speech_problems(message)
@@ -132,10 +132,14 @@
 	if(used_radios.len)
 		italics = 1
 		message_range = 1
-
+		if(speaking)
+			message_range = speaking.get_talkinto_msg_range(message)
+		var/msg
+		if(!speaking || !(speaking.flags & NO_TALK_MSG))
+			msg = "<span class='notice'>\The [src] talks into \the [used_radios[1]]</span>"
 		for(var/mob/living/M in hearers(5, src))
-			if(M != src)
-				M.show_message("<span class='notice'>[src] talks into [used_radios.len ? used_radios[1] : "the radio."]</span>")
+			if((M != src) && msg)
+				M.show_message(msg)
 			if (speech_sound)
 				sound_vol *= 0.5
 

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

@@ -11,6 +11,7 @@
 	var/deform = 'icons/mob/human_races/r_def_human.dmi' // Mutated icon set.
 	var/prone_icon                                       // If set, draws this from icobase when mob is prone.
 	var/eyes = "eyes_s"                                  // Icon for eyes.
+	var/blurb = "A completely nondescript species."      // A brief lore summary for use in the chargen screen.
 
 	var/primitive                                 // Lesser form, if any (ie. monkey for humans)
 	var/tail                                      // Name of tail image in species effects icon file.
@@ -22,7 +23,7 @@
 	var/rarity_value = 1  // Relative rarity/collector value for this species. Only used by ninja and cultists atm.
 	var/list/unarmed_types = list(/datum/unarmed_attack, /datum/unarmed_attack/bite)
 
-	var/language                  // Default racial language, if any.
+	var/language = "Galactic Common" // Default racial language, if any.
 	// Default language is used when 'say' is used without modifiers.
 	var/default_language = "Galactic Common"
 	var/secondary_langs = list()  // The names of secondary languages that are available to this species.
@@ -100,6 +101,10 @@
 	for(var/u_type in unarmed_types)
 		unarmed_attacks += new u_type()
 
+/datum/species/proc/get_random_name(var/gender)
+	var/datum/language/species_language = all_languages[language]
+	return species_language.get_random_name(gender)
+
 /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
 
 	//Trying to work out why species changes aren't fixing organs properly.
@@ -207,12 +212,14 @@
 	language = "Sol Common"
 	primitive = /mob/living/carbon/monkey
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite)
+	blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \
+	colonies across a wide swathe of space. They hold a wide range of forms and creeds.<br/><br/> \
+	While the central Sol government maintains control of its far-flung people, powerful corporate \
+	interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
+	worlds tumultous at best."
 
 	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
 
-	//If you wanted to add a species-level ability:
-	/*abilities = list(/client/proc/test_ability)*/
-
 /datum/species/unathi
 	name = "Unathi"
 	name_plural = "Unathi"
@@ -225,6 +232,12 @@
 	darksight = 3
 	gluttonous = 1
 
+	blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \
+	Uuosa-Eso system, which roughly translates to 'burning mother'.<br/><br/>Coming from a harsh, radioactive \
+	desert planet, they mostly hold ideals of honesty, virtue, martial combat and bravery above all \
+	else, frequently even their own lives. They prefer warmer temperatures than most species and \
+	their native tongue is a heavy hissing laungage called Sinta'Unathi."
+
 	cold_level_1 = 280 //Default 260 - Lower is better
 	cold_level_2 = 220 //Default 200
 	cold_level_3 = 130 //Default 120
@@ -249,6 +262,11 @@
 	tail = "tajtail"
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
 	darksight = 8
+	blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Ahdomai in the \
+	S'randarr system. They have been brought up into the space age by the Humans and Skrell, and have been \
+	influenced heavily by their long history of Slavemaster rule. They have a structured, clan-influenced way \
+	of family and politics. They prefer colder environments, and speak a variety of languages, mostly Siik'Maas, \
+	using unique inflections their mouths form."
 
 	cold_level_1 = 200 //Default 260
 	cold_level_2 = 140 //Default 200
@@ -274,6 +292,11 @@
 	language = "Skrellian"
 	primitive = /mob/living/carbon/monkey/skrell
 	unarmed_types = list(/datum/unarmed_attack/punch)
+	blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \
+	the royals' or 'Light of the Crown'.<br/><br/>Skrell are a highly advanced and logical race who live under the rule \
+	of the Qerr'Katish, a caste within their society which keeps the empire of the Skrell running smoothly. Skrell are \
+	herbivores on the whole and tend to be co-operative with the other species of the galaxy, although they rarely reveal \
+	the secrets of their empire to their allies."
 
 	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
 
@@ -291,6 +314,12 @@
 	language = "Galactic Common"
 	unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick,  /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong)
 	rarity_value = 2
+	blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \
+	scavenging vermin who prey on isolated stations, ships or planets to keep their own ancient arkships \
+	alive. They are four to five feet tall, reptillian, beaked, tailed and quilled; human crews often \
+	refer to them as 'shitbirds' for their violent and offensive nature, as well as their horrible \
+	smell.<br/><br/>Most humans will never meet a Vox raider, instead learning of this insular species through \
+	dealing with their traders and merchants; those that do rarely enjoy the experience."
 
 	speech_sounds = list('sound/voice/shriek1.ogg')
 	speech_chance = 20
@@ -329,6 +358,10 @@
 		"stack" =    /datum/organ/internal/stack/vox
 		)
 
+/datum/species/vox/get_random_name(var/gender)
+	var/datum/language/species_language = all_languages[default_language]
+	return species_language.get_random_name(gender)
+
 /datum/species/vox/armalis
 	name = "Vox Armalis"
 	name_plural = "Vox"
@@ -380,6 +413,13 @@
 	primitive = /mob/living/carbon/alien/diona
 	slowdown = 7
 	rarity_value = 3
+	blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
+	species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \
+	there is no effective upper limit to the number that can fuse in gestalt, and reports exist	of the Epsilon Ursae \
+	Minoris primary being ringed with a cloud of singing space-station-sized entities.<br/><br/>The Dionaea coexist peacefully with \
+	all known species, especially the Skrell. Their communal mind makes them slow to react, and they have difficulty understanding \
+	even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \
+	water and other radiation."
 
 	has_organ = list(
 		"nutrient channel" =   /datum/organ/internal/diona/nutrients,

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

@@ -29,7 +29,7 @@
 	//parse the language code and consume it
 	var/datum/language/speaking = parse_language(message)
 	if (speaking)
-		message = copytext(message,3)
+		message = copytext(message,2+length(speaking.key))
 
 	whisper_say(message, speaking, alt_name)
 
@@ -49,7 +49,7 @@
 		else
 			var/adverb = pick("quietly", "softly")
 			verb = "[speaking.speech_verb] [adverb]"
-			not_heard = "[verb] something [adverb]"
+			not_heard = "[speaking.speech_verb] something [adverb]"
 	else
 		not_heard = "[verb] something" //TODO get rid of the null language and just prevent speech if language is null
 
@@ -126,7 +126,7 @@
 	for (var/obj/O in view(message_range, src))
 		spawn (0)
 			if (O)
-				O.hear_talk(src, message)	//O.hear_talk(src, message, verb, speaking)
+				O.hear_talk(src, message, verb, speaking)
 
 	var/list/eavesdropping = hearers(eavesdropping_range, src)
 	eavesdropping -= src

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

@@ -72,7 +72,7 @@
 	var/datum/language/speaking = parse_language(message)
 	if (speaking)
 		verb = speaking.speech_verb
-		message = copytext(message,3)
+		message = trim(copytext(message,2+length(speaking.key)))
 
 		if(speaking.flags & HIVEMIND)
 			speaking.broadcast(src,trim(message))
@@ -102,7 +102,7 @@
 		if("department")
 			switch(bot_type)
 				if(IS_AI)
-					return AI.holopad_talk(message)
+					return AI.holopad_talk(message, verb, speaking)
 				if(IS_ROBOT)
 					log_say("[key_name(src)] : [message]")
 					return R.radio.talk_into(src,message,message_mode,verb,speaking)
@@ -110,7 +110,7 @@
 					log_say("[key_name(src)] : [message]")
 					return P.radio.talk_into(src,message,message_mode,verb,speaking)
 			return 0
-			
+
 		if("general")
 			switch(bot_type)
 				if(IS_AI)
@@ -149,7 +149,7 @@
 	return ..(message,speaking,verb)
 
 //For holopads only. Usable by AI.
-/mob/living/silicon/ai/proc/holopad_talk(var/message)
+/mob/living/silicon/ai/proc/holopad_talk(var/message, verb, datum/language/speaking)
 
 	log_say("[key_name(src)] : [message]")
 
@@ -160,16 +160,22 @@
 
 	var/obj/machinery/hologram/holopad/T = src.holo
 	if(T && T.hologram && T.master == src)//If there is a hologram and its master is the user.
-		var/verb = say_quote(message)
 
 		//Human-like, sorta, heard by those who understand humans.
-		var/rendered_a = "<span class='game say'><span class='name'>[name]</span> [verb], <span class='message'>\"[message]\"</span></span>"
-
+		var/rendered_a
 		//Speach distorted, heard by those who do not understand AIs.
 		var/message_stars = stars(message)
-		var/rendered_b = "<span class='game say'><span class='name'>[voice_name]</span> [verb], <span class='message'>\"[message_stars]\"</span></span>"
+		var/rendered_b
+
+		if(speaking)
+			rendered_a = "<span class='game say'><span class='name'>[name]</span> [speaking.format_message(message, verb)]</span>"
+			rendered_b = "<span class='game say'><span class='name'>[voice_name]</span> [speaking.format_message(message_stars, verb)]</span>"
+			src << "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> [speaking.format_message(message, verb)]</span></i>"//The AI can "hear" its own message.
+		else
+			rendered_a = "<span class='game say'><span class='name'>[name]</span> [verb], <span class='message'>\"[message]\"</span></span>"
+			rendered_b = "<span class='game say'><span class='name'>[voice_name]</span> [verb], <span class='message'>\"[message_stars]\"</span></span>"
+			src << "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> [verb], <span class='message'><span class='body'>\"[message]\"</span></span></span></i>"//The AI can "hear" its own message.
 
-		src << "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> [verb], <span class='message'>[message]</span></span></i>"//The AI can "hear" its own message.
 		for(var/mob/M in hearers(T.loc))//The location is the object, default distance.
 			if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to.
 				M.show_message(rendered_a, 2)
@@ -182,6 +188,34 @@
 		return
 	return 1
 
+/mob/living/silicon/ai/proc/holopad_emote(var/message) //This is called when the AI uses the 'me' verb while using a holopad.
+
+	log_emote("[key_name(src)] : [message]")
+
+	message = trim(message)
+
+	if (!message)
+		return
+
+	var/obj/machinery/hologram/holopad/T = src.holo
+	if(T && T.hologram && T.master == src)
+		var/rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message]</span></span>"
+		src << "<i><span class='game say'>Holopad action relayed, <span class='name'>[real_name]</span> <span class='message'>[message]</span></span></i>"
+
+		for(var/mob/M in viewers(T.loc))
+			M.show_message(rendered, 2)
+	else //This shouldn't occur, but better safe then sorry.
+		src << "No holopad connected."
+		return
+	return 1
+
+/mob/living/silicon/ai/emote(var/act, var/type, var/message)
+	var/obj/machinery/hologram/holopad/T = src.holo
+	if(T && T.hologram && T.master == src) //Is the AI using a holopad?
+		src.holopad_emote(message)
+	else //Emote normally, then.
+		..()
+
 #undef IS_AI
 #undef IS_ROBOT
 #undef IS_PAI

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

@@ -203,7 +203,8 @@
 	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
 
 	for(var/datum/language/L in languages)
-		dat += "<b>[L.name] (:[L.key])</b><br/>Speech Synthesizer: <i>[(L in speech_synthesizer_langs)? "YES":"NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
+		if(!(L.flags & NONGLOBAL))
+			dat += "<b>[L.name] (:[L.key])</b><br/>Speech Synthesizer: <i>[(L in speech_synthesizer_langs)? "YES":"NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
 
 	src << browse(dat, "window=checklanguage")
 	return
@@ -277,4 +278,4 @@
 			if (stat != 2)
 				adjustBruteLoss(30)
 
-	updatehealth()
+	updatehealth()

code/modules/mob/say.dm

@@ -79,6 +79,9 @@
 			return 1
 		return 0
 
+	if(speaking.flags & INNATE)
+		return 1
+
 	//Language check.
 	for(var/datum/language/L in src.languages)
 		if(speaking.name == L.name)
@@ -142,6 +145,9 @@
 //parses the language code (e.g. :j) from text, such as that supplied to say.
 //returns the language object only if the code corresponds to a language that src can speak, otherwise null.
 /mob/proc/parse_language(var/message)
+	if(length(message) >= 1 && copytext(message,1,2) == "!")
+		return all_languages["Noise"]
+
 	if(length(message) >= 2)
 		var/language_prefix = lowertext(copytext(message, 1 ,3))
 		var/datum/language/L = language_keys[language_prefix]

code/modules/paperwork/paper.dm

@@ -193,6 +193,10 @@
 	updateinfolinks()
 	update_icon()
 
+/obj/item/weapon/paper/proc/get_signature(var/obj/item/weapon/pen/P, mob/user as mob)
+	if(P)
+		return P.get_signature(user)
+	return (user && user.real_name) ? user.real_name : "Anonymous"
 
 /obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
 //	t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
@@ -208,7 +212,7 @@
 	t = replacetext(t, "\[/u\]", "</U>")
 	t = replacetext(t, "\[large\]", "<font size=\"4\">")
 	t = replacetext(t, "\[/large\]", "</font>")
-	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user ? user.real_name : "Anonymous"]</i></font>")
+	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[get_signature(P, user)]</i></font>")
 	t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
 
 	t = replacetext(t, "\[h1\]", "<H1>")

code/modules/paperwork/pen.dm

@@ -1,114 +1,140 @@
-/* Pens!
- * Contains:
- *		Pens
- *		Sleepy Pens
- *		Parapens
- */
-
-
-/*
- * Pens
- */
-/obj/item/weapon/pen
-	desc = "It's a normal black ink pen."
-	name = "pen"
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "pen"
-	item_state = "pen"
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT | SLOT_EARS
-	throwforce = 0
-	w_class = 1.0
-	throw_speed = 7
-	throw_range = 15
-	matter = list("metal" = 10)
-	var/colour = "black"	//what colour the ink is!
-	pressure_resistance = 2
-
-
-/obj/item/weapon/pen/blue
-	desc = "It's a normal blue ink pen."
-	icon_state = "pen_blue"
-	colour = "blue"
-
-/obj/item/weapon/pen/red
-	desc = "It's a normal red ink pen."
-	icon_state = "pen_red"
-	colour = "red"
-
-/obj/item/weapon/pen/invisible
-	desc = "It's an invisble pen marker."
-	icon_state = "pen"
-	colour = "white"
-
-
-/obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
-	if(!ismob(M))
-		return
-	user << "<span class='warning'>You stab [M] with the pen.</span>"
-//	M << "\red You feel a tiny prick!" //That's a whole lot of meta!
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
-	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-	return
-
-
-/*
- * Sleepy Pens
- */
-/obj/item/weapon/pen/sleepypen
-	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;syndicate=5"
-
-
-/obj/item/weapon/pen/sleepypen/New()
-	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
-	reagents = R
-	R.my_atom = src
-	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
-	..()
-	return
-
-
-/obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
-	if(!(istype(M,/mob)))
-		return
-	..()
-	if(reagents.total_volume)
-		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
-	return
-
-
-/*
- * Parapens
- */
- /obj/item/weapon/pen/paralysis
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;syndicate=5"
-
-
-/obj/item/weapon/pen/paralysis/attack(mob/living/M as mob, mob/user as mob)
-
-	if(!(istype(M,/mob)))
-		return
-
-	..()
-
-
-	if(M.can_inject(user,1))
-		if(reagents.total_volume)
-			if(M.reagents) reagents.trans_to(M, 50)
-	return
-
-
-/obj/item/weapon/pen/paralysis/New()
-	var/datum/reagents/R = new/datum/reagents(50)
-	reagents = R
-	R.my_atom = src
-	R.add_reagent("zombiepowder", 10)
-	R.add_reagent("cryptobiolin", 15)
-	..()
-	return
+/* Pens!
+ * Contains:
+ *		Pens
+ *		Sleepy Pens
+ *		Parapens
+ */
+
+
+/*
+ * Pens
+ */
+/obj/item/weapon/pen
+	desc = "It's a normal black ink pen."
+	name = "pen"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "pen"
+	item_state = "pen"
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT | SLOT_EARS
+	throwforce = 0
+	w_class = 1.0
+	throw_speed = 7
+	throw_range = 15
+	matter = list("metal" = 10)
+	var/colour = "black"	//what colour the ink is!
+	pressure_resistance = 2
+
+
+/obj/item/weapon/pen/blue
+	desc = "It's a normal blue ink pen."
+	icon_state = "pen_blue"
+	colour = "blue"
+
+/obj/item/weapon/pen/red
+	desc = "It's a normal red ink pen."
+	icon_state = "pen_red"
+	colour = "red"
+
+/obj/item/weapon/pen/invisible
+	desc = "It's an invisble pen marker."
+	icon_state = "pen"
+	colour = "white"
+
+
+/obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
+	if(!ismob(M))
+		return
+	user << "<span class='warning'>You stab [M] with the pen.</span>"
+//	M << "\red You feel a tiny prick!" //That's a whole lot of meta!
+	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
+	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
+	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+	return
+
+
+/*
+ * Sleepy Pens
+ */
+/obj/item/weapon/pen/sleepypen
+	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=2;syndicate=5"
+
+
+/obj/item/weapon/pen/sleepypen/New()
+	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
+	..()
+	return
+
+
+/obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
+	if(!(istype(M,/mob)))
+		return
+	..()
+	if(reagents.total_volume)
+		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
+	return
+
+
+/*
+ * Parapens
+ */
+ /obj/item/weapon/pen/paralysis
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=2;syndicate=5"
+
+
+/obj/item/weapon/pen/paralysis/attack(mob/living/M as mob, mob/user as mob)
+
+	if(!(istype(M,/mob)))
+		return
+
+	..()
+
+
+	if(M.can_inject(user,1))
+		if(reagents.total_volume)
+			if(M.reagents) reagents.trans_to(M, 50)
+	return
+
+
+/obj/item/weapon/pen/paralysis/New()
+	var/datum/reagents/R = new/datum/reagents(50)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("zombiepowder", 10)
+	R.add_reagent("cryptobiolin", 15)
+	..()
+	return
+
+/*
+ * Chameleon pen
+ */
+/obj/item/weapon/pen/chameleon
+	var/signature = ""
+
+/obj/item/weapon/pen/chameleon/attack_self(mob/user as mob)
+	/*
+	// Limit signatures to official crew members
+	var/personnel_list[] = list()
+	for(var/datum/data/record/t in data_core.locked) //Look in data core locked.
+		personnel_list.Add(t.fields["name"])
+	personnel_list.Add("Anonymous")
+
+	var/new_signature = input("Enter new signature pattern.", "New Signature") as null|anything in personnel_list
+	if(new_signature)
+		signature = new_signature
+	*/
+	signature = trim_strip_html_properly(input("Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature))
+
+/obj/item/weapon/pen/proc/get_signature(var/mob/user)
+	return (user && user.real_name) ? user.real_name : "Anonymous"
+
+/obj/item/weapon/pen/chameleon/get_signature(var/mob/user)
+	return signature ? signature : "Anonymous"

code/modules/power/batteryrack.dm

@@ -1,23 +1,3 @@
-//Boards
-/obj/item/weapon/circuitboard/batteryrack
-	name = "Circuit board (Battery rack PSU)"
-	build_path = "/obj/machinery/power/smes/batteryrack"
-	board_type = "machine"
-	origin_tech = "powerstorage=3;engineering=2"
-	frame_desc = "Requires 3 power cells."
-	req_components = list("/obj/item/weapon/cell" = 3)
-
-
-/obj/item/weapon/circuitboard/ghettosmes
-	name = "Circuit board (makeshift PSU)"
-	desc = "An APC circuit repurposed into some power storage device controller"
-	build_path = "/obj/machinery/power/smes/batteryrack/makeshift"
-	board_type = "machine"
-	frame_desc = "Requires 3 power cells."
-	req_components = list("/obj/item/weapon/cell" = 3)
-
-
-//Machines
 //The one that works safely.
 /obj/machinery/power/smes/batteryrack
 	name = "power cell rack PSU"
@@ -32,36 +12,12 @@
 	var/cells_amount = 0
 	var/capacitors_amount = 0
 
-	// Smaller capacity, but higher I/O
-	// Starts fully charged, as it's used in substations. This replaces Engineering SMESs round start charge.
-/obj/machinery/power/smes/batteryrack/substation
-	name = "Substation PSU"
-	desc = "A rack of power cells working as a PSU. This one seems to be equipped for higher power loads."
-	output_level = 150000
-	input_level = 150000
-	output_attempt = 1
-
-	// One high capacity cell, two regular cells. Lots of room for engineer upgrades
-	// Also five basic capacitors. Again, upgradeable.
-/obj/machinery/power/smes/batteryrack/substation/add_parts()
-	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/batteryrack
-	component_parts += new /obj/item/weapon/cell/high
-	component_parts += new /obj/item/weapon/cell
-	component_parts += new /obj/item/weapon/cell
-	component_parts += new /obj/item/weapon/stock_parts/capacitor
-	component_parts += new /obj/item/weapon/stock_parts/capacitor
-	component_parts += new /obj/item/weapon/stock_parts/capacitor
-	component_parts += new /obj/item/weapon/stock_parts/capacitor
-	component_parts += new /obj/item/weapon/stock_parts/capacitor
-
 /obj/machinery/power/smes/batteryrack/New()
 	..()
 	add_parts()
 	RefreshParts()
 	return
 
-
 //Maybe this should be moved up to obj/machinery
 /obj/machinery/power/smes/batteryrack/proc/add_parts()
 	component_parts = list()

code/modules/power/breaker_box.dm

@@ -17,6 +17,8 @@
 	var/on = 0
 	var/busy = 0
 	var/directions = list(1,2,4,8,5,6,9,10)
+	var/RCon_tag = "NO_TAG"
+	var/update_locked = 0
 
 /obj/machinery/power/breakerbox/activated
 	icon_state = "bbox_on"
@@ -33,19 +35,29 @@
 		user << "\red It seems to be offline"
 
 /obj/machinery/power/breakerbox/attack_ai(mob/user)
+	if(update_locked)
+		user << "\red System locked. Please try again later."
+		return
+
 	if(busy)
 		user << "\red System is busy. Please wait until current operation is finished before changing power settings."
 		return
 
 	busy = 1
 	user << "\green Updating power settings.."
-	if(do_after(user, 50)) //5s for AI as AIs can manipulate electronics much faster.
+	if(do_after(user, 50))
 		set_state(!on)
 		user << "\green Update Completed. New setting:[on ? "on": "off"]"
+		update_locked = 1
+		spawn(600)
+			update_locked = 0
 	busy = 0
 
 
 /obj/machinery/power/breakerbox/attack_hand(mob/user)
+	if(update_locked)
+		user << "\red System locked. Please try again later."
+		return
 
 	if(busy)
 		user << "\red System is busy. Please wait until current operation is finished before changing power settings."
@@ -55,13 +67,27 @@
 	for(var/mob/O in viewers(user))
 		O.show_message(text("\red [user] started reprogramming [src]!"), 1)
 
-	if(do_after(user, 300)) // 30s for non-AIs as humans have to manually reprogram it and rapid switching may cause some lag / powernet updates flood. If AIs spam it they can be easily traced.
+	if(do_after(user, 50))
 		set_state(!on)
 		user.visible_message(\
 		"<span class='notice'>[user.name] [on ? "enabled" : "disabled"] the breaker box!</span>",\
 		"<span class='notice'>You [on ? "enabled" : "disabled"] the breaker box!</span>")
+		update_locked = 1
+		spawn(600)
+			update_locked = 0
 	busy = 0
 
+/obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	if(istype(W, /obj/item/device/multitool))
+		var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text
+		if(newtag)
+			RCon_tag = newtag
+			user << "<span class='notice'>You changed the RCON tag to: [newtag]</span>"
+
+
+
+
+
 /obj/machinery/power/breakerbox/proc/set_state(var/state)
 	on = state
 	if(on)
@@ -93,3 +119,14 @@
 		icon_state = icon_state_off
 		for(var/obj/structure/cable/C in src.loc)
 			del(C)
+
+// Used by RCON to toggle the breaker box.
+/obj/machinery/power/breakerbox/proc/auto_toggle()
+	if(!update_locked)
+		set_state(!on)
+		update_locked = 1
+		spawn(600)
+			update_locked = 0
+
+/obj/machinery/power/breakerbox/process()
+	return 1

code/modules/power/sensors/sensor_monitoring.dm

@@ -5,7 +5,7 @@
 */
 
 /obj/machinery/computer/power_monitor
-	name = "Power Monitor"
+	name = "Power Monitoring Console"
 	desc = "Computer designed to remotely monitor power levels around the station"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "power"

code/modules/power/singularity/singularity.dm

@@ -6,8 +6,8 @@ var/global/list/uneatable = list(
 	)
 
 /obj/machinery/singularity/
-	name = "Gravitational Singularity"
-	desc = "A Gravitational Singularity."
+	name = "gravitational singularity"
+	desc = "A gravitational singularity."
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "singularity_s1"
 	anchored = 1

code/modules/power/smes.dm

@@ -32,6 +32,11 @@
 	var/last_input_attempt	= 0
 	var/last_charge			= 0
 
+	var/input_cut = 0
+	var/input_pulsed = 0
+	var/output_cut = 0
+	var/output_pulsed = 0
+
 	var/open_hatch = 0
 	var/name_tag = null
 	var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted!
@@ -119,7 +124,7 @@
 	var/last_onln = outputting
 
 	//inputting
-	if(input_attempt)
+	if(input_attempt && (!input_pulsed && !input_cut))
 		var/target_load = min((capacity-charge)/SMESRATE, input_level)	// charge at set rate, limited to spare capacity
 		var/actual_load = draw_power(target_load)						// add the load to the terminal side network
 		charge += actual_load * SMESRATE								// increase the charge
@@ -132,7 +137,7 @@
 			inputting = 0
 
 	//outputting
-	if(outputting)
+	if(outputting && (!output_pulsed && !output_cut))
 		output_used = min( charge/SMESRATE, output_level)		//limit output to that stored
 
 		charge -= output_used*SMESRATE		// reduce the storage (may be recovered in /restore() if excessive)
@@ -318,6 +323,8 @@
 		// auto update every Master Controller tick
 		ui.set_auto_update(1)
 
+/obj/machinery/power/smes/proc/Percentage()
+	return round(100.0*charge/capacity, 0.1)
 
 /obj/machinery/power/smes/Topic(href, href_list)
 	if(..())
@@ -413,6 +420,4 @@
 
 /obj/machinery/power/smes/magical/process()
 	charge = 5000000
-	..()
-
-#undef SMESRATE
+	..()

code/modules/power/smes_construction.dm

@@ -1,43 +1,51 @@
-// Constructable SMES version. Based on Coils. Each SMES can hold 6 Coils by default.
-// Each coil adds 250kW I/O and 5M capacity.
-// This is second version, now subtype of regular SMES.
+// Constructable SMES version (based on SMES Coils)
 
-
-//Board
-/obj/item/weapon/circuitboard/smes
-	name = "Circuit board (SMES Cell)"
-	build_path = "/obj/machinery/power/smes/buildable"
-	board_type = "machine"
-	origin_tech = "powerstorage=6;engineering=4" // Board itself is high tech. Coils have to be ordered from cargo or salvaged from existing SMESs.
-	frame_desc = "Requires 1 superconducting magnetic coil and 30 wires."
-	req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30)
-
-//Construction Item
+//Construction Items
 /obj/item/weapon/smes_coil
-	name = "Superconducting Magnetic Coil"
-	desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units."
+	name = "superconductive magnetic coil"
+	desc = "Heavy duty superconductive magnetic coil, mainly used in construction of SMES units."
 	icon = 'icons/obj/stock_parts.dmi'
 	icon_state = "smes_coil"			// Just few icons patched together. If someone wants to make better icon, feel free to do so!
 	w_class = 4.0 						// It's LARGE (backpack size)
 	var/ChargeCapacity = 5000000
 	var/IOCapacity = 250000
 
-
-
-
 // SMES itself
 /obj/machinery/power/smes/buildable
 	var/max_coils = 6 			//30M capacity, 1.5MW input/output when fully upgraded /w default coils
 	var/cur_coils = 1 			// Current amount of installed coils
 	var/safeties_enabled = 1 	// If 0 modifications can be done without discharging the SMES, at risk of critical failure.
 	var/failing = 0 			// If 1 critical failure has occured and SMES explosion is imminent.
+	var/datum/wires/smes/wires
+	var/grounding = 1			// Cut to quickly discharge, at cost of "minor" electrical issues in output powernet.
+	var/RCon = 1				// Cut to disable AI and remote control.
+	var/RCon_tag = "NO_TAG"		// RCON tag, change to show it on SMES Remote control console.
 	charge = 0
 	should_be_mapped = 1
 
+/obj/machinery/power/smes/buildable/process()
+	if(!grounding && (Percentage() > 5))
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(5, 1, src)
+		s.start()
+		charge -= (output_level_max * SMESRATE)
+		if(prob(1)) // Small chance of overload occuring since grounding is disabled.
+			apcs_overload(5,10)
+
+	..()
+
+
+/obj/machinery/power/smes/buildable/attack_ai()
+	if(RCon)
+		..()
+	else // RCON wire cut
+		usr << "<span class='warning'>Connection error: Destination Unreachable.</span>"
+
 /obj/machinery/power/smes/buildable/New()
 	component_parts = list()
 	component_parts += new /obj/item/stack/cable_coil(src,30)
 	component_parts += new /obj/item/weapon/circuitboard/smes(src)
+	src.wires = new /datum/wires/smes(src)
 
 	// Allows for mapped-in SMESs with larger capacity/IO
 	for(var/i = 1, i <= cur_coils, i++)
@@ -46,6 +54,11 @@
 	recalc_coils()
 	..()
 
+/obj/machinery/power/smes/buildable/attack_hand()
+	..()
+	if(open_hatch)
+		wires.Interact(usr)
+
 /obj/machinery/power/smes/buildable/proc/recalc_coils()
 	if ((cur_coils <= max_coils) && (cur_coils >= 1))
 		capacity = 0
@@ -205,8 +218,15 @@
 	// - No action was taken in parent function (terminal de/construction atm).
 	if (..())
 
+		// Multitool - change RCON tag
+		if(istype(W, /obj/item/device/multitool))
+			var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text
+			if(newtag)
+				RCon_tag = newtag
+				user << "<span class='notice'>You changed the RCON tag to: [newtag]</span>"
+			return
 		// Charged above 1% and safeties are enabled.
-		if((charge > (capacity/100)) && safeties_enabled && (!istype(W, /obj/item/device/multitool)))
+		if((charge > (capacity/100)) && safeties_enabled)
 			user << "<span class='warning'>Safety circuit of [src] is preventing modifications while it's charged!</span>"
 			return
 
@@ -263,8 +283,18 @@
 			else
 				usr << "\red You can't insert more coils to this SMES unit!"
 
-		// Multitool - Toggle the safeties.
-		else if(istype(W, /obj/item/device/multitool))
-			safeties_enabled = !safeties_enabled
-			user << "<span class='warning'>You [safeties_enabled ? "connected" : "disconnected"] the safety circuit.</span>"
-			src.visible_message("\icon[src] <b>[src]</b> beeps: \"Caution. Safety circuit has been: [safeties_enabled ? "re-enabled" : "disabled. Please excercise caution."]\"")
+/obj/machinery/power/smes/buildable/proc/toggle_input()
+	input_attempt = !input_attempt
+	update_icon()
+
+/obj/machinery/power/smes/buildable/proc/toggle_output()
+	output_attempt = !output_attempt
+	update_icon()
+
+/obj/machinery/power/smes/buildable/proc/set_input(var/new_input = 0)
+	input_level = new_input
+	update_icon()
+
+/obj/machinery/power/smes/buildable/proc/set_output(var/new_output = 0)
+	output_level = new_output
+	update_icon()

code/modules/projectiles/guns/alien.dm

@@ -1,6 +1,5 @@
 //Vox pinning weapon.
 /obj/item/weapon/gun/launcher/spikethrower
-
 	name = "Vox spike thrower"
 	desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
 
@@ -65,7 +64,6 @@
 
 //This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites.
 /obj/item/weapon/gun/energy/noisecannon
-
 	name = "alien heavy cannon"
 	desc = "It's some kind of enormous alien weapon, as long as a man is tall."
 
@@ -119,4 +117,4 @@
 
 /obj/item/projectile/energy/sonic/proc/split()
 	//TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf.
-	return
+	return

code/modules/projectiles/guns/energy.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/gun/energy
-	icon_state = "energy"
 	name = "energy gun"
 	desc = "A basic energy-based gun."
+	icon_state = "energy"
 	fire_sound = 'sound/weapons/Taser.ogg'
 
 	var/obj/item/weapon/cell/power_supply //What type of power cell this uses

code/modules/projectiles/guns/energy/laser.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser carbine"
-	desc = "a basic weapon designed kill with concentrated energy bolts"
+	desc = "A basic weapon designed to kill with concentrated energy bolts."
 	icon_state = "laser"
 	item_state = "laser"
 	fire_sound = 'sound/weapons/Laser.ogg'
@@ -186,4 +186,4 @@ obj/item/weapon/gun/energy/laser/retro
 		if(!power_supply) return 0
 		power_supply.give(100)
 		update_icon()
-		return 1
+		return 1

code/modules/projectiles/guns/energy/nuclear.dm

@@ -53,7 +53,7 @@
 	return 0
 
 /obj/item/weapon/gun/energy/gun/nuclear
-	name = "Advanced Energy Gun"
+	name = "advanced energy gun"
 	desc = "An energy gun with an experimental miniaturized reactor."
 	icon_state = "nucgun"
 	origin_tech = "combat=3;materials=5;powerstorage=3"

code/modules/projectiles/guns/energy/pulse.dm

@@ -52,6 +52,7 @@
 	name = "pulse destroyer"
 	desc = "A heavy-duty, pulse-based energy weapon."
 	cell_type = "/obj/item/weapon/cell/infinite"
+	fire_delay = 10
 
 	attack_self(mob/living/user as mob)
 		user << "\red [src.name] has three settings, and they are all DESTROY."
@@ -59,10 +60,11 @@
 
 
 /obj/item/weapon/gun/energy/pulse_rifle/M1911
-	name = "m1911-P"
+	name = "\improper M1911-P"
 	desc = "It's not the size of the gun, it's the size of the hole it puts through people."
 	icon_state = "m1911-p"
 	cell_type = "/obj/item/weapon/cell/infinite"
+	fire_delay = 10
 
 	isHandgun()
-		return 1
+		return 1

code/modules/projectiles/guns/energy/special.dm

@@ -214,7 +214,7 @@ obj/item/weapon/gun/energy/staff/focus
 	projectile_type = "/obj/item/projectile/energy/phoron"
 
 /obj/item/weapon/gun/energy/sniperrifle
-	name = "L.W.A.P. Sniper Rifle"
+	name = "\improper L.W.A.P. sniper rifle"
 	desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "sniper"

code/modules/projectiles/guns/energy/stun.dm

@@ -1,4 +1,3 @@
-
 /obj/item/weapon/gun/energy/taser
 	name = "taser gun"
 	desc = "A small, low capacity gun used for non-lethal takedowns."
@@ -10,12 +9,6 @@
 	cell_type = "/obj/item/weapon/cell/crap"
 
 /obj/item/weapon/gun/energy/taser/cyborg
-	name = "taser gun"
-	desc = "A small, low capacity gun used for non-lethal takedowns."
-	icon_state = "taser"
-	fire_sound = 'sound/weapons/Taser.ogg'
-	charge_cost = 100
-	projectile_type = "/obj/item/projectile/beam/stun"
 	cell_type = "/obj/item/weapon/cell/secborg"
 	var/charge_tick = 0
 	var/recharge_time = 10 //Time it takes for shots to recharge (in ticks)
@@ -107,5 +100,3 @@
 	force = 10
 	matter = list("metal" = 200000)
 	projectile_type = "/obj/item/projectile/energy/bolt/large"
-
-

code/modules/projectiles/guns/projectile.dm

@@ -3,8 +3,8 @@
 #define MAGAZINE 2
 
 /obj/item/weapon/gun/projectile
-	desc = "A classic revolver. Uses 357 ammo"
 	name = "revolver"
+	desc = "A classic revolver. Uses 357 ammo"
 	icon_state = "revolver"
 	caliber = "357"
 	origin_tech = "combat=2;materials=2"
@@ -117,4 +117,3 @@
 		if(istype(AC))
 			bullets += 1
 	return bullets
-

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

@@ -16,7 +16,7 @@
 
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
-	name = "Uzi"
+	name = "\improper Uzi"
 	desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
 	icon_state = "mini-uzi"
 	w_class = 3.0
@@ -143,4 +143,5 @@
    However, it looks like subsequent guns that use removable magazines don't take that into account and just get
    around simulating a removable magazine by adding the casings into the loaded list and spawning an empty magazine
    when the gun is out of rounds. Which means you can't eject magazines with rounds in them. The below is a very
-   rough and poor attempt at making that happen. -Ausops */
+   rough and poor attempt at making that happen. -Ausops */
+  

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

@@ -1,7 +1,6 @@
 //AMMUNITION
 
 /obj/item/weapon/arrow
-
 	name = "bolt"
 	desc = "It's got a tip for you - get the point?"
 	icon = 'icons/obj/weapons.dmi'
@@ -28,7 +27,6 @@
 	item_state = "bolt"
 
 /obj/item/weapon/arrow/quill
-
 	name = "vox quill"
 	desc = "A wickedly barbed quill from some bizarre animal."
 	icon = 'icons/obj/weapons.dmi'
@@ -37,7 +35,6 @@
 	throwforce = 5
 
 /obj/item/weapon/arrow/rod
-
 	name = "metal rod"
 	desc = "Don't cry for me, Orithena."
 	icon_state = "metal-rod"
@@ -50,7 +47,6 @@
 		src.Del()
 
 /obj/item/weapon/gun/launcher/crossbow
-
 	name = "powered crossbow"
 	desc = "A 2557AD twist on an old classic. Pick up that can."
 	icon_state = "crossbow"
@@ -173,7 +169,6 @@
 		..()
 
 /obj/item/weapon/gun/launcher/crossbow/proc/superheat_rod(var/mob/user)
-
 	if(!user || !cell || !in_chamber) return
 	if(cell.charge < 500) return
 	if(in_chamber.throwforce >= 15) return
@@ -262,4 +257,4 @@
 			del(src)
 		return
 	else
-		..()
+		..()

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

@@ -1,5 +1,4 @@
 /obj/item/weapon/gun/launcher
-
 	name = "launcher"
 	desc = "A device that launches things."
 	icon = 'icons/obj/weapons.dmi'
@@ -87,4 +86,4 @@
 	return 1
 
 /obj/item/weapon/gun/launcher/attack_self(mob/living/user as mob)
-	return
+	return

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

@@ -149,4 +149,4 @@
 	desc = "a silencer"
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "silencer"
-	w_class = 2
+	w_class = 2

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

@@ -27,7 +27,6 @@
 	tank_container.tag = "gas_tank_holder"
 
 /obj/item/weapon/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure.
-
 	set name = "Set Valve Pressure"
 	set category = "Object"
 	set src in range(0)
@@ -37,7 +36,6 @@
 		usr << "You dial the pressure valve to [pressure_setting]%."
 
 /obj/item/weapon/gun/launcher/pneumatic/verb/eject_tank() //Remove the tank.
-
 	set name = "Eject Tank"
 	set category = "Object"
 	set src in range(0)
@@ -79,7 +77,6 @@
 		user << "That won't fit into the hopper."
 
 /obj/item/weapon/gun/launcher/pneumatic/attack_self(mob/user as mob)
-
 	if(contents.len > 0)
 		var/obj/item/removing = contents[contents.len]
 		if(removing == in_chamber)
@@ -210,4 +207,4 @@
 				del(src)
 		return
 	else
-		..()
+		..()

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/detective
-	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 	name = "revolver"
+	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
 	icon_state = "detective"
 	max_shells = 6
 	caliber = "38"
@@ -71,8 +71,8 @@
 
 
 /obj/item/weapon/gun/projectile/detective/semiauto
-	desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds."
 	name = "\improper Colt M1911"
+	desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds."
 	icon_state = "colt"
 	max_shells = 7
 	caliber = ".45"
@@ -103,7 +103,7 @@
 // You can spin the chamber to randomize the position of the bullet.
 
 /obj/item/weapon/gun/projectile/russian
-	name = "Russian Revolver"
+	name = "\improper Russian revolver"
 	desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet."
 	max_shells = 6
 	origin_tech = "combat=2;materials=2"
@@ -113,7 +113,6 @@
 	update_icon()
 
 /obj/item/weapon/gun/projectile/russian/proc/Spin()
-
 	for(var/obj/item/ammo_casing/AC in loaded)
 		del(AC)
 	loaded = list()
@@ -126,7 +125,6 @@
 
 
 /obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob)
-
 	if(!A) return
 
 	var/num_loaded = 0
@@ -155,13 +153,11 @@
 	return
 
 /obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob)
-
 	user.visible_message("<span class='warning'>[user] spins the chamber of the revolver.</span>", "<span class='warning'>You spin the revolver's chamber.</span>")
 	if(getAmmo() > 0)
 		Spin()
 
 /obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
-
 	if(!loaded.len)
 		user.visible_message("\red *click*", "\red *click*")
 		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
@@ -186,4 +182,3 @@
 					user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead.
 				return
 	..()
-

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

@@ -1,5 +1,4 @@
 /obj/item/weapon/gun/rocketlauncher
-	var/projectile
 	name = "rocket launcher"
 	desc = "MAGGOT."
 	icon_state = "rocket"
@@ -11,7 +10,7 @@
 	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
 	slot_flags = 0
 	origin_tech = "combat=8;materials=5"
-	projectile = /obj/item/missile
+	var/projectile = /obj/item/missile
 	var/missile_speed = 2
 	var/missile_range = 30
 	var/max_rockets = 1
@@ -49,4 +48,4 @@
 		del(I)
 		return
 	else
-		usr << "\red [src] is empty."
+		usr << "\red [src] is empty."

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

@@ -134,4 +134,4 @@
 				slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
 				name = "sawn-off shotgun"
 				desc = "Omar's coming!"
-				user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
+				user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"

code/modules/projectiles/projectile/beams.dm

@@ -170,4 +170,4 @@ var/list/beam_master = list()
 	icon_state = "stun"
 	nodamage = 1
 	agony = 40
-	damage_type = HALLOSS
+	damage_type = HALLOSS

code/modules/projectiles/projectile/change.dm

@@ -85,4 +85,3 @@
 
 		del(M)
 		return new_mob
-

code/modules/projectiles/projectile/energy.dm

@@ -65,4 +65,3 @@
 	damage = 20
 	damage_type = TOX
 	irradiate = 20
-

code/modules/projectiles/projectile/force.dm

@@ -25,4 +25,4 @@
 			throwdir = get_dir(src,target)
 			M.throw_at(get_edge_target_turf(M, throwdir),15,1)
 	return ..()
-*/
+*/

code/modules/research/destructive_analyzer.dm

@@ -8,7 +8,7 @@ It is used to destroy hand-held objects and advance technological research. Cont
 Note: Must be placed within 3 tiles of the R&D Console
 */
 /obj/machinery/r_n_d/destructive_analyzer
-	name = "Destructive Analyzer"
+	name = "destructive analyzer"
 	icon_state = "d_analyzer"
 	var/obj/item/weapon/loaded_item = null
 	var/decon_mod = 1
@@ -105,13 +105,3 @@ Note: Must be placed within 3 tiles of the R&D Console
 			busy = 0
 		return 1
 	return
-
-//For testing purposes only.
-/*/obj/item/weapon/deconstruction_test
-	name = "Test Item"
-	desc = "WTF?"
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "d20"
-	g_amt = 5000
-	m_amt = 5000
-	origin_tech = "materials=5;phorontech=5;syndicate=5;programming=9"*/

code/modules/research/rdconsole.dm

@@ -32,7 +32,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 */
 
 /obj/machinery/computer/rdconsole
-	name = "R&D Console"
+	name = "R&D control console"
 	icon_state = "rdcomp"
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
@@ -50,9 +50,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 	req_access = list(access_research)	//Data and setting manipulation requires scientist access.
 
-
-
-
 /obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
 	var/datum/tech/check_tech
 	var/return_name = null
@@ -125,7 +122,6 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			C.files.AddDesign2Known(D)
 		C.files.RefreshResearch()
 
-
 /obj/machinery/computer/rdconsole/New()
 	..()
 	files = new /datum/research(src) //Setup the research data holder.
@@ -250,8 +246,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(linked_destroy.busy)
 				usr << "\red The destructive analyzer is busy at the moment."
 			else
-				var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
-				if(choice == "Cancel" || !linked_destroy) return
+				if(alert("Proceeding will destroy loaded item. Continue?", "Destructive analyzer confirmation", "Yes", "No") == "No" || !linked_destroy) return
 				linked_destroy.busy = 1
 				screen = 0.1
 				updateUsrDialog()
@@ -441,7 +436,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 		linked_lathe.reagents.clear_reagents()
 
 	else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
-		var/desired_num_sheets = text2num(href_list["lathe_ejectsheet_amt"])
+		var/desired_num_sheets = text2num(href_list["amount"])
 		var/res_amount, type
 		switch(href_list["lathe_ejectsheet"])
 			if("metal")
@@ -475,7 +470,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			else
 				del sheet
 	else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
-		var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"])
+		var/desired_num_sheets = text2num(href_list["amount"])
 		var/res_amount, type
 		switch(href_list["imprinter_ejectsheet"])
 			if("glass")
@@ -577,22 +572,38 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 		if(1.0) //Main Menu
 			dat += "Main Menu:<BR><BR>"
-			dat += "<A href='?src=\ref[src];menu=1.1'>Current Research Levels</A><BR>"
-			if(t_disk) dat += "<A href='?src=\ref[src];menu=1.2'>Disk Operations</A><BR>"
-			else if(d_disk) dat += "<A href='?src=\ref[src];menu=1.4'>Disk Operations</A><BR>"
-			else dat += "(Please Insert Disk)<BR>"
-			if(linked_destroy != null) dat += "<A href='?src=\ref[src];menu=2.2'>Destructive Analyzer Menu</A><BR>"
-			if(linked_lathe != null) dat += "<A href='?src=\ref[src];menu=3.1'>Protolathe Construction Menu</A><BR>"
-			if(linked_imprinter != null) dat += "<A href='?src=\ref[src];menu=4.1'>Circuit Construction Menu</A><BR>"
-			dat += "<A href='?src=\ref[src];menu=1.6'>Settings</A>"
+			dat += "Loaded disk: "
+			dat += (t_disk || d_disk) ? (t_disk ? "technology storage disk" : "design storage disk") : "none"
+			dat += "<HR><UL>"
+			dat += "<LI><A href='?src=\ref[src];menu=1.1'>Current Research Levels</A>"
+			dat += "<LI><A href='?src=\ref[src];menu=5.0'>View Researched Technologies</A>"
+			if(t_disk)
+				dat += "<LI><A href='?src=\ref[src];menu=1.2'>Disk Operations</A>"
+			else if(d_disk)
+				dat += "<LI><A href='?src=\ref[src];menu=1.4'>Disk Operations</A>"
+			else
+				dat += "<LI>Disk Operations"
+			if(linked_destroy)
+				dat += "<LI><A href='?src=\ref[src];menu=2.2'>Destructive Analyzer Menu</A>"
+			if(linked_lathe)
+				dat += "<LI><A href='?src=\ref[src];menu=3.1'>Protolathe Construction Menu</A>"
+			if(linked_imprinter)
+				dat += "<LI><A href='?src=\ref[src];menu=4.1'>Circuit Construction Menu</A>"
+			dat += "<LI><A href='?src=\ref[src];menu=1.6'>Settings</A>"
+			dat += "</UL>"
 
 		if(1.1) //Research viewer
+			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
 			dat += "Current Research Levels:<BR><BR>"
+			dat += "<UL>"
 			for(var/datum/tech/T in files.known_tech)
-				dat += "[T.name]<BR>"
-				dat +=  "* Level: [T.level]<BR>"
-				dat +=  "* Summary: [T.desc]<HR>"
-			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
+				dat += "<LI>"
+				dat += "[T.name]"
+				dat += "<UL>"
+				dat +=  "<LI>Level: [T.level]"
+				dat +=  "<LI>Summary: [T.desc]"
+				dat += "</UL>"
+			dat += "</UL>"
 
 		if(1.2) //Technology Disk Menu
 
@@ -615,9 +626,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<BR><A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
 			dat += "<A href='?src=\ref[src];menu=1.2'>Return to Disk Operations</A><HR>"
 			dat += "Load Technology to Disk:<BR><BR>"
+			dat += "<UL>"
 			for(var/datum/tech/T in files.known_tech)
-				dat += "[T.name] "
-				dat += "<A href='?src=\ref[src];copy_tech=1;copy_tech_ID=[T.id]'>(Copy to Disk)</A><BR>"
+				dat += "<LI>[T.name] "
+				dat += "\[<A href='?src=\ref[src];copy_tech=1;copy_tech_ID=[T.id]'>copy to disk</A>\]"
+			dat += "</UL>"
 
 		if(1.4) //Design Disk menu.
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
@@ -645,58 +658,67 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
 			dat += "<A href='?src=\ref[src];menu=1.4'>Return to Disk Operations</A><HR>"
 			dat += "Load Design to Disk:<BR><BR>"
+			dat += "<UL>"
 			for(var/datum/design/D in files.known_designs)
-				dat += "[D.name] "
-				dat += "<A href='?src=\ref[src];copy_design=1;copy_design_ID=[D.id]'>(Copy to Disk)</A><BR>"
+				if(D.build_path)
+					dat += "<LI>[D.name] "
+					dat += "<A href='?src=\ref[src];copy_design=1;copy_design_ID=[D.id]'>\[copy to disk\]</A>"
+			dat += "</UL>"
 
 		if(1.6) //R&D console settings
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
-			dat += "R&D Console Setting:<BR><BR>"
+			dat += "R&D Console Setting:<HR>"
+			dat += "<UL>"
 			if(sync)
-				dat += "<A href='?src=\ref[src];sync=1'>Sync Database with Network</A><BR>"
-				dat += "<A href='?src=\ref[src];togglesync=1'>Disconnect from Research Network</A><BR>"
+				dat += "<LI><A href='?src=\ref[src];sync=1'>Sync Database with Network</A><BR>"
+				dat += "<LI><A href='?src=\ref[src];togglesync=1'>Disconnect from Research Network</A><BR>"
 			else
-				dat += "<A href='?src=\ref[src];togglesync=1'>Connect to Research Network</A><BR>"
-			dat += "<A href='?src=\ref[src];menu=1.7'>Device Linkage Menu</A><BR>"
-			dat += "<A href='?src=\ref[src];lock=0.2'>Lock Console</A><BR>"
-			dat += "<A href='?src=\ref[src];reset=1'>Reset R&D Database.</A><BR>"
+				dat += "<LI><A href='?src=\ref[src];togglesync=1'>Connect to Research Network</A><BR>"
+			dat += "<LI><A href='?src=\ref[src];menu=1.7'>Device Linkage Menu</A><BR>"
+			dat += "<LI><A href='?src=\ref[src];lock=0.2'>Lock Console</A><BR>"
+			dat += "<LI><A href='?src=\ref[src];reset=1'>Reset R&D Database</A><BR>"
+			dat += "<UL>"
 
 		if(1.7) //R&D device linkage
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
-			dat += "<A href='?src=\ref[src];menu=1.6'>Settings Menu</A><HR> "
+			dat += "<A href='?src=\ref[src];menu=1.6'>Settings Menu</A><HR>"
 			dat += "R&D Console Device Linkage Menu:<BR><BR>"
-			dat += "<A href='?src=\ref[src];find_device=1'>Re-sync with Nearby Devices</A><BR>"
-			dat += "Linked Devices:<BR>"
+			dat += "<A href='?src=\ref[src];find_device=1'>Re-sync with Nearby Devices</A><HR>"
+			dat += "Linked Devices:"
+			dat += "<UL>"
 			if(linked_destroy)
-				dat += "* Destructive Analyzer <A href='?src=\ref[src];disconnect=destroy'>(Disconnect)</A><BR>"
+				dat += "<LI>Destructive Analyzer <A href='?src=\ref[src];disconnect=destroy'>(Disconnect)</A>"
 			else
-				dat += "* (No Destructive Analyzer Linked)<BR>"
+				dat += "<LI>(No Destructive Analyzer Linked)"
 			if(linked_lathe)
-				dat += "* Protolathe <A href='?src=\ref[src];disconnect=lathe'>(Disconnect)</A><BR>"
+				dat += "<LI>Protolathe <A href='?src=\ref[src];disconnect=lathe'>(Disconnect)</A>"
 			else
-				dat += "* (No Protolathe Linked)<BR>"
+				dat += "<LI>(No Protolathe Linked)"
 			if(linked_imprinter)
-				dat += "* Circuit Imprinter <A href='?src=\ref[src];disconnect=imprinter'>(Disconnect)</A><BR>"
+				dat += "<LI>Circuit Imprinter <A href='?src=\ref[src];disconnect=imprinter'>(Disconnect)</A>"
 			else
-				dat += "* (No Circuit Imprinter Linked)<BR>"
+				dat += "<LI>(No Circuit Imprinter Linked)"
+			dat += "</UL>"
 
 		////////////////////DESTRUCTIVE ANALYZER SCREENS////////////////////////////
 		if(2.0)
+			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
 			dat += "NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE<BR><BR>"
-			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 
 		if(2.1)
+			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
 			dat += "No Item Loaded. Standing-by...<BR><HR>"
-			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A>"
 
 		if(2.2)
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
 			dat += "Deconstruction Menu<HR>"
 			dat += "Name: [linked_destroy.loaded_item.name]<BR>"
-			dat += "Origin Tech:<BR>"
+			dat += "Origin Tech:"
+			dat += "<UL>"
 			var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
 			for(var/T in temp_tech)
-				dat += "* [CallTechName(T)] [temp_tech[T]]<BR>"
+				dat += "<LI>[CallTechName(T)] [temp_tech[T]]"
+			dat += "</UL>"
 			dat += "<HR><A href='?src=\ref[src];deconstruct=1'>Deconstruct Item</A> || "
 			dat += "<A href='?src=\ref[src];eject_item=1'>Eject Item</A> || "
 
@@ -712,13 +734,14 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "Protolathe Menu:<BR><BR>"
 			dat += "<B>Material Amount:</B> [linked_lathe.TotalMaterials()] cm<sup>3</sup> (MAX: [linked_lathe.max_material_storage])<BR>"
 			dat += "<B>Chemical Volume:</B> [linked_lathe.reagents.total_volume] (MAX: [linked_lathe.reagents.maximum_volume])<HR>"
+			dat += "<UL>"
 			for(var/datum/design/D in files.known_designs)
-				if(!(D.build_type & PROTOLATHE))
+				if(!D.build_path || !(D.build_type & PROTOLATHE))
 					continue
-				var/temp_dat = "[D.name]"
+				var/temp_dat
 				var/check_materials = 1
 				for(var/M in D.materials)
-					temp_dat += " [D.materials[M]] [CallMaterialName(M)]"
+					temp_dat += ", [D.materials[M]] [CallMaterialName(M)]"
 					if(copytext(M, 1, 2) == "$")
 						switch(M)
 							if("$glass")
@@ -737,64 +760,52 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								if(D.materials[M] > linked_lathe.diamond_amount) check_materials = 0
 					else if (!linked_lathe.reagents.has_reagent(M, D.materials[M]))
 						check_materials = 0
+				if(temp_dat)
+					temp_dat = " \[[copytext(temp_dat,3)]\]"
 				if (check_materials)
-					dat += "* <A href='?src=\ref[src];build=[D.id]'>[temp_dat]</A><BR>"
+					dat += "<LI><B><A href='?src=\ref[src];build=[D.id]'>[D.name]</A></B>[temp_dat]"
 				else
-					dat += "* [temp_dat]<BR>"
+					dat += "<LI><B>[D.name]</B>[temp_dat]"
+			dat += "</UL>"
 
 		if(3.2) //Protolathe Material Storage Sub-menu
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
 			dat += "<A href='?src=\ref[src];menu=3.1'>Protolathe Menu</A><HR>"
 			dat += "Material Storage<BR><HR>"
-			//Metal
-			dat += "* [linked_lathe.m_amount] cm<sup>3</sup> of Metal || "
-			dat += "Eject: "
-			if(linked_lathe.m_amount >= 3750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=metal;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.m_amount >= 18750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=metal;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.m_amount >= 3750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=metal;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Glass
-			dat += "* [linked_lathe.g_amount] cm<sup>3</sup> of Glass || "
-			dat += "Eject: "
-			if(linked_lathe.g_amount >= 3750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=glass;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.g_amount >= 18750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=glass;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.g_amount >= 3750) dat += "<A href='?src=\ref[src];lathe_ejectsheet=glass;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Gold
-			dat += "* [linked_lathe.gold_amount] cm<sup>3</sup> of Gold || "
-			dat += "Eject: "
-			if(linked_lathe.gold_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=gold;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.gold_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=gold;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.gold_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=gold;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Silver
-			dat += "* [linked_lathe.silver_amount] cm<sup>3</sup> of Silver || "
-			dat += "Eject: "
-			if(linked_lathe.silver_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=silver;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.silver_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=silver;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.silver_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=silver;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Phoron
-			dat += "* [linked_lathe.phoron_amount] cm<sup>3</sup> of Solid Phoron || "
-			dat += "Eject: "
-			if(linked_lathe.phoron_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=phoron;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.phoron_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=phoron;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.phoron_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=phoronlathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Uranium
-			dat += "* [linked_lathe.uranium_amount] cm<sup>3</sup> of Uranium || "
-			dat += "Eject: "
-			if(linked_lathe.uranium_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=uranium;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.uranium_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=uranium;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.uranium_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=uranium;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Diamond
-			dat += "* [linked_lathe.diamond_amount] cm<sup>3</sup> of Diamond || "
-			dat += "Eject: "
-			if(linked_lathe.diamond_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=diamond;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_lathe.diamond_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=diamond;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_lathe.diamond_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=diamond;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
+			dat += "<UL>"
+			for(var/M in list("metal", "glass", "gold", "silver", "phoron", "uranium", "diamond"))
+				var/amount
+				var/sheetsize = 2000
+				switch(M)
+					if("metal")
+						amount = linked_lathe.m_amount
+						sheetsize = 3750
+					if("glass")
+						amount = linked_lathe.g_amount
+						sheetsize = 3750
+					if("gold")
+						amount = linked_lathe.gold_amount
+					if("silver")
+						amount = linked_lathe.silver_amount
+					if("phoron")
+						amount = linked_lathe.phoron_amount
+					if("uranium")
+						amount = linked_lathe.uranium_amount
+					if("diamond")
+						amount = linked_lathe.diamond_amount
+					else
+						continue
+				dat += "<LI><B>[capitalize(M)]</B>: [amount] cm<sup>3</sup>"
+				if(amount >= sheetsize)
+					dat += " || Eject "
+					for (var/C in list(1,3,5,10,15,20,25,30,40))
+						if(amount < C * sheetsize)
+							break
+						dat += "[C > 1 ? ", " : ""]<A href='?src=\ref[src];lathe_ejectsheet=[M];amount=[C]'>[C]</A> "
+
+					dat += " or <A href='?src=\ref[src];lathe_ejectsheet=[M];amount=50'>max</A> sheets"
+				dat += ""
+			dat += "</UL>"
 
 		if(3.3) //Protolathe Chemical Storage Submenu
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
@@ -817,14 +828,14 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "Circuit Imprinter Menu:<BR><BR>"
 			dat += "Material Amount: [linked_imprinter.TotalMaterials()] cm<sup>3</sup><BR>"
 			dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]<HR>"
-
+			dat += "<UL>"
 			for(var/datum/design/D in files.known_designs)
-				if(!(D.build_type & IMPRINTER))
+				if(!D.build_path || !(D.build_type & IMPRINTER))
 					continue
-				var/temp_dat = "[D.name]"
+				var/temp_dat
 				var/check_materials = 1
 				for(var/M in D.materials)
-					temp_dat += " [D.materials[M]] [CallMaterialName(M)]"
+					temp_dat += ", [D.materials[M]] [CallMaterialName(M)]"
 					if(copytext(M, 1, 2) == "$")
 						switch(M)
 							if("$glass")
@@ -837,10 +848,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								if(D.materials[M] > linked_imprinter.uranium_amount) check_materials = 0
 					else if (!linked_imprinter.reagents.has_reagent(M, D.materials[M]))
 						check_materials = 0
+				if(temp_dat)
+					temp_dat = " \[[copytext(temp_dat,3)]\]"
 				if (check_materials)
-					dat += "* <A href='?src=\ref[src];imprint=[D.id]'>[temp_dat]</A><BR>"
+					dat += "<LI><B><A href='?src=\ref[src];imprint=[D.id]'>[D.name]</A></B>[temp_dat]"
 				else
-					dat += "* [temp_dat]<BR>"
+					dat += "<LI><B>[D.name]</B>[temp_dat]"
+			dat += "</UL>"
 
 		if(4.2)
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
@@ -855,35 +869,44 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A> || "
 			dat += "<A href='?src=\ref[src];menu=4.1'>Circuit Imprinter Menu</A><HR>"
 			dat += "Material Storage<BR><HR>"
-			//Glass
-			dat += "* [linked_imprinter.g_amount] cm<sup>3</sup> of Glass || "
-			dat += "Eject: "
-			if(linked_imprinter.g_amount >= 3750) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=glass;imprinter_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_imprinter.g_amount >= 18750) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=glass;imprinter_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_imprinter.g_amount >= 3750) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=glass;imprinter_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Gold
-			dat += "* [linked_imprinter.gold_amount] cm<sup>3</sup> of Gold || "
-			dat += "Eject: "
-			if(linked_imprinter.gold_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=gold;imprinter_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_imprinter.gold_amount >= 10000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=gold;imprinter_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_imprinter.gold_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=gold;imprinter_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Diamond
-			dat += "* [linked_imprinter.diamond_amount] cm<sup>3</sup> of Diamond || "
-			dat += "Eject: "
-			if(linked_imprinter.diamond_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=diamond;imprinter_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_imprinter.diamond_amount >= 10000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=diamond;imprinter_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_imprinter.diamond_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=diamond;imprinter_ejectsheet_amt=50'>(Max Sheets)</A>"
-			dat += "<BR>"
-			//Uranium
-			dat += "* [linked_imprinter.uranium_amount] cm<sup>3</sup> of Uranium || "
-			dat += "Eject: "
-			if(linked_imprinter.uranium_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=uranium;imprinter_ejectsheet_amt=1'>(1 Sheet)</A> "
-			if(linked_imprinter.uranium_amount >= 10000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=uranium;imprinter_ejectsheet_amt=5'>(5 Sheets)</A> "
-			if(linked_imprinter.uranium_amount >= 2000) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=uranium;imprinter_ejectsheet_amt=50'>(Max Sheets)</A>"
+			dat += "<UL>"
+			for(var/M in list("glass", "gold", "diamond", "uranium"))
+				var/amount
+				var/sheetsize = 2000
+				switch(M)
+					if("glass")
+						amount = linked_imprinter.g_amount
+						sheetsize = 3750
+					if("gold")
+						amount = linked_imprinter.gold_amount
+					if("diamond")
+						amount = linked_imprinter.diamond_amount
+					if("uranium")
+						amount = linked_imprinter.uranium_amount
+				dat += "<LI><B>[capitalize(M)]</B>: [amount] cm<sup>3</sup>"
+				if(amount >= sheetsize)
+					dat += " || Eject: "
+					for (var/C in list(1,3,5,10,15,20,25,30,40))
+						if(amount < C * sheetsize)
+							break
+						dat += "[C > 1 ? ", " : ""]<A href='?src=\ref[src];imprinter_ejectsheet=[M];amount=[C]'>[C]</A> "
 
-	user << browse("<TITLE>Research and Development Console</TITLE><HR>[dat]", "window=rdconsole;size=575x400")
+					dat += " or <A href='?src=\ref[src];imprinter_ejectsheet=[M];amount=50'>max</A> sheets"
+				dat += ""
+			dat += "</UL>"
+
+		///////////////////Research Information Browser////////////////////
+		if(5.0)
+			dat += "<A href='?src=\ref[src];menu=1.0'>Main Menu</A><HR>"
+			dat += "List of Researched Technologies and Designs:"
+			dat += "<UL>"
+			for(var/datum/design/D in files.known_designs)
+				if(D.build_path)
+					dat += "<LI><B>[D.name]</B>: [D.desc]"
+			dat += "</UL>"
+			
+
+	user << browse("<TITLE>Research and Development Console</TITLE><HR>[dat]", "window=rdconsole;size=850x600")
 	onclose(user, "rdconsole")
 
 /obj/machinery/computer/rdconsole/robotics

code/modules/research/research.dm

@@ -257,7 +257,7 @@ datum/tech/robotics
 
 
 /obj/item/weapon/disk/tech_disk
-	name = "Technology Disk"
+	name = "technology disk"
 	desc = "A disk for storing technology data for further research."
 	icon = 'icons/obj/cloning.dmi'
 	icon_state = "datadisk2"
@@ -268,4 +268,18 @@ datum/tech/robotics
 
 /obj/item/weapon/disk/tech_disk/New()
 	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
+	src.pixel_y = rand(-5.0, 5)
+
+/obj/item/weapon/disk/design_disk
+	name = "component design disk"
+	desc = "A disk for storing device design data for construction in lathes."
+	icon = 'icons/obj/cloning.dmi'
+	icon_state = "datadisk2"
+	item_state = "card-id"
+	w_class = 2.0
+	matter = list("metal" = 30,"glass" = 10)
+	var/datum/design/blueprint
+
+/obj/item/weapon/disk/design_disk/New()
+	src.pixel_x = rand(-5.0, 5)
+	src.pixel_y = rand(-5.0, 5)

code/modules/shieldgen/circuits_and_designs.dm

@@ -1,78 +0,0 @@
-
-////////////////////////////////////////
-// External Shield Generator
-
-/obj/item/weapon/circuitboard/shield_gen_ex
-	name = "Circuit board (Hull shield generator)"
-	board_type = "machine"
-	build_path = "/obj/machinery/shield_gen/external"
-	origin_tech = "bluespace=4;phorontech=3"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen."
-	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
-
-datum/design/shield_gen_ex
-	name = "Circuit Design (Experimental hull shield generator)"
-	desc = "Allows for the construction of circuit boards used to build an experimental hull shield generator."
-	id = "shield_gen"
-	req_tech = list("bluespace" = 4, "phorontech" = 3)
-	build_type = IMPRINTER
-	materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
-	build_path = "/obj/machinery/shield_gen/external"
-
-////////////////////////////////////////
-// Shield Generator
-
-/obj/item/weapon/circuitboard/shield_gen
-	name = "Circuit board (Bubble shield generator)"
-	board_type = "machine"
-	build_path = "/obj/machinery/shield_gen/external"
-	origin_tech = "bluespace=4;phorontech=3"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen."
-	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
-							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
-
-datum/design/shield_gen
-	name = "Circuit Design (Bubble shield generator)"
-	desc = "Allows for the construction of circuit boards used to build an experimental shield generator."
-	id = "shield_gen"
-	req_tech = list("bluespace" = 4, "phorontech" = 3)
-	build_type = IMPRINTER
-	materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
-	build_path = "/obj/machinery/shield_gen/external"
-
-////////////////////////////////////////
-// Shield Capacitor
-
-/obj/item/weapon/circuitboard/shield_cap
-	name = "Circuit board (Shield capacitor)"
-	board_type = "machine"
-	build_path = "/obj/machinery/shield_capacitor"
-	origin_tech = "magnets=3;powerstorage=4"
-	frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Filter, 5 Pieces of cable, 1 Subspace Treatment disk, 1 Subspace Analyzer and 1 Console Screen."
-	req_components = list(
-							"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
-							"/obj/item/weapon/stock_parts/subspace/filter" = 1,
-							"/obj/item/weapon/stock_parts/subspace/treatment" = 1,
-							"/obj/item/weapon/stock_parts/subspace/analyzer" = 1,
-							"/obj/item/weapon/stock_parts/console_screen" = 1,
-							"/obj/item/stack/cable_coil" = 5)
-
-datum/design/shield_cap
-	name = "Circuit Design (Shield capacitor)"
-	desc = "Allows for the construction of circuit boards used to build an experimental shielding capacitor."
-	id = "shield_cap"
-	req_tech = list("magnets" = 3, "powerstorage" = 4)
-	build_type = IMPRINTER
-	materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$silver" = 10000)
-	build_path = "/obj/machinery/shield_gen/external"

code/modules/shuttles/antagonist.dm

@@ -4,6 +4,6 @@
 	shuttle_tag = "Vox Skipjack"
 
 /obj/machinery/computer/shuttle_control/multi/syndicate
-	name = "Syndicate control console"
+	name = "mercenary shuttle control console"
 	req_access = list(access_syndicate)
-	shuttle_tag = "Mercenary"
+	shuttle_tag = "Mercenary"

code/modules/shuttles/departmental.dm

@@ -1,17 +1,17 @@
 /obj/machinery/computer/shuttle_control/mining
-	name = "mining shuttle console"
+	name = "mining shuttle control console"
 	shuttle_tag = "Mining"
 	//req_access = list(access_mining)
 	circuit = /obj/item/weapon/circuitboard/mining_shuttle
 
 /obj/machinery/computer/shuttle_control/engineering
-	name = "engineering shuttle console"
+	name = "engineering shuttle control console"
 	shuttle_tag = "Engineering"
 	//req_one_access_txt = "11;24"
 	circuit = /obj/item/weapon/circuitboard/engineering_shuttle
 
 /obj/machinery/computer/shuttle_control/research
-	name = "research shuttle console"
+	name = "research shuttle control console"
 	shuttle_tag = "Research"
 	//req_access = list(access_research)
-	circuit = /obj/item/weapon/circuitboard/research_shuttle
+	circuit = /obj/item/weapon/circuitboard/research_shuttle

code/modules/shuttles/shuttle.dm

@@ -126,4 +126,4 @@
 
 //returns 1 if the shuttle has a valid arrive time
 /datum/shuttle/proc/has_arrive_time()
-	return (moving_status == SHUTTLE_INTRANSIT)
+	return (moving_status == SHUTTLE_INTRANSIT)

code/modules/shuttles/shuttle_emergency.dm

@@ -1,4 +1,3 @@
-
 /datum/shuttle/ferry/emergency
 	//pass
 

code/modules/shuttles/shuttle_ferry.dm

@@ -1,4 +1,3 @@
-
 #define DOCK_ATTEMPT_TIMEOUT 200	//how long in ticks we wait before assuming the docking controller is broken or blown up.
 
 /datum/shuttle/ferry

code/modules/shuttles/shuttle_supply.dm

@@ -1,8 +1,3 @@
-
-
-
-
-
 /datum/shuttle/ferry/supply
 	var/away_location = 1	//the location to hide at while pretending to be in-transit
 	var/late_chance = 80
@@ -76,4 +71,4 @@
 //returns the ETA in minutes
 /datum/shuttle/ferry/supply/proc/eta_minutes()
 	var/ticksleft = arrive_time - world.time
-	return round(ticksleft/600,1)
+	return round(ticksleft/600,1)

code/modules/shuttles/shuttles_multi.dm

@@ -140,4 +140,4 @@
 		MS.short_jump(MS.last_departed, MS.destinations[choice])
 		MS.last_departed = MS.destinations[choice]
 
-	updateUsrDialog()
+	updateUsrDialog()