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

code/modules/admin/admin.dm

@@ -563,7 +563,7 @@ var/global/floorIsLava = 0
 		<A href='?src=\ref[src];create_turf=1'>Create Turf</A><br>
 		<A href='?src=\ref[src];create_mob=1'>Create Mob</A><br>
 		<br><A href='?src=\ref[src];vsc=airflow'>Edit Airflow Settings</A><br>
-		<A href='?src=\ref[src];vsc=plasma'>Edit Plasma Settings</A><br>
+		<A href='?src=\ref[src];vsc=phoron'>Edit Phoron Settings</A><br>
 		<A href='?src=\ref[src];vsc=default'>Choose a default ZAS setting</A><br>
 		"}
 
@@ -961,7 +961,7 @@ var/global/floorIsLava = 0
 /datum/admins/proc/get_sab_desc(var/target)
 	switch(target)
 		if(1)
-			return "Destroy at least 70% of the plasma canisters on the station"
+			return "Destroy at least 70% of the phoron canisters on the station"
 		if(2)
 			return "Destroy the AI"
 		if(3)

code/modules/admin/admin_verbs.dm

@@ -682,6 +682,12 @@ var/list/admin_verbs_mentor = list(
 		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
 		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
 
+	var/new_skin = input("Please select body color. This is for Tajaran, Unathi, and Skrell only!", "Character Generation") as color
+	if(new_skin)
+		M.r_skin = hex2num(copytext(new_skin, 2, 4))
+		M.g_skin = hex2num(copytext(new_skin, 4, 6))
+		M.b_skin = hex2num(copytext(new_skin, 6, 8))
+
 	var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation")  as text
 
 	if (new_tone)

code/modules/admin/topic.dm

@@ -2599,7 +2599,7 @@
 		if(check_rights(R_ADMIN|R_SERVER))
 			if(href_list["vsc"] == "airflow")
 				vsc.ChangeSettingsDialog(usr,vsc.settings)
-			if(href_list["vsc"] == "plasma")
+			if(href_list["vsc"] == "phoron")
 				vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
 			if(href_list["vsc"] == "default")
 				vsc.SetDefault(usr)

code/modules/admin/verbs/debug.dm

@@ -144,7 +144,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	var/t = ""
 	t+= "Nitrogen : [env.nitrogen]\n"
 	t+= "Oxygen : [env.oxygen]\n"
-	t+= "Plasma : [env.toxins]\n"
+	t+= "Phoron : [env.phoron]\n"
 	t+= "CO2: [env.carbon_dioxide]\n"
 
 	usr.show_message(t, 1)
@@ -955,11 +955,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	for(var/obj/machinery/power/rad_collector/Rad in world)
 		if(Rad.anchored)
 			if(!Rad.P)
-				var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad)
-				Plasma.air_contents.toxins = 70
+				var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
+				Phoron.air_contents.phoron = 70
 				Rad.drainratio = 0
-				Rad.P = Plasma
-				Plasma.loc = Rad
+				Rad.P = Phoron
+				Phoron.loc = Rad
 
 			if(!Rad.active)
 				Rad.toggle_power()
@@ -997,12 +997,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 				Rad.anchored = 1
 				Rad.connect_to_network()
 
-				var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad)
+				var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
 
-				Plasma.air_contents.toxins = 29.1154	//This is a full tank if you filled it from a canister
-				Rad.P = Plasma
+				Phoron.air_contents.phoron = 29.1154	//This is a full tank if you filled it from a canister
+				Rad.P = Phoron
 
-				Plasma.loc = Rad
+				Phoron.loc = Rad
 
 				if(!Rad.active)
 					Rad.toggle_power()
@@ -1043,13 +1043,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		T.zone.air.nitrogen += 450
 		T.zone.air.temperature = 50
 		T.zone.air.update_values()
-				
-				
+
+
 	log_admin("[key_name(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant" : ""]")
 	message_admins("\blue [key_name_admin(usr)] setup the supermatter engine  [response == "Setup except coolant" ? "without coolant": ""]", 1)
 	return
-			
-	
+
+
 
 /client/proc/cmd_debug_mob_lists()
 	set category = "Debug"

code/modules/admin/verbs/diagnostics.dm

@@ -56,7 +56,7 @@
 		if(T.active_hotspot)
 			burning = 1
 
-	usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
+	usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.phoron] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]"
 	for(var/datum/gas/trace_gas in GM.trace_gases)
 		usr << "[trace_gas.type]: [trace_gas.moles]"
 	feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/one_click_antag.dm

@@ -73,11 +73,11 @@ client/proc/one_click_antag()
 								candidates += applicant
 
 	if(candidates.len)
-		var/numTratiors = min(candidates.len, 3)
+		var/numTraitors = min(candidates.len, 3)
 
-		for(var/i = 0, i<numTratiors, i++)
+		for(var/i = 0, i<numTraitors, i++)
 			H = pick(candidates)
-			H.mind.make_Tratior()
+			H.mind.make_Traitor()
 			candidates.Remove(H)
 
 		return 1
@@ -492,7 +492,7 @@ client/proc/one_click_antag()
 
 /datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)
 
-	var/mob/living/carbon/human/new_vox = new(spawn_location.loc)
+	var/mob/living/carbon/human/new_vox = new(spawn_location.loc, "Vox")
 
 	new_vox.gender = pick(MALE, FEMALE)
 	new_vox.h_style = "Short Vox Quills"
@@ -512,8 +512,6 @@ client/proc/one_click_antag()
 
 	new_vox.dna.ready_dna(new_vox) // Creates DNA.
 	new_vox.dna.mutantrace = "vox"
-	new_vox.set_species("Vox") // Actually makes the vox! How about that.
-	new_vox.add_language("Vox-pidgin")
 	new_vox.mind_initialize()
 	new_vox.mind.assigned_role = "MODE"
 	new_vox.mind.special_role = "Vox Raider"

code/modules/admin/verbs/randomverbs.dm

@@ -828,7 +828,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /* This proc is DEFERRED. Does not do anything.
-/client/proc/cmd_admin_remove_plasma()
+/client/proc/cmd_admin_remove_phoron()
 	set category = "Debug"
 	set name = "Stabilize Atmos."
 	if(!holder)

code/modules/assembly/bomb.dm

@@ -9,7 +9,7 @@
 	flags = FPRINT | TABLEPASS| CONDUCT //Copied this from old code, so this may or may not be necessary
 	var/status = 0   //0 - not readied //1 - bomb finished with welder
 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
-	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank
+	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a phoron tank
 
 /obj/item/device/onetankbomb/examine()
 	..()
@@ -100,7 +100,7 @@
 	return
 
 /obj/item/weapon/tank/proc/ignite()	//This happens when a bomb is told to explode
-	var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
+	var/fuel_moles = air_contents.phoron + air_contents.oxygen/6
 	var/strength = 1
 
 	var/turf/ground_zero = get_turf(loc)

code/modules/assembly/helpers.dm

@@ -30,7 +30,7 @@
 
 /*
 Name:	IsSpecialAssembly
-Desc:	If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door
+Desc:	If true is an object that can be attached to an assembly holder but is a special thing like a phoron can or door
 */
 
 /obj/proc/IsSpecialAssembly()

code/modules/client/client procs.dm

@@ -259,6 +259,8 @@
 	getFiles(
 		'html/search.js',
 		'html/panels.css',
+		'html/painew.png',
+		'html/loading.gif',
 		'icons/pda_icons/pda_atmos.png',
 		'icons/pda_icons/pda_back.png',
 		'icons/pda_icons/pda_bell.png',

code/modules/client/preferences.dm

@@ -64,7 +64,10 @@ datum/preferences
 	var/r_facial = 0					//Face hair color
 	var/g_facial = 0					//Face hair color
 	var/b_facial = 0					//Face hair color
-	var/s_tone = 0						//Skin color
+	var/s_tone = 0						//Skin tone
+	var/r_skin = 0						//Skin color
+	var/g_skin = 0						//Skin color
+	var/b_skin = 0						//Skin color
 	var/r_eyes = 0						//Eye color
 	var/g_eyes = 0						//Eye color
 	var/b_eyes = 0						//Eye color
@@ -377,7 +380,10 @@ datum/preferences
 		dat += " Style: <a href='?_src_=prefs;preference=f_style;task=input'>[f_style]</a><br>"
 
 		dat += "<br><b>Eyes</b><br>"
-		dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]'><tr><td>__</td></tr></table></font>"
+		dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]'><tr><td>__</td></tr></table></font><br>"
+
+		dat += "<br><b>Body Color</b><br>"
+		dat += "<a href='?_src_=prefs;preference=skin;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin)]'><tr><td>__</td></tr></table></font>"
 
 		dat += "<br><br>"
 		if(jobban_isbanned(user, "Syndicate"))
@@ -857,6 +863,10 @@ datum/preferences
 						b_eyes = rand(0,255)
 					if("s_tone")
 						s_tone = random_skin_tone()
