Now

code/game/objects/items/blueprints.dm

@@ -74,7 +74,7 @@ move an amendment</a> to the drawing.</p>
 
 
 /obj/item/blueprints/proc/get_area()
-	var/turf/T = get_turf_loc(usr)
+	var/turf/T = get_turf(usr)
 	var/area/A = T.loc
 	A = A.master
 	return A
@@ -101,7 +101,7 @@ move an amendment</a> to the drawing.</p>
 
 /obj/item/blueprints/proc/create_area()
 	//world << "DEBUG: create_area"
-	var/res = detect_room(get_turf_loc(usr))
+	var/res = detect_room(get_turf(usr))
 	if(!istype(res,/list))
 		switch(res)
 			if(ROOM_ERR_SPACE)

code/game/objects/items/devices/PDA/PDA.dm

@@ -333,7 +333,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	return
 
 
-/obj/item/device/pda/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
+/obj/item/device/pda/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 	ui_tick++
 	var/datum/nanoui/old_ui = nanomanager.get_open_ui(user, src, "main")
 	var/auto_update = 1
@@ -445,13 +445,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			var/datum/gas_mixture/environment = T.return_air()
 
 			var/pressure = environment.return_pressure()
-			var/total_moles = environment.total_moles()
+			var/total_moles = environment.total_moles
 
 			if (total_moles)
-				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/o2_level = environment.gas["oxygen"]/total_moles
+				var/n2_level = environment.gas["nitrogen"]/total_moles
+				var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+				var/plasma_level = environment.gas["toxins"]/total_moles
 				var/unknown_level =  1-(o2_level+n2_level+co2_level+plasma_level)
 				data["aircontents"] = list(\
 					"pressure" = "[round(pressure,0.1)]",\
@@ -467,7 +467,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			data["aircontents"] = list("reading" = 0)
 
 	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
@@ -778,14 +778,18 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 //pAI FUNCTIONS===================================
 		if("pai")
-			switch(href_list["option"])
-				if("1")		// Configure pAI device
-					pai.attack_self(U)
-				if("2")		// Eject pAI device
-					var/turf/T = get_turf_or_move(src.loc)
-					if(T)
-						pai.loc = T
-						pai = null
+			if(pai)
+				if(pai.loc != src)
+					pai = null
+				else
+					switch(href_list["option"])
+						if("1")		// Configure pAI device
+							pai.attack_self(U)
+						if("2")		// Eject pAI device
+							var/turf/T = get_turf_or_move(src.loc)
+							if(T)
+								pai.loc = T
+								pai = null
 
 		else
 			mode = text2num(href_list["choice"])
@@ -924,7 +928,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(useTC != 2) // Does our recipient have a broadcaster on their level?
 			U << "ERROR: Cannot reach recipient."
 			return
-		useMS.send_pda_message("[P.owner]","[owner]","[t]")
+		var/send_result = useMS.send_pda_message("[P.owner]","[owner]","[t]")
+		if (send_result)
+			U << "ERROR: Messaging server rejected your message. Reason: contains '[send_result]'."
+			return
+
 		tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))
 		P.tnote.Add(list(list("sent" = 0, "owner" = "[owner]", "job" = "[ownjob]", "message" = "[t]", "target" = "\ref[src]")))
 		for(var/mob/M in player_list)
@@ -1165,24 +1173,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					O << "\red [user] has used [src] on \icon[icon] [A]"
 				var/pressure = A:air_contents.return_pressure()
 
-				var/total_moles = A:air_contents.total_moles()
+				var/total_moles = A:air_contents.total_moles
 
 				user << "\blue Results of analysis of \icon[icon]"
 				if (total_moles>0)
-					var/o2_concentration = A:air_contents.oxygen/total_moles
-					var/n2_concentration = A:air_contents.nitrogen/total_moles
-					var/co2_concentration = A:air_contents.carbon_dioxide/total_moles
-					var/plasma_concentration = A:air_contents.toxins/total_moles
-
-					var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
 					user << "\blue Pressure: [round(pressure,0.1)] kPa"
-					user << "\blue Nitrogen: [round(n2_concentration*100)]%"
-					user << "\blue Oxygen: [round(o2_concentration*100)]%"
-					user << "\blue CO2: [round(co2_concentration*100)]%"
-					user << "\blue Plasma: [round(plasma_concentration*100)]%"
-					if(unknown_concentration>0.01)
-						user << "\red Unknown: [round(unknown_concentration*100)]%"
+					for(var/g in A:air_contents.gas)
+						user << "\blue [gas_data.name[g]]: [round((A:air_contents.gas[g] / total_moles) * 100)]%"
 					user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]&deg;C"
 				else
 					user << "\blue Tank is empty!"
@@ -1194,31 +1191,66 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 				var/obj/machinery/atmospherics/pipe/tank/T = A
 				var/pressure = T.parent.air.return_pressure()
-				var/total_moles = T.parent.air.total_moles()
+				var/total_moles = T.parent.air.total_moles
 
 				user << "\blue Results of analysis of \icon[icon]"
 				if (total_moles>0)
-					var/o2_concentration = T.parent.air.oxygen/total_moles
-					var/n2_concentration = T.parent.air.nitrogen/total_moles
-					var/co2_concentration = T.parent.air.carbon_dioxide/total_moles
-					var/plasma_concentration = T.parent.air.toxins/total_moles
-
-					var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
 					user << "\blue Pressure: [round(pressure,0.1)] kPa"
-					user << "\blue Nitrogen: [round(n2_concentration*100)]%"
-					user << "\blue Oxygen: [round(o2_concentration*100)]%"
-					user << "\blue CO2: [round(co2_concentration*100)]%"
-					user << "\blue Plasma: [round(plasma_concentration*100)]%"
-					if(unknown_concentration>0.01)
-						user << "\red Unknown: [round(unknown_concentration*100)]%"
+					for(var/g in T.parent.air.gas)
+						user << "\blue [gas_data.name[g]]: [round((T.parent.air.gas[g] / total_moles) * 100)]%"
 					user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]&deg;C"
 				else
 					user << "\blue Tank is empty!"
 
 	if (!scanmode && istype(A, /obj/item/weapon/paper) && owner)
-		note = A:info
-		user << "\blue Paper scanned." //concept of scanning paper copyright brainoblivion 2009
+		// JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents,
+		// as this will clobber the HTML, but at least it lets you scan a document. You can restore the original
+		// notes by editing the note again. (Was going to allow you to edit, but scanned documents are too long.)
+		var/raw_scan = (A:info)
+		var/formatted_scan = ""
+		// Scrub out the tags (replacing a few formatting ones along the way)
+
+		// Find the beginning and end of the first tag.
+		var/tag_start = findtext(raw_scan,"<")
+		var/tag_stop = findtext(raw_scan,">")
+
+		// Until we run out of complete tags...
+		while(tag_start&&tag_stop)
+			var/pre = copytext(raw_scan,1,tag_start) // Get the stuff that comes before the tag
+			var/tag = lowertext(copytext(raw_scan,tag_start+1,tag_stop)) // Get the tag so we can do intellegent replacement
+			var/tagend = findtext(tag," ") // Find the first space in the tag if there is one.
+
+			// Anything that's before the tag can just be added as is.
+			formatted_scan = formatted_scan+pre
+
+			// If we have a space after the tag (and presumably attributes) just crop that off.
+			if (tagend)
+				tag=copytext(tag,1,tagend)
+
+			if (tag=="p"||tag=="/p"||tag=="br") // Check if it's I vertical space tag.
+				formatted_scan=formatted_scan+"<br>" // If so, add some padding in.
+
+			raw_scan = copytext(raw_scan,tag_stop+1) // continue on with the stuff after the tag
+
+			// Look for the next tag in what's left
+			tag_start = findtext(raw_scan,"<")
+			tag_stop = findtext(raw_scan,">")
+
+		// Anything that is left in the page. just tack it on to the end as is
+		formatted_scan=formatted_scan+raw_scan
+
+    	// If there is something in there already, pad it out.
+		if (length(note)>0)
+			note = note + "<br><br>"
+
+    	// Store the scanned document to the notes
+		note = "Scanned Document. Edit to restore previous notes/delete scan.<br>----------<br>" + formatted_scan + "<br>"
+		// notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents"
+		// feature to the PDA, which would better convey the availability of the feature, but this will work for now.
+
+		// Inform the user
+		user << "\blue Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009
+
 
 
 /obj/item/device/pda/proc/explode() //This needs tuning. //Sure did.
@@ -1235,7 +1267,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		src.id.loc = get_turf(src.loc)
 	..()
 
-/obj/item/device/pda/clown/HasEntered(AM as mob|obj) //Clown PDA is slippery.
+/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if ((istype(M, /mob/living/carbon/human) && (istype(M:shoes, /obj/item/clothing/shoes) && M:shoes.flags&NOSLIP)) || M.m_intent == "walk")

code/game/objects/items/devices/PDA/cart.dm

@@ -245,12 +245,12 @@
 
 	/*		Signaler (Mode: 40)				*/
 
-	
+
 	if(istype(radio,/obj/item/radio/integrated/signal) && (mode==40))
 		var/obj/item/radio/integrated/signal/R = radio
 		values["signal_freq"] = format_frequency(R.frequency)
 		values["signal_code"] = R.code
-		
+
 
 	/*		Station Display (Mode: 42)			*/
 
@@ -266,8 +266,8 @@
 		for(var/obj/machinery/power/monitor/pMon in world)
 			if(!(pMon.stat & (NOPOWER|BROKEN)) )
 				pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]")
-				if(isnull(powmonitor)) powmonitor = pMon 
-						
+				if(isnull(powmonitor)) powmonitor = pMon
+
 		values["powermonitors"] = pMonData
 
 		values["poweravail"] = powmonitor.powernet.avail
@@ -284,22 +284,22 @@
 		var/apcData[0]
 		for(var/obj/machinery/power/apc/A in L)
 			apcData[++apcData.len] = list("Name" = html_encode(A.area.name), "Equipment" = Status[A.equipment+1], "Lights" = Status[A.lighting+1], "Environment" = Status[A.environ+1], "CellPct" = A.cell ? round(A.cell.percent(),1) : -1, "CellStatus" = A.cell ? chg[A.charging+1] : 0)
-	
+
 		values["apcs"] = apcData
 
-				      
-	
-	
+
+
+
 
 	/*		General Records (Mode: 44 / 441 / 45 / 451)	*/
 	if(mode == 44 || mode == 441 || mode == 45 || mode ==451)
 		if(istype(active1, /datum/data/record) && (active1 in data_core.general))
 			values["general"] = active1.fields
 			values["general_exists"] = 1
-								
+
 		else
 			values["general_exists"] = 0
-	
+
 
 
 	/*		Medical Records (Mode: 44 / 441)	*/
@@ -316,7 +316,7 @@
 		else
 			values["medical_exists"] = 0
 
-	/*		Security Records (Mode:45 / 451)	*/	
+	/*		Security Records (Mode:45 / 451)	*/
 
 	if(mode == 45 || mode == 451)
 		var/secData[0]
@@ -348,15 +348,15 @@
 			if(SC.botlist && SC.botlist.len)
 				for(var/obj/machinery/bot/B in SC.botlist)
 					botsCount++
-					if(B.loc) 
+					if(B.loc)
 						botsData[++botsData.len] = list("Name" = sanitize(B.name), "Location" = sanitize(B.loc.loc.name), "ref" = "\ref[B]")