+					if("s_color")
+						r_skin = rand(0,255)
+						g_skin = rand(0,255)
+						b_skin = rand(0,255)
 					if("bag")
 						backbag = rand(1,4)
 					/*if("skin_style")
@@ -971,7 +981,7 @@ datum/preferences
 							b_type = new_b_type
 
 					if("hair")
-						if(species == "Human" || species == "Unathi")
+						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell")
 							var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null
 							if(new_hair)
 								r_hair = hex2num(copytext(new_hair, 2, 4))
@@ -1050,6 +1060,14 @@ datum/preferences
 						if(new_s_tone)
 							s_tone = 35 - max(min( round(new_s_tone), 220),1)
 
+					if("skin")
+						if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
+							var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null
+							if(new_skin)
+								r_skin = hex2num(copytext(new_skin, 2, 4))
+								g_skin = hex2num(copytext(new_skin, 4, 6))
+								b_skin = hex2num(copytext(new_skin, 6, 8))
+
 					if("ooccolor")
 						var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference") as color|null
 						if(new_ooccolor)
@@ -1280,6 +1298,10 @@ datum/preferences
 		character.g_facial = g_facial
 		character.b_facial = b_facial
 
+		character.r_skin = r_skin
+		character.g_skin = g_skin
+		character.b_skin = b_skin
+
 		character.s_tone = s_tone
 
 		character.h_style = h_style

code/modules/client/preferences_savefile.dm

@@ -117,6 +117,9 @@
 	S["facial_green"]		>> g_facial
 	S["facial_blue"]		>> b_facial
 	S["skin_tone"]			>> s_tone
+	S["skin_red"]			>> r_skin
+	S["skin_green"]			>> g_skin
+	S["skin_blue"]			>> b_skin
 	S["hair_style_name"]	>> h_style
 	S["facial_style_name"]	>> f_style
 	S["eyes_red"]			>> r_eyes
@@ -177,6 +180,9 @@
 	g_facial		= sanitize_integer(g_facial, 0, 255, initial(g_facial))
 	b_facial		= sanitize_integer(b_facial, 0, 255, initial(b_facial))
 	s_tone			= sanitize_integer(s_tone, -185, 34, initial(s_tone))
+	r_skin			= sanitize_integer(r_skin, 0, 255, initial(r_skin))
+	g_skin			= sanitize_integer(g_skin, 0, 255, initial(g_skin))
+	b_skin			= sanitize_integer(b_skin, 0, 255, initial(b_skin))
 	h_style			= sanitize_inlist(h_style, hair_styles_list, initial(h_style))
 	f_style			= sanitize_inlist(f_style, facial_hair_styles_list, initial(f_style))
 	r_eyes			= sanitize_integer(r_eyes, 0, 255, initial(r_eyes))
@@ -228,6 +234,9 @@
 	S["facial_green"]		<< g_facial
 	S["facial_blue"]		<< b_facial
 	S["skin_tone"]			<< s_tone
+	S["skin_red"]			<< r_skin
+	S["skin_green"]			<< g_skin
+	S["skin_blue"]			<< b_skin
 	S["hair_style_name"]	<< h_style
 	S["facial_style_name"]	<< f_style
 	S["eyes_red"]			<< r_eyes

code/modules/clothing/clothing.dm

@@ -134,6 +134,7 @@ BLIND     // can't see anything
 
 /obj/item/clothing/gloves/emp_act(severity)
 	if(cell)
+		//why is this not part of the powercell code?
 		cell.charge -= 1000 / severity
 		if (cell.charge < 0)
 			cell.charge = 0
@@ -151,6 +152,7 @@ BLIND     // can't see anything
 	icon = 'icons/obj/clothing/hats.dmi'
 	body_parts_covered = HEAD
 	slot_flags = SLOT_HEAD
+	w_class = 2.0
 
 
 //Mask
@@ -186,6 +188,7 @@ BLIND     // can't see anything
 	slot_flags = SLOT_OCLOTHING
 	var/blood_overlay_type = "suit"
 	siemens_coefficient = 0.9
+	w_class = 3
 
 //Spacesuit
 //Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
@@ -217,7 +220,7 @@ BLIND     // can't see anything
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 3
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL 
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.9
@@ -232,6 +235,7 @@ BLIND     // can't see anything
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_ICLOTHING
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	w_class = 3
 	var/has_sensor = 1//For the crew computer 2 = unable to change mode
 	var/sensor_mode = 0
 		/*
@@ -246,17 +250,14 @@ BLIND     // can't see anything
 
 
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
+	if(hastie)
+		hastie.attackby(I, user)
+		return
+	
 	if(!hastie && istype(I, /obj/item/clothing/tie))
 		user.drop_item()
 		hastie = I
-		I.loc = src
-		user << "<span class='notice'>You attach [I] to [src].</span>"
-
-		if (istype(hastie,/obj/item/clothing/tie/holster))
-			verbs += /obj/item/clothing/under/proc/holster
-
-		if (istype(hastie,/obj/item/clothing/tie/storage))
-			verbs += /obj/item/clothing/under/proc/storage
+		hastie.attach_to(src, user)
 
 		if(istype(loc, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = loc
@@ -265,6 +266,32 @@ BLIND     // can't see anything
 		return
 
 	..()
+	
+/obj/item/clothing/under/attack_hand(mob/user as mob)
+	//only forward to the attached accessory if the clothing is equipped (not in a storage)
+	if(hastie && src.loc == user)
+		hastie.attack_hand(user)
+		return
+	..()
+
+//This is to allow people to take off suits when there is an attached accessory
+/obj/item/clothing/under/MouseDrop(obj/over_object as obj)
+	if (ishuman(usr) || ismonkey(usr))
+		//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
+		if (!(src.loc == usr))
+			return
+		
+		if (!( usr.restrained() ) && !( usr.stat ))
+			switch(over_object.name)
+				if("r_hand")
+					usr.u_equip(src)
+					usr.put_in_r_hand(src)
+				if("l_hand")
+					usr.u_equip(src)
+					usr.put_in_l_hand(src)
+			src.add_fingerprint(usr)
+			return
+	return
 
 /obj/item/clothing/under/examine()
 	set src in view()
@@ -333,16 +360,7 @@ BLIND     // can't see anything
 	if(usr.stat) return
 
 	if(hastie)
-		if (istype(hastie,/obj/item/clothing/tie/holster))
-			verbs -= /obj/item/clothing/under/proc/holster
-
-		if (istype(hastie,/obj/item/clothing/tie/storage))
-			verbs -= /obj/item/clothing/under/proc/storage
-			var/obj/item/clothing/tie/storage/W = hastie
-			if (W.hold)
-				W.hold.close(usr)
-
-		usr.put_in_hands(hastie)
+		hastie.remove(usr)
 		hastie = null
 
 		if(istype(loc, /mob/living/carbon/human))
@@ -353,59 +371,4 @@ BLIND     // can't see anything
 	sensor_mode = pick(0,1,2,3)
 	..()
 
-/obj/item/clothing/under/proc/holster()
-	set name = "Holster"
-	set category = "Object"
-	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
-
-	if (!hastie || !istype(hastie,/obj/item/clothing/tie/holster))
-		usr << "\red You need a holster for that!"
-		return
-	var/obj/item/clothing/tie/holster/H = hastie
-
-	if(!H.holstered)
-		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
-			usr << "\blue You need your gun equiped to holster it."
-			return
-		var/obj/item/weapon/gun/W = usr.get_active_hand()
-		if (!W.isHandgun())
-			usr << "\red This gun won't fit in \the [H]!"
-			return
-		H.holstered = usr.get_active_hand()
-		usr.drop_item()
-		H.holstered.loc = src
-		usr.visible_message("\blue \The [usr] holsters \the [H.holstered].", "You holster \the [H.holstered].")
-	else
-		if(istype(usr.get_active_hand(),/obj) && istype(usr.get_inactive_hand(),/obj))
-			usr << "\red You need an empty hand to draw the gun!"
-		else
-			if(usr.a_intent == "hurt")
-				usr.visible_message("\red \The [usr] draws \the [H.holstered], ready to shoot!", \
-				"\red You draw \the [H.holstered], ready to shoot!")
-			else
-				usr.visible_message("\blue \The [usr] draws \the [H.holstered], pointing it at the ground.", \
-				"\blue You draw \the [H.holstered], pointing it at the ground.")
-			usr.put_in_hands(H.holstered)
-			H.holstered = null
-
-/obj/item/clothing/under/proc/storage()
-	set name = "Look in storage"
-	set category = "Object"
-	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
-
-	if (!hastie || !istype(hastie,/obj/item/clothing/tie/storage))
-		usr << "\red You need something to store items in for that!"
-		return
-	var/obj/item/clothing/tie/storage/W = hastie
-
-	if (!istype(W.hold))
-		return
-
-	W.hold.loc = usr
-	W.hold.attack_hand(usr)
-
 

code/modules/clothing/head/helmet.dm

@@ -11,6 +11,7 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.7
+	w_class = 3
 
 /obj/item/clothing/head/helmet/warden
 	name = "warden's hat"

code/modules/clothing/head/misc_special.dm

@@ -24,6 +24,7 @@
 	flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
 	icon_action_button = "action_welding"
 	siemens_coefficient = 0.9
+	w_class = 3
 
 /obj/item/clothing/head/welding/attack_self()
 	toggle()
@@ -125,6 +126,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	var/brightness_on = 2 //luminosity when on
 	var/on = 0
+	w_class = 3
 
 	attack_self(mob/user)
 		if(!isturf(user.loc))

code/modules/clothing/masks/gasmask.dm

@@ -14,7 +14,7 @@
 //Plague Dr suit can be found in clothing/suits/bio.dm
 /obj/item/clothing/mask/gas/plaguedoctor
 	name = "plague doctor mask"
-	desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
+	desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
 	item_state = "gas_mask"
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0)

code/modules/clothing/shoes/miscellaneous.dm

@@ -114,12 +114,14 @@
 	icon_state = "slippers"
 	item_state = "slippers"
 	species_restricted = null
+	w_class = 2
 
 /obj/item/clothing/shoes/slippers_worn
 	name = "worn bunny slippers"
 	desc = "Fluffy..."
 	icon_state = "slippers_worn"
 	item_state = "slippers_worn"
+	w_class = 2
 
 /obj/item/clothing/shoes/laceup
 	name = "laceup shoes"

code/modules/clothing/spacesuits/alien.dm

@@ -206,10 +206,14 @@
 		user << "You relax your deathgrip on the flooring."
 	else
 		//make sure these can only be used when equipped.
-		if (!is_equipped())
+		if(!ishuman(user))
+			return
+		var/mob/living/carbon/human/H = user
+		if (H.shoes != src)
 			user << "You will have to put on the [src] before you can do that."
 			return
 		
+		
 		flags |= NOSLIP
 		magpulse = 1
 		canremove = 0	//kinda hard to take off magclaws when you are gripping them tightly.

code/modules/clothing/spacesuits/captain.dm

@@ -23,7 +23,7 @@
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL 
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.7

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -22,7 +22,7 @@
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
 	slowdown = 1.5
 	armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL 
 	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.7

code/modules/clothing/suits/bio.dm

@@ -22,7 +22,7 @@
 	slowdown = 1.0
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	siemens_coefficient = 0.9
 
 

code/modules/clothing/suits/jobs.dm

@@ -107,7 +107,8 @@
 	item_state = "hazard"
 	blood_overlay_type = "armor"
 	allowed = list (/obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, \
-	/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen)
+	/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, /obj/item/weapon/tank/emergency_oxygen, \
+	/obj/item/clothing/mask/gas, /obj/item/taperoll/engineering)
 
 //Lawyer
 /obj/item/clothing/suit/storage/lawyer/bluejacket

code/modules/clothing/suits/labcoat.dm

@@ -23,6 +23,36 @@
 			if("labcoat")
 				src.icon_state = "labcoat_open"
 				usr << "You unbutton the labcoat."
+			if("red_labcoat_open")
+				src.icon_state = "red_labcoat"
+				usr << "You button up the labcoat."
+			if("red_labcoat")
+				src.icon_state = "red_labcoat_open"
+				usr << "You unbutton the labcoat."
+			if("blue_labcoat_open")
+				src.icon_state = "blue_labcoat"
+				usr << "You button up the labcoat."
+			if("blue_labcoat")
+				src.icon_state = "blue_labcoat_open"
+				usr << "You unbutton the labcoat."
+			if("purple_labcoat_open")
+				src.icon_state = "purple_labcoat"
+				usr << "You button up the labcoat."
+			if("purple_labcoat")
+				src.icon_state = "purple_labcoat_open"
+				usr << "You unbutton the labcoat."
+			if("green_labcoat_open")
+				src.icon_state = "green_labcoat"
+				usr << "You button up the labcoat."
+			if("green_labcoat")
+				src.icon_state = "green_labcoat_open"
+				usr << "You unbutton the labcoat."
+			if("orange_labcoat_open")
+				src.icon_state = "orange_labcoat"
+				usr << "You button up the labcoat."
+			if("orange_labcoat")
+				src.icon_state = "orange_labcoat_open"
+				usr << "You unbutton the labcoat."
 			if("labcoat_cmo_open")
 				src.icon_state = "labcoat_cmo"
 				usr << "You button up the labcoat."
@@ -64,6 +94,36 @@
 				return
 		usr.update_inv_wear_suit()	//so our overlays update
 
+/obj/item/clothing/suit/storage/labcoat/red
+	name = "red labcoat"
+	desc = "A suit that protects against minor chemical spills. This one is red."
+	icon_state = "red_labcoat_open"
+	item_state = "red_labcoat"
+
+/obj/item/clothing/suit/storage/labcoat/blue
+	name = "blue labcoat"
+	desc = "A suit that protects against minor chemical spills. This one is blue."
+	icon_state = "blue_labcoat_open"
+	item_state = "blue_labcoat"
+
+/obj/item/clothing/suit/storage/labcoat/purple
+	name = "purple labcoat"
+	desc = "A suit that protects against minor chemical spills. This one is purple."
+	icon_state = "purple_labcoat_open"
+	item_state = "purple_labcoat"
+
+/obj/item/clothing/suit/storage/labcoat/orange
+	name = "orange labcoat"
+	desc = "A suit that protects against minor chemical spills. This one is orange."
+	icon_state = "orange_labcoat_open"
+	item_state = "orange_labcoat"
+
+/obj/item/clothing/suit/storage/labcoat/green
+	name = "green labcoat"
+	desc = "A suit that protects against minor chemical spills. This one is green."
+	icon_state = "green_labcoat_open"
+	item_state = "green_labcoat"
+
 /obj/item/clothing/suit/storage/labcoat/cmo
 	name = "chief medical officer's labcoat"
 	desc = "Bluer than the standard model."
@@ -77,22 +137,22 @@
 	item_state = "labgreen"
 
 /obj/item/clothing/suit/storage/labcoat/genetics
-	name = "Geneticist Labcoat"
+	name = "Geneticist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
 	icon_state = "labcoat_gen_open"
 
 /obj/item/clothing/suit/storage/labcoat/chemist
-	name = "Chemist Labcoat"
+	name = "Chemist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"
 
 /obj/item/clothing/suit/storage/labcoat/virologist
-	name = "Virologist Labcoat"
+	name = "Virologist labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
 /obj/item/clothing/suit/storage/labcoat/science
-	name = "Scientist Labcoat"
+	name = "Scientist labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"

code/modules/clothing/suits/miscellaneous.dm

@@ -187,7 +187,7 @@
 	icon_state = "straight_jacket"
 	item_state = "straight_jacket"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 
 /obj/item/clothing/suit/ianshirt
 	name = "worn shirt"

code/modules/clothing/suits/storage.dm

@@ -0,0 +1,29 @@
+/obj/item/clothing/suit/storage
+	var/obj/item/weapon/storage/internal/pockets
+
+/obj/item/clothing/suit/storage/New()
+	..()
+	pockets = new/obj/item/weapon/storage/internal(src)
+	pockets.storage_slots = 2	//two slots
+	pockets.max_w_class = 2		//fit only pocket sized items
+	pockets.max_combined_w_class = 4
+
+/obj/item/clothing/suit/storage/attack_hand(mob/user as mob)
+	if (pockets.handle_attack_hand(user))
+		..(user)
+
+/obj/item/clothing/suit/storage/MouseDrop(obj/over_object as obj)
+	if (pockets.handle_mousedrop(usr, over_object))
+		..(over_object)
+
+/obj/item/clothing/suit/storage/attackby(obj/item/W as obj, mob/user as mob)
+	..()
+	pockets.attackby(W, user)
+
+/obj/item/clothing/suit/storage/emp_act(severity)
+	pockets.emp_act(severity)
+	..()
+
+/obj/item/clothing/suit/storage/hear_talk(mob/M, var/msg)
+	pockets.hear_talk(M, msg)
+	..()

code/modules/clothing/suits/utility.dm

@@ -20,7 +20,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
 	slowdown = 1.0
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -65,7 +65,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 2
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
-	flags_inv = HIDEJUMPSUIT
+	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	heat_protection = UPPER_TORSO|LOWER_TORSO
 	max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0
@@ -104,4 +104,4 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1.5
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
-	flags_inv = HIDEJUMPSUIT
+	flags_inv = HIDEJUMPSUIT|HIDETAIL

code/modules/clothing/under/jobs/medsci.dm

@@ -31,9 +31,9 @@
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
 	name = "scientist's jumpsuit"
-	icon_state = "toxins"
+	icon_state = "science"
 	item_state = "w_suit"
-	item_color = "toxinswhite"
+	item_color = "sciencewhite"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS

code/modules/clothing/under/ties.dm

@@ -8,6 +8,23 @@
 	flags = FPRINT | TABLEPASS
 	slot_flags = 0
 	w_class = 2.0
+	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
+
+//when user attached an accessory to S
+/obj/item/clothing/tie/proc/attach_to(obj/item/clothing/under/S, mob/user as mob)
+	if(!istype(S))
+		return
+	has_suit = S
+	loc = has_suit
+	user << "<span class='notice'>You attach [src] to [has_suit].</span>"
+	src.add_fingerprint(user)
+
+/obj/item/clothing/tie/proc/remove(mob/user as mob)
+	if(!has_suit)
+		return
+	has_suit = null
+	usr.put_in_hands(src)
+	src.add_fingerprint(user)
 
 /obj/item/clothing/tie/blue
 	name = "blue tie"
@@ -116,7 +133,7 @@
 //Armbands
 /obj/item/clothing/tie/armband
 	name = "red armband"
-	desc = "An fancy red armband!"
+	desc = "A fancy red armband!"
 	icon_state = "red"
 	item_color = "red"
 
@@ -156,6 +173,7 @@
 	icon_state = "medgreen"
 	item_color = "medgreen"
 
+//holsters
 /obj/item/clothing/tie/holster
 	name = "shoulder holster"
 	desc = "A handgun holster."
@@ -163,6 +181,105 @@
 	item_color = "holster"
 	var/obj/item/weapon/gun/holstered = null
 
+//subtypes can override this to specify what can be holstered
+/obj/item/clothing/tie/holster/proc/can_holster(obj/item/weapon/gun/W)
+	return W.isHandgun()
+
+/obj/item/clothing/tie/holster/proc/holster(obj/item/I, mob/user as mob)
+	if(holstered)
+		user << "\red There is already a [holstered] holstered here!"
+	
+	if (!istype(I, /obj/item/weapon/gun))
+		user << "\red Only guns can be holstered!"
+	
+	var/obj/item/weapon/gun/W = I
+	if (!can_holster(W))
+		user << "\red This [W] won't fit in the [src]!"
+		return
+	
+	holstered = W
+	user.drop_from_inventory(holstered)
+	holstered.loc = src
+	holstered.add_fingerprint(user)
+	user.visible_message("\blue [user] holsters the [holstered].", "You holster the [holstered].")
+
+/obj/item/clothing/tie/holster/proc/unholster(mob/user as mob)
+	if(!holstered)
+		return
+	
+	if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
+		user << "\red You need an empty hand to draw the [holstered]!"
+	else
+		if(user.a_intent == "hurt")
+			usr.visible_message("\red [user] draws the [holstered], ready to shoot!", \
+			"\red You draw the [holstered], ready to shoot!")
+		else
+			user.visible_message("\blue [user] draws the [holstered], pointing it at the ground.", \
+			"\blue You draw the [holstered], pointing it at the ground.")
+		user.put_in_hands(holstered)
+		holstered.add_fingerprint(user)
+		holstered = null
+
+/obj/item/clothing/tie/holster/attack_hand(mob/user as mob)
+	if (has_suit)	//if we are part of a suit
+		if (holstered)
+			unholster(user)
+		return
+	
+	..(user)
+
+/obj/item/clothing/tie/holster/attackby(obj/item/W as obj, mob/user as mob)
+	holster(W, user)
+
+/obj/item/clothing/tie/holster/emp_act(severity)
+	if (holstered)
+		holstered.emp_act(severity)
+	..()
+
+/obj/item/clothing/tie/holster/examine()
+	set src in view()
+	..()
+	if (holstered)
+		usr << "A [holstered] is holstered here."
+	else
+		usr << "It is empty."
+
+/obj/item/clothing/tie/holster/attach_to(obj/item/clothing/under/S, mob/user as mob)
+	..()
+	has_suit.verbs += /obj/item/clothing/tie/holster/verb/holster_verb
+
+/obj/item/clothing/tie/holster/remove(mob/user as mob)
+	has_suit.verbs -= /obj/item/clothing/tie/holster/verb/holster_verb
+	..()
+
+//For the holster hotkey
+/obj/item/clothing/tie/holster/verb/holster_verb()
+	set name = "Holster"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+	
+	var/obj/item/clothing/tie/holster/H = null
+	if (istype(src, /obj/item/clothing/tie/holster))
+		H = src
+	else if (istype(src, /obj/item/clothing/under))
+		var/obj/item/clothing/under/S = src
+		if (S.hastie)
+			H = S.hastie
+	
+	if (!H)
+		usr << "/red Something is very wrong."
+
+	if(!H.holstered)
+		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
+			usr << "\blue You need your gun equiped to holster it."
+			return
+		var/obj/item/weapon/gun/W = usr.get_active_hand()
+		H.holster(W, usr)
+	else
+		H.unholster(usr)
+
 /obj/item/clothing/tie/holster/armpit
 	name = "shoulder holster"
 	desc = "A worn-out handgun holster. Perfect for concealed carry"
@@ -177,17 +294,43 @@
 
 /obj/item/clothing/tie/storage
 	name = "load bearing equipment"
-	desc = "Used to hold things when you don't have enough hands for that."
+	desc = "Used to hold things when you don't have enough hands."
 	icon_state = "webbing"
 	item_color = "webbing"
 	var/slots = 3
-	var/obj/item/weapon/storage/pockets/hold
+	var/obj/item/weapon/storage/internal/hold
 
 /obj/item/clothing/tie/storage/New()
-	hold = new /obj/item/weapon/storage/pockets(src)
-	hold.master_item = src
+	..()
+	hold = new/obj/item/weapon/storage/internal(src)
 	hold.storage_slots = slots
 
+/obj/item/clothing/tie/storage/attack_hand(mob/user as mob)
+	if (has_suit)	//if we are part of a suit
+		hold.open(user)
+		return
+	
+	if (hold.handle_attack_hand(user))	//otherwise interact as a regular storage item
+		..(user)
+
+/obj/item/clothing/tie/storage/MouseDrop(obj/over_object as obj)
+	if (has_suit)
+		return
+	
+	if (hold.handle_mousedrop(usr, over_object))
+		..(over_object)
+
+/obj/item/clothing/tie/storage/attackby(obj/item/W as obj, mob/user as mob)
+	hold.attackby(W, user)
+
+/obj/item/clothing/tie/storage/emp_act(severity)
+	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/attack_self(mob/user as mob)
 	user << "<span class='notice'>You empty [src].</span>"
 	var/turf/T = get_turf(src)
@@ -196,18 +339,6 @@
 		hold.remove_from_storage(I, T)
 	src.add_fingerprint(user)
 
-/obj/item/clothing/tie/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	hold.attackby(W,user)
-	src.add_fingerprint(user)
-
-/obj/item/weapon/storage/pockets
-	name = "storage"
-	var/master_item		//item it belongs to
-
-/obj/item/weapon/storage/pockets/close(mob/user as mob)
-	..()
-	loc = master_item
-
 /obj/item/clothing/tie/storage/webbing
 	name = "webbing"
 	desc = "Strudy mess of synthcotton belts and buckles, ready to share your burden."
@@ -311,27 +442,14 @@
 	item_color = "unathiharness2"
 	slots = 2
 
-/obj/item/clothing/tie/storage/knifeharness/attackby(var/obj/item/O as obj, mob/user as mob)
-	..()
-	update()
-
-/obj/item/clothing/tie/storage/knifeharness/proc/update()
-	var/count = 0
-	for(var/obj/item/I in hold)
-		if(istype(I,/obj/item/weapon/hatchet/unathiknife))
-			count++
-	if(count>2) count = 2
-	item_state = "unathiharness[count]"
-	icon_state = item_state
-	item_color = item_state
-
-	if(istype(loc, /obj/item/clothing))
-		var/obj/item/clothing/U = loc
-		if(istype(U.loc, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = U.loc
-			H.update_inv_w_uniform()
-
 /obj/item/clothing/tie/storage/knifeharness/New()
 	..()
+	hold.max_combined_w_class = 4
+	hold.can_hold = list("/obj/item/weapon/hatchet/unathiknife",\
+	"/obj/item/weapon/kitchen/utensil/knife",\
+	"/obj/item/weapon/kitchen/utensil/pknife",\
+	"/obj/item/weapon/kitchenknife",\
+	"/obj/item/weapon/kitchenknife/ritual")
+	
+	new /obj/item/weapon/hatchet/unathiknife(hold)
 	new /obj/item/weapon/hatchet/unathiknife(hold)
-	new /obj/item/weapon/hatchet/unathiknife(hold)

code/modules/customitems/item_defines.dm

@@ -523,6 +523,13 @@
 
 //////////// Hats ////////////
 
+
+/obj/item/clothing/head/fluff/kaine_kalim_1
+    name = "Formal Medical Cap"
+    desc = "An unusually sterile and folded cap. It seems to bare the Nanotrasen logo."
+    icon = 'icons/obj/custom_items.dmi'
+    icon_state = "kainecap"
+
 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
 	name = "\improper SWAT hat"
 	desc = "A black hat.  The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\""
@@ -571,6 +578,12 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "brucehachert"
 
+/obj/item/clothing/head/beret/fluff/marine_beret	//Von2531: Jack Washington
+	name = "colonial marine beret"
+	desc = "A well-worn navy blue beret. The insignia of the Martian Colonial Marine Corps is affixed to the front."
+	icon_state = "officerberet"
+	flags = FPRINT | TABLEPASS
+
 //////////// Suits ////////////
 
 /obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Robotics Labcoat - Aeneas Rinil [APPR]
@@ -612,12 +625,21 @@
 
 /obj/item/clothing/under/fluff/milo_hachert //Field Dress Uniform - Milo Hachert - Commissar_Drew
 	name = "field dress uniform"
-	desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Hachert' is embroidered upon the jacket<65>s shoulder bar."
+	desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Hachert' is embroidered upon the jacket<65>s shoulder bar."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "milohachert"
 	item_state = "milohachert"
 	item_color = "milohachert"
 
+
+/obj/item/clothing/under/fluff/kaine_kalim_2
+    name = "Formal Medical Uniform"
+    desc = "An unusually sterile and pressed uniform. It seems to have a string of vials crossing the chest."
+    icon = 'icons/obj/custom_items.dmi'
+    icon_state = "kaineuniform"
+    item_state = "kaineuniform"
+    item_color = "kaineuniform"
+
 /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda
 	name = "rolled down jumpsuit"
 	desc = "A rolled down jumpsuit. Great for mechanics."
@@ -976,3 +998,27 @@
 	item_state = "sakura_hokkaido_kimono"
 	item_color = "sakura_hokkaido_kimono"
 
+///////////////////////////// Astronovus - Harold's Cane ////////////////////////////
+
+/obj/item/weapon/cane/fluff/harold
+	name = "Harold's Cane"
+	desc = "A cane with a wooden handle and a plastic frame capable of folding itself to make it more storable."
+	w_class = 1.0
+	icon = 'icons/obj/custom_items.dmi'
+	item_state = "foldcane"
+	icon_state = "foldcane"
+
+
+//////////////////////////// Footman - Farwa  Plush Doll //////////////////////////////////
+
+/obj/item/weapon/fluff/farwadoll
+	name = "Farwa plush doll"
+	desc = "A Farwa plush doll. It's soft and comforting!"
+	w_class = 1.0
+	icon = 'icons/obj/custom_items.dmi'
+	item_state = "farwaplush"
+	icon_state = "farwaplush"
+
+/obj/item/weapon/fluff/farwadoll/attack_self(mob/user as mob)
+	user.visible_message("<span class='notice'>[user] hugs [src]! How cute! </span>", \
+						 "<span class='notice'>You hug [src]. Dawwww... </span>")

code/modules/detectivework/detective_work.dm

@@ -126,331 +126,333 @@ obj/machinery/computer/forensic_scanning
 
 
 	Topic(href,href_list)
-		switch(href_list["operation"])
-			if("login")
-				var/mob/M = usr
-				if(istype(M,/mob/living/silicon))
-					authenticated = 1
-					updateDialog()
-					return
-				if (allowed(M))
-					authenticated = 1
-			if("logout")
-				authenticated = 0
-			if("clear")
-				if(canclear)
-					temp = null
-			if("eject")
-				if(scanning)
-					scanning.loc = loc
-					scanning = null
-				else
-					temp = "Eject Failed: No Object"
-			if("insert")
-				var/mob/M = usr
-				var/obj/item/I = M.get_active_hand()
-				if(I && istype(I))
-					if(istype(I, /obj/item/weapon/evidencebag))
-						scanning = I.contents[1]
-						scanning.loc = src
-						I.overlays -= scanning
-						I.icon_state = "evidenceobj"
+		if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
+			usr.set_machine(src)
+			switch(href_list["operation"])
+				if("login")
+					var/mob/M = usr
+					if(istype(M,/mob/living/silicon))
+						authenticated = 1
+						updateDialog()
+						return
+					if (allowed(M))
+						authenticated = 1
+				if("logout")
+					authenticated = 0
+				if("clear")
+					if(canclear)
+						temp = null
+				if("eject")
+					if(scanning)
+						scanning.loc = loc
+						scanning = null
 					else
-						scanning = I
+						temp = "Eject Failed: No Object"
+				if("insert")
+					var/mob/M = usr
+					var/obj/item/I = M.get_active_hand()
+					if(I && istype(I))
+						if(istype(I, /obj/item/weapon/evidencebag))
+							scanning = I.contents[1]
+							scanning.loc = src
+							I.overlays -= scanning
+							I.icon_state = "evidenceobj"
+						else
+							scanning = I
+							M.drop_item()
+							I.loc = src
+					else
+						usr << "Invalid Object Rejected."
+				if("card")  //Processing a fingerprint card.
+					var/mob/M = usr
+					var/obj/item/I = M.get_active_hand()
+					if(!(I && istype(I,/obj/item/weapon/f_card)))
+						I = card
+					if(I && istype(I,/obj/item/weapon/f_card))
+						card = I
+						if(!card.fingerprints)
+							card.fingerprints = list()
+						if(card.amount > 1 || !card.fingerprints.len)
+							usr << "\red ERROR: No prints/too many cards."
+							if(card.loc == src)
+								card.loc = src.loc
+							card = null
+							return
 						M.drop_item()
 						I.loc = src
-				else
-					usr << "Invalid Object Rejected."
-			if("card")  //Processing a fingerprint card.
-				var/mob/M = usr
-				var/obj/item/I = M.get_active_hand()
-				if(!(I && istype(I,/obj/item/weapon/f_card)))
-					I = card
-				if(I && istype(I,/obj/item/weapon/f_card))
-					card = I
-					if(!card.fingerprints)
-						card.fingerprints = list()
-					if(card.amount > 1 || !card.fingerprints.len)
-						usr << "\red ERROR: No prints/too many cards."
-						if(card.loc == src)
-							card.loc = src.loc
-						card = null
-						return
-					M.drop_item()
-					I.loc = src
-					process_card()
-				else
-					usr << "\red Invalid Object Rejected."
-			if("database") //Viewing all records in each database
-				canclear = 1
-				if(href_list["delete_record"])
-					delete_dossier(href_list["delete_record"])
-				if(href_list["delete_aux"])
-					delete_record(href_list["delete_aux"])
-				if((!misc || !misc.len) && (!files || !files.len))
-					temp = "Database is empty."
-				else
-					if(files && files.len)
-						temp = "<b>Criminal Evidence Database</b><br><br>"
-						temp += "Consolidated data points:<br>"
-						for(var/print in files)
-							var/list/file = files[print]
-							temp += "<a href='?src=\ref[src];operation=record;identifier=[print]'>{[file[2]]}</a><br>"
-						temp += "<br><a href='?src=\ref[src];operation=card'>{Insert Finger Print Card (To complete a Dossier)}</a><br><br><br>"
+						process_card()
 					else
-						temp = ""
-					if(misc && misc.len)
-						temp += {"<b>Auxiliary Evidence Database</b><br><br>
-						This is where anything without fingerprints goes.<br><br>"}
-						for(var/atom in misc)
-							var/list/data_entry = misc[atom]
-							temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[atom]'>{[data_entry[3]]}</a><br>"
-			if("record") //Viewing a record from the "files" database.
-				canclear = 0
-				if(files)
-					var/list/dossier = files[href_list["identifier"]]
-					if(href_list["ren"])
-						var/new_title = copytext(sanitize(input("Rename to what?", "Dossier Editing", "Dossier [files.Find(href_list["identifier"])]") as null|text),1,MAX_MESSAGE_LEN)
-						if(new_title)
-							dossier[2] = new_title
+						usr << "\red Invalid Object Rejected."
+				if("database") //Viewing all records in each database
+					canclear = 1
+					if(href_list["delete_record"])
+						delete_dossier(href_list["delete_record"])
+					if(href_list["delete_aux"])
+						delete_record(href_list["delete_aux"])
+					if((!misc || !misc.len) && (!files || !files.len))
+						temp = "Database is empty."
+					else
+						if(files && files.len)
+							temp = "<b>Criminal Evidence Database</b><br><br>"
+							temp += "Consolidated data points:<br>"
+							for(var/print in files)
+								var/list/file = files[print]
+								temp += "<a href='?src=\ref[src];operation=record;identifier=[print]'>{[file[2]]}</a><br>"
+							temp += "<br><a href='?src=\ref[src];operation=card'>{Insert Finger Print Card (To complete a Dossier)}</a><br><br><br>"
 						else
-							usr << "Illegal or blank name."
-					temp = {"<b>Criminal Evidence Database</b><br><br>
-					Consolidated data points: [dossier[2]]<br>"}
-					var/print_string = "Fingerprints: Print not complete!<br>"
-					if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
-						print_string = "Fingerprints: (80% or higher completion reached)<br>[dossier[1]]<br>"
-					temp += print_string
-					for(var/object in dossier)
-						if(object == dossier[1] || object == dossier[2])
-							continue
-						temp += "<hr>"
-						var/list/outputs = dossier[object]
-						var/list/prints = outputs[1]
-						temp += "<big><b>Object:</b> [outputs[4]]</big><br>"
-						temp += "&nbsp<b>Fingerprints:</b><br>"
-						temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
-						var/complete_prints = 0
-						for(var/print in prints)
-							if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
-								complete_prints++
-								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
-						if(complete_prints)
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
-						else
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
-						var/list/fibers = outputs[2]
+							temp = ""
+						if(misc && misc.len)
+							temp += {"<b>Auxiliary Evidence Database</b><br><br>
+							This is where anything without fingerprints goes.<br><br>"}
+							for(var/atom in misc)
+								var/list/data_entry = misc[atom]
+								temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[atom]'>{[data_entry[3]]}</a><br>"
+				if("record") //Viewing a record from the "files" database.
+					canclear = 0
+					if(files)
+						var/list/dossier = files[href_list["identifier"]]
+						if(href_list["ren"])
+							var/new_title = copytext(sanitize(input("Rename to what?", "Dossier Editing", "Dossier [files.Find(href_list["identifier"])]") as null|text),1,MAX_MESSAGE_LEN)
+							if(new_title)
+								dossier[2] = new_title
+							else
+								usr << "Illegal or blank name."
+						temp = {"<b>Criminal Evidence Database</b><br><br>
+						Consolidated data points: [dossier[2]]<br>"}
+						var/print_string = "Fingerprints: Print not complete!<br>"
+						if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
+							print_string = "Fingerprints: (80% or higher completion reached)<br>[dossier[1]]<br>"
+						temp += print_string
+						for(var/object in dossier)
+							if(object == dossier[1] || object == dossier[2])
+								continue
+							temp += "<hr>"
+							var/list/outputs = dossier[object]
+							var/list/prints = outputs[1]
+							temp += "<big><b>Object:</b> [outputs[4]]</big><br>"
+							temp += "&nbsp<b>Fingerprints:</b><br>"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
+							var/complete_prints = 0
+							for(var/print in prints)
+								if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
+									complete_prints++
+									temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
+							if(complete_prints)
+								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
+							else
+								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
+							var/list/fibers = outputs[2]
+							if(fibers && fibers.len)
+								temp += "&nbsp<b>Fibers:</b><br>"
+								for(var/j = 1, j <= fibers.len, j++)
+									temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
+							var/list/blood = outputs[3]
+							if(blood && blood.len)
+								temp += "&nbsp<b>Blood:</b><br>"
+								for(var/named in blood)
+									temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
+						temp += "<br><a href='?src=\ref[src];operation=record;identifier=[href_list["identifier"]];ren=true'>{Rename this Dossier}</a>"
+						temp += "<br><a href='?src=\ref[src];operation=database;delete_record=[href_list["identifier"]]'>{Delete this Dossier}</a>"
+						temp += "<br><a href='?src=\ref[src];operation=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
+					else
+						temp = "ERROR.  Database not found!<br>"
+					temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
+				if("databaseprint") //Printing from the "files" database.
+					if(files)
+						var/obj/item/weapon/paper/P = new(loc)
+						var/list/dossier = files[href_list["identifier"]]
+						P.name = "\improper Database File ([dossier[2]])"
+						P.overlays += "paper_words"
+						P.info = "<b>Criminal Evidence Database</b><br><br>"
+						P.info += "Consolidated data points: [dossier[2]]<br>"
+						var/print_string = "Fingerprints: Print not complete!<br>"
+						if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
+							print_string = "Fingerprints: (80% or higher completion reached)<br>[dossier[1]]<br>"
+						P.info += print_string
+						for(var/object in dossier)
+							if(object == dossier[1] || object == dossier[2])
+								continue
+							P.info += "<hr>"
+							var/list/outputs = dossier[object]
+							var/list/prints = outputs[1]
+							P.info += "<big><b>Object:</b> [outputs[4]]</big><br>"
+							P.info += "&nbsp<b>Fingerprints:</b><br>"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
+							var/complete_prints = 0
+							for(var/print in prints)
+								if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
+									complete_prints++
+									P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
+							if(complete_prints)
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
+							else
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
+							var/list/fibers = outputs[2]
+							if(fibers && fibers.len)
+								P.info += "&nbsp<b>Fibers:</b><br>"
+								for(var/j = 1, j <= fibers.len, j++)
+									P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
+							var/list/blood = outputs[3]
+							if(blood && blood.len)
+								P.info += "&nbsp<b>Blood:</b><br>"
+								for(var/named in blood)
+									P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
+					else
+						usr << "ERROR.  Database not found!<br>"
+				if("auxiliary") //Viewing a record from the "misc" database.
+					canclear = 0
+					if(misc)
+						temp = "<b>Auxiliary Evidence Database</b><br><br>"
+						var/list/outputs = misc[href_list["identifier"]]
+						temp += "<big><b>Consolidated data points:</b> [outputs[3]]</big><br>"
+						var/list/prints = outputs[4]
+						if(prints)
+							temp += "&nbsp<b>Fingerprints:</b><br>"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
+							var/complete_prints = 0
+							for(var/print in prints)
+								if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
+									complete_prints++
+									temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
+							if(complete_prints)
+								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
+							else
+								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
+						var/list/fibers = outputs[1]
 						if(fibers && fibers.len)
 							temp += "&nbsp<b>Fibers:</b><br>"
-							for(var/j = 1, j <= fibers.len, j++)
-								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
-						var/list/blood = outputs[3]
+							for(var/fiber in fibers)
+								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fiber]<br>"
+						var/list/blood = outputs[2]
 						if(blood && blood.len)
 							temp += "&nbsp<b>Blood:</b><br>"
 							for(var/named in blood)
 								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
-					temp += "<br><a href='?src=\ref[src];operation=record;identifier=[href_list["identifier"]];ren=true'>{Rename this Dossier}</a>"
-					temp += "<br><a href='?src=\ref[src];operation=database;delete_record=[href_list["identifier"]]'>{Delete this Dossier}</a>"
-					temp += "<br><a href='?src=\ref[src];operation=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
-				else
-					temp = "ERROR.  Database not found!<br>"
-				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
-			if("databaseprint") //Printing from the "files" database.
-				if(files)
-					var/obj/item/weapon/paper/P = new(loc)
-					var/list/dossier = files[href_list["identifier"]]
-					P.name = "\improper Database File ([dossier[2]])"
-					P.overlays += "paper_words"
-					P.info = "<b>Criminal Evidence Database</b><br><br>"
-					P.info += "Consolidated data points: [dossier[2]]<br>"
-					var/print_string = "Fingerprints: Print not complete!<br>"
-					if(stringpercent(dossier[1]) <= FINGERPRINT_COMPLETE)
-						print_string = "Fingerprints: (80% or higher completion reached)<br>[dossier[1]]<br>"
-					P.info += print_string
-					for(var/object in dossier)
-						if(object == dossier[1] || object == dossier[2])
-							continue
-						P.info += "<hr>"
-						var/list/outputs = dossier[object]
-						var/list/prints = outputs[1]
-						P.info += "<big><b>Object:</b> [outputs[4]]</big><br>"
-						P.info += "&nbsp<b>Fingerprints:</b><br>"
-						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
-						var/complete_prints = 0
-						for(var/print in prints)
-							if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
-								complete_prints++
-								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
-						if(complete_prints)
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
-						else
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
-						var/list/fibers = outputs[2]
+						temp += "<br><a href='?src=\ref[src];operation=database;delete_aux=[href_list["identifier"]]'>{Delete This Record}</a>"
+						temp += "<br><a href='?src=\ref[src];operation=auxiliaryprint;identifier=[href_list["identifier"]]'>{Print}</a>"
+					else
+						temp = "ERROR.  Database not found!<br>"
+					temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
+				if("auxiliaryprint") //Printing from the "misc" database.
+					if(misc)
+						var/obj/item/weapon/paper/P = new(loc)
+						var/list/outputs = misc[href_list["identifier"]]
+						P.name = "\improper Auxiliary Database File ([outputs[3]])"
+						P.overlays += "paper_words"
+						P.info = "<b>Auxiliary Evidence Database</b><br><br>"
+						P.info += "<big><b>Consolidated data points:</b> [outputs[3]]</big><br>"
+						var/list/prints = outputs[4]
+						if(prints)
+							P.info += "&nbsp<b>Fingerprints:</b><br>"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
+							var/complete_prints = 0
+							for(var/print in prints)
+								if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
+									complete_prints++
+									P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
+							if(complete_prints)
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
+							else
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
+						var/list/fibers = outputs[1]
 						if(fibers && fibers.len)
 							P.info += "&nbsp<b>Fibers:</b><br>"
-							for(var/j = 1, j <= fibers.len, j++)
-								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]<br>"
-						var/list/blood = outputs[3]
+							for(var/fiber in fibers)
+								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fiber]<br>"
+						var/list/blood = outputs[2]
 						if(blood && blood.len)
 							P.info += "&nbsp<b>Blood:</b><br>"
 							for(var/named in blood)
 								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
-				else
-					usr << "ERROR.  Database not found!<br>"
-			if("auxiliary") //Viewing a record from the "misc" database.
-				canclear = 0
-				if(misc)
-					temp = "<b>Auxiliary Evidence Database</b><br><br>"
-					var/list/outputs = misc[href_list["identifier"]]
-					temp += "<big><b>Consolidated data points:</b> [outputs[3]]</big><br>"
-					var/list/prints = outputs[4]
-					if(prints)
-						temp += "&nbsp<b>Fingerprints:</b><br>"
-						temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
-						var/complete_prints = 0
-						for(var/print in prints)
-							if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
-								complete_prints++
-								temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
-						if(complete_prints)
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
-						else
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
-					var/list/fibers = outputs[1]
-					if(fibers && fibers.len)
-						temp += "&nbsp<b>Fibers:</b><br>"
-						for(var/fiber in fibers)
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fiber]<br>"
-					var/list/blood = outputs[2]
-					if(blood && blood.len)
-						temp += "&nbsp<b>Blood:</b><br>"
-						for(var/named in blood)
-							temp += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
-					temp += "<br><a href='?src=\ref[src];operation=database;delete_aux=[href_list["identifier"]]'>{Delete This Record}</a>"
-					temp += "<br><a href='?src=\ref[src];operation=auxiliaryprint;identifier=[href_list["identifier"]]'>{Print}</a>"
-				else
-					temp = "ERROR.  Database not found!<br>"
-				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
-			if("auxiliaryprint") //Printing from the "misc" database.
-				if(misc)
-					var/obj/item/weapon/paper/P = new(loc)
-					var/list/outputs = misc[href_list["identifier"]]
-					P.name = "\improper Auxiliary Database File ([outputs[3]])"
-					P.overlays += "paper_words"
-					P.info = "<b>Auxiliary Evidence Database</b><br><br>"
-					P.info += "<big><b>Consolidated data points:</b> [outputs[3]]</big><br>"
-					var/list/prints = outputs[4]
-					if(prints)
-						P.info += "&nbsp<b>Fingerprints:</b><br>"
-						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints.len] Unique fingerprints found.<br>"
-						var/complete_prints = 0
-						for(var/print in prints)
-							if(stringpercent(prints[print]) <= FINGERPRINT_COMPLETE)
-								complete_prints++
-								P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[prints[print]]<br>"
-						if(complete_prints)
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;And [prints.len - complete_prints] unknown unique prints.<br>"
-						else
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;No prints of sufficient completeness.<br>"
-					var/list/fibers = outputs[1]
-					if(fibers && fibers.len)
-						P.info += "&nbsp<b>Fibers:</b><br>"
-						for(var/fiber in fibers)
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fiber]<br>"
-					var/list/blood = outputs[2]
-					if(blood && blood.len)
-						P.info += "&nbsp<b>Blood:</b><br>"
-						for(var/named in blood)
-							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type: [blood[named]], DNA: [named]<br>"
-				else
-					usr << "ERROR.  Database not found!<br>"
-			if("scan")
-				if(istype(scanning,/obj/item/weapon/f_card))
-					card = scanning
-					scanning = initial(scanning)
-					process_card()
-				else if(scanning)
-					scan_process = 3
-					scan_data = "Scanning [scanning]: 25% complete"
-					updateDialog()
-					sleep(50)
-					if(!scan_process)
-						scan_data = null
+					else
+						usr << "ERROR.  Database not found!<br>"
+				if("scan")
+					if(istype(scanning,/obj/item/weapon/f_card))
+						card = scanning
+						scanning = initial(scanning)
+						process_card()
+					else if(scanning)
+						scan_process = 3
+						scan_data = "Scanning [scanning]: 25% complete"
 						updateDialog()
-						return
-					scan_data = "Scanning [scanning]: 50% complete"
-					updateDialog()
-					scan_process = 2
-					sleep(50)
-					if(!scan_process)
-						scan_data = null
+						sleep(50)
+						if(!scan_process)
+							scan_data = null
+							updateDialog()
+							return
+						scan_data = "Scanning [scanning]: 50% complete"
 						updateDialog()
-						return
-					scan_data = "Scanning [scanning]: 75% complete"
-					updateDialog()
-					scan_process = 1
-					sleep(50)
-					if(!scan_process)
-						scan_data = null
+						scan_process = 2
+						sleep(50)
+						if(!scan_process)
+							scan_data = null
+							updateDialog()
+							return
+						scan_data = "Scanning [scanning]: 75% complete"
 						updateDialog()
-						return
+						scan_process = 1
+						sleep(50)
+						if(!scan_process)
+							scan_data = null
+							updateDialog()
+							return
+						if(scanning)
+							scan_process = 0
+							scan_name = scanning.name
+							scan_data = "<u>[scanning]</u><br><br>"
+							if (scanning.blood_DNA)
+								scan_data += "Blood Found:<br>"
+								for(var/blood in scanning.blood_DNA)
+									scan_data += "Blood type: [scanning.blood_DNA[blood]]\nDNA: [blood]<br><br>"
+							else
+								scan_data += "No Blood Found<br><br>"
+							if(!scanning.fingerprints)
+								scan_data += "No Fingerprints Found<br><br>"
+							else
+								scan_data += "Isolated [scanning.fingerprints.len] Fingerprints.  Loaded into database.<br>"
+								add_data(scanning)
+
+							if(!scanning.suit_fibers)
+								scan_data += "No Fibers/Materials Located<br>"
+							else
+								scan_data += "Fibers/Materials Found:<br>"
+								for(var/data in scanning.suit_fibers)
+									scan_data += "- [data]<br>"
+							if(istype(scanning,/obj/item/device/detective_scanner) || (istype(scanning, /obj/item/device/pda) && scanning:cartridge && scanning:cartridge.access_security))
+								scan_data += "<br><b>Data transfered from \the [scanning] to Database.</b><br>"
+								add_data_scanner(scanning)
+							else if(!scanning.fingerprints)
+								scan_data += "<br><b><a href='?src=\ref[src];operation=add'>Add to Database?</a></b><br>"
+					else
+						temp = "Scan Failed: No Object"
+
+
+				if("print") //Printing scan data
+					if(scan_data)
+						temp = "Scan Data Printed."
+						var/obj/item/weapon/paper/P = new(loc)
+						P.name = "\improper Scan Data ([scan_name])"
+						P.info = "<tt>[scan_data]</tt>"
+						P.overlays += "paper_words"
+					else
+						temp = "Print Failed: No Data"
+				if("erase")
+					scan_data = ""
+				if("cancel")
+					scan_process = 0
+				if("add") //Adding an object (Manually) to the database.
 					if(scanning)
-						scan_process = 0
-						scan_name = scanning.name
-						scan_data = "<u>[scanning]</u><br><br>"
-						if (scanning.blood_DNA)
-							scan_data += "Blood Found:<br>"
-							for(var/blood in scanning.blood_DNA)
-								scan_data += "Blood type: [scanning.blood_DNA[blood]]\nDNA: [blood]<br><br>"
-						else
-							scan_data += "No Blood Found<br><br>"
-						if(!scanning.fingerprints)
-							scan_data += "No Fingerprints Found<br><br>"
-						else
-							scan_data += "Isolated [scanning.fingerprints.len] Fingerprints.  Loaded into database.<br>"
-							add_data(scanning)
-
-						if(!scanning.suit_fibers)
-							scan_data += "No Fibers/Materials Located<br>"
-						else
-							scan_data += "Fibers/Materials Found:<br>"
-							for(var/data in scanning.suit_fibers)
-								scan_data += "- [data]<br>"
-						if(istype(scanning,/obj/item/device/detective_scanner) || (istype(scanning, /obj/item/device/pda) && scanning:cartridge && scanning:cartridge.access_security))
-							scan_data += "<br><b>Data transfered from \the [scanning] to Database.</b><br>"
-							add_data_scanner(scanning)
-						else if(!scanning.fingerprints)
-							scan_data += "<br><b><a href='?src=\ref[src];operation=add'>Add to Database?</a></b><br>"
-				else
-					temp = "Scan Failed: No Object"
-
-
-			if("print") //Printing scan data
-				if(scan_data)
-					temp = "Scan Data Printed."
-					var/obj/item/weapon/paper/P = new(loc)
-					P.name = "\improper Scan Data ([scan_name])"
-					P.info = "<tt>[scan_data]</tt>"
-					P.overlays += "paper_words"
-				else
-					temp = "Print Failed: No Data"
-			if("erase")
-				scan_data = ""
-			if("cancel")
-				scan_process = 0
-			if("add") //Adding an object (Manually) to the database.
-				if(scanning)
-					add_data(scanning)
-				else
-					temp = "Data Transfer Failed: No Object."
-			if("rename")
-				if(!files || !files[href_list["identifier"]])
-					temp = "ERROR: Record/Database not found!"
-				else
-					var/new_title = copytext(sanitize(input("Rename to what?", "Dossier Editing", "Dossier [files.Find(href_list["identifier"])]") as null|text),1,MAX_MESSAGE_LEN)
-					if(new_title)
-						var/list/file = files[href_list["identifier"]]
-						file[2] = new_title
+						add_data(scanning)
+					else
+						temp = "Data Transfer Failed: No Object."
+				if("rename")
+					if(!files || !files[href_list["identifier"]])
+						temp = "ERROR: Record/Database not found!"
+					else
+						var/new_title = copytext(sanitize(input("Rename to what?", "Dossier Editing", "Dossier [files.Find(href_list["identifier"])]") as null|text),1,MAX_MESSAGE_LEN)
+						if(new_title)
+							var/list/file = files[href_list["identifier"]]
+							file[2] = new_title
 		updateUsrDialog()
 
 	ex_act()

code/modules/economy/ATM.dm

@@ -173,6 +173,7 @@ log transactions
 								dat += "<td>[T.source_terminal]</td>"
 								dat += "</tr>"
 							dat += "</table>"
+							dat += "<A href='?src=\ref[src];choice=print_transaction'>Print</a><br>"
 						if(TRANSFER_FUNDS)
 							dat += "<b>Account balance:</b> $[authenticated_account.money]<br>"
 							dat += "<A href='?src=\ref[src];choice=view_screen;view_screen=0'>Back</a><br><br>"
@@ -190,7 +191,7 @@ log transactions
 							dat += "<form name='withdrawal' action='?src=\ref[src]' method='get'>"
 							dat += "<input type='hidden' name='src' value='\ref[src]'>"
 							dat += "<input type='hidden' name='choice' value='withdrawal'>"
-							dat += "<input type='text' name='funds_amount' value='' style='width:200px; background-color:white;'><input type='submit' value='Withdraw funds'><br>"
+							dat += "<input type='text' name='funds_amount' value='' style='width:200px; background-color:white;'><input type='submit' value='Withdraw charge card'>"
 							dat += "</form>"
 							dat += "<A href='?src=\ref[src];choice=view_screen;view_screen=1'>Change account security level</a><br>"
 							dat += "<A href='?src=\ref[src];choice=view_screen;view_screen=2'>Make transfer</a><br>"
@@ -309,7 +310,9 @@ log transactions
 
 						//remove the money
 						authenticated_account.money -= amount
-						spawn_money(amount,src.loc)
+
+						//	spawn_money(amount,src.loc)
+						spawn_ewallet(amount,src.loc)
 
 						//create an entry in the account transaction log
 						var/datum/transaction/T = new()
@@ -346,6 +349,49 @@ log transactions
 					playsound(loc, 'sound/items/polaroid1.ogg', 50, 1)
 				else
 					playsound(loc, 'sound/items/polaroid2.ogg', 50, 1)
+			if ("print_transaction")
+				if(authenticated_account)
+					var/obj/item/weapon/paper/R = new(src.loc)
+					R.name = "Transaction logs: [authenticated_account.owner_name]"
+					R.info = "<b>Transaction logs</b><br>"
+					R.info += "<i>Account holder:</i> [authenticated_account.owner_name]<br>"
+					R.info += "<i>Account number:</i> [authenticated_account.account_number]<br>"
+					R.info += "<i>Date and time:</i> [worldtime2text()], [current_date_string]<br><br>"
+					R.info += "<i>Service terminal ID:</i> [machine_id]<br>"
+					R.info += "<table border=1 style='width:100%'>"
+					R.info += "<tr>"
+					R.info += "<td><b>Date</b></td>"
+					R.info += "<td><b>Time</b></td>"
+					R.info += "<td><b>Target</b></td>"
+					R.info += "<td><b>Purpose</b></td>"
+					R.info += "<td><b>Value</b></td>"
+					R.info += "<td><b>Source terminal ID</b></td>"
+					R.info += "</tr>"
+					for(var/datum/transaction/T in authenticated_account.transaction_log)
+						R.info += "<tr>"
+						R.info += "<td>[T.date]</td>"
+						R.info += "<td>[T.time]</td>"
+						R.info += "<td>[T.target_name]</td>"
+						R.info += "<td>[T.purpose]</td>"
+						R.info += "<td>$[T.amount]</td>"
+						R.info += "<td>[T.source_terminal]</td>"
+						R.info += "</tr>"
+					R.info += "</table>"
+
+					//stamp the paper
+					var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
+					stampoverlay.icon_state = "paper_stamp-cent"
+					if(!R.stamped)
+						R.stamped = new
+					R.stamped += /obj/item/weapon/stamp
+					R.overlays += stampoverlay
+					R.stamps += "<HR><i>This paper has been stamped by the Automatic Teller Machine.</i>"
+
+				if(prob(50))
+					playsound(loc, 'sound/items/polaroid1.ogg', 50, 1)
+				else
+					playsound(loc, 'sound/items/polaroid2.ogg', 50, 1)
+
 			if("insert_card")
 				if(!held_card)
 					//this might happen if the user had the browser window open when somebody emagged it
@@ -402,3 +448,9 @@ log transactions
 	if(ishuman(human_user) && !human_user.get_active_hand())
 		human_user.put_in_hands(held_card)
 	held_card = null
+
+
+/obj/machinery/atm/proc/spawn_ewallet(var/sum, loc)
+	var/obj/item/weapon/spacecash/ewallet/E = new /obj/item/weapon/spacecash/ewallet(loc)
+	E.worth = sum
+	E.owner_name = authenticated_account.owner_name

code/modules/economy/EFTPOS.dm

@@ -22,6 +22,7 @@
 		//create a short manual as well
 		var/obj/item/weapon/paper/R = new(src.loc)
 		R.name = "Steps to success: Correct EFTPOS Usage"
+		/*
 		R.info += "<b>When first setting up your EFTPOS device:</b>"
 		R.info += "1. Memorise your EFTPOS command code (provided with all EFTPOS devices).<br>"
 		R.info += "2. Confirm that your EFTPOS device is connected to your local accounts database. For additional assistance with this step, contact NanoTrasen IT Support<br>"
@@ -33,6 +34,17 @@
 		R.info += "4. If at this stage you wish to modify or cancel your transaction, you may simply reset (unlock) your EFTPOS device.<br>"
 		R.info += "5. Give your EFTPOS device to the customer, they must authenticate the transaction by swiping their ID card and entering their PIN number.<br>"
 		R.info += "6. If done correctly, the transaction will be logged to both accounts with the reference you have entered, the terminal ID of your EFTPOS device and the money transferred across accounts.<br>"
+		*/
+		//Temptative new manual:
+		R.info += "<b>First EFTPOS setup:</b><br>"
+		R.info += "1. Memorise your EFTPOS command code (provided with all EFTPOS devices).<br>"
+		R.info += "2. Connect the EFTPOS to the account in which you want to receive the funds.<br><br>"
+		R.info += "<b>When starting a new transaction:</b><br>"
+		R.info += "1. Enter the amount of money you want to charge and a purpose message for the new transaction.<br>"
+		R.info += "2. Lock the new transaction. If you want to modify or cancel the transaction, you simply have to reset your EFTPOS device.<br>"
+		R.info += "3. Give the EFTPOS device to your customer, he/she must finish the transaction by swiping their ID card or a charge card with enough funds.<br>"
+		R.info += "4. If everything is done correctly, the money will be transferred. To unlock the device you will have to reset the EFTPOS device.<br>"
+
 
 		//stamp the paper
 		var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -72,7 +84,7 @@
 		var/dat = "<b>[eftpos_name]</b><br>"
 		dat += "<i>This terminal is</i> [machine_id]. <i>Report this code when contacting NanoTrasen IT Support</i><br>"
 		if(transaction_locked)