-		
+
 			if(!botsData.len)
 				botsData[++botsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
 
 			beepskyData["bots"] = botsData
 			beepskyData["count"] = botsCount
-		
+
 		else
 			beepskyData["active"] = 0
 			botsData[++botsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
@@ -379,10 +379,10 @@
 				var/area/loca = QC.botstatus["loca"]
 				var/loca_name = sanitize(loca.name)
 				muleData["botstatus"] =  list("loca" = loca_name, "mode" = QC.botstatus["mode"],"home"=QC.botstatus["home"],"powr" = QC.botstatus["powr"],"retn" =QC.botstatus["retn"], "pick"=QC.botstatus["pick"], "load" = QC.botstatus["load"], "dest" = sanitize(QC.botstatus["dest"]))
-	  
+
 			else
 				muleData["botstatus"] = list("loca" = null, "mode" = -1,"home"=null,"powr" = null,"retn" =null, "pick"=null, "load" = null, "dest" = null)
-		
+
 
 			var/mulebotsCount=0
 			for(var/obj/machinery/bot/B in QC.botlist)
@@ -397,7 +397,7 @@
 			muleData["count"] = mulebotsCount
 
 		else
-			muleData["botstatus"] =  list("loca" = null, "mode" = -1,"home"=null,"powr" = null,"retn" =null, "pick"=null, "load" = null, "dest" = null) 
+			muleData["botstatus"] =  list("loca" = null, "mode" = -1,"home"=null,"powr" = null,"retn" =null, "pick"=null, "load" = null, "dest" = null)
 			muleData["active"] = 0
 			mulebotsData[++mulebotsData.len] = list("Name" = "No bots found", "Location" = "Invalid", "ref"= null)
 			muleData["bots"] = mulebotsData
@@ -411,43 +411,45 @@
 
 	if(mode==47)
 		var/supplyData[0]
-		supplyData["shuttle_moving"] = supply_shuttle.moving
-		supplyData["shuttle_eta"] = supply_shuttle.eta
-		supplyData["shuttle_loc"] = supply_shuttle.at_station ? "Station" : "Dock"
+		var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
+		if (shuttle)
+			supplyData["shuttle_moving"] = shuttle.has_arrive_time()
+			supplyData["shuttle_eta"] = shuttle.eta_minutes()
+			supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
 		var/supplyOrderCount = 0
 		var/supplyOrderData[0]
-		for(var/S in supply_shuttle.shoppinglist)
+		for(var/S in supply_controller.shoppinglist)
 			var/datum/supply_order/SO = S
-		
+
 			supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
 		if(!supplyOrderData.len)
 			supplyOrderData[++supplyOrderData.len] = list("Number" = null, "Name" = null, "OrderedBy"=null)
-		
+
 		supplyData["approved"] = supplyOrderData
-		supplyData["approved_count"] = supplyOrderCount	
+		supplyData["approved_count"] = supplyOrderCount
 
 		var/requestCount = 0
 		var/requestData[0]
-		for(var/S in supply_shuttle.requestlist)
+		for(var/S in supply_controller.requestlist)
 			var/datum/supply_order/SO = S
 			requestCount++
 			requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
 		if(!requestData.len)
 			requestData[++requestData.len] = list("Number" = null, "Name" = null, "orderedBy" = null, "Comment" = null)
-	
+
 		supplyData["requests"] = requestData
 		supplyData["requests_count"] = requestCount
 
 
 		values["supply"] = supplyData
 
-	
+
 
 	/* 	Janitor Supplies Locator  (Mode: 49)      */
 	if(mode==49)
 		var/JaniData[0]
 		var/turf/cl = get_turf(src)
-	
+
 		if(cl)
 			JaniData["user_loc"] = list("x" = cl.x, "y" = cl.y)
 		else
@@ -460,14 +462,14 @@
 					continue
 				var/direction = get_dir(src, M)
 				MopData[++MopData.len] = list ("x" = ml.x, "y" = ml.y, "dir" = uppertext(dir2text(direction)), "status" = M.reagents.total_volume ? "Wet" : "Dry")
-	
+
 		if(!MopData.len)
 			MopData[++MopData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-	
+
 
 		var/BucketData[0]
 		for(var/obj/structure/mopbucket/B in world)
-			var/turf/bl = get_turf(B)	
+			var/turf/bl = get_turf(B)
 			if(bl)
 				if(bl.z != cl.z)
 					continue
@@ -485,8 +487,8 @@
 					continue
 				var/direction = get_dir(src,B)
 				CbotData[++CbotData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.on ? "Online" : "Offline")
-	
-	
+
+
 		if(!CbotData.len)
 			CbotData[++CbotData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
 		var/CartData[0]
@@ -499,7 +501,7 @@
 				CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.reagents.total_volume/100)
 		if(!CartData.len)
 			CartData[++CartData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
-	
+
 
 
 
@@ -510,7 +512,7 @@
 		values["janitor"] = JaniData
 
 	return values
-			
+
 
 
 
@@ -523,8 +525,8 @@
 		usr << browse(null, "window=pda")
 		return
 
-		
-		
+
+
 
 	switch(href_list["choice"])
 		if("Medical Records")
@@ -575,10 +577,10 @@
 				if("alert")
 					post_status("alert", href_list["alert"])
 				if("setmsg1")
-					message1 = input("Line 1", "Enter Message Text", message1) as text|null
+					message1 = reject_bad_text(trim(copytext(sanitize(input("Line 1", "Enter Message Text", message1) as text|null), 1, 40)), 40)
 					updateSelfDialog()
 				if("setmsg2")
-					message2 = input("Line 2", "Enter Message Text", message2) as text|null
+					message2 = reject_bad_text(trim(copytext(sanitize(input("Line 2", "Enter Message Text", message2) as text|null), 1, 40)), 40)
 					updateSelfDialog()
 				else
 					post_status(href_list["statdisp"])

code/game/objects/items/devices/debugger.dm

@@ -16,8 +16,9 @@
 	throw_range = 15
 	throw_speed = 3
 	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	m_amt = 50
-	g_amt = 20
+
+	matter = list("metal" = 50,"glass" = 20)
+
 	origin_tech = "magnets=1;engineering=1"
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 

code/game/objects/items/devices/flashlight.dm

@@ -7,8 +7,7 @@
 	w_class = 2
 	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
-	m_amt = 50
-	g_amt = 20
+	matter = list("glass" = 20,"metal" = 50)
 	icon_action_button = "action_flashlight"
 	var/on = 0
 	var/brightness_on = 4 //luminosity when on
@@ -137,8 +136,7 @@
 	brightness_on = 5
 	w_class = 4
 	flags = FPRINT | TABLEPASS | CONDUCT
-	m_amt = 0
-	g_amt = 0
+	matter = list("glass" = 0,"metal" = 0)
 	on = 1
 
 
@@ -290,7 +288,7 @@ var/charge_tick = 0
 	return
 // This code... Gave me cancer... -Dalekfodder
 
-		
+
 /obj/item/device/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"
@@ -299,16 +297,15 @@ var/charge_tick = 0
 	icon_state = "floor1" //not a slime extract sprite but... something close enough!
 	item_state = "slime"
 	w_class = 1
-	m_amt = 0
-	g_amt = 0
+	matter = list("glass" = 0,"metal" = 0)
 	brightness_on = 6
 	on = 1 //Bio-luminesence has one setting, on.
-	
+
 /obj/item/device/flashlight/slime/New()
 	SetLuminosity(brightness_on)
 	spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me!
 		update_brightness()
 		icon_state = initial(icon_state)
-	
+
 /obj/item/device/flashlight/slime/attack_self(mob/user)
 	return //Bio-luminescence does not toggle.

code/game/objects/items/devices/laserpointer.dm

@@ -7,8 +7,7 @@
 	var/pointer_icon_state
 	flags =  FPRINT | TABLEPASS | CONDUCT |  USEDELAY
 	slot_flags = SLOT_BELT
-	m_amt = 500
-	g_amt = 500
+	matter = list("glass" = 500,"metal" = 500)
 	w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
 	origin_tech = "combat=1"
 	origin_tech = "magnets=2"

code/game/objects/items/devices/multitool.dm

@@ -15,7 +15,6 @@
 	throw_range = 15
 	throw_speed = 3
 	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	m_amt = 50
-	g_amt = 20
+	matter = list("glass" = 20,"metal" = 50)
 	origin_tech = "magnets=1;engineering=1"
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage

code/game/objects/items/devices/powersink.dm

@@ -10,8 +10,7 @@
 	throwforce = 5
 	throw_speed = 1
 	throw_range = 2
-	m_amt = 750
-	w_amt = 750
+	matter = list("glass" = 750,"metal" = 750)
 	origin_tech = "powerstorage=3;syndicate=5"
 	var/drain_rate = 600000		// amount of power to drain per tick
 	var/power_drained = 0 		// has drained this much power

code/game/objects/items/devices/radio/electropack.dm

@@ -7,8 +7,7 @@
 	flags = FPRINT | CONDUCT | TABLEPASS
 	slot_flags = SLOT_BACK
 	w_class = 5.0
-	g_amt = 2500
-	m_amt = 10000
+	matter = list("metal" = 10000,"glass" = 2500)
 	var/code = 2
 
 /obj/item/device/radio/electropack/attack_hand(mob/user as mob)

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -74,6 +74,12 @@
 	icon_state = "cap_cypherkey"
 	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)
 
+/obj/item/device/encryptionkey/heads/ai_integrated
+	name = "AI Integrated Encryption Key"
+	desc = "Integrated encryption key"
+	icon_state = "cap_cypherkey"
+	channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1)
+
 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."

code/game/objects/items/devices/radio/headset.dm

@@ -3,8 +3,7 @@
 	desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
 	icon_state = "headset"
 	item_state = "headset"
-	g_amt = 0
-	m_amt = 75
+	matter = list("metal" = 75)
 	subspace_transmission = 1
 	canhear_range = 0 // can't hear headsets from very far away
 
@@ -20,7 +19,9 @@
 	keyslot1 = new /obj/item/device/encryptionkey/
 	recalculateChannels()
 
-/obj/item/device/radio/headset/receive_range(freq, level)
+/obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0)
+	if (aiOverride)
+		return ..(freq, level)
 	if(ishuman(src.loc))
 		var/mob/living/carbon/human/H = src.loc
 		if(H.l_ear == src || H.r_ear == src)
@@ -100,6 +101,21 @@
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/captain
 
+/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
+	name = "AI Subspace Transceiver"
+	desc = "Integrated AI radio transceiver."
+	icon = 'icons/obj/robot_component.dmi'
+	icon_state = "radio"
+	item_state = "headset"
+	keyslot2 = new /obj/item/device/encryptionkey/heads/ai_integrated
+	var/myAi = null    // Atlantis: Reference back to the AI which has this radio.
+	var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
+
+/obj/item/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
+	if (disabledAi)
+		return -1 //Transciever Disabled.
+	return ..(freq, level, 1)
+
 /obj/item/device/radio/headset/heads/rd
 	name = "Research Director's headset"
 	desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c."

code/game/objects/items/devices/radio/radio.dm

@@ -30,8 +30,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2
-	g_amt = 25
-	m_amt = 75
+
+	matter = list("glass" = 25,"metal" = 75)
+
 	var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
 	var/const/WIRE_RECEIVE = 2
 	var/const/WIRE_TRANSMIT = 4
@@ -702,6 +703,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 
 /obj/item/device/radio/borg
 	var/obj/item/device/encryptionkey/keyslot = null//Borg radios can handle a single encryption key
+	icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
+	icon_state = "radio"
 
 /obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
 //	..()
@@ -761,10 +764,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 				continue
 			src.channels += ch_name
 			src.channels[ch_name] += keyslot.channels[ch_name]
-			
+
 		if(keyslot.syndie)
 			src.syndie = 1
-	
+
 
 	for (var/ch_name in src.channels)
 		if(!radio_controller)

code/game/objects/items/devices/scanners.dm

@@ -17,7 +17,9 @@ REAGENT SCANNER
 	slot_flags = SLOT_BELT
 	w_class = 2
 	item_state = "electronic"
-	m_amt = 150
+
+	matter = list("metal" = 150)
+
 	origin_tech = "magnets=1;engineering=1"
 
 /obj/item/device/t_scanner/attack_self(mob/user)
@@ -46,11 +48,13 @@ REAGENT SCANNER
 
 			if(O.invisibility == 101)
 				O.invisibility = 0
+				O.alpha = 128
 				spawn(10)
 					if(O)
 						var/turf/U = O.loc
 						if(U.intact)
 							O.invisibility = 101
+							O.alpha = 255
 
 		var/mob/living/M = locate() in T
 		if(M && M.invisibility == 2)
@@ -71,7 +75,7 @@ REAGENT SCANNER
 	w_class = 2.0
 	throw_speed = 5
 	throw_range = 10
-	m_amt = 200
+	matter = list("metal" = 200)
 	origin_tech = "magnets=1;biotech=1"
 	var/mode = 1;
 
@@ -89,7 +93,18 @@ REAGENT SCANNER
 	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
 		usr << "\red You don't have the dexterity to do this!"
 		return
-	user.visible_message("<span class='notice'> [user] has analyzed [M]'s vitals.</span>","<span class='notice'> You have analyzed [M]'s vitals.</span>")
+	user.visible_message("<span class='notice'> [user] has analyzed [M]'s vitals.","<span class='notice'> You have analyzed [M]'s vitals.")
+
+	if (!istype(M, /mob/living/carbon) || (ishuman(M) && (M:species.flags & IS_SYNTHETIC)))
+		//these sensors are designed for organic life
+		user.show_message("\blue Analyzing Results for ERROR:\n\t Overall Status: ERROR")
+		user.show_message("\t Key: <font color='blue'>Suffocation</font>/<font color='green'>Toxin</font>/<font color='#FFA500'>Burns</font>/<font color='red'>Brute</font>", 1)
+		user.show_message("\t Damage Specifics: <font color='blue'>?</font> - <font color='green'>?</font> - <font color='#FFA500'>?</font> - <font color='red'>?</font>")
+		user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
+		user.show_message("\red <b>Warning: Blood Level ERROR: --% --cl.\blue Type: ERROR")
+		user.show_message("\blue Subject's pulse: <font color='red'>-- bpm.</font>")
+		return
+
 	var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
 	var/OX = M.getOxyLoss() > 50 	? 	"<b>[M.getOxyLoss()]</b>" 		: M.getOxyLoss()
 	var/TX = M.getToxLoss() > 50 	? 	"<b>[M.getToxLoss()]</b>" 		: M.getToxLoss()
@@ -128,7 +143,20 @@ REAGENT SCANNER
 	user.show_message("[OX] | [TX] | [BU] | [BR]")
 	if (istype(M, /mob/living/carbon))
 		if(M:reagents.total_volume > 0)
-			user.show_message(text("\red Warning: Unknown substance detected in subject's blood."))
+			var/unknown = 0
+			var/reagentdata[0]
+			for(var/A in M.reagents.reagent_list)
+				var/datum/reagent/R = A
+				if(R.scannable)
+					reagentdata["[R.id]"] = "\t \blue [round(M.reagents.get_reagent_amount(R.id), 1)]u [R.name]"
+				else
+					unknown++
+			if(reagentdata.len)
+				user.show_message("\blue Beneficial reagents detected in subject's blood:")
+				for(var/d in reagentdata)
+					user.show_message(reagentdata[d])
+			if(unknown)
+				user.show_message(text("\red Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood."))
 		if(M:virus2.len)
 			var/mob/living/carbon/C = M
 			for (var/ID in C.virus2)
@@ -141,8 +169,8 @@ REAGENT SCANNER
 	for(var/datum/disease/D in M.viruses)
 		if(!D.hidden[SCANNER])
 			user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
-	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
+//	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
+//		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
 	if (M.has_brain_worms())
 		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
 	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
@@ -159,7 +187,7 @@ REAGENT SCANNER
 			if(e.status & ORGAN_BROKEN)
 				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & ORGAN_SPLINTED)))
 					user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport."
-			if(e.is_infected())
+			if(e.has_infected_wound())
 				user << "\red Infected wound detected in subject [limb]. Disinfection recommended."
 
 		for(var/name in H.organs_by_name)
@@ -209,8 +237,7 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+	matter = list("glass" = 20,"metal" = 30)
 	origin_tech = "magnets=1;engineering=1"
 
 /obj/item/device/analyzer/attack_self(mob/user as mob)
@@ -228,7 +255,7 @@ REAGENT SCANNER
 	var/datum/gas_mixture/environment = location.return_air()
 
 	var/pressure = environment.return_pressure()
-	var/total_moles = environment.total_moles()
+	var/total_moles = environment.total_moles
 
 	user.show_message("\blue <B>Results:</B>", 1)
 	if(abs(pressure - ONE_ATMOSPHERE) < 10)
@@ -236,32 +263,8 @@ REAGENT SCANNER
 	else
 		user.show_message("\red Pressure: [round(pressure,0.1)] kPa", 1)
 	if(total_moles)
-		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/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-		if(abs(n2_concentration - N2STANDARD) < 20)
-			user.show_message("\blue Nitrogen: [round(n2_concentration*100)]%", 1)
-		else
-			user.show_message("\red Nitrogen: [round(n2_concentration*100)]%", 1)
-
-		if(abs(o2_concentration - O2STANDARD) < 2)
-			user.show_message("\blue Oxygen: [round(o2_concentration*100)]%", 1)
-		else
-			user.show_message("\red Oxygen: [round(o2_concentration*100)]%", 1)
-
-		if(co2_concentration > 0.01)
-			user.show_message("\red CO2: [round(co2_concentration*100)]%", 1)
-		else
-			user.show_message("\blue CO2: [round(co2_concentration*100)]%", 1)
-
-		if(plasma_concentration > 0.01)
-			user.show_message("\red Plasma: [round(plasma_concentration*100)]%", 1)
-
-		if(unknown_concentration > 0.01)
-			user.show_message("\red Unknown: [round(unknown_concentration*100)]%", 1)
+		for(var/g in environment.gas)
+			user.show_message("\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles)*100)]%", 1)
 
 		user.show_message("\blue Temperature: [round(environment.temperature-T0C)]&deg;C", 1)
 
@@ -279,8 +282,7 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+	matter = list("metal" = 20,"glass" = 50)
 	origin_tech = "magnets=2;biotech=2"
 	var/details = 0
 	var/recent_fail = 0
@@ -352,13 +354,14 @@ REAGENT SCANNER
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 30
-	g_amt = 20
+	matter = list("metal" = 30,"glass" = 20)
 	origin_tech = "magnets=2;biotech=2"
 	var/details = 0
 	var/recent_fail = 0
 
-/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob)
+/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity)
+	if(!proximity)
+		return
 	if (user.stat)
 		return
 	if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
@@ -397,4 +400,48 @@ REAGENT SCANNER
 	name = "advanced reagent scanner"
 	icon_state = "adv_spectrometer"
 	details = 1
-	origin_tech = "magnets=4;biotech=2"
+	origin_tech = "magnets=4;biotech=2"
+
+/*
+/obj/item/device/slime_scanner
+	name = "slime scanner"
+	icon_state = "adv_spectrometer"
+	item_state = "analyzer"
+	origin_tech = "biotech=1"
+	w_class = 2.0
+	flags = CONDUCT
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 7
+	matter = list("metal" = 30,"glass" = 20)
+
+/obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
+	if (!isslime(M))
+		user << "<B>This device can only scan slimes!</B>"
+		return
+	var/mob/living/carbon/slime/T = M
+	user.show_message("Slime scan results:")
+	user.show_message(text("[T.colour] [] slime", T.is_adult ? "adult" : "baby"))
+	user.show_message(text("Nutrition: [T.nutrition]/[]", T.get_max_nutrition()))
+	if (T.nutrition < T.get_starve_nutrition())
+		user.show_message("<span class='alert'>Warning: slime is starving!</span>")
+	else if (T.nutrition < T.get_hunger_nutrition())
+		user.show_message("<span class='warning'>Warning: slime is hungry</span>")
+	user.show_message("Electric change strength: [T.powerlevel]")
+	user.show_message("Health: [T.health]")
+	if (T.slime_mutation[4] == T.colour)
+		user.show_message("This slime does not evolve any further")
+	else
+		if (T.slime_mutation[3] == T.slime_mutation[4])
+			if (T.slime_mutation[2] == T.slime_mutation[1])
+				user.show_message(text("Possible mutation: []", T.slime_mutation[3]))
+				user.show_message("Genetic destability: [T.mutation_chance/2]% chance of mutation on splitting")
+			else
+				user.show_message(text("Possible mutations: [], [], [] (x2)", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3]))
+				user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting")
+		else
+			user.show_message(text("Possible mutations: [], [], [], []", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3], T.slime_mutation[4]))
+			user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting")
+	if (T.cores > 1)
+		user.show_message("Anomalious slime core amount detected")
+	user.show_message("Growth progress: [T.amount_grown]/10")*/

code/game/objects/items/devices/taperecorder.dm

@@ -4,8 +4,7 @@
 	icon_state = "taperecorderidle"
 	item_state = "analyzer"
 	w_class = 1.0
-	m_amt = 60
-	g_amt = 30
+	matter = list("metal" = 60,"glass" = 50)
 	var/emagged = 0.0
 	var/recording = 0.0
 	var/playing = 0.0

code/game/objects/items/shooting_range.dm

@@ -61,7 +61,7 @@
 						user.put_in_hands(src)
 						user << "You take the target out of the stake."
 				else
-					src.loc = get_turf_loc(user)
+					src.loc = get_turf(user)
 					user << "You take the target out of the stake."
 
 				stake.pinned_target = null

code/game/objects/items/stacks/rods.dm

@@ -9,7 +9,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	m_amt = 1875
+	matter = list("metal" = 1875)
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 
@@ -52,15 +52,19 @@
 				use(1)
 			else
 				return 1