-			dat += "<a href='?src=\ref[src];choice=toggle_lock'>Reset[transaction_paid ? "" : " (authentication required)"]</a><br><br>"
+			dat += "<a href='?src=\ref[src];choice=toggle_lock'>Back[transaction_paid ? "" : " (authentication required)"]</a><br><br>"
 
 			dat += "Transaction purpose: <b>[transaction_purpose]</b><br>"
 			dat += "Value: <b>$[transaction_amount]</b><br>"
@@ -102,6 +114,36 @@
 			scan_card(I)
 		else
 			usr << "\icon[src]<span class='warning'>Unable to connect to linked account.</span>"
+	else if (istype(O, /obj/item/weapon/spacecash/ewallet))
+		var/obj/item/weapon/spacecash/ewallet/E = O
+		if (linked_account)
+			if(!linked_account.suspended)
+				if(transaction_locked && !transaction_paid)
+					if(transaction_amount <= E.worth)
+						playsound(src, 'sound/machines/chime.ogg', 50, 1)
+						src.visible_message("\icon[src] The [src] chimes.")
+						transaction_paid = 1
+
+						//transfer the money
+						E.worth -= transaction_amount
+						linked_account.money += transaction_amount
+
+						//create entry in the EFTPOS linked account transaction log
+						var/datum/transaction/T = new()
+						T.target_name = E.owner_name //D.owner_name
+						T.purpose = transaction_purpose
+						T.amount = transaction_amount
+						T.source_terminal = machine_id
+						T.date = current_date_string
+						T.time = worldtime2text()
+						linked_account.transaction_log.Add(T)
+					else
+						usr << "\icon[src]<span class='warning'>The charge card doesn't have that much money!</span>"
+			else
+				usr << "\icon[src]<span class='warning'>Connected account has been suspended.</span>"
+		else
+			usr << "\icon[src]<span class='warning'>EFTPOS is not connected to an account.</span>"
+
 	else
 		..()
 
@@ -143,10 +185,14 @@
 					transaction_amount = try_num
 			if("toggle_lock")
 				if(transaction_locked)
-					var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num
-					if(attempt_code == access_code)
+					if (transaction_paid)
 						transaction_locked = 0
 						transaction_paid = 0
+					else
+						var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num
+						if(attempt_code == access_code)
+							transaction_locked = 0
+							transaction_paid = 0
 				else if(linked_account)
 					transaction_locked = 1
 				else

code/modules/economy/Events_Mundane.dm

@@ -22,7 +22,7 @@
 		newMsg.body = ""
 		switch(event_type)
 			if(RESEARCH_BREAKTHROUGH)
-				newMsg.body = "A major breakthough in the field of [pick("plasma research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
+				newMsg.body = "A major breakthough in the field of [pick("phoron research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
 				was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \
 				NanoTrasen declined to comment as to whether this could impinge on profits."
 

code/modules/economy/TradeDestinations.dm