-	else
+
+	else if(!in_use)
 		if(amount < 2)
 			user << "\blue You need at least two rods to do this."
 			return
 		usr << "\blue Assembling grille..."
+		in_use = 1
 		if (!do_after(usr, 10))
+			in_use = 0
 			return
 		var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
 		usr << "\blue You assemble a grille"
+		in_use = 0
 		F.add_fingerprint(usr)
 		use(2)
 	return

code/game/objects/items/stacks/sheets/glass.dm

@@ -15,7 +15,7 @@
 	desc = "HOLY SHEET! That is a lot of glass."
 	singular_name = "glass sheet"
 	icon_state = "sheet-glass"
-	g_amt = 3750
+	matter = list("glass" = 3750)
 	origin_tech = "materials=1"
 	var/created_window = /obj/structure/window/basic
 
@@ -24,7 +24,7 @@
 	desc = "HOLY SHEET! That is a lot of glass."
 	singular_name = "glass sheet"
 	icon_state = "sheet-glass"
-	g_amt = 0
+	matter = null
 	created_window = /obj/structure/window/basic
 
 /obj/item/stack/sheet/glass/attack_self(mob/user as mob)
@@ -123,8 +123,9 @@
 	desc = "Glass which seems to have rods or something stuck in them."
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
-	g_amt = 3750
-	m_amt = 1875
+
+	matter = list("metal" = 1875,"glass" = 3750)
+
 	origin_tech = "materials=2"
 
 /obj/item/stack/sheet/rglass/cyborg
@@ -132,8 +133,6 @@
 	desc = "Glass which seems to have rods or something stuck in them."
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
-	g_amt = 0
-	m_amt = 0
 
 /obj/item/stack/sheet/rglass/attack_self(mob/user as mob)
 	construct_window(user)
@@ -317,7 +316,7 @@
 	desc = "A very strong and very resistant sheet of a plasma-glass alloy."
 	singular_name = "plasma glass sheet"
 	icon_state = "sheet-plasmaglass"
-	g_amt = 7500
+	matter = list("glass" = 7500)
 	origin_tech = "materials=3;plasma=2"
 	created_window = /obj/structure/window/plasmabasic
 
@@ -349,8 +348,7 @@
 	desc = "Plasma glass which seems to have rods or something stuck in them."
 	singular_name = "reinforced plasma glass sheet"
 	icon_state = "sheet-plasmarglass"
-	g_amt = 7500
-	m_amt = 1875
+	matter = list("glass" = 7500,"metal" = 1875)
 	origin_tech = "materials=4;plasma=2"
 	created_window = /obj/structure/window/plasmareinforced
 

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -79,7 +79,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	desc = "Sheets made out off metal. It has been dubbed Metal Sheets."
 	singular_name = "metal sheet"
 	icon_state = "sheet-metal"
-	m_amt = 3750
+	matter = list("metal" = 3750)
 	throwforce = 14.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 	origin_tech = "materials=1"
@@ -89,7 +89,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	desc = "Sheets made out off metal. It has been dubbed Metal Sheets."
 	singular_name = "metal sheet"
 	icon_state = "sheet-metal"
-	m_amt = 0
 	throwforce = 14.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 
@@ -115,7 +114,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	desc = "This sheet is an alloy of iron and plasma."
 	icon_state = "sheet-plasteel"
 	item_state = "sheet-metal"
-	m_amt = 7500
+	matter = list("metal" = 7500)
 	throwforce = 15.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 	origin_tech = "materials=2"

code/game/objects/items/stacks/tiles/plasteel.dm

@@ -5,7 +5,7 @@
 	icon_state = "tile"
 	w_class = 3.0
 	force = 6.0
-	m_amt = 937.5
+	matter = list("metal" = 937.5)
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20

code/game/objects/items/toys.dm

@@ -126,8 +126,9 @@
 	flags =  FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_BELT
 	w_class = 3.0
-	g_amt = 10
-	m_amt = 10
+
+	matter = list("glass" = 10,"metal" = 10)
+
 	attack_verb = list("struck", "pistol whipped", "hit", "bashed")
 	var/bullets = 7.0
 
@@ -182,8 +183,9 @@
 	icon_state = "357-7"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	w_class = 1.0
-	g_amt = 10
-	m_amt = 10
+
+	matter = list("metal" = 10,"glass" = 10)
+
 	var/amount_left = 7.0
 
 	update_icon()

code/game/objects/items/weapons/RCD.dm

@@ -18,10 +18,10 @@ RCD
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
-	m_amt = 50000
+	matter = list("metal" = 50000)
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/effect/system/spark_spread/spark_system
-	var/matter = 0
+	var/stored_matter = 0
 	var/working = 0
 	var/mode = 1
 	var/canRwall = 0
@@ -29,7 +29,7 @@ RCD
 
 
 	New()
-		desc = "A RCD. It currently holds [matter]/30 matter-units."
+		desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
 		src.spark_system = new /datum/effect/effect/system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
@@ -39,15 +39,15 @@ RCD
 	attackby(obj/item/weapon/W, mob/user)
 		..()
 		if(istype(W, /obj/item/weapon/rcd_ammo))
-			if((matter + 10) > 30)
+			if((stored_matter + 10) > 30)
 				user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
 				return
 			user.drop_item()
 			del(W)
-			matter += 10
+			stored_matter += 10
 			playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-			user << "<span class='notice'>The RCD now holds [matter]/30 matter-units.</span>"
-			desc = "A RCD. It currently holds [matter]/30 matter-units."
+			user << "<span class='notice'>The RCD now holds [stored_matter]/30 matter-units.</span>"
+			desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
 			return
 
 
@@ -163,14 +163,14 @@ RCD
 				return 0
 
 /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user)
-	if(matter < amount)
+	if(stored_matter < amount)
 		return 0
-	matter -= amount
-	desc = "A RCD. It currently holds [matter]/30 matter-units."
+	stored_matter -= amount
+	desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
 	return 1
 
 /obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)
-	return matter >= amount
+	return stored_matter >= amount
 /obj/item/weapon/rcd/borg/useResource(var/amount, var/mob/user)
 	if(!isrobot(user))
 		return 0
@@ -196,5 +196,4 @@ RCD
 	density = 0
 	anchored = 0.0
 	origin_tech = "materials=2"
-	m_amt = 30000
-	g_amt = 15000
+	matter = list("metal" = 30000, "glass" = 15000)

code/game/objects/items/weapons/RSF.dm

@@ -3,6 +3,7 @@ CONTAINS:
 RSF
 
 */
+
 /obj/item/weapon/rsf
 	name = "\improper Rapid-Service-Fabricator"
 	desc = "A device used to rapidly deploy service items."
@@ -11,26 +12,29 @@ RSF
 	opacity = 0
 	density = 0
 	anchored = 0.0
-	var/matter = 0
+	var/stored_matter = 30
 	var/mode = 1
 	flags = TABLEPASS
 	w_class = 3.0
 
-/obj/item/weapon/rsf/New()
-	desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-	return
+/obj/item/weapon/rsf/examine()
+	set src in view(1)
+	..()
+	usr << "It currently holds [stored_matter]/30 fabrication-units."
 
 /obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if (istype(W, /obj/item/weapon/rcd_ammo))
-		if ((matter + 10) > 30)
-			user << "The RSF cant hold any more matter."
+
+		if ((stored_matter + 10) > 30)
+			user << "The RSF can't hold any more matter."
 			return
+
 		del(W)
-		matter += 10
+
+		stored_matter += 10
 		playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-		user << "The RSF now holds [matter]/30 fabrication-units."
-		desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+		user << "The RSF now holds [stored_matter]/30 fabrication-units."
 		return
 
 /obj/item/weapon/rsf/attack_self(mob/user as mob)
@@ -62,174 +66,51 @@ RSF
 	// Change mode
 
 /obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity)
+
 	if(!proximity) return