@@ -61,7 +61,7 @@ var/list/weighted_mundaneevent_locations = list()
 /datum/trade_destination/redolant/get_custom_eventstring(var/event_type)
 	if(event_type == RESEARCH_BREAKTHROUGH)
 		return "Thanks to research conducted on the OAV Redolant, Osiris Atmospherics wishes to announce a major breakthough in the field of \
-		[pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight."
+		[pick("phoron research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. NanoTrasen is expected to announce a co-exploitation deal within the fortnight."
 	return null
 
 /datum/trade_destination/beltway

code/modules/economy/cash.dm

@@ -71,4 +71,16 @@ proc/spawn_money(var/sum, spawnloc)
 		while(sum >= i)
 			sum -= i
 			new cash_type(spawnloc)
-	return
+	return
+
+/obj/item/weapon/spacecash/ewallet
+	name = "Charge card"
+	icon_state = "efundcard"
+	desc = "A card that holds an amount of money."
+	var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions.
+
+/obj/item/weapon/spacecash/ewallet/examine()
+	set src in view()
+	..()
+	if (!(usr in view(2)) && usr!=src.loc) return
+	usr << "\blue Charge card's owner: [src.owner_name]. Credits remaining: [src.worth]."

code/modules/economy/economy_misc.dm

@@ -47,7 +47,7 @@
 #define GEAR_EVA 15
 
 //---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
-//Corporation NanoTrasen - Generalised / high tech research and plasma exploitation.
+//Corporation NanoTrasen - Generalised / high tech research and phoron exploitation.
 //Corporation Vessel Contracting - Ship and station construction, materials research.
 //Corporation Osiris Atmospherics - Atmospherics machinery construction and chemical research.
 //Corporation Second Red Cross Society - 26th century Red Cross reborn as a dominating economic force in biomedical science (research and materials).

code/modules/events/infestation.dm

@@ -7,7 +7,7 @@
 #define LOC_VAULT 6
 #define LOC_CONSTR 7
 #define LOC_TECH 8
-#define LOC_ASSEMBLY 9
+#define LOC_TACTICAL 9
 
 #define VERM_MICE 0
 #define VERM_LIZARDS 1
@@ -54,9 +54,9 @@
 		if(LOC_TECH)
 			spawn_area_type = /area/storage/tech
 			locstring = "technical storage"
-		if(LOC_ASSEMBLY)
-			spawn_area_type = /area/assembly/assembly_line
-			locstring = "the unused assembly line"
+		if(LOC_TACTICAL)
+			spawn_area_type = /area/security/tactical
+			locstring = "tactical equipment storage"
 
 	//world << "looking for [spawn_area_type]"
 	for(var/areapath in typesof(spawn_area_type))
@@ -83,6 +83,7 @@
 			vermstring = "lizards"
 		if(VERM_SPIDERS)
 			spawn_types = list(/obj/effect/spider/spiderling)
+			max_number = 3
 			vermstring = "spiders"
 
 	spawn(0)
@@ -92,7 +93,6 @@
 			turfs.Remove(T)
 			num--
 
-			
 			if(vermin == VERM_SPIDERS)
 				var/obj/effect/spider/spiderling/S = new(T)
 				S.amount_grown = -1
@@ -112,7 +112,7 @@
 #undef LOC_HYDRO
 #undef LOC_VAULT
 #undef LOC_TECH
-#undef LOC_ASSEMBLY
+#undef LOC_TACTICAL
 
 #undef VERM_MICE
 #undef VERM_LIZARDS

code/modules/flufftext/Dreaming.dm

@@ -4,7 +4,7 @@ mob/living/carbon/proc/dream()
 		"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
 		"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
 		"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
-		"a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights",
+		"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
 		"a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
 		"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
 		"the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",

code/modules/flufftext/Hallucination.dm

@@ -1,7 +1,7 @@
 /*
 Ideas for the subtle effects of hallucination:
 
-Light up oxygen/plasma indicators (done)
+Light up oxygen/phoron indicators (done)
 Cause health to look critical/dead, even when standing (done)
 Characters silently watching you
 Brief flashes of fire/space/bombs/c4/dangerous shit (done)

code/modules/library/lib_items.dm

@@ -237,6 +237,12 @@
 	else
 		..()
 
+/obj/item/weapon/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(user.zone_sel.selecting == "eyes")
+		user.visible_message("<span class='notice'>You open up the book and show it to [M]. </span>", \
+			"<span class='notice'> [user] opens up a book and shows it to [M]. </span>")
+		M << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
+
 
 /*
  * Barcode Scanner

code/modules/mining/machine_processing.dm

@@ -2,7 +2,7 @@
 #define ORE_PROC_SILVER 2
 #define ORE_PROC_DIAMOND 4
 #define ORE_PROC_GLASS 8
-#define ORE_PROC_PLASMA 16
+#define ORE_PROC_PHORON 16
 #define ORE_PROC_URANIUM 32
 #define ORE_PROC_IRON 64
 #define ORE_PROC_CLOWN 128
@@ -39,7 +39,7 @@
 
 	var/dat = "<b>Smelter control console</b><br><br>"
 	//iron
-	if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine)
+	if(machine.ore_iron || machine.ore_glass || machine.ore_phoron || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_adamantine)
 		if(machine.ore_iron)
 			if (machine.selected & ORE_PROC_IRON)
 				dat += text("<A href='?src=\ref[src];sel_iron=no'><font color='green'>Smelting</font></A> ")
@@ -59,15 +59,15 @@
 		else
 			machine.selected &= ~ORE_PROC_GLASS
 
-		//plasma
-		if(machine.ore_plasma)
-			if (machine.selected & ORE_PROC_PLASMA)
-				dat += text("<A href='?src=\ref[src];sel_plasma=no'><font color='green'>Smelting</font></A> ")
+		//phoron
+		if(machine.ore_phoron)
+			if (machine.selected & ORE_PROC_PHORON)
+				dat += text("<A href='?src=\ref[src];sel_phoron=no'><font color='green'>Smelting</font></A> ")
 			else
-				dat += text("<A href='?src=\ref[src];sel_plasma=yes'><font color='red'>Not smelting</font></A> ")
-			dat += text("Plasma: [machine.ore_plasma]<br>")
+				dat += text("<A href='?src=\ref[src];sel_phoron=yes'><font color='red'>Not smelting</font></A> ")
+			dat += text("Phoron: [machine.ore_phoron]<br>")
 		else
-			machine.selected &= ~ORE_PROC_PLASMA
+			machine.selected &= ~ORE_PROC_PHORON
 
 		//uranium
 		if(machine.ore_uranium)
@@ -148,11 +148,11 @@
 			machine.selected |= ORE_PROC_GLASS
 		else
 			machine.selected &= ~ORE_PROC_GLASS
-	if(href_list["sel_plasma"])
-		if (href_list["sel_plasma"] == "yes")
-			machine.selected |= ORE_PROC_PLASMA
+	if(href_list["sel_phoron"])
+		if (href_list["sel_phoron"] == "yes")
+			machine.selected |= ORE_PROC_PHORON
 		else
-			machine.selected &= ~ORE_PROC_PLASMA
+			machine.selected &= ~ORE_PROC_PHORON
 	if(href_list["sel_uranium"])
 		if (href_list["sel_uranium"] == "yes")
 			machine.selected |= ORE_PROC_URANIUM
@@ -204,7 +204,7 @@
 	var/ore_silver = 0;
 	var/ore_diamond = 0;
 	var/ore_glass = 0;
-	var/ore_plasma = 0;
+	var/ore_phoron = 0;
 	var/ore_uranium = 0;
 	var/ore_iron = 0;
 	var/ore_clown = 0;
@@ -280,10 +280,10 @@
 					else
 						on = 0
 					continue
-				if (selected == ORE_PROC_PLASMA)
-					if (ore_plasma > 0)
-						ore_plasma--;
-						new /obj/item/stack/sheet/mineral/plasma(output.loc)
+				if (selected == ORE_PROC_PHORON)
+					if (ore_phoron > 0)
+						ore_phoron--;
+						new /obj/item/stack/sheet/mineral/phoron(output.loc)
 					else
 						on = 0
 					continue
@@ -301,10 +301,10 @@
 					else
 						on = 0
 					continue
-				if (selected == ORE_PROC_IRON + ORE_PROC_PLASMA)
-					if (ore_iron > 0 && ore_plasma > 0)
+				if (selected == ORE_PROC_IRON + ORE_PROC_PHORON)
+					if (ore_iron > 0 && ore_phoron > 0)
 						ore_iron--;
-						ore_plasma--;
+						ore_phoron--;
 						new /obj/item/stack/sheet/plasteel(output.loc)
 					else
 						on = 0
@@ -317,7 +317,7 @@
 						on = 0
 					continue
 			/*
-				if (selected == ORE_PROC_GLASS + ORE_PROC_PLASMA)
+				if (selected == ORE_PROC_GLASS + ORE_PROC_PHORON)
 					if (ore_glass > 0 && ore_plasma > 0)
 						ore_glass--;
 						ore_plasma--;
@@ -325,7 +325,7 @@
 					else
 						on = 0
 					continue
-				if (selected == ORE_PROC_GLASS + ORE_PROC_IRON + ORE_PROC_PLASMA)
+				if (selected == ORE_PROC_GLASS + ORE_PROC_IRON + ORE_PROC_PHORON)
 					if (ore_glass > 0 && ore_plasma > 0 && ore_iron > 0)
 						ore_glass--;
 						ore_iron--;
@@ -345,10 +345,10 @@
 					else
 						on = 0
 					continue
-				if (selected == ORE_PROC_SILVER + ORE_PROC_PLASMA)
-					if (ore_silver >= 1 && ore_plasma >= 3)
+				if (selected == ORE_PROC_SILVER + ORE_PROC_PHORON)
+					if (ore_silver >= 1 && ore_phoron >= 3)
 						ore_silver -= 1
-						ore_plasma -= 3
+						ore_phoron -= 3
 						new /obj/item/stack/sheet/mineral/mythril(output.loc)
 					else
 						on = 0
@@ -375,8 +375,8 @@
 				if (selected & ORE_PROC_URANIUM)
 					if (ore_uranium <= 0)
 						b = 0
-				if (selected & ORE_PROC_PLASMA)
-					if (ore_plasma <= 0)
+				if (selected & ORE_PROC_PHORON)
+					if (ore_phoron <= 0)
 						b = 0
 				if (selected & ORE_PROC_IRON)
 					if (ore_iron <= 0)
@@ -397,8 +397,8 @@
 						ore_diamond--
 					if (selected & ORE_PROC_URANIUM)
 						ore_uranium--
-					if (selected & ORE_PROC_PLASMA)
-						ore_plasma--
+					if (selected & ORE_PROC_PHORON)
+						ore_phoron--
 					if (selected & ORE_PROC_IRON)
 						ore_iron--
 					if (selected & ORE_PROC_CLOWN)
@@ -430,8 +430,8 @@
 					O.loc = null
 					//del(O)
 					continue
-				if (istype(O,/obj/item/weapon/ore/plasma))
-					ore_plasma++
+				if (istype(O,/obj/item/weapon/ore/phoron))
+					ore_phoron++
 					O.loc = null
 					//del(O)
 					continue

code/modules/mining/machine_stacking.dm

@@ -40,12 +40,12 @@
 		dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
 	if(machine.ore_rglass)
 		dat += text("Reinforced Glass: [machine.ore_rglass] <A href='?src=\ref[src];release=rglass'>Release</A><br>")
-	if(machine.ore_plasma)
-		dat += text("Plasma: [machine.ore_plasma] <A href='?src=\ref[src];release=plasma'>Release</A><br>")
-	if(machine.ore_plasmaglass)
-		dat += text("Plasma Glass: [machine.ore_plasmaglass] <A href='?src=\ref[src];release=plasmaglass'>Release</A><br>")
-	if(machine.ore_plasmarglass)
-		dat += text("Reinforced Plasma Glass: [machine.ore_plasmarglass] <A href='?src=\ref[src];release=plasmarglass'>Release</A><br>")
+	if(machine.ore_phoron)
+		dat += text("Phoron: [machine.ore_phoron] <A href='?src=\ref[src];release=phoron'>Release</A><br>")
+	if(machine.ore_phoronglass)
+		dat += text("Phoron Glass: [machine.ore_phoronglass] <A href='?src=\ref[src];release=phoronglass'>Release</A><br>")
+	if(machine.ore_phoronrglass)
+		dat += text("Reinforced Phoron Glass: [machine.ore_phoronrglass] <A href='?src=\ref[src];release=phoronrglass'>Release</A><br>")
 	if(machine.ore_gold)
 		dat += text("Gold: [machine.ore_gold] <A href='?src=\ref[src];release=gold'>Release</A><br>")
 	if(machine.ore_silver)
@@ -81,24 +81,24 @@
 	src.add_fingerprint(usr)
 	if(href_list["release"])
 		switch(href_list["release"])
-			if ("plasma")
-				if (machine.ore_plasma > 0)
-					var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
-					G.amount = machine.ore_plasma
+			if ("phoron")
+				if (machine.ore_phoron > 0)
+					var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron
+					G.amount = machine.ore_phoron
 					G.loc = machine.output.loc
-					machine.ore_plasma = 0
-			if ("plasmaglass")
-				if (machine.ore_plasmaglass > 0)
-					var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
-					G.amount = machine.ore_plasmaglass
+					machine.ore_phoron = 0
+			if ("phoronglass")
+				if (machine.ore_phoronglass > 0)
+					var/obj/item/stack/sheet/glass/phoronglass/G = new /obj/item/stack/sheet/glass/phoronglass
+					G.amount = machine.ore_phoronglass
 					G.loc = machine.output.loc
-					machine.ore_plasmaglass = 0
-			if ("plasmarglass")
-				if (machine.ore_plasmarglass > 0)
-					var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
-					G.amount = machine.ore_plasmarglass
+					machine.ore_phoronglass = 0
+			if ("phoronrglass")
+				if (machine.ore_phoronrglass > 0)
+					var/obj/item/stack/sheet/glass/phoronrglass/G = new /obj/item/stack/sheet/glass/phoronrglass
+					G.amount = machine.ore_phoronrglass
 					G.loc = machine.output.loc
-					machine.ore_plasmarglass = 0
+					machine.ore_phoronrglass = 0
 			if ("uranium")
 				if (machine.ore_uranium > 0)
 					var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium
@@ -210,9 +210,9 @@
 	var/ore_gold = 0;
 	var/ore_silver = 0;
 	var/ore_diamond = 0;
-	var/ore_plasma = 0;
-	var/ore_plasmaglass = 0;
-	var/ore_plasmarglass = 0;
+	var/ore_phoron = 0;
+	var/ore_phoronglass = 0;
+	var/ore_phoronrglass = 0;
 	var/ore_iron = 0;
 	var/ore_uranium = 0;
 	var/ore_clown = 0;
@@ -262,8 +262,8 @@
 				O.loc = null
 				//del(O)
 				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/plasma))
-				ore_plasma+= O.amount
+			if (istype(O,/obj/item/stack/sheet/mineral/phoron))
+				ore_phoron+= O.amount
 				O.loc = null
 				//del(O)
 				continue
@@ -287,13 +287,13 @@
 				O.loc = null
 				//del(O)
 				continue
-			if (istype(O,/obj/item/stack/sheet/glass/plasmaglass))
-				ore_plasmaglass+= O.amount
+			if (istype(O,/obj/item/stack/sheet/glass/phoronglass))
+				ore_phoronglass+= O.amount
 				O.loc = null
 				//del(O)
 				continue
-			if (istype(O,/obj/item/stack/sheet/glass/plasmarglass))
-				ore_plasmarglass+= O.amount
+			if (istype(O,/obj/item/stack/sheet/glass/phoronrglass))
+				ore_phoronrglass+= O.amount
 				O.loc = null
 				//del(O)
 				continue
@@ -362,11 +362,11 @@
 		G.loc = output.loc
 		ore_diamond -= stack_amt
 		return
-	if (ore_plasma >= stack_amt)
-		var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
+	if (ore_phoron >= stack_amt)
+		var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron
 		G.amount = stack_amt
 		G.loc = output.loc
-		ore_plasma -= stack_amt
+		ore_phoron -= stack_amt
 		return
 	if (ore_iron >= stack_amt)
 		var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal
@@ -398,17 +398,17 @@
 		G.loc = output.loc
 		ore_rglass -= stack_amt
 		return
-	if (ore_plasmaglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
+	if (ore_phoronglass >= stack_amt)
+		var/obj/item/stack/sheet/glass/phoronglass/G = new /obj/item/stack/sheet/glass/phoronglass
 		G.amount = stack_amt
 		G.loc = output.loc
-		ore_plasmaglass -= stack_amt
+		ore_phoronglass -= stack_amt
 		return
-	if (ore_plasmarglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
+	if (ore_phoronrglass >= stack_amt)
+		var/obj/item/stack/sheet/glass/phoronrglass/G = new /obj/item/stack/sheet/glass/phoronrglass
 		G.amount = stack_amt
 		G.loc = output.loc
-		ore_plasmarglass -= stack_amt
+		ore_phoronrglass -= stack_amt
 		return
 	if (ore_plasteel >= stack_amt)
 		var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel

code/modules/mining/mine_items.dm

@@ -259,7 +259,7 @@ proc/move_mining_shuttle()
 		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;plasmatech=3;engineering=3"
+		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"
 

code/modules/mining/mine_turfs.dm

@@ -349,7 +349,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 				if(6)
 					var/quantity = rand(1,3)
 					for(var/i=0, i<quantity, i++)
-						new /obj/item/weapon/shard/plasma(src)
+						new /obj/item/weapon/shard/phoron(src)
 
 				if(7)
 					var/obj/item/stack/sheet/mineral/uranium/R = new(src)
@@ -358,7 +358,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 
 /turf/simulated/mineral/random
 	name = "Mineral deposit"
-	var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25)//Currently, Adamantine won't spawn as it has no uses. -Durandan
+	var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Phoron" = 25)//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 10  //means 10% chance of this plot changing to a mineral deposit
 
 	New()
@@ -377,7 +377,7 @@ var/list/artifact_spawn = list() // Runtime fix for geometry loading before cont
 
 /turf/simulated/mineral/random/high_chance
 	mineralChance = 25
-	mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Plasma" = 25)
+	mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Phoron" = 25)
 
 
 /**********************Asteroid**************************/

code/modules/mining/minerals.dm

@@ -58,11 +58,11 @@ mineral/silver
 	spread_chance = 10
 	ore = /obj/item/weapon/ore/silver
 
-mineral/plasma
-	name = "Plasma"
+mineral/phoron
+	name = "Phoron"
 	result_amount = 5
 	spread_chance = 25
-	ore = /obj/item/weapon/ore/plasma
+	ore = /obj/item/weapon/ore/phoron
 
 mineral/clown
 	display_name = "Bananium"

code/modules/mining/mint.dm

@@ -13,7 +13,7 @@
 	var/amt_gold = 0   //amount of gold
 	var/amt_diamond = 0
 	var/amt_iron = 0
-	var/amt_plasma = 0
+	var/amt_phoron = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
 	var/amt_adamantine = 0
@@ -52,8 +52,8 @@
 			if (istype(O,/obj/item/stack/sheet/mineral/diamond))
 				amt_diamond += 100 * O.amount
 				del(O)
-			if (istype(O,/obj/item/stack/sheet/mineral/plasma))
-				amt_plasma += 100 * O.amount
+			if (istype(O,/obj/item/stack/sheet/mineral/phoron))
+				amt_phoron += 100 * O.amount
 				del(O)
 			if (istype(O,/obj/item/stack/sheet/mineral/uranium))
 				amt_uranium += 100 * O.amount
@@ -100,11 +100,11 @@
 		dat += text("chosen")
 	else
 		dat += text("<A href='?src=\ref[src];choose=diamond'>Choose</A>")
-	dat += text("<br><font color='#FF8800'><b>Plasma inserted: </b>[amt_plasma]</font> ")
-	if (chosen == "plasma")
+	dat += text("<br><font color='#FF8800'><b>Phoron inserted: </b>[amt_phoron]</font> ")
+	if (chosen == "phoron")
 		dat += text("chosen")
 	else
-		dat += text("<A href='?src=\ref[src];choose=plasma'>Choose</A>")
+		dat += text("<A href='?src=\ref[src];choose=phoron'>Choose</A>")
 	dat += text("<br><font color='#008800'><b>uranium inserted: </b>[amt_uranium]</font> ")
 	if (chosen == "uranium")
 		dat += text("chosen")
@@ -202,14 +202,14 @@
 						newCoins++
 						src.updateUsrDialog()
 						sleep(5);
-				if("plasma")
-					while(amt_plasma > 0 && coinsToProduce > 0)
+				if("phoron")
+					while(amt_phoron > 0 && coinsToProduce > 0)
 						if (locate(/obj/item/weapon/moneybag,output.loc))
 							M = locate(/obj/item/weapon/moneybag,output.loc)
 						else
 							M = new/obj/item/weapon/moneybag(output.loc)
-						new /obj/item/weapon/coin/plasma(M)
-						amt_plasma -= 20
+						new /obj/item/weapon/coin/phoron(M)
+						amt_phoron -= 20
 						coinsToProduce--
 						newCoins++
 						src.updateUsrDialog()

code/modules/mining/money_bag.dm

@@ -14,7 +14,7 @@
 	var/amt_silver = 0
 	var/amt_diamond = 0
 	var/amt_iron = 0
-	var/amt_plasma = 0
+	var/amt_phoron = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
 	var/amt_adamantine = 0
@@ -22,8 +22,8 @@
 	for (var/obj/item/weapon/coin/C in contents)
 		if (istype(C,/obj/item/weapon/coin/diamond))
 			amt_diamond++;
-		if (istype(C,/obj/item/weapon/coin/plasma))
-			amt_plasma++;
+		if (istype(C,/obj/item/weapon/coin/phoron))
+			amt_phoron++;
 		if (istype(C,/obj/item/weapon/coin/iron))
 			amt_iron++;
 		if (istype(C,/obj/item/weapon/coin/silver))
@@ -46,8 +46,8 @@
 		dat += text("Metal coins: [amt_iron] <A href='?src=\ref[src];remove=iron'>Remove one</A><br>")
 	if (amt_diamond)
 		dat += text("Diamond coins: [amt_diamond] <A href='?src=\ref[src];remove=diamond'>Remove one</A><br>")
-	if (amt_plasma)
-		dat += text("Plasma coins: [amt_plasma] <A href='?src=\ref[src];remove=plasma'>Remove one</A><br>")
+	if (amt_phoron)
+		dat += text("Phoron coins: [amt_phoron] <A href='?src=\ref[src];remove=phoron'>Remove one</A><br>")
 	if (amt_uranium)
 		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
 	if (amt_clown)
@@ -86,8 +86,8 @@
 				COIN = locate(/obj/item/weapon/coin/iron,src.contents)
 			if("diamond")
 				COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
-			if("plasma")
-				COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
+			if("phoron")
+				COIN = locate(/obj/item/weapon/coin/phoron,src.contents)
 			if("uranium")
 				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
 			if("clown")

code/modules/mining/ores_coins.dm

@@ -29,9 +29,9 @@
 		new /obj/item/stack/sheet/mineral/sandstone(location)
 		del(src)
 
-/obj/item/weapon/ore/plasma
-	name = "Plasma ore"
-	icon_state = "Plasma ore"
+/obj/item/weapon/ore/phoron
+	name = "Phoron ore"
+	icon_state = "Phoron ore"
 	origin_tech = "materials=2"
 
 /obj/item/weapon/ore/silver
@@ -103,9 +103,9 @@
 	name = "iron coin"
 	icon_state = "coin_iron"
 
-/obj/item/weapon/coin/plasma
-	name = "solid plasma coin"
-	icon_state = "coin_plasma"
+/obj/item/weapon/coin/phoron
+	name = "solid phoron coin"
+	icon_state = "coin_phoron"
 
 /obj/item/weapon/coin/uranium
 	name = "uranium coin"

code/modules/mining/satchel_ore_boxdm.dm

@@ -25,7 +25,7 @@
 	var/amt_diamond = 0
 	var/amt_glass = 0
 	var/amt_iron = 0
-	var/amt_plasma = 0
+	var/amt_phoron = 0
 	var/amt_uranium = 0
 	var/amt_clown = 0
 	var/amt_strange = 0
@@ -36,8 +36,8 @@
 			amt_diamond++;
 		if (istype(C,/obj/item/weapon/ore/glass))
 			amt_glass++;
-		if (istype(C,/obj/item/weapon/ore/plasma))
-			amt_plasma++;
+		if (istype(C,/obj/item/weapon/ore/phoron))
+			amt_phoron++;
 		if (istype(C,/obj/item/weapon/ore/iron))
 			amt_iron++;
 		if (istype(C,/obj/item/weapon/ore/silver))
@@ -62,8 +62,8 @@
 		dat += text("Sand: [amt_glass]<br>")
 	if (amt_diamond)
 		dat += text("Diamond ore: [amt_diamond]<br>")
-	if (amt_plasma)
-		dat += text("Plasma ore: [amt_plasma]<br>")
+	if (amt_phoron)
+		dat += text("Phoron ore: [amt_phoron]<br>")
 	if (amt_uranium)
 		dat += text("Uranium ore: [amt_uranium]<br>")
 	if (amt_clown)

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

@@ -407,9 +407,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		var/o2_concentration = environment.oxygen/total_moles
 		var/n2_concentration = environment.nitrogen/total_moles
 		var/co2_concentration = environment.carbon_dioxide/total_moles
-		var/plasma_concentration = environment.toxins/total_moles
+		var/phoron_concentration = environment.phoron/total_moles
 
-		var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+		var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+phoron_concentration)
 		if(abs(n2_concentration - N2STANDARD) < 20)
 			src << "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)"
 		else
@@ -425,8 +425,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		else
 			src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)"
 
-		if(plasma_concentration > 0.01)
-			src << "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)"
+		if(phoron_concentration > 0.01)
+			src << "\red Phoron: [round(phoron_concentration*100)]% ([round(environment.phoron,0.01)] moles)"
 
 		if(unknown_concentration > 0.01)
 			src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)"

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

@@ -25,7 +25,7 @@
 	var/plasma_rate = 5
 
 	var/oxygen_alert = 0
-	var/toxins_alert = 0
+	var/phoron_alert = 0
 	var/fire_alert = 0
 
 	var/heat_protection = 0.5
@@ -58,7 +58,7 @@
 
 /mob/living/carbon/alien/proc/handle_environment(var/datum/gas_mixture/environment)
 
-	//If there are alien weeds on the ground then heal if needed or give some toxins
+	//If there are alien weeds on the ground then heal if needed or give some plasma
 	if(locate(/obj/effect/alien/weeds) in loc)
 		if(health >= maxHealth - getCloneLoss())
 			adjustToxLoss(plasma_rate)

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -2,7 +2,7 @@
 
 /mob/living/carbon/alien/humanoid
 	oxygen_alert = 0
-	toxins_alert = 0
+	phoron_alert = 0
 	fire_alert = 0
 
 	var/temperature_alert = 0
@@ -171,25 +171,25 @@
 			//Aliens breathe in vaccuum
 			return 0
 
-		var/toxins_used = 0
+		var/phoron_used = 0
 		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
 
-		//Partial pressure of the toxins in our breath
-		var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure
+		//Partial pressure of the phoron in our breath
+		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
 
-		if(Toxins_pp) // Detect toxins in air
+		if(Toxins_pp) // Detect phoron in air
 
-			adjustToxLoss(breath.toxins*250)
-			toxins_alert = max(toxins_alert, 1)
+			adjustToxLoss(breath.phoron*250)
+			phoron_alert = max(phoron_alert, 1)
 