-	if (!(istype(A, /obj/structure/table) || istype(A, /turf/simulated/floor)))
+
+	if(istype(user,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = user
+		if(R.stat || !R.cell || R.cell.charge <= 0)
+			return
+	else
+		if(stored_matter <= 0)
+			return
+
+	if(!istype(A, /obj/structure/table) && !istype(A, /turf/simulated/floor))
 		return
 
-	if (istype(A, /obj/structure/table) && mode == 1)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Dosh..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/spacecash/c10( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
+	playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
+	var/used_energy = 0
+	var/obj/product
 
-	else if (istype(A, /turf/simulated/floor) && mode == 1)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Dosh..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/spacecash/c10( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
+	switch(mode)
+		if(1)
+			product = new /obj/item/weapon/spacecash/c10()
+			used_energy = 200
+		if(2)
+			product = new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass()
+			used_energy = 50
+		if(3)
+			product = new /obj/item/weapon/paper()
+			used_energy = 10
+		if(4)
+			product = new /obj/item/weapon/pen()
+			used_energy = 50
+		if(5)
+			product = new /obj/item/weapon/storage/pill_bottle/dice()
+			used_energy = 200
+		if(6)
+			product = new /obj/item/clothing/mask/cigarette()
+			used_energy = 10
 
-	else if (istype(A, /obj/structure/table) && mode == 2)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Drinking Glass..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 50
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
+	user << "Dispensing [product ? product : "product"]..."
+	product.loc = get_turf(A)
 
-	else if (istype(A, /turf/simulated/floor) && mode == 2)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Drinking Glass..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 50
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /obj/structure/table) && mode == 3)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Paper Sheet..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/paper( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 10
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /turf/simulated/floor) && mode == 3)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Paper Sheet..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/paper( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 10
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /obj/structure/table) && mode == 4)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Pen..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/pen( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 50
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /turf/simulated/floor) && mode == 4)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Pen..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/pen( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 50
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /obj/structure/table) && mode == 5)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Dice Pack..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/storage/pill_bottle/dice( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 200
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /turf/simulated/floor) && mode == 5)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Dice Pack..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/storage/pill_bottle/dice( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 200
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /obj/structure/table) && mode == 6)
-		if (istype(A, /obj/structure/table) && matter >= 1)
-			user << "Dispensing Cigarette..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/clothing/mask/cigarette( A.loc )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 10
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
-
-	else if (istype(A, /turf/simulated/floor) && mode == 6)
-		if (istype(A, /turf/simulated/floor) && matter >= 1)
-			user << "Dispensing Cigarette..."
-			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/clothing/mask/cigarette( A )
-			if (isrobot(user))
-				var/mob/living/silicon/robot/engy = user
-				engy.cell.charge -= 10
-			else
-				matter--
-				user << "The RSF now holds [matter]/30 fabrication-units."
-				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
-		return
+	if(isrobot(user))
+		var/mob/living/silicon/robot/R = user
+		if(R.cell)
+			R.cell.use(used_energy)
+	else
+		stored_matter--
+		user << "The RSF now holds [stored_matter]/30 fabrication-units."

code/game/objects/items/weapons/extinguisher.dm

@@ -11,7 +11,7 @@
 	throw_speed = 2
 	throw_range = 10
 	force = 10.0
-	m_amt = 90
+	matter = list("metal" = 90)
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
 	var/max_water = 50
 	var/last_use = 1.0
@@ -28,7 +28,6 @@
 	throwforce = 2
 	w_class = 2.0
 	force = 3.0
-	m_amt = 0
 	max_water = 30
 	sprite_name = "miniFE"
 

code/game/objects/items/weapons/flamethrower.dm

@@ -10,7 +10,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
-	m_amt = 500
+	matter = list("metal" = 500)
 	origin_tech = "combat=1;plasmatech=1"
 	var/status = 0
 	var/throw_amount = 100
@@ -116,24 +116,13 @@
 		var/obj/item/weapon/icon = src
 		user.visible_message("<span class='notice'>[user] has used the analyzer on \icon[icon]</span>")
 		var/pressure = ptank.air_contents.return_pressure()
-		var/total_moles = ptank.air_contents.total_moles()
+		var/total_moles = ptank.air_contents.total_moles
 
 		user << "\blue Results of analysis of \icon[icon]"
 		if(total_moles>0)
-			var/o2_concentration = ptank.air_contents.oxygen/total_moles
-			var/n2_concentration = ptank.air_contents.nitrogen/total_moles
-			var/co2_concentration = ptank.air_contents.carbon_dioxide/total_moles
-			var/plasma_concentration = ptank.air_contents.toxins/total_moles
-
-			var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
 			user << "\blue Pressure: [round(pressure,0.1)] kPa"
-			user << "\blue Nitrogen: [round(n2_concentration*100)]%"
-			user << "\blue Oxygen: [round(o2_concentration*100)]%"
-			user << "\blue CO2: [round(co2_concentration*100)]%"
-			user << "\blue Plasma: [round(plasma_concentration*100)]%"
-			if(unknown_concentration>0.01)
-				user << "\red Unknown: [round(unknown_concentration*100)]%"
+			for(var/g in ptank.air_contents.gas)
+				user << "\blue [gas_data.name[g]]: [round((ptank.air_contents.gas[g] / total_moles) * 100)]%"
 			user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]&deg;C"
 		else
 			user << "\blue Tank is empty!"
@@ -163,7 +152,7 @@
 	usr.set_machine(src)
 	if(href_list["light"])
 		if(!ptank)	return
-		if(ptank.air_contents.toxins < 1)	return
+		if(ptank.air_contents.gas["toxins"] < 1)	return
 		if(!status)	return
 		lit = !lit
 		if(lit)
@@ -212,8 +201,8 @@
 	//Transfer 5% of current tank air contents to turf
 	var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100))
 	//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE
-	new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.toxins,get_dir(loc,target))
-	air_transfer.toxins = 0
+	new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["toxins"],get_dir(loc,target))
+	air_transfer.gas["toxins"] = 0
 	target.assume_air(air_transfer)
 	//Burn it based on transfered gas
 	//target.hotspot_expose(part4.air_contents.temperature*2,300)

code/game/objects/items/weapons/handcuffs.dm

@@ -10,7 +10,7 @@
 	w_class = 2.0
 	throw_speed = 2
 	throw_range = 5
-	m_amt = 500
+	matter = list("metal" = 500)
 	origin_tech = "materials=1"
 	var/dispenser = 0
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes

code/game/objects/items/weapons/kitchen.dm

@@ -163,7 +163,7 @@
 	throwforce = 6.0
 	throw_speed = 3
 	throw_range = 6
-	m_amt = 12000
+	matter = list("metal" = 12000)
 	origin_tech = "materials=1"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
@@ -193,7 +193,7 @@
 	throwforce = 8.0
 	throw_speed = 3
 	throw_range = 6
-	m_amt = 12000
+	matter = list("metal" = 12000)
 	origin_tech = "materials=1"
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharp = 1
@@ -265,7 +265,7 @@
 	throw_range = 5
 	w_class = 3.0
 	flags = FPRINT | TABLEPASS | CONDUCT
-	m_amt = 3000
+	matter = list("metal" = 3000)
 	/* // NOPE
 	var/food_total= 0
 	var/burger_amt = 0

code/game/objects/items/weapons/paint.dm

@@ -8,8 +8,7 @@ var/global/list/cached_icons = list()
 	icon = 'icons/obj/items.dmi'
 	icon_state = "paint_neutral"
 	item_state = "paintcan"
-	m_amt = 200
-	g_amt = 0
+	matter = list("metal" = 200)
 	w_class = 3.0
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10,20,30,50,70)

code/game/objects/items/weapons/power_cells.dm

@@ -13,8 +13,7 @@
 	w_class = 3.0
 	var/charge = 0	// note %age conveted to actual charge in New
 	var/maxcharge = 1000
-	m_amt = 700
-	g_amt = 50
+	matter = list("metal" = 700, "glass" = 50)
 	var/rigged = 0		// true if rigged to explode
 	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
 	var/construction_cost = list("metal"=750,"glass"=75)
@@ -29,7 +28,7 @@
 	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
 	origin_tech = "powerstorage=0"
 	maxcharge = 500
-	g_amt = 40
+	matter = list("glass" = 40)
 
 /obj/item/weapon/cell/crap/empty/New()
 	..()
@@ -39,18 +38,24 @@
 	name = "security borg rechargable D battery"
 	origin_tech = "powerstorage=0"
 	maxcharge = 600	//600 max charge / 100 charge per shot = six shots
-	g_amt = 40
+	matter = list("glass" = 40)
 
 /obj/item/weapon/cell/secborg/empty/New()
 	..()
 	charge = 0
 
+/obj/item/weapon/cell/apc
+	name = "heavy-duty power cell"
+	origin_tech = "powerstorage=1"
+	maxcharge = 5000
+	matter = list("metal" = 700, "glass" = 50)
+
 /obj/item/weapon/cell/high
 	name = "high-capacity power cell"
 	origin_tech = "powerstorage=2"
 	icon_state = "hcell"
 	maxcharge = 10000
-	g_amt = 60
+	matter = list("glass" = 60)
 
 /obj/item/weapon/cell/high/empty/New()
 	..()
@@ -61,7 +66,7 @@
 	origin_tech = "powerstorage=5"
 	icon_state = "scell"
 	maxcharge = 20000
-	g_amt = 70
+	matter = list("glass" = 70)
 	construction_cost = list("metal"=750,"glass"=100)
 
 /obj/item/weapon/cell/super/empty/New()
@@ -73,7 +78,7 @@
 	origin_tech = "powerstorage=6"
 	icon_state = "hpcell"
 	maxcharge = 30000
-	g_amt = 80
+	matter = list("glass" = 80)
 	construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
 
 /obj/item/weapon/cell/hyper/empty/New()
@@ -85,7 +90,7 @@
 	icon_state = "icell"
 	origin_tech =  null
 	maxcharge = 30000
-	g_amt = 80
+	matter = list("glass" = 80)
 	use()
 		return 1
 
@@ -97,8 +102,7 @@
 	icon_state = "potato_cell" //"potato_battery"
 	charge = 100
 	maxcharge = 300
-	m_amt = 0
-	g_amt = 0
+	matter = list("metal" = 0, "glass" = 0)
 	minor_fault = 1
 
 
@@ -110,5 +114,4 @@
 	icon_state = "yellow slime extract" //"potato_battery"
 	maxcharge = 10000
 	maxcharge = 10000
-	m_amt = 0
-	g_amt = 0
+	matter = null

code/game/objects/items/weapons/shields.dm

@@ -13,8 +13,7 @@
 	throw_speed = 1
 	throw_range = 4
 	w_class = 4.0
-	g_amt = 7500
-	m_amt = 1000
+	matter = list("metal" = 1000, "glass" = 7500)
 	origin_tech = "materials=2"
 	attack_verb = list("shoved", "bashed")
 	var/cooldown = 0 //shield bash cooldown. based on world.time

code/game/objects/items/weapons/storage/boxes.dm

@@ -529,7 +529,7 @@
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
-	m_amt = 50
+	matter = list("metal" = 50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 	can_hold = list(
 		"/obj/item/weapon/canesword")

code/game/objects/items/weapons/storage/firstaid.dm

@@ -123,8 +123,7 @@
 	allow_quick_gather = 1
 	use_to_pickup = 1
 	storage_slots = 14
-	m_amt = 100
-	g_amt = 700
+	matter = list("metal" = 100, "glass" = 700)
 	use_sound = null
 
 /obj/item/weapon/storage/pill_bottle/verb/rename()

code/game/objects/items/weapons/surgery_tools.dm

@@ -16,8 +16,7 @@
 	desc = "Retracts stuff."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "retractor"
-	m_amt = 10000
-	g_amt = 5000
+	matter = list("metal" = 10000, "glass" = 5000)
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
@@ -130,8 +129,7 @@ LOOK FOR SURGERY.DM*/
 	desc = "You think you have seen this before."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "hemostat"
-	m_amt = 5000
-	g_amt = 2500
+	matter = list("metal" = 5000, "glass" = 2500)
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
@@ -265,8 +263,7 @@ LOOK FOR SURGERY.DM*/
 	desc = "This stops bleeding."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "cautery"
-	m_amt = 5000
-	g_amt = 2500
+	matter = list("metal" = 5000, "glass" = 2500)
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
@@ -356,8 +353,7 @@ LOOK FOR SURGERY.DM*/
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "drill"
 	hitsound = 'sound/weapons/circsawhit.ogg'
-	m_amt = 15000
-	g_amt = 10000
+	matter = list("metal" = 15000, "glass" = 10000)
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 2.0
@@ -385,8 +381,7 @@ LOOK FOR SURGERY.DM*/
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	m_amt = 10000
-	g_amt = 5000
+	matter = list("metal" = 10000, "glass" = 5000)
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
@@ -666,8 +661,7 @@ LOOK FOR SURGERY.DM*/
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
-	m_amt = 20000
-	g_amt = 10000
+	matter = list("metal" = 20000, "glass" = 10000)
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharp = 1
@@ -850,7 +844,7 @@ LOOK FOR SURGERY.DM*/
 	force = 8.0
 	throwforce = 9.0
 	throw_speed = 3
-	m_amt = 1000
+	matter = list("metal" = 1000)
 	throw_range = 5
 	w_class = 2.0
 	attack_verb = list("attacked", "hit", "bludgeoned")

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -13,63 +13,58 @@
 	var/volume_rate = 500              //Needed for borg jetpack transfer
 	icon_action_button = "action_jetpack"
 
-	New()
-		..()
-		src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
-		src.ion_trail.set_up(src)
-		return
+/obj/item/weapon/tank/jetpack/New()
+	..()
+	src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	src.ion_trail.set_up(src)
 
+/obj/item/weapon/tank/jetpack/examine()
+	set src in usr
+	..()
+	if(air_contents.gas["oxygen"] < 10)
+		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
+		playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
-	examine()
-		set src in usr
-		..()
-		if(air_contents.oxygen < 10)
-			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-			playsound(usr, 'sound/effects/alert.ogg', 50, 1)
-		return
+/obj/item/weapon/tank/jetpack/verb/toggle_rockets()
+	set name = "Toggle Jetpack Stabilization"
+	set category = "Object"
+	src.stabilization_on = !( src.stabilization_on )
+	usr << "You toggle the stabilization [stabilization_on? "on":"off"]."
 
+/obj/item/weapon/tank/jetpack/verb/toggle()
+	set name = "Toggle Jetpack"
+	set category = "Object"
 
-	verb/toggle_rockets()
-		set name = "Toggle Jetpack Stabilization"
-		set category = "Object"
-		src.stabilization_on = !( src.stabilization_on )
-		usr << "You toggle the stabilization [stabilization_on? "on":"off"]."
-		return
+	on = !on
+	if(on)
+		icon_state = "[icon_state]-on"
+		ion_trail.start()
+	else
+		icon_state = initial(icon_state)
+		ion_trail.stop()
 
+	if (ismob(usr))
+		var/mob/M = usr
+		M.update_inv_back()
 
-	verb/toggle()
-		set name = "Toggle Jetpack"
-		set category = "Object"
-		on = !on
-		if(on)
-			icon_state = "[icon_state]-on"
-//			item_state = "[item_state]-on"
-			ion_trail.start()
-		else
-			icon_state = initial(icon_state)
-//			item_state = initial(item_state)
-			ion_trail.stop()
-		return
+/obj/item/weapon/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob)
+	if(!(src.on))
+		return 0
+	if((num < 0.005 || src.air_contents.total_moles < num))
+		src.ion_trail.stop()
+		return 0
 
+	var/datum/gas_mixture/G = src.air_contents.remove(num)
 
-	proc/allow_thrust(num, mob/living/user as mob)
-		if(!(src.on))
-			return 0
-		if((num < 0.005 || src.air_contents.total_moles() < num))
-			src.ion_trail.stop()
-			return 0
+	var/allgases = G.gas["carbon_dioxide"] + G.gas["nitrogen"] + G.gas["oxygen"] + G.gas["phoron"]
+	if(allgases >= 0.005)
+		return 1
 
-		var/datum/gas_mixture/G = src.air_contents.remove(num)
+	del(G)
+	return
 
-		var/allgases = G.carbon_dioxide + G.nitrogen + G.oxygen + G.toxins	//fuck trace gases	-Pete
-		if(allgases >= 0.005)
-			return 1
-
-		del(G)
-		return
-
-	ui_action_click()
-		toggle()
+/obj/item/weapon/tank/jetpack/ui_action_click()
+	toggle()
 
 
 /obj/item/weapon/tank/jetpack/void
@@ -78,11 +73,10 @@
 	icon_state = "jetpack-void"
 	item_state =  "jetpack-void"
 
-	New()
-		..()
-		//src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		air_contents.adjust((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/void/New()
+	..()
+	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/weapon/tank/jetpack/oxygen
 	name = "Jetpack (Oxygen)"
@@ -90,11 +84,10 @@
 	icon_state = "jetpack"
 	item_state = "jetpack"
 