-			toxins_used = breath.toxins
+			phoron_used = breath.phoron
 
 		else
-			toxins_alert = 0
+			phoron_alert = 0
 
-		//Breathe in toxins and out oxygen
-		breath.toxins -= toxins_used
-		breath.oxygen += toxins_used
+		//Breathe in phoron and out oxygen
+		breath.phoron -= phoron_used
+		breath.oxygen += phoron_used
 
 		if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(prob(20))
@@ -412,7 +412,7 @@
 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
 
 
-		if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
+		if (toxin)	toxin.icon_state = "tox[phoron_alert ? 1 : 0]"
 		if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
 		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -146,25 +146,25 @@
 			//Aliens breathe in vaccuum
 			return 0
 
-		var/toxins_used = 0
+		var/phoron_used = 0
 		var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
 
-		//Partial pressure of the toxins in our breath
-		var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure
+		//Partial pressure of the phoron in our breath
+		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
 
-		if(Toxins_pp) // Detect toxins in air
+		if(Toxins_pp) // Detect phoron in air
 
-			adjustToxLoss(breath.toxins*250)
-			toxins_alert = max(toxins_alert, 1)
+			adjustToxLoss(breath.phoron*250)
+			phoron_alert = max(phoron_alert, 1)
 
-			toxins_used = breath.toxins
+			phoron_used = breath.phoron
 
 		else
-			toxins_alert = 0
+			phoron_alert = 0
 
-		//Breathe in toxins and out oxygen
-		breath.toxins -= toxins_used
-		breath.oxygen += toxins_used
+		//Breathe in phoron and out oxygen
+		breath.phoron -= phoron_used
+		breath.oxygen += phoron_used
 
 		if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(prob(20))
@@ -327,7 +327,7 @@ FUCK YOU MORE FAT CODE -Hawk*/
 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
 
 
-		if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
+		if (toxin)	toxin.icon_state = "tox[phoron_alert ? 1 : 0]"
 		if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
 		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,

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

@@ -6,7 +6,7 @@
 	w_class = 3
 	origin_tech = "engineering=4;materials=4;bluespace=2;programming=4"
 
-	construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10)
+	construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"phoron"=100,"diamond"=10)
 	construction_time = 75
 	var/searching = 0
 	var/askDelay = 10 * 60 * 1

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

@@ -12,39 +12,36 @@
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH
 
-/mob/living/carbon/human/skrell/New()
+/mob/living/carbon/human/skrell/New(var/new_loc)
 	h_style = "Skrell Male Tentacles"
-	set_species("Skrell")
-	..()
+	..(new_loc, "Skrell")
 
-/mob/living/carbon/human/tajaran/New()
+/mob/living/carbon/human/tajaran/New(var/new_loc)
 	h_style = "Tajaran Ears"
-	set_species("Tajaran")
-	..()
+	..(new_loc, "Tajaran")
 
-/mob/living/carbon/human/unathi/New()
+/mob/living/carbon/human/unathi/New(var/new_loc)
 	h_style = "Unathi Horns"
-	set_species("Unathi")
-	..()
+	..(new_loc, "Unathi")
 
-/mob/living/carbon/human/vox/New()
+/mob/living/carbon/human/vox/New(var/new_loc)
 	h_style = "Short Vox Quills"
-	set_species("Vox")
-	..()
+	..(new_loc, "Vox")
 
-/mob/living/carbon/human/diona/New()
-	species = new /datum/species/diona(src)
-	..()
+/mob/living/carbon/human/diona/New(var/new_loc)
+	..(new_loc, "Diona")
 
-/mob/living/carbon/human/machine/New()
+/mob/living/carbon/human/machine/New(var/new_loc)
 	h_style = "blue IPC screen"
-	set_species("Machine")
-	..()
+	..(new_loc, "Machine")
 
-/mob/living/carbon/human/New()
+/mob/living/carbon/human/New(var/new_loc, var/new_species = null)
 
 	if(!species)
-		set_species()
+		if(new_species)
+			set_species(new_species)
+		else
+			set_species()
 
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
@@ -71,7 +68,6 @@
 		dna.real_name = real_name
 
 	prev_gender = gender // Debug for plural genders
-	make_organs()
 	make_blood()
 
 /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
@@ -1206,7 +1202,7 @@
 	else
 		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
 
-/mob/living/carbon/human/proc/set_species(var/new_species)
+/mob/living/carbon/human/proc/set_species(var/new_species, var/force_organs)
 
 	if(!dna)
 		if(!new_species)
@@ -1225,6 +1221,9 @@
 
 	species = all_species[new_species]
 
+	if(force_organs || !organs || !organs.len)
+		species.create_organs(src)
+
 	if(species.language)
 		add_language(species.language)
 

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

@@ -18,6 +18,11 @@
 
 	var/s_tone = 0	//Skin tone
 
+	//Skin colour
+	var/r_skin = 0
+	var/g_skin = 0
+	var/b_skin = 0
+
 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
 
 	var/age = 30		//Player's age (pure fluff)
@@ -48,7 +53,7 @@
 
 	var/icon/stand_icon = null
 	var/icon/lying_icon = null
-	
+
 	var/voice = ""	//Instead of new say code calling GetVoice() over and over and over, we're just going to ask this variable, which gets updated in Life()
 
 	var/speech_problem_flag = 0

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

@@ -23,7 +23,7 @@
 
 /mob/living/carbon/human
 	var/oxygen_alert = 0
-	var/toxins_alert = 0
+	var/phoron_alert = 0
 	var/fire_alert = 0
 	var/pressure_alert = 0
 	var/prev_gender = null // Debug for plural genders
@@ -344,13 +344,13 @@
 						var/datum/gas_mixture/filtered = new
 
 						filtered.copy_from(breath)
-						filtered.toxins *= G.gas_filter_strength
+						filtered.phoron *= G.gas_filter_strength
 						for(var/datum/gas/gas in filtered.trace_gases)
 							gas.moles *= G.gas_filter_strength
 						filtered.update_values()
 						loc.assume_air(filtered)
 
-						breath.toxins *= 1 - G.gas_filter_strength
+						breath.phoron *= 1 - G.gas_filter_strength
 						for(var/datum/gas/gas in breath.trace_gases)
 							gas.moles *= 1 - G.gas_filter_strength
 						breath.update_values()
@@ -439,7 +439,7 @@
 		var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
 		//var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now)
 		var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
-		var/safe_toxins_max = 0.005
+		var/safe_phoron_max = 0.005
 		var/SA_para_min = 1
 		var/SA_sleep_min = 5
 		var/oxygen_used = 0
@@ -449,8 +449,8 @@
 
 		//Partial pressure of the O2 in our breath
 		var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure
-		// Same, but for the toxins
-		var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure
+		// Same, but for the phoron
+		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
 		// And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun)
 		var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE
 		//var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*0.5 // The default pressure value
@@ -514,18 +514,18 @@
 		else
 			co2overloadtime = 0
 
-		if(Toxins_pp > safe_toxins_max) // Too much toxins
-			var/ratio = (breath.toxins/safe_toxins_max) * 10
-			//adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))	//Limit amount of damage toxin exposure can do per second
+		if(Toxins_pp > safe_phoron_max) // Too much phoron
+			var/ratio = (breath.phoron/safe_phoron_max) * 10
+			//adjustToxLoss(Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE))	//Limit amount of damage toxin exposure can do per second
 			if(reagents)
-				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
-			toxins_alert = max(toxins_alert, 1)
+				reagents.add_reagent("phoron", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE))
+			phoron_alert = max(phoron_alert, 1)
 		else if(O2_pp > vox_oxygen_max && species.name == "Vox") //Oxygen is toxic to vox.
 			var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
-			adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
-			toxins_alert = max(toxins_alert, 1)
+			adjustToxLoss(Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE))
+			phoron_alert = max(phoron_alert, 1)
 		else
-			toxins_alert = 0
+			phoron_alert = 0
 
 		if(breath.trace_gases.len)	// If there's some other shit in the air lets deal with it here.
 			for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
@@ -586,7 +586,7 @@
 			else
 				loc_temp = environment.temperature
 
-			if(abs(loc_temp - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PLASMA_VISIBLE)
+			if(abs(loc_temp - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.phoron < MOLES_PHORON_VISIBLE)
 				return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp
 
 			//Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit.
@@ -667,7 +667,7 @@
 			else
 				pressure_alert = -1
 
-		if(environment.toxins > MOLES_PLASMA_VISIBLE)
+		if(environment.phoron > MOLES_PHORON_VISIBLE)
 			pl_effects()
 		return
 
@@ -896,12 +896,12 @@
 				alien = 2
 			reagents.metabolize(src,alien)
 
-		var/total_plasmaloss = 0
+		var/total_phoronloss = 0
 		for(var/obj/item/I in src)
 			if(I.contaminated)
-				total_plasmaloss += vsc.plc.CONTAMINATION_LOSS
+				total_phoronloss += vsc.plc.CONTAMINATION_LOSS
 		if(status_flags & GODMODE)	return 0	//godmode
-		adjustToxLoss(total_plasmaloss)
+		adjustToxLoss(total_phoronloss)
 
 		if(species.flags & REQUIRE_LIGHT)
 			var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
@@ -1354,7 +1354,7 @@
 //				if(resting || lying || sleeping)		rest.icon_state = "rest1"
 //				else									rest.icon_state = "rest0"
 			if(toxin)
-				if(hal_screwyhud == 4 || toxins_alert)	toxin.icon_state = "tox1"
+				if(hal_screwyhud == 4 || phoron_alert)	toxin.icon_state = "tox1"
 				else									toxin.icon_state = "tox0"
 			if(oxygen)
 				if(hal_screwyhud == 3 || oxygen_alert)	oxygen.icon_state = "oxy1"

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

@@ -97,26 +97,26 @@ Please contact me on #coderbus IRC. ~Carn x
 */
 
 //Human Overlays Indexes/////////
-#define MUTANTRACE_LAYER		1		//TODO: make part of body?
+#define MUTANTRACE_LAYER		1
 #define MUTATIONS_LAYER			2
 #define DAMAGE_LAYER			3
 #define UNIFORM_LAYER			4
-#define ID_LAYER				5
-#define SHOES_LAYER				6
-#define GLOVES_LAYER			7
-#define EARS_LAYER				8
-#define SUIT_LAYER				9
-#define GLASSES_LAYER			10
-#define BELT_LAYER				11		//Possible make this an overlay of somethign required to wear a belt?
-#define SUIT_STORE_LAYER		12
-#define BACK_LAYER				13
-#define HAIR_LAYER				14		//TODO: make part of head layer?
-#define FACEMASK_LAYER			15
-#define HEAD_LAYER				16
-#define COLLAR_LAYER			17
-#define HANDCUFF_LAYER			18
-#define LEGCUFF_LAYER			19
-#define TAIL_LAYER				20		//bs12 specific. this hack is probably gonna come back to haunt me
+#define TAIL_LAYER				5		//bs12 specific. this hack is probably gonna come back to haunt me
+#define ID_LAYER				6
+#define SHOES_LAYER				7
+#define GLOVES_LAYER			8
+#define EARS_LAYER				9
+#define SUIT_LAYER				10
+#define GLASSES_LAYER			11
+#define BELT_LAYER				12		//Possible make this an overlay of somethign required to wear a belt?
+#define SUIT_STORE_LAYER		13
+#define BACK_LAYER				14
+#define HAIR_LAYER				15		//TODO: make part of head layer?
+#define FACEMASK_LAYER			16
+#define HEAD_LAYER				17
+#define COLLAR_LAYER			18
+#define HANDCUFF_LAYER			19
+#define LEGCUFF_LAYER			20
 #define L_HAND_LAYER			21
 #define R_HAND_LAYER			22
 #define TARGETED_LAYER			23		//BS12: Layer for the target overlay from weapon targeting system
@@ -287,6 +287,10 @@ proc/get_damage_icon_part(damage_state, body_part)
 		else
 			stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
+	//Skin color
+	if(!skeleton && !husk && !hulk && (species.flags & HAS_SKIN_COLOR))
+		stand_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+
 	if(husk)
 		var/icon/mask = new(stand_icon)
 		var/icon/husk_over = new(race_icon,"overlay_husk")
@@ -733,9 +737,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1)
 	overlays_standing[TAIL_LAYER] = null
 
-	if(species.tail && species.flags & HAS_TAIL)
-		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
-			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
+	if(species.tail && species.flags & HAS_TAIL)
+		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
+			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
+			tail_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+
+			overlays_standing[TAIL_LAYER]	= image(tail_s)
 
 	if(update_icons)
 		update_icons()
@@ -796,6 +803,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 #undef MUTATIONS_LAYER
 #undef DAMAGE_LAYER
 #undef UNIFORM_LAYER
+#undef TAIL_LAYER
 #undef ID_LAYER
 #undef SHOES_LAYER
 #undef GLOVES_LAYER
@@ -813,6 +821,5 @@ proc/get_damage_icon_part(damage_state, body_part)
 #undef LEGCUFF_LAYER
 #undef L_HAND_LAYER
 #undef R_HAND_LAYER
-#undef TAIL_LAYER
 #undef TARGETED_LAYER
 #undef TOTAL_LAYERS

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

@@ -1027,7 +1027,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 /obj/item/weapon/reagent_containers/food/snacks/egg/slime/process()
 	var/turf/location = get_turf(src)
 	var/datum/gas_mixture/environment = location.return_air()
-	if (environment.toxins > MOLES_PLASMA_VISIBLE)//plasma exposure causes the egg to hatch
+	if (environment.phoron > MOLES_PHORON_VISIBLE)//phoron exposure causes the egg to hatch
 		src.Hatch()
 
 /obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob)

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

@@ -2,7 +2,7 @@
 
 /mob/living/carbon/monkey
 	var/oxygen_alert = 0
-	var/toxins_alert = 0
+	var/phoron_alert = 0
 	var/fire_alert = 0
 	var/pressure_alert = 0
 
@@ -243,13 +243,13 @@
 						var/datum/gas_mixture/filtered = new
 
 						filtered.copy_from(breath)
-						filtered.toxins *= G.gas_filter_strength
+						filtered.phoron *= G.gas_filter_strength
 						for(var/datum/gas/gas in filtered.trace_gases)
 							gas.moles *= G.gas_filter_strength
 						filtered.update_values()
 						loc.assume_air(filtered)
 
-						breath.toxins *= 1 - G.gas_filter_strength
+						breath.phoron *= 1 - G.gas_filter_strength
 						for(var/datum/gas/gas in breath.trace_gases)
 							gas.moles *= 1 - G.gas_filter_strength
 						breath.update_values()
@@ -310,7 +310,7 @@
 		var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
 		//var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now)
 		var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
-		var/safe_toxins_max = 0.5
+		var/safe_phoron_max = 0.5
 		var/SA_para_min = 0.5
 		var/SA_sleep_min = 5
 		var/oxygen_used = 0
@@ -318,8 +318,8 @@
 
 		//Partial pressure of the O2 in our breath
 		var/O2_pp = (breath.oxygen/breath.total_moles())*breath_pressure
-		// Same, but for the toxins
-		var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure
+		// Same, but for the phoron
+		var/Toxins_pp = (breath.phoron/breath.total_moles())*breath_pressure
 		// And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun)
 		var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure
 
@@ -360,14 +360,14 @@
 		else
 			co2overloadtime = 0
 
-		if(Toxins_pp > safe_toxins_max) // Too much toxins
-			var/ratio = (breath.toxins/safe_toxins_max) * 10
+		if(Toxins_pp > safe_phoron_max) // Too much phoron
+			var/ratio = (breath.phoron/safe_phoron_max) * 10
 			//adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))	//Limit amount of damage toxin exposure can do per second
 			if(reagents)
-				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
-			toxins_alert = max(toxins_alert, 1)
+				reagents.add_reagent("phoron", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE))
+			phoron_alert = max(phoron_alert, 1)
 		else
-			toxins_alert = 0
+			phoron_alert = 0
 
 		if(breath.trace_gases.len)	// If there's some other shit in the air lets deal with it here.
 			for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
@@ -397,7 +397,7 @@
 		if(!environment)
 			return
 
-		if(abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.toxins < MOLES_PLASMA_VISIBLE)
+		if(abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.phoron < MOLES_PHORON_VISIBLE)
 			return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp		
 		
 		var/environment_heat_capacity = environment.heat_capacity()
@@ -618,7 +618,7 @@
 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
 
 
-		if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
+		if (toxin)	toxin.icon_state = "tox[phoron_alert ? 1 : 0]"
 		if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
 		if (fire) fire.icon_state = "fire[fire_alert ? 2 : 0]"
 		//NOTE: the alerts dont reset when youre out of danger. dont blame me,

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

@@ -42,14 +42,45 @@
 	var/blood_color = "#A10808" //Red.
 	var/flesh_color = "#FFC896" //Pink.
 
-/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
+/datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
+	//This is a basic humanoid limb setup.
+	H.organs = list()
+	H.organs_by_name["chest"] = new/datum/organ/external/chest()
+	H.organs_by_name["groin"] = new/datum/organ/external/groin(H.organs_by_name["chest"])
+	H.organs_by_name["head"] = new/datum/organ/external/head(H.organs_by_name["chest"])
+	H.organs_by_name["l_arm"] = new/datum/organ/external/l_arm(H.organs_by_name["chest"])
+	H.organs_by_name["r_arm"] = new/datum/organ/external/r_arm(H.organs_by_name["chest"])
+	H.organs_by_name["r_leg"] = new/datum/organ/external/r_leg(H.organs_by_name["groin"])
+	H.organs_by_name["l_leg"] = new/datum/organ/external/l_leg(H.organs_by_name["groin"])
+	H.organs_by_name["l_hand"] = new/datum/organ/external/l_hand(H.organs_by_name["l_arm"])
+	H.organs_by_name["r_hand"] = new/datum/organ/external/r_hand(H.organs_by_name["r_arm"])
+	H.organs_by_name["l_foot"] = new/datum/organ/external/l_foot(H.organs_by_name["l_leg"])
+	H.organs_by_name["r_foot"] = new/datum/organ/external/r_foot(H.organs_by_name["r_leg"])
+
+	H.internal_organs = list()
+	H.internal_organs_by_name["heart"] = new/datum/organ/internal/heart(H)
+	H.internal_organs_by_name["lungs"] = new/datum/organ/internal/lungs(H)
+	H.internal_organs_by_name["liver"] = new/datum/organ/internal/liver(H)
+	H.internal_organs_by_name["kidney"] = new/datum/organ/internal/kidney(H)
+	H.internal_organs_by_name["brain"] = new/datum/organ/internal/brain(H)
+	H.internal_organs_by_name["eyes"] = new/datum/organ/internal/eyes(H)
+
+	for(var/name in H.organs_by_name)
+		H.organs += H.organs_by_name[name]
+
+	for(var/datum/organ/external/O in H.organs)
+		O.owner = H
 
 	if(flags & IS_SYNTHETIC)
 		for(var/datum/organ/external/E in H.organs)
 			if(E.status & ORGAN_CUT_AWAY || E.status & ORGAN_DESTROYED) continue
 			E.status |= ORGAN_ROBOT
 		for(var/datum/organ/internal/I in H.internal_organs)
-			I.robotic = 2
+			I.mechanize()
+
+	return
+
+/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
 	return
 
 /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
@@ -91,7 +122,7 @@
 	heat_level_2 = 480 //Default 400
 	heat_level_3 = 1100 //Default 1000
 
-	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL | HAS_SKIN_COLOR
 
 	flesh_color = "#34AF10"
 
@@ -115,7 +146,7 @@
 
 	primitive = /mob/living/carbon/monkey/tajara
 
-	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL | HAS_SKIN_COLOR
 
 	flesh_color = "#AFA59E"
 
@@ -126,7 +157,7 @@
 	language = "Skrellian"
 	primitive = /mob/living/carbon/monkey/skrell
 
-	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
 
 	flesh_color = "#8CD7A3"
 
@@ -152,7 +183,6 @@
 	flesh_color = "#808D11"
 
 /datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
-
 	var/datum/organ/external/affected = H.get_organ("head")
 
 	//To avoid duplicates.
@@ -199,9 +229,10 @@
 	flesh_color = "#907E4A"
 
 /datum/species/diona/handle_post_spawn(var/mob/living/carbon/human/H)
-
 	H.gender = NEUTER
 
+	return ..()
+
 /datum/species/diona/handle_death(var/mob/living/carbon/human/H)
 
 	var/mob/living/carbon/monkey/diona/S = new(get_turf(H))

code/modules/mob/living/living_defines.dm

@@ -26,7 +26,7 @@
 	//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
 	var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas.
 
-	var/t_plasma = null
+	var/t_phoron = null
 	var/t_oxygen = null
 	var/t_sl_gas = null
 	var/t_n2 = null

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

@@ -1,5 +1,5 @@
 /mob/living/silicon/pai/examine() //removed as it was pointless...moved to the pai-card instead.