-	New()
-		..()
-		//src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		air_contents.adjust((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/oxygen/New()
+	..()
+	air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/weapon/tank/jetpack/oxygen/syndicate
 	name = "syndicate jetpack (Oxygen)"
@@ -109,18 +102,18 @@
 	icon_state = "jetpack-black"
 	item_state =  "jetpack-black"
 
-	New()
-		..()
-		src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
-		src.ion_trail.set_up(src)
-		//src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		air_contents.adjust(0,(6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-		return
+/obj/item/weapon/tank/jetpack/carbondioxide/New()
+	..()
+	src.ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	src.ion_trail.set_up(src)
+	//src.air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
-	examine()
-		set src in usr
-		..()
-		if(air_contents.carbon_dioxide < 10)
-			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-			playsound(usr, 'sound/effects/alert.ogg', 50, 1)
-		return
+/obj/item/weapon/tank/jetpack/carbondioxide/examine()
+	set src in usr
+	..()
+	if(air_contents.gas["carbon_dioxide"] < 10)
+		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
+		playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+	return

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -19,15 +19,14 @@
 
 	New()
 		..()
-		//src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		air_contents.adjust((6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+		air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 		return
 
 
 	examine()
 		set src in usr
 		..()
-		if(air_contents.oxygen < 10)
+		if(air_contents.gas["oxygen"] < 10)
 			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
 			//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
@@ -53,13 +52,8 @@
 /obj/item/weapon/tank/anesthetic/New()
 	..()
 
-	src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-
-	var/datum/gas/sleeping_agent/trace_gas = new()
-	trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
-
-	src.air_contents.trace_gases += trace_gas
-	//
+	air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+	air_contents.gas["sleeping_agent"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
 	air_contents.update_values()
 
 	return
@@ -76,17 +70,14 @@
 	examine()
 		set src in usr
 		..()
-		if(air_contents.oxygen < 1 && loc==usr)
+		if(air_contents.gas["oxygen"] < 1 && loc==usr)
 			usr << "\red <B>The meter on the [src.name] indicates you are almost out of air!</B>"
 			usr << sound('sound/effects/alert.ogg')
 
 /obj/item/weapon/tank/air/New()
 	..()
 
-	src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-	src.air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
-	//
-	src.air_contents.update_values()
+	src.air_contents.adjust_multi("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, "nitrogen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
 
 	return
 
@@ -105,9 +96,7 @@
 /obj/item/weapon/tank/plasma/New()
 	..()
 
-	src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
-	//
-	src.air_contents.update_values()
+	src.air_contents.adjust_gas("toxins", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -139,9 +128,7 @@
 
 	New()
 		..()
-		src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-		//
-		src.air_contents.update_values()
+		src.air_contents.adjust_gas("oxygen", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 
 		return
 
@@ -149,7 +136,7 @@
 	examine()
 		set src in usr
 		..()
-		if(air_contents.oxygen < 0.2 && loc==usr)
+		if(air_contents.gas["oxygen"] < 0.2 && loc==usr)
 			usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
 			usr << sound('sound/effects/alert.ogg')
 
@@ -176,15 +163,13 @@
 /obj/item/weapon/tank/nitrogen/New()
 	..()
 
-	src.air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
-	//
-	src.air_contents.update_values()
+	src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 /obj/item/weapon/tank/nitrogen/examine()
 	set src in usr
 	..()
-	if(air_contents.nitrogen < 10)
+	if(air_contents.gas["nitrogen"] < 10)
 		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
 		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
 
@@ -196,6 +181,6 @@
 	slot_flags = SLOT_BELT
 	w_class = 2.0
 	force = 4.0
-	m_amt = 1000
+	matter = list("metal" = 1000)
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	volume = 2

code/game/objects/items/weapons/tanks/tanks.dm

@@ -90,24 +90,13 @@
 
 		var/pressure = air_contents.return_pressure()
 		manipulated_by = user.real_name			//This person is aware of the contents of the tank.
-		var/total_moles = air_contents.total_moles()
+		var/total_moles = air_contents.total_moles
 
 		user << "\blue Results of analysis of \icon[icon]"
 		if (total_moles>0)
-			var/o2_concentration = air_contents.oxygen/total_moles
-			var/n2_concentration = air_contents.nitrogen/total_moles
-			var/co2_concentration = air_contents.carbon_dioxide/total_moles
-			var/plasma_concentration = air_contents.toxins/total_moles
-
-			var/unknown_concentration =  1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
 			user << "\blue Pressure: [round(pressure,0.1)] kPa"
-			user << "\blue Nitrogen: [round(n2_concentration*100)]%"
-			user << "\blue Oxygen: [round(o2_concentration*100)]%"
-			user << "\blue CO2: [round(co2_concentration*100)]%"
-			user << "\blue Plasma: [round(plasma_concentration*100)]%"
-			if(unknown_concentration>0.01)
-				user << "\red Unknown: [round(unknown_concentration*100)]%"
+			for(var/g in air_contents.gas)
+				user << "\blue [gas_data.name[g]]: [(round(air_contents.gas[g] / total_moles) * 100)]%"
 			user << "\blue Temperature: [round(air_contents.temperature-T0C)]&deg;C"
 		else
 			user << "\blue Tank is empty!"
@@ -126,7 +115,7 @@
 
 	ui_interact(user)
 
-/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
+/obj/item/weapon/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 
 	var/using_internal
 	if(istype(loc,/mob/living/carbon))
@@ -149,7 +138,7 @@
 			data["maskConnected"] = 1
 
 	// update the ui if it exists, returns null if no ui is passed/found
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm

code/game/objects/items/weapons/teleportation.dm

@@ -21,7 +21,7 @@
 	item_state = "electronic"
 	throw_speed = 4
 	throw_range = 20
-	m_amt = 400
+	matter = list("metal" = 400)
 	origin_tech = "magnets=1"
 
 /obj/item/weapon/locator/attack_self(mob/user as mob)
@@ -132,7 +132,7 @@ Frequency:
 	w_class = 2.0
 	throw_speed = 3
 	throw_range = 5
-	m_amt = 10000
+	matter = list("metal" = 10000)
 	origin_tech = "magnets=1;bluespace=3"
 
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)

code/game/objects/items/weapons/tools.dm

@@ -24,7 +24,7 @@
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
-	m_amt = 150
+	matter = list("metal" = 150)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 
@@ -44,8 +44,7 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
-	g_amt = 0
-	m_amt = 75
+	matter = list("metal" = 75)
 	attack_verb = list("stabbed")
 
 	suicide_act(mob/user)
@@ -103,7 +102,7 @@
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2.0
-	m_amt = 80
+	matter = list("metal" = 80)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("pinched", "nipped")
 	sharp = 1
@@ -143,8 +142,7 @@
 	w_class = 2.0
 
 	//Cost to make in the autolathe
-	m_amt = 70
-	g_amt = 30
+	matter = list("metal" = 70, "glass" = 30)
 
 	//R&D tech level
 	origin_tech = "engineering=1"
@@ -382,7 +380,7 @@
 	var/safety = user:eyecheck()
 	if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
+		var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
 		if(H.species.flags & IS_SYNTHETIC)
 			return
 		switch(safety)
@@ -421,24 +419,21 @@
 /obj/item/weapon/weldingtool/largetank
 	name = "Industrial Welding Tool"
 	max_fuel = 40
-	m_amt = 70
-	g_amt = 60
+	matter = list("metal" = 70, "glass" = 60)
 	origin_tech = "engineering=2"
 
 /obj/item/weapon/weldingtool/hugetank
 	name = "Upgraded Welding Tool"
 	max_fuel = 80
 	w_class = 3.0
-	m_amt = 70
-	g_amt = 120
+	matter = list("metal" = 70, "glass" = 120)
 	origin_tech = "engineering=3"
 
 /obj/item/weapon/weldingtool/experimental
 	name = "Experimental Welding Tool"
 	max_fuel = 40
 	w_class = 3.0
-	m_amt = 70
-	g_amt = 120
+	matter = list("metal" = 70, "glass" = 120)
 	origin_tech = "engineering=4;plasma=3"
 	var/last_gen = 0
 
@@ -465,7 +460,7 @@
 	throwforce = 7.0
 	item_state = "crowbar"
 	w_class = 2.0
-	m_amt = 50
+	matter = list("metal" = 50)
 	origin_tech = "engineering=1"
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 
@@ -499,4 +494,4 @@
 			user << "Nothing to fix!"
 
 	else
-		return ..()
+		return ..()