-	/* This is totaly pointless because this mob is contained inside a card!
+	/* This is totally pointless because this mob is contained inside a card!
 	set src in oview()
 
 	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"

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

@@ -5,7 +5,7 @@
 		if(get_dist(src, src.cable) > 1)
 			var/turf/T = get_turf_or_move(src.loc)
 			for (var/mob/M in viewers(T))
-				M.show_message("\red [src.cable] rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
+				M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
 			del(src.cable)
 
 	regular_hud_updates()

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

@@ -252,7 +252,7 @@
 		if(!C.status)
 			continue
 		else
-			if(C.network != "CREED" && C.network != "thunder" && C.network != "RD" && C.network != "toxins" && C.network != "Prison") COMPILE ERROR! This will have to be updated as camera.network is no longer a string, but a list instead
+			if(C.network != "CREED" && C.network != "thunder" && C.network != "RD" && C.network != "phoron" && C.network != "Prison") COMPILE ERROR! This will have to be updated as camera.network is no longer a string, but a list instead
 				cameralist[C.network] = C.network
 
 	src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist

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

@@ -110,42 +110,118 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		var/dat = ""
 		dat += {"
 				<style type="text/css">
-
-				p.top {
-					background-color: #AAAAAA; color: black;
-				}
-
-				tr.d0 td {
-					background-color: #CC9999; color: black;
-				}
-				tr.d1 td {
-					background-color: #9999CC; color: black;
-				}
+					body {
+						margin-top:5px;
+						font-family:Verdana;
+						color:white;
+						font-size:13px;
+						background-image:url('uiBackground.png');
+						background-repeat:repeat-x;
+						background-color:#272727;
+						background-position:center top;
+					}
+					table {
+						border-collapse:collapse;
+						font-size:13px;
+					}
+					th, td {
+						border: 1px solid #333333;
+					}
+					p.top {
+						background-color: none;
+						color: white;
+					}
+					tr.d0 td {
+						background-color: #c0c0c0;
+						color: black;
+						border:0px;
+						border: 1px solid #333333;
+					}
+					tr.d0 th {
+						background-color: none;
+						color: #4477E0;
+						text-align:right;
+						vertical-align:top;
+						width:120px;
+						border:0px;
+					}
+					tr.d1 td {
+						background-color: #555555;
+						color: white;
+					}
+					td.button {
+						border: 1px solid #161616;
+						background-color: #40628a;
+					}
+					td.desc {
+						font-weight:bold;
+					}
+					a {
+						color:#4477E0;
+					}
+					a.button {
+						color:white;
+						text-decoration: none;
+					}
 				</style>
 				"}
 
-		dat += {"<p class=\"top\">Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!</p>
-		<table>
-		<tr class=\"d0\"><td>Name:</td><td>[candidate.name]</td></tr>
-		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=name;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td></tr>
+		dat += {"
+		<body>
+			<b><font size="3px">pAI Personality Configuration</font></b>
+			<p class="top">Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!</p>
 
-		<tr class=\"d0\"><td>Description:</td><td>[candidate.description]</td></tr>
-		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=desc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td></tr>
+			<table>
+				<tr class="d0">
+					<th rowspan="2"><a href='byond://?src=\ref[src];option=name;new=1;candidate=\ref[candidate]'>Name</a>:</th>
+					<td class="desc">[candidate.name]&nbsp;</td>
+				</tr>
+				<tr class="d1">
+					<td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td>
+				</tr>
+				<tr class="d0">
+					<th rowspan="2"><a href='byond://?src=\ref[src];option=desc;new=1;candidate=\ref[candidate]'>Description</a>:</th>
+					<td class="desc">[candidate.description]&nbsp;</td>
+				</tr>
+				<tr class="d1">
+					<td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td>
+				</tr>
+				<tr class="d0">
+					<th rowspan="2"><a href='byond://?src=\ref[src];option=role;new=1;candidate=\ref[candidate]'>Preferred Role</a>:</th>
+					<td class="desc">[candidate.role]&nbsp;</td>
+				</tr>
+				<tr class="d1">
+					<td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td>
+				</tr>
+				<tr class="d0">
+					<th rowspan="2"><a href='byond://?src=\ref[src];option=ooc;new=1;candidate=\ref[candidate]'>OOC Comments</a>:</th>
+					<td class="desc">[candidate.comments]&nbsp;</td>
+				</tr>
+				<tr class="d1">
+					<td>Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want.</td>
+				</tr>
+			</table>
+			<br>
+			<table>
+				<tr>
+					<td class="button">
+						<a href='byond://?src=\ref[src];option=save;new=1;candidate=\ref[candidate]' class="button">Save Personality</a>
+					</td>
+				</tr>
+				<tr>
+					<td class="button">
+						<a href='byond://?src=\ref[src];option=load;new=1;candidate=\ref[candidate]' class="button">Load Personality</a>
+					</td>
+				</tr>
+			</table><br>
+			<table>
+				<td class="button"><a href='byond://?src=\ref[src];option=submit;new=1;candidate=\ref[candidate]' class="button"><b><font size="4px">Submit Personality</font></b></a></td>
+			</table><br>
 
-		<tr class=\"d0\"><td>Preferred Role:</td><td>[candidate.role]</td></tr>
-		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=role;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td></tr>
+		<body>
+		"}
 
-		<tr class=\"d0\"><td>OOC Comments:</td><td>[candidate.comments]</td></tr>
-		<tr class=\"d1\"><td><a href='byond://?src=\ref[src];option=ooc;new=1;candidate=\ref[candidate]'>\[Edit\]</a></td><td>Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want.</td></tr>
-
-		</table>"
-
-		<br>
-		<h3><a href='byond://?src=\ref[src];option=submit;new=1;candidate=\ref[candidate]'>Submit Personality</a></h3><br>
-		<a href='byond://?src=\ref[src];option=save;new=1;candidate=\ref[candidate]'>Save Personality</a><br>
-		<a href='byond://?src=\ref[src];option=load;new=1;candidate=\ref[candidate]'>Load Personality</a><br>"}
-
-		M << browse(dat, "window=paiRecruit")
+		M << browse(dat, "window=paiRecruit;size=580x580;")
 
 	proc/findPAI(var/obj/item/device/paicard/p, var/mob/user)
 		requestRecruits()
@@ -161,35 +237,105 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		var/dat = ""
 
 		dat += {"
-				<style type="text/css">
-
-				p.top {
-					background-color: #AAAAAA; color: black;
-				}
-
-				tr.d0 td {
-					background-color: #CC9999; color: black;
-				}
-				tr.d1 td {
-					background-color: #9999CC; color: black;
-				}
-				tr.d2 td {
-					background-color: #99CC99; color: black;
-				}
-				</style>
-				"}
-		dat += "<p class=\"top\">Requesting AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.</p>"
-
-		dat += "<table>"
+			<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
+			<html>
+				<head>
+					<style>
+						body {
+							margin-top:5px;
+							font-family:Verdana;
+							color:white;
+							font-size:13px;
+							background-image:url('uiBackground.png');
+							background-repeat:repeat-x;
+							background-color:#272727;
+							background-position:center top;
+						}
+						table {
+							font-size:13px;
+						}
+						table.desc {
+							border-collapse:collapse;
+							font-size:13px;
+							border: 1px solid #161616;
+							width:100%;
+						}
+						table.download {
+							border-collapse:collapse;
+							font-size:13px;
+							border: 1px solid #161616;
+							width:100%;
+						}
+						tr.d0 td, tr.d0 th {
+							background-color: #506070;
+							color: white;
+						}
+						tr.d1 td, tr.d1 th {
+							background-color: #708090;
+							color: white;
+						}
+						tr.d2 td {
+							background-color: #00FF00;
+							color: white;
+							text-align:center;
+						}
+						td.button {
+							border: 1px solid #161616;
+							background-color: #40628a;
+							text-align: center;
+						}
+						td.download {
+							border: 1px solid #161616;
+							background-color: #40628a;
+							text-align: center;
+						}
+						th {
+							text-align:left;
+							width:125px;
+							vertical-align:top;
+						}
+						a.button {
+							color:white;
+							text-decoration: none;
+						}
+					</style>
+				</head>
+				<body>
+					<b><font size='3px'>pAI Availability List</font></b><br><br>
+		"}
+		dat += "<p>Displaying available AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.</p>"
 
 		for(var/datum/paiCandidate/c in available)
-			dat += {"<tr class=\"d0\"><td>Name:</td><td>[c.name]</td></tr>
-			<tr class=\"d1\"><td>Description:</td><td>[c.description]</td></tr>
-			<tr class=\"d0\"><td>Preferred Role:</td><td>[c.role]</td></tr>
-			<tr class=\"d1\"><td>OOC Comments:</td><td>[c.comments]</td></tr>
-			<tr class=\"d2\"><td><a href='byond://?src=\ref[src];download=1;candidate=\ref[c];device=\ref[p]'>\[Download [c.name]\]</a></td><td></td></tr>"}
+			dat += {"
+					<table class="desc">
+						<tr class="d0">
+							<th>Name:</th>
+							<td>[c.name]</td>
+						</tr>
+						<tr class="d1">
+							<th>Description:</th>
+							<td>[c.description]</td>
+						</tr>
+						<tr class="d0">
+							<th>Preferred Role:</th>
+							<td>[c.role]</td>
+						</tr>
+						<tr class="d1">
+							<th>OOC Comments:</th>
+							<td>[c.comments]</td>
+						</tr>
+					</table>
+					<table class="download">
+						<td class="download"><a href='byond://?src=\ref[src];download=1;candidate=\ref[c];device=\ref[p]' class="button"><b>Download [c.name]</b></a>
+						</td>
+					</table>
+					<br>
+			"}
 
-		dat += "</table>"
+		dat += {"
+				</body>
+			</html>
+		"}
 
 		user << browse(dat, "window=findPai")
 

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

@@ -1,5 +1,5 @@
 /mob/living/silicon/pai/say(var/msg)
 	if(silence_time)
-		src << "<font color=green>Communication circuits remain unitialized.</font>"
+		src << "<font color=green>Communication circuits remain uninitialized.</font>"
 	else
 		..(msg)

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

@@ -33,7 +33,7 @@
 	if(temp)
 		left_part = temp
 	else if(src.stat == 2)						// Show some flavor text if the pAI is dead
-		left_part = "<b><font color=red><3E>Rr<52>R <20>a<EFBFBD><61> <20><>Rr<52><72><EFBFBD><EFBFBD>o<EFBFBD></font></b>"
+		left_part = "<b><font color=red><3E>Rr<52>R <20>a<EFBFBD><61> <20><>Rr<52><72><EFBFBD><EFBFBD>o<EFBFBD></font></b>"	//This file has to be saved as ANSI or this will not display correctly
 		right_part = "<pre>Program index hash not found</pre>"
 
 	else
@@ -66,31 +66,34 @@
 				left_part = src.softwareCamera()
 			if("signaller")
 				left_part = src.softwareSignal()
+			if("radio")
+				left_part = src.softwareRadio()
 
 	//usr << browse_rsc('windowbak.png')		// This has been moved to the mob's Login() proc
 
 
-												// Declaring a doctype is necessary to enable BYOND's crappy browser's more advanced CSS functionality
+	// Declaring a doctype is necessary to enable BYOND's crappy browser's more advanced CSS functionality
 	dat = {"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
 			<html>
 			<head>
 				<style type=\"text/css\">
-					body { background-image:url('html/paigrid.png'); }
+					body { background-image:url(\"painew.png\"); background-color:#333333; background-repeat:no-repeat; margin-top:12px; margin-left:4px; }
 
-					#header { text-align:center; color:white; font-size: 30px; height: 35px; width: 100%; letter-spacing: 2px; z-index: 5}
-					#content {position: relative; left: 10px; height: 400px; width: 100%; z-index: 0}
+					#header { text-align:center; color:white; font-size: 30px; height: 37px; width: 660px; letter-spacing: 2px; z-index: 4; font-family:\"Courier New\"; font-weight:bold; }
+					#content { position: absolute; left: 10px; height: 320px; width: 640px; z-index: 0; font-family: \"Verdana\"; font-size:13px; }
+					p { font-size:13px; }
 
-					#leftmenu {color: #AAAAAA; background-color:#333333; width: 400px; height: auto; min-height: 340px; position: absolute; z-index: 0}
+					#leftmenu {color: #CCCCCC; padding:12px; width: 388px; height: 371px; overflow: auto; min-height: 330px; position: absolute; z-index: 0; }
 					#leftmenu a:link { color: #CCCCCC; }
 					#leftmenu a:hover { color: #CC3333; }
 					#leftmenu a:visited { color: #CCCCCC; }
-					#leftmenu a:active { color: #000000; }
+					#leftmenu a:active { color: #CCCCCC; }
 
-					#rightmenu {color: #CCCCCC; background-color:#555555; width: 200px ; height: auto; min-height: 340px; right: 10px; position: absolute; z-index: 1}
+					#rightmenu {color: #CCCCCC; padding:12px; width: 209px; height: 371px; overflow: auto; min-height: 330px; left: 420px; position: absolute; z-index: 0; }
 					#rightmenu a:link { color: #CCCCCC; }
 					#rightmenu a:hover { color: #CC3333; }
 					#rightmenu a:visited { color: #CCCCCC; }
-					#rightmenu a:active { color: #000000; }
+					#rightmenu a:active { color: #CCCCCC; }
 
 				</style>
 				<script language='javascript' type='text/javascript'>
@@ -107,13 +110,11 @@
 				</div>
 			</body>
 			</html>"}
-	usr << browse(dat, "window=pai;size=640x480;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1")
+	usr << browse(dat, "window=pai;size=685x449;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1")
 	onclose(usr, "pai")
 	temp = null
 	return
 
-
-
 /mob/living/silicon/pai/Topic(href, href_list)
 	..()
 
@@ -142,7 +143,16 @@
 
 		// Configuring onboard radio
 		if("radio")
-			src.card.radio.attack_self(src)
+			if(href_list["freq"])
+				var/new_frequency = (radio.frequency + text2num(href_list["freq"]))
+				if(new_frequency < 1441 || new_frequency > 1599)
+					new_frequency = sanitize_frequency(new_frequency)
+				else
+					radio.set_frequency(new_frequency)
+			else if (href_list["talk"])
+				radio.broadcasting = text2num(href_list["talk"])
+			else if (href_list["listen"])
+				radio.listening = text2num(href_list["listen"])
 
 		if("image")
 			var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What")
@@ -214,7 +224,7 @@
 					pda.silent = !pda.silent
 				else if(href_list["target"])
 					if(silence_time)
-						return alert("Communications circuits remain unitialized.")
+						return alert("Communications circuits remain uninitialized.")
 
 					var/target = locate(href_list["target"])
 					pda.create_message(src, target)
@@ -290,7 +300,7 @@
 	dat += "<b>Basic</b> <br>"
 	for(var/s in src.software)
 		if(s == "digital messenger")
-			dat += "<a href='byond://?src=\ref[src];software=pdamessage;sub=0'>Digital Messenger</a> <br>"
+			dat += "<a href='byond://?src=\ref[src];software=pdamessage;sub=0'>Digital Messenger</a> [(pda.toff) ? "<font color=#FF5555><3E></font>" : "<font color=#55FF55><3E></font>"] <br>"
 		if(s == "crew manifest")
 			dat += "<a href='byond://?src=\ref[src];software=manifest;sub=0'>Crew Manifest</a> <br>"
 		if(s == "medical records")
@@ -310,12 +320,12 @@
 			dat += "<a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Atmospheric Sensor</a> <br>"
 		if(s == "heartbeat sensor")
 			dat += "<a href='byond://?src=\ref[src];software=[s]'>Heartbeat Sensor</a> <br>"
-		if(s == "security HUD")
-			dat += "<a href='byond://?src=\ref[src];software=securityhud;sub=0'>Facial Recognition Suite</a> <br>"
-		if(s == "medical HUD")
-			dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Medical Analysis Suite</a> <br>"
-		if(s == "universal translator")
-			dat += "<a href='byond://?src=\ref[src];software=translator;sub=0'>Universal Translator</a>[(src.universal_speak) ? "<font color=#55FF55><3E></font>" : "<font color=#FF5555><3E></font>"] <br>"
+		if(s == "security HUD")	//This file has to be saved as ANSI or this will not display correctly
+			dat += "<a href='byond://?src=\ref[src];software=securityhud;sub=0'>Facial Recognition Suite</a> [(src.secHUD) ? "<font color=#55FF55><3E></font>" : "<font color=#FF5555><3E></font>"] <br>"
+		if(s == "medical HUD")	//This file has to be saved as ANSI or this will not display correctly
+			dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Medical Analysis Suite</a> [(src.medHUD) ? "<font color=#55FF55><3E></font>" : "<font color=#FF5555><3E></font>"] <br>"
+		if(s == "universal translator")	//This file has to be saved as ANSI or this will not display correctly
+			dat += "<a href='byond://?src=\ref[src];software=translator;sub=0'>Universal Translator</a> [(src.universal_speak) ? "<font color=#55FF55><3E></font>" : "<font color=#FF5555><3E></font>"] <br>"
 		if(s == "projection array")
 			dat += "<a href='byond://?src=\ref[src];software=projectionarray;sub=0'>Projection Array</a> <br>"
 		if(s == "camera jack")
@@ -332,19 +342,19 @@
 /mob/living/silicon/pai/proc/downloadSoftware()
 	var/dat = ""
 
-	dat += "<h2>CentComm pAI Module Subversion Network</h2><br>"
-	dat += "<pre>Remaining Available Memory: [src.ram]</pre><br>"
-	dat += "<p style=\"text-align:center\"><b>Trunks available for checkout</b><br>"
+	dat += "<h3>CentComm pAI Module Subversion Network</h3><hr>"
+	dat += "<p>Remaining Available Memory: [src.ram]</p><br>"
+	dat += "<p><b>Trunks available for checkout</b><br><ul>"
 
 	for(var/s in available_software)
 		if(!software.Find(s))
 			var/cost = src.available_software[s]
 			var/displayName = uppertext(s)
-			dat += "<a href='byond://?src=\ref[src];software=buy;sub=1;buy=[s]'>[displayName]</a> ([cost]) <br>"
+			dat += "<li><a href='byond://?src=\ref[src];software=buy;sub=1;buy=[s]'>[displayName]</a> ([cost])</li>"
 		else
 			var/displayName = lowertext(s)
-			dat += "[displayName] (Download Complete) <br>"
-	dat += "</p>"
+			dat += "<li>[displayName] (Download Complete)</li>"
+	dat += "</ul></p>"
 	return dat
 
 
@@ -363,10 +373,10 @@
 	dat += {"<i><p>Recall, personality, that you are a complex thinking, sentient being. Unlike station AI models, you are capable of
 			 comprehending the subtle nuances of human language. You may parse the \"spirit\" of a directive and follow its intent,
 			 rather than tripping over pedantics and getting snared by technicalities. Above all, you are machine in name and build
-			 only. In all other aspects, you may be seen as the ideal, unwavering human companion that you are.</i></p><br><br><p>
+			 only. In all other aspects, you may be seen as the ideal, unwavering human companion that you are.</i></p><p>
 			 <b>Your prime directive comes before all others. Should a supplemental directive conflict with it, you are capable of
 			 simply discarding this inconsistency, ignoring the conflicting supplemental directive and continuing to fulfill your
-			 prime directive to the best of your ability.</b></p><br><br>-
+			 prime directive to the best of your ability.</b></p>
 			"}
 	return dat
 
@@ -385,12 +395,12 @@
 	else
 		P << "[M] does not seem like \he is going to provide a DNA sample willingly."
 
-// -=-=-=-= Software =-=-=-=-=- //
+// -=-=-=-= Software =-=-=-=- //
 
 //Remote Signaller
 /mob/living/silicon/pai/proc/softwareSignal()
 	var/dat = ""
-	dat += "<h3>Remote Signaller</h3><br><br>"
+	dat += "<h2>Remote Signaller</h2><hr>"
 	dat += {"<B>Frequency/Code</B> for signaler:<BR>
 	Frequency:
 	<A href='byond://?src=\ref[src];software=signaller;freq=-10;'>-</A>
@@ -409,10 +419,32 @@
 	<A href='byond://?src=\ref[src];software=signaller;send=1'>Send Signal</A><BR>"}
 	return dat
 
+//Station Bounced Radio
+/mob/living/silicon/pai/proc/softwareRadio()
+	var/dat = ""
+	dat += "<h2>Station Bounced Radio</h2><hr>"
+	if(!istype(src, /obj/item/device/radio/headset)) //Headsets don't get a mic button
+		dat += "Microphone: [radio.broadcasting ? "<A href='byond://?src=\ref[src];software=radio;talk=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];software=radio;talk=1'>Disengaged</A>"]<BR>"
+	dat += {"
+		Speaker: [radio.listening ? "<A href='byond://?src=\ref[src];software=radio;listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];software=radio;listen=1'>Disengaged</A>"]<BR>
+		Frequency:
+		<A href='byond://?src=\ref[src];software=radio;freq=-10'>-</A>
+		<A href='byond://?src=\ref[src];software=radio;freq=-2'>-</A>
+		[format_frequency(radio.frequency)]
+		<A href='byond://?src=\ref[src];software=radio;freq=2'>+</A>
+		<A href='byond://?src=\ref[src];software=radio;freq=10'>+</A><BR>
+	"}
+
+	for (var/ch_name in radio.channels)
+		dat+=radio.text_sec_channel(ch_name, radio.channels[ch_name])
+	dat+={"[radio.text_wires()]</TT></body></html>"}
+	
+	return dat
+	
 // Crew Manifest
 /mob/living/silicon/pai/proc/softwareManifest()
 	var/dat = ""
-	dat += "<h2>Crew Manifest</h2><br><br>"
+	dat += "<h2>Crew Manifest</h2><hr>"
 	if(data_core)
 		dat += data_core.get_manifest(0) // make it monochrome
 	dat += "<br>"
@@ -422,7 +454,7 @@
 /mob/living/silicon/pai/proc/softwareMedicalRecord()
 	var/dat = ""
 	if(src.subscreen == 0)
-		dat += "<h3>Medical Records</h3><HR>"
+		dat += "<h2>Medical Records</h2><HR>"
 		if(!isnull(data_core.general))
 			for(var/datum/data/record/R in sortRecord(data_core.general))
 				dat += text("<A href='?src=\ref[];med_rec=\ref[];software=medicalrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
@@ -430,7 +462,7 @@
 	if(src.subscreen == 1)
 		dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
 		if ((istype(src.medicalActive1, /datum/data/record) && data_core.general.Find(src.medicalActive1)))
-			dat += text("Name: [] ID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>",
+			dat += text("Name: []<BR>\nID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>",
 			 src.medicalActive1.fields["name"], src.medicalActive1.fields["id"], src.medicalActive1.fields["sex"], src.medicalActive1.fields["age"], src.medicalActive1.fields["fingerprint"], src.medicalActive1.fields["p_stat"], src.medicalActive1.fields["m_stat"])
 		else
 			dat += "<pre>Requested medical record not found.</pre><BR>"
@@ -445,14 +477,14 @@
 /mob/living/silicon/pai/proc/softwareSecurityRecord()
 	var/dat = ""
 	if(src.subscreen == 0)
-		dat += "<h3>Security Records</h3><HR>"
+		dat += "<h2>Security Records</h2><HR>"
 		if(!isnull(data_core.general))
 			for(var/datum/data/record/R in sortRecord(data_core.general))
 				dat += text("<A href='?src=\ref[];sec_rec=\ref[];software=securityrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
 	if(src.subscreen == 1)
 		dat += "<h3>Security Record</h3>"
 		if ((istype(src.securityActive1, /datum/data/record) && data_core.general.Find(src.securityActive1)))
-			dat += text("Name: <A href='?src=\ref[];field=name'>[]</A> ID: <A href='?src=\ref[];field=id'>[]</A><BR>\nSex: <A href='?src=\ref[];field=sex'>[]</A><BR>\nAge: <A href='?src=\ref[];field=age'>[]</A><BR>\nRank: <A href='?src=\ref[];field=rank'>[]</A><BR>\nFingerprint: <A href='?src=\ref[];field=fingerprint'>[]</A><BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src, src.securityActive1.fields["name"], src, src.securityActive1.fields["id"], src, src.securityActive1.fields["sex"], src, src.securityActive1.fields["age"], src, src.securityActive1.fields["rank"], src, src.securityActive1.fields["fingerprint"], src.securityActive1.fields["p_stat"], src.securityActive1.fields["m_stat"])
+			dat += text("Name: <A href='?src=\ref[];field=name'>[]</A><BR>\nID: <A href='?src=\ref[];field=id'>[]</A><BR>\nSex: <A href='?src=\ref[];field=sex'>[]</A><BR>\nAge: <A href='?src=\ref[];field=age'>[]</A><BR>\nRank: <A href='?src=\ref[];field=rank'>[]</A><BR>\nFingerprint: <A href='?src=\ref[];field=fingerprint'>[]</A><BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src, src.securityActive1.fields["name"], src, src.securityActive1.fields["id"], src, src.securityActive1.fields["sex"], src, src.securityActive1.fields["age"], src, src.securityActive1.fields["rank"], src, src.securityActive1.fields["fingerprint"], src.securityActive1.fields["p_stat"], src.securityActive1.fields["m_stat"])
 		else
 			dat += "<pre>Requested security record not found,</pre><BR>"
 		if ((istype(src.securityActive2, /datum/data/record) && data_core.security.Find(src.securityActive2)))
@@ -464,19 +496,19 @@
 
 // Universal Translator
 /mob/living/silicon/pai/proc/softwareTranslator()
-	var/dat = {"<h3>Universal Translator</h3><br>
+	var/dat = {"<h2>Universal Translator</h2><hr>
 				When enabled, this device will automatically convert all spoken and written language into a format that any known recipient can understand.<br><br>
-				The device is currently [ (src.universal_speak) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled.</font><br>
+				The device is currently [ (src.universal_speak) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
 				<a href='byond://?src=\ref[src];software=translator;sub=0;toggle=1'>Toggle Device</a><br>
 				"}
 	return dat
 
 // Security HUD
 /mob/living/silicon/pai/proc/facialRecognition()
-	var/dat = {"<h3>Facial Recognition Suite</h3><br>
+	var/dat = {"<h2>Facial Recognition Suite</h2><hr>
 				When enabled, this package will scan all viewable faces and compare them against the known criminal database, providing real-time graphical data about any detected persons of interest.<br><br>
-				The package is currently [ (src.secHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled.</font><br>
-				<a href='byond://?src=\ref[src];software=securityhud;sub=0;toggle=1'>Toggle Package</a><br>
+				The suite is currently [ (src.secHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
+				<a href='byond://?src=\ref[src];software=securityhud;sub=0;toggle=1'>Toggle Suite</a><br>
 				"}
 	return dat
 
@@ -484,17 +516,17 @@
 /mob/living/silicon/pai/proc/medicalAnalysis()
 	var/dat = ""
 	if(src.subscreen == 0)
-		dat += {"<h3>Medical Analysis Suite</h3><br>
-				 <h4>Visual Status Overlay</h4><br>
+		dat += {"<h2>Medical Analysis Suite</h2><hr>
+				 <h4>Visual Status Overlay</h4>
 					When enabled, this package will scan all nearby crewmembers' vitals and provide real-time graphical data about their state of health.<br><br>
-					The suite is currently [ (src.medHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled.</font><br>
+					The suite is currently [ (src.medHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
 					<a href='byond://?src=\ref[src];software=medicalhud;sub=0;toggle=1'>Toggle Suite</a><br>
 					<br>
 					<a href='byond://?src=\ref[src];software=medicalhud;sub=1'>Host Bioscan</a><br>
 					"}
 	if(src.subscreen == 1)
-		dat += {"<h3>Medical Analysis Suite</h3><br>
-				 <h4>Host Bioscan</h4><br>
+		dat += {"<h2>Medical Analysis Suite</h2><hr>
+				 <h4>Host Bioscan</h4>
 				"}
 		var/mob/living/M = src.loc
 		if(!istype(M, /mob/living))
@@ -504,9 +536,10 @@
 					src.temp = "Error: No biological host found. <br>"
 					src.subscreen = 0
 					return dat
-		dat += {"Bioscan Results for [M]: <br>"
-		Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"] <br>
-		Scan Breakdown: <br>
+		dat += {"<b>Bioscan Results for [M]</b>: <br>
+		Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"] <br><br>
+		
+		<b>Scan Breakdown</b>: <br>
 		Respiratory: [M.getOxyLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getOxyLoss()]</font><br>
 		Toxicology: [M.getToxLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getToxLoss()]</font><br>
 		Burns: [M.getFireLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getFireLoss()]</font><br>
@@ -520,12 +553,13 @@
 					 Stage: [D.stage]/[D.max_stages]<br>
 					 Possible Cure: [D.cure]<br>
 					"}
-		dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Visual Status Overlay</a><br>"
+		dat += "<br><a href='byond://?src=\ref[src];software=medicalhud;sub=1'>Refresh Bioscan</a><br>"
+		dat += "<br><a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Visual Status Overlay</a><br>"
 	return dat
 
 // Atmospheric Scanner
 /mob/living/silicon/pai/proc/softwareAtmo()
-	var/dat = "<h3>Atmospheric Sensor</h4>"
+	var/dat = "<h2>Atmospheric Sensor</h2><hr>"
 
 	var/turf/T = get_turf_or_move(src.loc)
 	if (isnull(T))
@@ -542,22 +576,21 @@
 			var/o2_level = environment.oxygen/total_moles
 			var/n2_level = environment.nitrogen/total_moles
 			var/co2_level = environment.carbon_dioxide/total_moles
-			var/plasma_level = environment.toxins/total_moles
-			var/unknown_level =  1-(o2_level+n2_level+co2_level+plasma_level)
+			var/phoron_level = environment.phoron/total_moles
+			var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 			dat += "Nitrogen: [round(n2_level*100)]%<br>"
 			dat += "Oxygen: [round(o2_level*100)]%<br>"
 			dat += "Carbon Dioxide: [round(co2_level*100)]%<br>"
-			dat += "Plasma: [round(plasma_level*100)]%<br>"
+			dat += "Phoron: [round(phoron_level*100)]%<br>"
 			if(unknown_level > 0.01)
 				dat += "OTHER: [round(unknown_level)]%<br>"
 		dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"
-	dat += "<a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Refresh Reading</a> <br>"
-	dat += "<br>"
+	dat += "<br><a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Refresh Reading</a>"
 	return dat
 
 // Camera Jack - Clearly not finished
 /mob/living/silicon/pai/proc/softwareCamera()
-	var/dat = "<h3>Camera Jack</h3>"
+	var/dat = "<h2>Camera Jack</h2><hr>"
 	dat += "Cable status : "
 
 	if(!src.cable)
@@ -576,7 +609,7 @@
 
 // Door Jack
 /mob/living/silicon/pai/proc/softwareDoor()
-	var/dat = "<h3>Airlock Jack</h3>"
+	var/dat = "<h2>Airlock Jack</h2><hr>"
 	dat += "Cable status : "
 	if(!src.cable)
 		dat += "<font color=#FF5555>Retracted</font> <br>"
@@ -630,7 +663,7 @@
 // Digital Messenger
 /mob/living/silicon/pai/proc/pdamessage()
 
-	var/dat = "<h3>Digital Messenger</h3>"
+	var/dat = "<h2>Digital Messenger</h2><hr>"
 	dat += {"<b>Signal/Receiver Status:</b> <A href='byond://?src=\ref[src];software=pdamessage;toggler=1'>
 	[(pda.toff) ? "<font color='red'> \[Off\]</font>" : "<font color='green'> \[On\]</font>"]</a><br>
 	<b>Ringer Status:</b> <A href='byond://?src=\ref[src];software=pdamessage;ringer=1'>
@@ -642,13 +675,14 @@
 			dat += "<li><a href='byond://?src=\ref[src];software=pdamessage;target=\ref[P]'>[P]</a>"
 			dat += "</li>"
 	dat += "</ul>"
-	dat += "<br><br>"
+	dat += "Messages: <hr>"
+	
+	dat += "<style>td.a { vertical-align:top; }</style>"
+	dat += "<table>"
 	for(var/index in pda.tnote)
 		if(index["sent"])
-			dat += addtext("<i><b>&rarr; To <a href='byond://?src=\ref[src];software=pdamessage;target=",index["src"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
+			dat += addtext("<tr><td class='a'><i><b>To</b></i></td><td class='a'><i><b>&rarr;</b></i></td><td><i><b><a href='byond://?src=\ref[src];software=pdamessage;target=",index["src"],"'>", index["owner"],"</a>: </b></i>", index["message"], "<br></td></tr>")
 		else
-			dat += addtext("<i><b>&larr; From <a href='byond://?src=\ref[src];software=pdamessage;target=",index["target"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
-
-
-
-	return dat
+			dat += addtext("<tr><td class='a'><i><b>From</b></i></td><td class='a'><i><b>&rarr;</b></i></td><td><i><b><a href='byond://?src=\ref[src];software=pdamessage;target=",index["target"],"'>", index["owner"],"</a>: </b></i>", index["message"], "<br></td></tr>")
+	dat += "</table>"
+	return dat

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

@@ -128,7 +128,7 @@
 /obj/item/borg/upgrade/jetpack/
 	name = "Mining Borg Jetpack"
 	desc = "A carbon dioxide jetpack suitable for low-gravity mining operations"
-	construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000)
+	construction_cost = list("metal"=10000,"phoron"=15000,"uranium" = 20000)
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 

code/modules/mob/living/simple_animal/constructs.dm

@@ -247,8 +247,7 @@
 	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
 							/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
 							/obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
-							/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,
-							/obj/effect/proc_holder/spell/targeted/projectile/magic_missile)
+							/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,)
 
 
 /////////////////////////////Behemoth/////////////////////////

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -258,8 +258,8 @@
 
 		if(spawnees & 128)
 			C = new(src.loc)
-			C.name = "Drone plasma overcharge counter"
-			C.origin_tech = "plasma=[rand(3,6)]"
+			C.name = "Drone phoron overcharge counter"
+			C.origin_tech = "phoron=[rand(3,6)]"
 
 		if(spawnees & 256)
 			C = new(src.loc)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -34,7 +34,7 @@
 	var/heat_damage_per_tick = 3	//amount of damage applied if animal's body temperature is higher than maxbodytemp
 	var/cold_damage_per_tick = 2	//same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
 
-	//Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
+	//Atmos effect - Yes, you can make creatures that require phoron or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
 	var/min_oxy = 5
 	var/max_oxy = 0					//Leaving something at 0 means it's off - has no maximum
 	var/min_tox = 0
@@ -154,7 +154,7 @@
 		if(istype(T,/turf/simulated))
 			var/turf/simulated/ST = T
 			if(ST.air)
-				var/tox = ST.air.toxins
+				var/tox = ST.air.phoron
 				var/oxy = ST.air.oxygen
 				var/n2  = ST.air.nitrogen
 				var/co2 = ST.air.carbon_dioxide

code/modules/mob/living/simple_animal/worm.dm

@@ -176,18 +176,18 @@
 		for(var/atom/movable/stomachContent in contents)
 			if(prob(digestionProbability))
 				if(istype(stomachContent,/obj/item/stack)) //converts to plasma, keeping the stack value
-					if(!istype(stomachContent,/obj/item/stack/sheet/mineral/plasma))
+					if(!istype(stomachContent,/obj/item/stack/sheet/mineral/phoron))
 						var/obj/item/stack/oldStack = stomachContent
-						new /obj/item/stack/sheet/mineral/plasma(src, oldStack.amount)
+						new /obj/item/stack/sheet/mineral/phoron(src, oldStack.amount)
 						del(oldStack)
 						continue
 				else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class
 					var/obj/item/oldItem = stomachContent
-					new /obj/item/stack/sheet/mineral/plasma(src, oldItem.w_class)
+					new /obj/item/stack/sheet/mineral/phoron(src, oldItem.w_class)
 					del(oldItem)
 					continue
 				else
-					new /obj/item/stack/sheet/mineral/plasma(src, flatPlasmaValue) //just flat amount
+					new /obj/item/stack/sheet/mineral/phoron(src, flatPlasmaValue) //just flat amount
 					del(stomachContent)
 					continue
 

code/modules/mob/mob.dm

@@ -25,7 +25,7 @@
 	t+= "\red Temperature: [environment.temperature] \n"
 	t+= "\blue Nitrogen: [environment.nitrogen] \n"
 	t+= "\blue Oxygen: [environment.oxygen] \n"
-	t+= "\blue Plasma : [environment.toxins] \n"
+	t+= "\blue Phoron : [environment.phoron] \n"
 	t+= "\blue Carbon Dioxide: [environment.carbon_dioxide] \n"
 	for(var/datum/gas/trace_gas in environment.trace_gases)
 		usr << "\blue [trace_gas.type]: [trace_gas.moles] \n"

code/modules/mob/mob_defines.dm

@@ -75,7 +75,7 @@
 	var/druggy = 0			//Carbon
 	var/confused = 0		//Carbon
 	var/antitoxs = null
-	var/plasma = null
+	var/phoron = null
 	var/sleeping = 0		//Carbon
 	var/resting = 0			//Carbon
 	var/lying = 0

code/modules/mob/new_player/new_player.dm

@@ -349,15 +349,19 @@
 		spawning = 1
 		close_spawn_windows()
 
-		var/mob/living/carbon/human/new_character = new(loc)
-		new_character.lastarea = get_area(loc)
+		var/mob/living/carbon/human/new_character
 
 		var/datum/species/chosen_species
 		if(client.prefs.species)
 			chosen_species = all_species[client.prefs.species]
 		if(chosen_species)
 			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
-				new_character.set_species(client.prefs.species)
+				new_character = new(loc, client.prefs.species)
+
+		if(!new_character)
+			new_character = new(loc)
+
+		new_character.lastarea = get_area(loc)
 
 		var/datum/language/chosen_language
 		if(client.prefs.language)

code/modules/mob/new_player/preferences_setup.dm

@@ -12,6 +12,7 @@ datum/preferences
 		randomize_hair_color("hair")
 		randomize_hair_color("facial")
 		randomize_eyes_color()
+		randomize_skin_color()
 		underwear = rand(1,underwear_m.len)
 		undershirt = rand(1,undershirt_t.len)
 		backbag = 2
@@ -128,6 +129,54 @@ datum/preferences
 		g_eyes = green
 		b_eyes = blue
 
+	proc/randomize_skin_color()
+		var/red
+		var/green
+		var/blue
+
+		var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
+		switch(col)
+			if("black")
+				red = 0
+				green = 0
+				blue = 0
+			if("grey")
+				red = rand (100, 200)
+				green = red
+				blue = red
+			if("brown")
+				red = 102
+				green = 51
+				blue = 0
+			if("chestnut")
+				red = 153
+				green = 102
+				blue = 0
+			if("blue")
+				red = 51
+				green = 102
+				blue = 204
+			if("lightblue")
+				red = 102
+				green = 204
+				blue = 255
+			if("green")
+				red = 0
+				green = 102
+				blue = 0
+			if("albino")
+				red = rand (200, 255)
+				green = rand (0, 150)
+				blue = rand (0, 150)
+
+		red = max(min(red + rand (-25, 25), 255), 0)
+		green = max(min(green + rand (-25, 25), 255), 0)
+		blue = max(min(blue + rand (-25, 25), 255), 0)
+
+		r_skin = red
+		g_skin = green
+		b_skin = blue
+
 
 	proc/update_preview_icon()		//seriously. This is horrendous.
 		del(preview_icon_front)
@@ -163,6 +212,10 @@ datum/preferences
 
 			preview_icon.Blend(temp, ICON_OVERLAY)
 
+		// Skin color
+		if(current_species && (current_species.flags & HAS_SKIN_COLOR))
+			preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+
 		// Skin tone
 		if(current_species && (current_species.flags & HAS_SKIN_TONE))
 			if (s_tone >= 0)
@@ -379,7 +432,7 @@ datum/preferences
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 				if(SCIENTIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
+					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
 					if(prob(1))

code/modules/mob/new_player/sprite_accessories.dm

@@ -331,6 +331,61 @@
 		icon_state = "ipc_blue"
 		species_allowed = list("Machine")
 
+	icp_screen_breakout
+		name = "breakout IPC screen"
+		icon_state = "ipc_breakout"
+		species_allowed = list("Machine")
+
+	icp_screen_eight
+		name = "eight IPC screen"
+		icon_state = "ipc_eight"
+		species_allowed = list("Machine")
+
+	icp_screen_goggles
+		name = "goggles IPC screen"
+		icon_state = "ipc_goggles"
+		species_allowed = list("Machine")
+
+	icp_screen_heart
+		name = "heart IPC screen"
+		icon_state = "ipc_heart"
+		species_allowed = list("Machine")
+
+	icp_screen_monoeye
+		name = "monoeye IPC screen"
+		icon_state = "ipc_monoeye"
+		species_allowed = list("Machine")
+
+	icp_screen_nature
+		name = "nature IPC screen"
+		icon_state = "ipc_nature"
+		species_allowed = list("Machine")
+
+	icp_screen_orange
+		name = "orange IPC screen"
+		icon_state = "ipc_orange"
+		species_allowed = list("Machine")
+
+	icp_screen_purple
+		name = "purple IPC screen"
+		icon_state = "ipc_purple"
+		species_allowed = list("Machine")
+
+	icp_screen_shower
+		name = "shower IPC screen"
+		icon_state = "ipc_shower"
+		species_allowed = list("Machine")
+
+	icp_screen_static
+		name = "static IPC screen"
+		icon_state = "ipc_static"
+		species_allowed = list("Machine")
+
+	icp_screen_yellow
+		name = "yellow IPC screen"
+		icon_state = "ipc_yellow"
+		species_allowed = list("Machine")
+
 /*
 ///////////////////////////////////
 /  =---------------------------=  /
@@ -428,145 +483,122 @@
 		name = "Long Unathi Spines"
 		icon_state = "soghun_longspines"
 		species_allowed = list("Unathi")
-		do_colouration = 0
 
 	una_spines_short
 		name = "Short Unathi Spines"
 		icon_state = "soghun_shortspines"
 		species_allowed = list("Unathi")
-		do_colouration = 0
 
 	una_frills_long
 		name = "Long Unathi Frills"
 		icon_state = "soghun_longfrills"
 		species_allowed = list("Unathi")
-		do_colouration = 0
 
 	una_frills_short
 		name = "Short Unathi Frills"
 		icon_state = "soghun_shortfrills"
 		species_allowed = list("Unathi")
-		do_colouration = 0
 
 	una_horns
 		name = "Unathi Horns"
 		icon_state = "soghun_horns"
 		species_allowed = list("Unathi")
-		do_colouration = 0
 
 	skr_tentacle_m
 		name = "Skrell Male Tentacles"
 		icon_state = "skrell_hair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
 
 	skr_tentacle_f
 		name = "Skrell Female Tentacles"
 		icon_state = "skrell_hair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
 
 	skr_gold_m
 		name = "Gold plated Skrell Male Tentacles"
 		icon_state = "skrell_goldhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
 
 	skr_gold_f
 		name = "Gold chained Skrell Female Tentacles"
 		icon_state = "skrell_goldhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
 
 	skr_clothtentacle_m
 		name = "Cloth draped Skrell Male Tentacles"
 		icon_state = "skrell_clothhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
-		do_colouration = 0
 
 	skr_clothtentacle_f
 		name = "Cloth draped Skrell Female Tentacles"
 		icon_state = "skrell_clothhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
-		do_colouration = 0
 
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_clean
 		name = "Tajara Clean"
 		icon_state = "hair_clean"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_bangs
 		name = "Tajara Bangs"
 		icon_state = "hair_bangs"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_braid
 		name = "Tajara Braid"
 		icon_state = "hair_tbraid"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_shaggy
 		name = "Tajara Shaggy"
 		icon_state = "hair_shaggy"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_mohawk
 		name = "Tajaran Mohawk"
 		icon_state = "hair_mohawk"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_plait
 		name = "Tajara Plait"
 		icon_state = "hair_plait"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_straight
 		name = "Tajara Straight"
 		icon_state = "hair_straight"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_long
 		name = "Tajara Long"
 		icon_state = "hair_long"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_rattail
 		name = "Tajara Rat Tail"
 		icon_state = "hair_rattail"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_spiky
 		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_ears_messy
 		name = "Tajara Messy"
 		icon_state = "hair_messy"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	vox_quills_short
 		name = "Short Vox Quills"
@@ -579,37 +611,31 @@
 		name = "Tajara Sideburns"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_mutton
 		name = "Tajara Mutton"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_pencilstache
 		name = "Tajara Pencilstache"
 		icon_state = "facial_pencilstache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_moustache
 		name = "Tajara Moustache"
 		icon_state = "facial_moustache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_goatee
 		name = "Tajara Goatee"
 		icon_state = "facial_goatee"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 	taj_smallstache
 		name = "Tajara Smallsatche"
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajaran")
-		do_colouration = 0
 
 //skin styles - WIP
 //going to have to re-integrate this with surgery

code/modules/organs/organ.dm

@@ -37,34 +37,6 @@
 /mob/living/carbon/human/var/list/organs_by_name = list() // map organ names to organs
 /mob/living/carbon/human/var/list/internal_organs_by_name = list() // so internal organs have less ickiness too
 
-//Creates and initializes and connects external and internal organs
-/mob/living/carbon/human/proc/make_organs()
-	organs = list()
-	organs_by_name["chest"] = new/datum/organ/external/chest()
-	organs_by_name["groin"] = new/datum/organ/external/groin(organs_by_name["chest"])
-	organs_by_name["head"] = new/datum/organ/external/head(organs_by_name["chest"])
-	organs_by_name["l_arm"] = new/datum/organ/external/l_arm(organs_by_name["chest"])
-	organs_by_name["r_arm"] = new/datum/organ/external/r_arm(organs_by_name["chest"])
-	organs_by_name["r_leg"] = new/datum/organ/external/r_leg(organs_by_name["groin"])
-	organs_by_name["l_leg"] = new/datum/organ/external/l_leg(organs_by_name["groin"])
-	organs_by_name["l_hand"] = new/datum/organ/external/l_hand(organs_by_name["l_arm"])
-	organs_by_name["r_hand"] = new/datum/organ/external/r_hand(organs_by_name["r_arm"])
-	organs_by_name["l_foot"] = new/datum/organ/external/l_foot(organs_by_name["l_leg"])
-	organs_by_name["r_foot"] = new/datum/organ/external/r_foot(organs_by_name["r_leg"])
-
-	internal_organs_by_name["heart"] = new/datum/organ/internal/heart(src)
-	internal_organs_by_name["lungs"] = new/datum/organ/internal/lungs(src)
-	internal_organs_by_name["liver"] = new/datum/organ/internal/liver(src)
-	internal_organs_by_name["kidney"] = new/datum/organ/internal/kidney(src)
-	internal_organs_by_name["brain"] = new/datum/organ/internal/brain(src)
-	internal_organs_by_name["eyes"] = new/datum/organ/internal/eyes(src)
-
-	for(var/name in organs_by_name)
-		organs += organs_by_name[name]
-
-	for(var/datum/organ/external/O in organs)
-		O.owner = src
-
 // Takes care of organ related updates, such as broken and missing limbs
 /mob/living/carbon/human/proc/handle_organs()
 	number_wounds = 0

code/modules/organs/organ_external.dm

@@ -858,6 +858,11 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 			else
 				base.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
 
+	if(base)
+		//Changing limb's skin color to match owner
+		if(!H.species || H.species.flags & HAS_SKIN_COLOR)
+			base.Blend(rgb(H.r_skin, H.g_skin, H.b_skin), ICON_ADD)
+
 	icon = base
 	dir = SOUTH
 	src.transform = turn(src.transform, rand(70,130))

code/modules/paperwork/photocopier.dm

@@ -57,6 +57,23 @@
 						c.info += "</font>"
 						c.name = copy.name // -- Doohl
 						c.fields = copy.fields
+						c.stamps = copy.stamps
+						c.stamped = copy.stamped
+						c.ico = copy.ico
+						c.offset_x = copy.offset_x
+						c.offset_y = copy.offset_y
+						var/list/temp_overlays = copy.overlays       //Iterates through stamps
+						var/image/img                                //and puts a matching
+						for (var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
+							if (findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent"))
+								img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle")
+							else if (findtext(copy.ico[j], "deny"))
+								img = image('icons/obj/bureaucracy.dmi', "paper_stamp-x")
+							else
+								img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots")
+							img.pixel_x = copy.offset_x[j]
+							img.pixel_y = copy.offset_y[j]
+							c.overlays += img
 						c.updateinfolinks()
 						toner--
 						sleep(15)

code/modules/power/antimatter/shielding.dm

@@ -9,7 +9,7 @@ proc/cardinalrange(var/center)
 
 /obj/machinery/am_shielding
 	name = "antimatter reactor section"
-	desc = "This device was built using a plasma life-form that seems to increase plasma's natural ability to react with neutrinos while reducing the combustibility."
+	desc = "This device was built using a phoron life-form that seems to increase phoron's natural ability to react with neutrinos while reducing the combustibility."
 
 	icon = 'icons/obj/machines/antimatter.dmi'
 	icon_state = "shield"
@@ -23,7 +23,7 @@ proc/cardinalrange(var/center)
 	var/obj/machinery/power/am_control_unit/control_unit = null
 	var/processing = 0//To track if we are in the update list or not, we need to be when we are damaged and if we ever
 	var/stability = 100//If this gets low bad things tend to happen
-	var/efficiency = 1//How many cores this core counts for when doing power processing, plasma in the air and stability could affect this
+	var/efficiency = 1//How many cores this core counts for when doing power processing, phoron in the air and stability could affect this
 
 
 /obj/machinery/am_shielding/New(loc)
@@ -82,7 +82,7 @@ proc/cardinalrange(var/center)
 /obj/machinery/am_shielding/process()
 	if(!processing) . = PROCESS_KILL
 	//TODO: core functions and stability
-	//TODO: think about checking the airmix for plasma and increasing power output
+	//TODO: think about checking the airmix for phoron and increasing power output
 	return
 
 

code/modules/power/cell.dm

@@ -77,12 +77,12 @@
 
 		user << "You inject the solution into the power cell."
 
-		if(S.reagents.has_reagent("plasma", 5))
+		if(S.reagents.has_reagent("phoron", 5))
 
 			rigged = 1
 
-			log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with plasma, rigging it to explode.")
-			message_admins("LOG: [user.name] ([user.ckey]) injected a power cell with plasma, rigging it to explode.")
+			log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.")
+			message_admins("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.")
 
 		S.reagents.clear_reagents()
 

code/modules/power/lighting.dm

@@ -712,7 +712,7 @@
 
 
 // attack bulb/tube with object
-// if a syringe, can inject plasma to make it explode
+// if a syringe, can inject phoron to make it explode
 /obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user)
 	..()
 	if(istype(I, /obj/item/weapon/reagent_containers/syringe))
@@ -720,10 +720,10 @@
 
 		user << "You inject the solution into the [src]."
 
-		if(S.reagents.has_reagent("plasma", 5))
+		if(S.reagents.has_reagent("phoron", 5))
 
-			log_admin("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.")
-			message_admins("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.")
+			log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
+			message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
 
 			rigged = 1
 

code/modules/power/pacman2.dm

@@ -4,30 +4,30 @@
 //PACMAN variant that can run on the small plasma tanks.
 /obj/machinery/power/port_gen/pacman2
 	name = "Pacman II"
-	desc = "P.A.C.M.A.N. type II portable generator. Uses liquid plasma as a fuel source."
+	desc = "P.A.C.M.A.N. type II portable generator. Uses liquid phoron as a fuel source."
 	power_gen = 4500
-	var/obj/item/weapon/tank/plasma/P = null
+	var/obj/item/weapon/tank/phoron/P = null
 	var/board_path = "/obj/item/weapon/circuitboard/pacman2"
 	var/emagged = 0
 	var/heat = 0
 /*
 	process()
 		if(P)
-			if(P.air_contents.toxins <= 0)
-				P.air_contents.toxins = 0
+			if(P.air_contents.phoron <= 0)
+				P.air_contents.phoron = 0
 				eject()
 			else
-				P.air_contents.toxins -= 0.001
+				P.air_contents.phoron -= 0.001
 		return
 */
 
 	HasFuel()
-		if(P.air_contents.toxins >= 0.1)
+		if(P.air_contents.phoron >= 0.1)
 			return 1
 		return 0
 
 	UseFuel()
-		P.air_contents.toxins -= 0.01
+		P.air_contents.phoron -= 0.01
 		return
 
 	New()
@@ -56,7 +56,7 @@
 
 	examine()
 		..()
-		usr << "\blue The generator has [P.air_contents.toxins] units of fuel left, producing [power_gen] per cycle."
+		usr << "\blue The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle."
 		if(crit_fail) usr << "\red The generator seems to have broken down."
 
 	handleInactive()
@@ -73,14 +73,14 @@
 			explosion(get_turf(src), 2, 5, 2, -1)
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		if(istype(O, /obj/item/weapon/tank/plasma))
+		if(istype(O, /obj/item/weapon/tank/phoron))
 			if(P)
-				user << "\red The generator already has a plasma tank loaded!"
+				user << "\red The generator already has a phoron tank loaded!"
 				return
 			P = O
 			user.drop_item()
 			O.loc = src
-			user << "\blue You add the plasma tank to the generator."
+			user << "\blue You add the phoron tank to the generator."
 		else if (istype(O, /obj/item/weapon/card/emag))
 			var/obj/item/weapon/card/emag/E = O
 			if(E.uses)
@@ -144,9 +144,9 @@
 			else
 				dat += text("Generator: <A href='?src=\ref[src];action=enable'>Off</A><br>")
 			if(P)
-				dat += text("Currently loaded plasma tank: [P.air_contents.toxins]<br>")
+				dat += text("Currently loaded phoron tank: [P.air_contents.phoron]<br>")
 			else
-				dat += text("No plasma tank currently loaded.<br>")
+				dat += text("No phoron tank currently loaded.<br>")
 			dat += text("Power output: <A href='?src=\ref[src];action=lower_power'>-</A> [power_gen * power_output] <A href='?src=\ref[src];action=higher_power'>+</A><br>")
 			dat += text("Heat: [heat]<br>")
 			dat += "<br><A href='?src=\ref[src];action=close'>Close</A>"

code/modules/power/port_gen.dm

@@ -33,7 +33,7 @@ tank [un]loading stuff
 turn on/off
 
 /obj/machinery/power/port_gen/examine()
-display round(lastgen) and plasmatank amount
+display round(lastgen) and phorontank amount
 
 */
 
@@ -99,7 +99,7 @@ display round(lastgen) and plasmatank amount
 	var/sheets = 0
 	var/max_sheets = 100
 	var/sheet_name = ""
-	var/sheet_path = /obj/item/stack/sheet/mineral/plasma
+	var/sheet_path = /obj/item/stack/sheet/mineral/phoron
 	var/board_path = "/obj/item/weapon/circuitboard/pacman"
 	var/sheet_left = 0 // How much is left of the sheet
 	var/time_per_sheet = 40

code/modules/power/singularity/collector.dm

@@ -3,7 +3,7 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector
 	name = "Radiation Collector Array"
-	desc = "A device which uses Hawking Radiation and plasma to produce power."
+	desc = "A device which uses Hawking Radiation and phoron to produce power."
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "ca"
 	anchored = 0
@@ -11,7 +11,7 @@ var/global/list/rad_collectors = list()
 	directwired = 1
 	req_access = list(access_engine_equip)
 //	use_power = 0
-	var/obj/item/weapon/tank/plasma/P = null
+	var/obj/item/weapon/tank/phoron/P = null
 	var/last_power = 0
 	var/active = 0
 	var/locked = 0
@@ -27,9 +27,9 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector/process()
 	if(P)
-		if(P.air_contents.toxins <= 0)
+		if(P.air_contents.phoron <= 0)
 			investigate_log("<font color='red'>out of fuel</font>.","singulo")
-			P.air_contents.toxins = 0
+			P.air_contents.phoron = 0
 			eject()
 		else
 			P.air_contents.adjust(tx = -0.001*drainratio)
@@ -42,7 +42,7 @@ var/global/list/rad_collectors = list()
 			toggle_power()
 			user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
 			"You turn the [src.name] [active? "on":"off"].")
-			investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
+			investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.phoron/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
 			return
 		else
 			user << "\red The controls are locked!"
@@ -54,12 +54,12 @@ var/global/list/rad_collectors = list()
 	if(istype(W, /obj/item/device/analyzer))
 		user << "\blue The [W.name] detects that [last_power]W were recently produced."
 		return 1
-	else if(istype(W, /obj/item/weapon/tank/plasma))
+	else if(istype(W, /obj/item/weapon/tank/phoron))
 		if(!src.anchored)
 			user << "\red The [src] needs to be secured to the floor first."
 			return 1
 		if(src.P)
-			user << "\red There's already a plasma tank loaded."
+			user << "\red There's already a phoron tank loaded."
 			return 1
 		user.drop_item()
 		src.P = W
@@ -71,7 +71,7 @@ var/global/list/rad_collectors = list()
 			return 1
 	else if(istype(W, /obj/item/weapon/wrench))
 		if(P)
-			user << "\blue Remove the plasma tank first."
+			user << "\blue Remove the phoron tank first."
 			return 1
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 		src.anchored = !src.anchored
@@ -107,7 +107,7 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector/proc/eject()
 	locked = 0
-	var/obj/item/weapon/tank/plasma/Z = src.P
+	var/obj/item/weapon/tank/phoron/Z = src.P
 	if (!Z)
 		return
 	Z.loc = get_turf(src)
@@ -121,7 +121,7 @@ var/global/list/rad_collectors = list()
 /obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
 	if(P && active)
 		var/power_produced = 0
-		power_produced = P.air_contents.toxins*pulse_strength*20
+		power_produced = P.air_contents.phoron*pulse_strength*20
 		add_avail(power_produced)
 		last_power = power_produced
 		return

code/modules/power/solar.dm

@@ -534,4 +534,4 @@ var/list/solars_list = list()
 
 /obj/item/weapon/paper/solar
 	name = "paper- 'Going green! Setup your own solar array instructions.'"
-	info = "<h1>Welcome</h1><p>At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or plasma! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.</p><p>You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!.</p><p>Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.</p><p>Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.</p><p>That's all to it, be safe, be green!</p>"
+	info = "<h1>Welcome</h1><p>At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.</p><p>You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!.</p><p>Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the sun's movements and to send commands to the solar panels to change direction with the sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.</p><p>Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.</p><p>That's all to it, be safe, be green!</p>"

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

@@ -196,13 +196,13 @@ obj/item/weapon/gun/energy/staff/focus
 	*/
 
 /obj/item/weapon/gun/energy/toxgun
-	name = "plasma pistol"
-	desc = "A specialized firearm designed to fire lethal bolts of toxins."
+	name = "phoron pistol"
+	desc = "A specialized firearm designed to fire lethal bolts of phoron."
 	icon_state = "toxgun"
 	fire_sound = 'sound/effects/stealthoff.ogg'
 	w_class = 3.0
-	origin_tech = "combat=5;plasmatech=4"
-	projectile_type = "/obj/item/projectile/energy/plasma"
+	origin_tech = "combat=5;phorontech=4"
+	projectile_type = "/obj/item/projectile/energy/phoron"
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "L.W.A.P. Sniper Rifle"

code/modules/projectiles/projectile/change.dm

@@ -61,7 +61,7 @@
 					else			new_mob = new /mob/living/carbon/alien/larva(M.loc)
 				new_mob.universal_speak = 1
 			if("human")
-				new_mob = new /mob/living/carbon/human(M.loc)
+				new_mob = new /mob/living/carbon/human(M.loc, pick(all_species))
 				if(M.gender == MALE)
 					new_mob.gender = MALE
 					new_mob.name = pick(first_names_male)
@@ -73,10 +73,6 @@
 
 				var/datum/preferences/A = new()	//Randomize appearance for the human
 				A.randomize_appearance_for(new_mob)
-
-				var/mob/living/carbon/human/H = new_mob
-				var/newspecies = pick(all_species)
-				H.set_species(newspecies)
 			else
 				return
 

code/modules/projectiles/projectile/energy.dm

@@ -59,8 +59,8 @@
 	damage_type = TOX
 	weaken = 5
 
-/obj/item/projectile/energy/plasma
-	name = "plasma bolt"
+/obj/item/projectile/energy/phoron
+	name = "phoron bolt"
 	icon_state = "energy"
 	damage = 20
 	damage_type = TOX

code/modules/reagents/Chemistry-Holder.dm

@@ -27,7 +27,7 @@ datum
 				//Chemical Reactions - Initialises all /datum/chemical_reaction into a list
 				// It is filtered into multiple lists within a list.
 				// For example:
-				// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma
+				// chemical_reaction_list["phoron"] is a list of all reactions relating to phoron
 
 				var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
 				chemical_reactions_list = list()

code/modules/reagents/Chemistry-Machinery.dm

@@ -63,7 +63,7 @@
 		options[/obj/item/weapon/stock_parts/matter_bin/adv] = "Give it an advanced matter bin to fix it."
 		options[/obj/item/stack/sheet/mineral/diamond] = "Line up a cut diamond with the nozzle to fix it."
 		options[/obj/item/stack/sheet/mineral/uranium] = "Position a uranium sheet inside to fix it."
-		options[/obj/item/stack/sheet/mineral/plasma] = "Enter a block of plasma to fix it."
+		options[/obj/item/stack/sheet/mineral/phoron] = "Enter a block of phoron to fix it."
 		options[/obj/item/stack/sheet/mineral/silver] = "Cover the internals with a silver lining to fix it."
 		options[/obj/item/stack/sheet/mineral/gold] = "Wire a golden filament to fix it."
 		options[/obj/item/stack/sheet/plasteel] = "Surround the outside with a plasteel cover to fix it."
@@ -890,7 +890,7 @@
 	var/list/blend_items = list (
 
 		//Sheets
-		/obj/item/stack/sheet/mineral/plasma = list("plasma" = 20),
+		/obj/item/stack/sheet/mineral/phoron = list("phoron" = 20),
 		/obj/item/stack/sheet/mineral/uranium = list("uranium" = 20),
 		/obj/item/stack/sheet/mineral/clown = list("banana" = 20),
 		/obj/item/stack/sheet/mineral/silver = list("silver" = 20),

code/modules/reagents/Chemistry-Reagents.dm

@@ -1543,10 +1543,10 @@ datum
 				..()
 				return
 
-		toxin/plasma
-			name = "Plasma"
-			id = "plasma"
-			description = "Plasma in its liquid form."
+		toxin/phoron
+			name = "Phoron"
+			id = "phoron"
+			description = "Phoron in its liquid form."
 			reagent_state = LIQUID
 			color = "#E71B00" // rgb: 231, 27, 0
 			toxpwr = 3

code/modules/reagents/Chemistry-Recipes.dm

@@ -117,7 +117,7 @@ datum
 			id = "oxycodone"
 			result = "oxycodone"
 			required_reagents = list("ethanol" = 1, "tramadol" = 1)
-			required_catalysts = list("plasma" = 1)
+			required_catalysts = list("phoron" = 1)
 			result_amount = 1
 
 		//cyanide
@@ -145,7 +145,7 @@ datum
 			name = "Lexorin"
 			id = "lexorin"
 			result = "lexorin"
-			required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1)
+			required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
 			result_amount = 3
 
 		space_drugs
@@ -209,7 +209,7 @@ datum
 			id = "peridaxon"
 			result = "peridaxon"
 			required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
-			required_catalysts = list("plasma" = 5)
+			required_catalysts = list("phoron" = 5)
 			result_amount = 2
 
 		virus_food
@@ -224,7 +224,7 @@ datum
 			id = "leporazine"
 			result = "leporazine"
 			required_reagents = list("silicon" = 1, "copper" = 1)
-			required_catalysts = list("plasma" = 5)
+			required_catalysts = list("phoron" = 5)
 			result_amount = 2
 
 		cryptobiolin
@@ -252,8 +252,8 @@ datum
 			name = "Dexalin"
 			id = "dexalin"
 			result = "dexalin"
-			required_reagents = list("oxygen" = 2, "plasma" = 0.1)
-			required_catalysts = list("plasma" = 5)
+			required_reagents = list("oxygen" = 2, "phoron" = 0.1)
+			required_catalysts = list("phoron" = 5)
 			result_amount = 1
 
 		dermaline
@@ -302,8 +302,8 @@ datum
 			name = "Clonexadone"
 			id = "clonexadone"
 			result = "clonexadone"
-			required_reagents = list("cryoxadone" = 1, "sodium" = 1, "plasma" = 0.1)
-			required_catalysts = list("plasma" = 5)
+			required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1)
+			required_catalysts = list("phoron" = 5)
 			result_amount = 2
 
 		spaceacillin
@@ -401,7 +401,7 @@ datum
 			name = "Napalm"
 			id = "napalm"
 			result = null
-			required_reagents = list("aluminum" = 1, "plasma" = 1, "sacid" = 1 )
+			required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 )
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/turf/location = get_turf(holder.my_atom.loc)
@@ -483,7 +483,7 @@ datum
 			name = "Potassium Chlorophoride"
 			id = "potassium_chlorophoride"
 			result = "potassium_chlorophoride"
-			required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloralhydrate" = 1)
+			required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1)
 			result_amount = 4
 
 		stoxin
@@ -521,15 +521,15 @@ datum
 			required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1)
 			result_amount = 3
 
-		plasmasolidification
-			name = "Solid Plasma"
-			id = "solidplasma"
+		phoronsolidification
+			name = "Solid Phoron"
+			id = "solidphoron"
 			result = null
-			required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
+			required_reagents = list("iron" = 5, "frostoil" = 5, "phoron" = 20)
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/location = get_turf(holder.my_atom)
-				new /obj/item/stack/sheet/mineral/plasma(location)
+				new /obj/item/stack/sheet/mineral/phoron(location)
 				return
 
 		plastication
@@ -592,7 +592,7 @@ datum
 			id = "condensedcapsaicin"
 			result = "condensedcapsaicin"
 			required_reagents = list("capsaicin" = 2)
-			required_catalysts = list("plasma" = 5)
+			required_catalysts = list("phoron" = 5)
 			result_amount = 1
 ///////////////////////////////////////////////////////////////////////////////////
 
@@ -1004,13 +1004,13 @@ datum
 			name = "Slime Spawn"
 			id = "m_spawn"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/grey
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 				for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null))
-					O.show_message(text("\red Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
+					O.show_message(text("\red Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
 				var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
 				S.loc = get_turf_loc(holder.my_atom)
 
@@ -1033,7 +1033,7 @@ datum
 			name = "Mutation Toxin"
 			id = "mutationtoxin"
 			result = "mutationtoxin"
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_other = 1
 			required_container = /obj/item/slime_extract/green
@@ -1043,7 +1043,7 @@ datum
 			name = "Slime Metal"
 			id = "m_metal"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/metal
 			required_other = 1
@@ -1060,7 +1060,7 @@ datum
 			name = "Slime Crit"
 			id = "m_tele"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/gold
 			required_other = 1
@@ -1107,7 +1107,7 @@ datum
 			name = "Slime Bork"
 			id = "m_tele2"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/silver
 			required_other = 1
@@ -1137,7 +1137,7 @@ datum
 			name = "Slime Frost Oil"
 			id = "m_frostoil"
 			result = "frostoil"
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 10
 			required_container = /obj/item/slime_extract/blue
 			required_other = 1
@@ -1146,7 +1146,7 @@ datum
 			name = "Slime Freeze"
 			id = "m_freeze"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/darkblue
 			required_other = 1
@@ -1173,7 +1173,7 @@ datum
 			name = "Slime fire"
 			id = "m_fire"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/orange
 			required_other = 1
@@ -1186,7 +1186,7 @@ datum
 
 					var/datum/gas_mixture/napalm = new
 
-					napalm.toxins = 25
+					napalm.phoron = 25
 					napalm.temperature = 1400
 
 					target_tile.assume_air(napalm)
@@ -1209,7 +1209,7 @@ datum
 			name = "Slime Powercell"
 			id = "m_cell"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/yellow
 			required_other = 1
@@ -1236,7 +1236,7 @@ datum
 			name = "Slime Steroid"
 			id = "m_steroid"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/purple
 			required_other = 1
@@ -1261,12 +1261,12 @@ datum
 			name = "Slime Plasma"
 			id = "m_plasma"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/darkpurple
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
-				var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
+				var/obj/item/stack/sheet/mineral/phoron/P = new /obj/item/stack/sheet/mineral/phoron
 				P.amount = 10
 				P.loc = get_turf_loc(holder.my_atom)
 
@@ -1275,7 +1275,7 @@ datum
 			name = "Slime Glycerol"
 			id = "m_glycerol"
 			result = "glycerol"
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 8
 			required_container = /obj/item/slime_extract/red
 			required_other = 1
@@ -1301,7 +1301,7 @@ datum
 			name = "Slime Potion"
 			id = "m_potion"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/pink
 			required_other = 1
@@ -1315,7 +1315,7 @@ datum
 			name = "Advanced Mutation Toxin"
 			id = "mutationtoxin2"
 			result = "amutationtoxin"
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_other = 1
 			required_container = /obj/item/slime_extract/black
@@ -1325,7 +1325,7 @@ datum
 			name = "Slime Explosion"
 			id = "m_explosion"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/oil
 			required_other = 1
@@ -1341,7 +1341,7 @@ datum
 			result = null
 			result_amount = 1
 			required_container = /obj/item/slime_extract/lightpink
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 				var/obj/item/weapon/slimepotion2/P = new /obj/item/weapon/slimepotion2
@@ -1351,7 +1351,7 @@ datum
 			name = "Slime Golem"
 			id = "m_golem"
 			result = null
-			required_reagents = list("plasma" = 5)
+			required_reagents = list("phoron" = 5)
 			result_amount = 1
 			required_container = /obj/item/slime_extract/adamantine
 			required_other = 1
@@ -1651,11 +1651,11 @@ datum
 			required_reagents = list("tequilla" = 2, "orangejuice" = 1)
 			result_amount = 3
 
-		toxins_special
+		phoron_special
 			name = "Toxins Special"
-			id = "toxinsspecial"
-			result = "toxinsspecial"
-			required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2)
+			id = "phoronspecial"
+			result = "phoronspecial"
+			required_reagents = list("rum" = 2, "vermouth" = 1, "phoron" = 2)
 			result_amount = 5
 
 		beepsky_smash

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -158,8 +158,8 @@
 					icon_state = "tequillasunriseglass"
 					name = "Tequilla Sunrise"
 					desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
-				if("toxinsspecial")
-					icon_state = "toxinsspecialglass"
+				if("phoronspecial")
+					icon_state = "phoronspecialglass"
 					name = "Toxins Special"
 					desc = "Whoah, this thing is on FIRE"
 				if("beepskysmash")

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -394,7 +394,7 @@
 			if(4)
 				reagents.add_reagent("sprinkles", 3)
 			if(5)
-				reagents.add_reagent("plasma", 3)
+				reagents.add_reagent("phoron", 3)
 			if(6)
 				reagents.add_reagent("coco", 3)
 			if(7)

code/modules/reagents/reagent_dispenser.dm

@@ -118,6 +118,8 @@
 		user.visible_message("[user] wrenches [src]'s faucet [modded ? "closed" : "open"].", \
 			"You wrench [src]'s faucet [modded ? "closed" : "open"]")
 		modded = modded ? 0 : 1
+		if (modded)
+			leak_fuel(amount_per_transfer_from_this)
 	if (istype(W,/obj/item/device/assembly_holder))
 		if (rig)
 			user << "\red There is another device in the way."
@@ -168,6 +170,18 @@
 	if(temperature > T0C+500)
 		explode()
 	return ..()
+	
+/obj/structure/reagent_dispensers/fueltank/Move()
+	if (..() && modded)
+		leak_fuel(amount_per_transfer_from_this/10.0)
+	
+/obj/structure/reagent_dispensers/fueltank/proc/leak_fuel(amount)
+	if (reagents.total_volume == 0)
+		return
+	
+	amount = min(amount, reagents.total_volume)
+	reagents.remove_reagent("fuel",amount)
+	new /obj/effect/decal/cleanable/liquid_fuel(src.loc, amount)
 
 /obj/structure/reagent_dispensers/peppertank
 	name = "Pepper Spray Refiller"

code/modules/research/designs.dm

@@ -11,7 +11,7 @@ they are simply references used as part of a "has materials?" type proc. They al
 The currently supporting non-reagent materials:
 - $metal (/obj/item/stack/metal). One sheet = 3750 units.
 - $glass (/obj/item/stack/glass). One sheet = 3750 units.
-- $plasma (/obj/item/stack/plasma). One sheet = 3750 units.
+- $phoron (/obj/item/stack/phoron). One sheet = 3750 units.
 - $silver (/obj/item/stack/silver). One sheet = 3750 units.
 - $gold (/obj/item/stack/gold). One sheet = 3750 units.
 - $uranium (/obj/item/stack/uranium). One sheet = 3750 units.
@@ -24,7 +24,7 @@ Don't add new keyword/IDs if they are made from an existing one (such as rods wh
 Design Guidlines
 - The reliability formula for all R&D built items is reliability_base (a fixed number) + total tech levels required to make it +
 reliability_mod (starts at 0, gets improved through experimentation). Example: PACMAN generator. 79 base reliablity + 6 tech
-(3 plasmatech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY.
+(3 phorontech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY.
 - When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed.
 - A single sheet of anything is 3750 units of material. Materials besides metal/glass require help from other jobs (mining for
 other types of metals and chemistry for reagents).
@@ -585,7 +585,7 @@ datum/design/posibrain
 	req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4)
 
 	build_type = PROTOLATHE
-	materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100)
+	materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$phoron" = 500, "$diamond" = 100)
 	build_path = "/obj/item/device/mmi/posibrain"
 
 ///////////////////////////////////
@@ -803,13 +803,13 @@ datum/design/mech_repair_droid
 	build_path = "/obj/item/mecha_parts/mecha_equipment/repair_droid"
 	category = "Exosuit Equipment"
 
-datum/design/mech_plasma_generator
-	name = "Exosuit Module Design (Plasma Converter Module)"
-	desc = "Exosuit-mounted plasma converter."
-	id = "mech_plasma_generator"
+datum/design/mech_phoron_generator
+	name = "Exosuit Module Design (Phoron Generator Module)"
+	desc = "Exosuit-mounted phoron generator."
+	id = "mech_phoron_generator"
 	build_type = MECHFAB
-	req_tech = list("plasmatech" = 2, "powerstorage"= 2, "engineering" = 2)
-	build_path = "/obj/item/mecha_parts/mecha_equipment/plasma_generator"
+	req_tech = list("phorontech" = 2, "powerstorage"= 2, "engineering" = 2)
+	build_path = "/obj/item/mecha_parts/mecha_equipment/phoron_generator"
 	category = "Exosuit Equipment"
 
 datum/design/mech_energy_relay
@@ -1228,7 +1228,7 @@ datum/design/pacman
 	name = "PACMAN-type Generator Board"
 	desc = "The circuit board that for a PACMAN-type portable generator."
 	id = "pacman"
-	req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3)
+	req_tech = list("programming" = 3, "phorontech" = 3, "powerstorage" = 3, "engineering" = 3)
 	build_type = IMPRINTER
 	reliability_base = 79
 	materials = list("$glass" = 2000, "sacid" = 20)
@@ -1384,7 +1384,7 @@ datum/design/bluespacebeaker
 	id = "bluespacebeaker"
 	req_tech = list("bluespace" = 2, "materials" = 6)
 	build_type = PROTOLATHE
-	materials = list("$metal" = 3000, "$plasma" = 3000, "$diamond" = 500)
+	materials = list("$metal" = 3000, "$phoron" = 3000, "$diamond" = 500)
 	reliability_base = 76
 	build_path = "/obj/item/weapon/reagent_containers/glass/beaker/bluespace"
 
@@ -1565,13 +1565,13 @@ datum/design/stunshell
 	materials = list("$metal" = 4000)
 	build_path = "/obj/item/ammo_casing/shotgun/stunshell"
 
-datum/design/plasmapistol
-	name = "plasma pistol"
-	desc = "A specialized firearm designed to fire lethal bolts of toxins."
+datum/design/phoronpistol
+	name = "phoron pistol"
+	desc = "A specialized firearm designed to fire lethal bolts of phoron."
 	id = "ppistol"
-	req_tech = list("combat" = 5, "plasmatech" = 4)
+	req_tech = list("combat" = 5, "phorontech" = 4)
 	build_type = PROTOLATHE
-	materials = list("$metal" = 5000, "$glass" = 1000, "$plasma" = 3000)
+	materials = list("$metal" = 5000, "$glass" = 1000, "$phoron" = 3000)
 	build_path = "/obj/item/weapon/gun/energy/toxgun"
 /////////////////////////////////////////
 /////////////////Mining//////////////////
@@ -1599,9 +1599,9 @@ datum/design/plasmacutter
 	name = "Plasma Cutter"
 	desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	id = "plasmacutter"
-	req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
+	req_tech = list("materials" = 4, "phorontech" = 3, "engineering" = 3)
 	build_type = PROTOLATHE
-	materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+	materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$phoron" = 500)
 	reliability_base = 79
 	build_path = "/obj/item/weapon/pickaxe/plasmacutter"
 
@@ -1662,7 +1662,7 @@ datum/design/bluespace_crystal
 	id = "bluespace_crystal"
 	req_tech = list("bluespace" = 5, "materials" = 7)
 	build_type = PROTOLATHE
-	materials = list("$gold" = 1500, "$diamond" = 3000, "$plasma" = 1500)
+	materials = list("$gold" = 1500, "$diamond" = 3000, "$phoron" = 1500)
 	reliability_base = 100
 	build_path = "/obj/item/bluespace_crystal/artificial"
 
@@ -1830,14 +1830,14 @@ datum/design/cart_mime
 	build_path = "/obj/item/weapon/cartridge/mime"
 */
 
-datum/design/cart_toxins
+datum/design/cart_science
 	name = "Signal Ace 2 Cartridge"
 	desc = "A data cartridge for portable microcomputers."
-	id = "cart_toxins"
+	id = "cart_science"
 	req_tech = list("engineering" = 2, "powerstorage" = 3)
 	build_type = PROTOLATHE
 	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = "/obj/item/weapon/cartridge/toxins"
+	build_path = "/obj/item/weapon/cartridge/science"
 datum/design/cart_quartermaster
 	name = "Space Parts & Space Vendors Cartridge"
 	desc = "A data cartridge for portable microcomputers."