Merge remote-tracking branch 'upstream/dev' into CanTrack

Conflicts:
	code/game/machinery/camera/tracking.dm

code/ATMOSPHERICS/datum_pipeline.dm

@@ -205,9 +205,15 @@ datum/pipeline
 		var/gas_density = air.total_moles/air.volume
 		thermal_conductivity *= min(gas_density / ( RADIATOR_OPTIMUM_PRESSURE/(R_IDEAL_GAS_EQUATION*T20C) ), 1)
 		
-		//if the h/e pipes radiate less than the AVERAGE_SOLAR_RADIATION, then they will heat up, otherwise they will cool down. It turns out the critical temperature is -26 C
-		var/heat_gain = surface*(AVERAGE_SOLAR_RADIATION - STEFAN_BOLTZMANN_CONSTANT*thermal_conductivity*(air.temperature - COSMIC_RADIATION_TEMPERATURE) ** 4)
+		// We only get heat from the star on the exposed surface area.
+		// If the HE pipes gain more energy from AVERAGE_SOLAR_RADIATION than they can radiate, then they have a net heat increase.
+		var/heat_gain = AVERAGE_SOLAR_RADIATION * RADIATOR_EXPOSED_SURFACE_AREA * thermal_conductivity 
+		
+		// Previously, the temperature would enter equilibrium at 26C or 294K.
+		// Only would happen if both sides (all 2 square meters of surface area) were exposed to sunlight.  We now assume it aligned edge on.
+		// It currently should stabilise at 85K or -183C.
+		heat_gain -= surface * STEFAN_BOLTZMANN_CONSTANT * thermal_conductivity * (air.temperature - COSMIC_RADIATION_TEMPERATURE) ** 4
 		
 		air.add_thermal_energy(heat_gain)
 		if(network)
-			network.update = 1
+			network.update = 1

code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm

@@ -6,7 +6,7 @@
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "port2"
 	w_class = 4
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 
 /obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))

code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm

@@ -6,7 +6,7 @@
 	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "fuel_compressor0"
 	w_class = 4
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 
 /obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))

code/WorkInProgress/Ported/Abi79/uplinks.dm

@@ -317,7 +317,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/temp = null 			//Temporary storage area for a message offering the option to destroy the radio
 	var/selfdestruct = 0		//Set to 1 while the radio is self destructing itself.
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "radio"

code/WorkInProgress/Ported/policetape.dm

@@ -3,7 +3,6 @@
 	name = "tape roll"
 	icon = 'icons/policetape.dmi'
 	icon_state = "rollstart"
-	flags = FPRINT
 	w_class = 2.0
 	var/turf/start
 	var/turf/end
@@ -98,8 +97,8 @@
 	//is_blocked_turf(var/turf/T)
 		usr << "\blue You finish placing the [src]."	//Git Test
 
-/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob)
-	if (istype(A, /obj/machinery/door/airlock))
+/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
+	if (proximity && istype(A, /obj/machinery/door/airlock))
 		var/turf/T = get_turf(A)
 		var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)
 		P.loc = locate(T.x,T.y,T.z)

code/WorkInProgress/Sigyn/Softcurity/clothing.dm

@@ -5,7 +5,7 @@
 	item_state = "ba_suit"
 	color = "hosblueclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/advisor
 	name = "correctional advisor's jumpsuit"
@@ -14,7 +14,7 @@
 	item_state = "ba_suit"
 	color = "wardenblueclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = ONESIZEFITSALL
 
 /obj/item/clothing/under/rank/supervisor
 	name = "crew supervisor's jumpsuit"
@@ -23,7 +23,7 @@
 	item_state = "ba_suit"
 	color = "officerblueclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	flags = ONESIZEFITSALL
 
 /obj/item/clothing/shoes/boots
 	name = "boots"

code/WorkInProgress/SkyMarshal/officer_stuff.dm

@@ -5,13 +5,11 @@
 	name = "officers beret"
 	desc = "A black beret adorned with the shield<6C>a silver kite shield with an engraved sword<72>of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
 	icon_state = "centcomofficerberet"
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
 	desc = "A white beret adorned with the shield<6C>a cobalt kite shield with an engraved sword<72>of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
 	icon_state = "centcomcaptain"
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/shoes/centcom
 	name = "dress shoes"

code/WorkInProgress/SkyMarshal/traitoritems.dm

@@ -3,7 +3,6 @@
 /obj/item/weapon/stamperaser
 	name = "eraser"
 	desc = "It looks like some kind of eraser."
-	flags = FPRINT | TABLEPASS
 	icon = 'icons/obj/items.dmi'
 	icon_state = "zippo"
 	item_state = "zippo"
@@ -15,7 +14,6 @@
 	desc = "It blinks and has an antenna on it.  Weird."
 	icon_state = "t-ray0"
 	var/on = 0
-	flags = FPRINT|TABLEPASS
 	w_class = 1
 	var/list/obj/item/device/radio/Old = list()
 	var/list/obj/item/device/radio/Curr = list()

code/WorkInProgress/Susan/susan_desert_turfs.dm

@@ -252,7 +252,6 @@ Alien plants should do something if theres a lot of poison
 	item_state = "wardendnavyclothes"
 	item_color = "wardendnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/navysecurity
 	name = "security officer's jumpsuit"
@@ -261,7 +260,6 @@ Alien plants should do something if theres a lot of poison
 	item_state = "officerdnavyclothes"
 	item_color = "officerdnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/under/rank/navyhead_of_security
 	desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
@@ -270,7 +268,6 @@ Alien plants should do something if theres a lot of poison
 	item_state = "hosdnavyclothes"
 	item_color = "hosdnavyclothes"
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/suit/armor/hosnavycoat
 	name = "armored coat"
@@ -283,26 +280,22 @@ Alien plants should do something if theres a lot of poison
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
 	icon_state = "officerberet"
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/beret/navywarden
 	name = "warden's beret"
 	desc = "A beret with a two-colored security insignia emblazoned on it. For wardens that are more inclined towards style than safety."
 	icon_state = "wardenberet"
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/beret/navyhos
 	name = "security head's beret"
 	desc = "A stylish beret bearing a golden insignia that proudly displays the security coat of arms. A commander's must-have."
 	icon_state = "hosberet"
-	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/suit/armor/navysecvest
 	name = "armored coat"
 	desc = "An armored coat that protects against some damage."
 	icon_state = "officerdnavyjacket"
 	item_state = "armor"
-	flags = FPRINT | TABLEPASS
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/navywardenvest
@@ -310,7 +303,6 @@ Alien plants should do something if theres a lot of poison
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "wardendnavyjacket"
 	item_state = "armor"
-	flags = FPRINT | TABLEPASS
 	armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 //hostile entities or npcs

code/WorkInProgress/autopsy.dm

@@ -7,7 +7,7 @@
 	desc = "Extracts information on wounds."
 	icon = 'icons/obj/autopsy_scanner.dmi'
 	icon_state = ""
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	var/list/datum/autopsy_data_scanner/wdata = list()

code/WorkInProgress/computer3/computers/camera.dm

@@ -141,14 +141,14 @@
 		if (!computer || computer.z > 6)
 			return null
 
+		cameranet.process_sort()
+
 		var/list/L = list()
 		for(var/obj/machinery/camera/C in cameranet.cameras)
 			var/list/temp = C.network & key.networks
 			if(temp.len)
 				L.Add(C)
 
-		camera_sort(L)
-
 		return L
 	verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null)
 		if(!istype(C) || !C.can_use())

code/WorkInProgress/computer3/computers/crew.dm

@@ -35,7 +35,7 @@
 					var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
 					var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
 
-					log += "<tr><td width='40%'>[H.get_id_name()]</td>"
+					log += "<tr><td width='40%'>[H.get_authentification_name()] ([H.get_assignment()])</td>"
 
 					switch(C.sensor_mode)
 						if(1)

code/WorkInProgress/computer3/lapvend.dm

@@ -174,8 +174,9 @@
 			vendmode = 1
 
 		if("cancel")
-			relap.loc = src.loc
-			relap = null
+			if(relap)
+				relap.loc = src.loc
+				relap = null
 			vendmode = 0
 
 	src.updateUsrDialog()

code/__HELPERS/lists.dm

@@ -581,3 +581,6 @@ datum/proc/dd_SortValue()
 
 /obj/machinery/dd_SortValue()
 	return "[sanitize(name)]"
+
+/obj/machinery/camera/dd_SortValue()
+	return "[c_tag]"

code/__HELPERS/maths.dm

@@ -1,3 +1,5 @@
+#define RAND_F(L, H) (rand()*(H-L) + L)
+
 // Credits to Nickr5 for the useful procs I've taken from his library resource.
 
 var/const/E		= 2.71828183

code/__HELPERS/text.dm

@@ -42,15 +42,15 @@
 			index = findtext(t, char)
 	return t
 
-/proc/readd_quotes(var/t)
-	var/list/repl_chars = list(""" = "\"")
-	for(var/char in repl_chars)
-		var/index = findtext(t, char)
-		while(index)
-			t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+5)
-			index = findtext(t, char)
-	return t
-
+/proc/readd_quotes(var/t)
+	var/list/repl_chars = list(""" = "\"")
+	for(var/char in repl_chars)
+		var/index = findtext(t, char)
+		while(index)
+			t = copytext(t, 1, index) + repl_chars[char] + copytext(t, index+5)
+			index = findtext(t, char)
+	return t
+
 //Runs byond's sanitization proc along-side sanitize_simple
 /proc/sanitize(var/t,var/list/repl_chars = null)
 	return html_encode(sanitize_simple(t,repl_chars))
@@ -83,7 +83,7 @@
 /proc/stripped_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN)
 	var/name = input(user, message, title, default)
 	return strip_html_properly(name, max_length)
-    
+
 // Used to get a trimmed, properly sanitized input, of max_length
 /proc/trim_strip_input(var/mob/user, var/message = "", var/title = "", var/default = "", var/max_length=MAX_MESSAGE_LEN)
 	return trim(stripped_input(user, message, title, default, max_length))
@@ -326,7 +326,7 @@ proc/TextPreview(var/string,var/len=40)
 		else
 			return string
 	else
-		return "[copytext(string, 1, 37)]..."
+		return "[copytext(string, 1, 37)]..."
 
 //This proc strips html properly, but it's not lazy like the other procs.
 //This means that it doesn't just remove < and > and call it a day.
@@ -342,7 +342,7 @@ proc/TextPreview(var/string,var/len=40)
 		input = copytext(input, 1, opentag) + copytext(input, (closetag + 1))
 	if(max_length)
 		input = copytext(input,1,max_length)
-	return input
+	return sanitize(input)
 
 /proc/trim_strip_html_properly(var/input, var/max_length = MAX_MESSAGE_LEN)
     return trim(strip_html_properly(input, max_length))

code/_onclick/item_attack.dm

@@ -46,7 +46,11 @@
 			playsound(loc, hitsound, 50, 1, -1)
 		return hit
 	else
-		user.visible_message("<span class='danger'>[M] has been [pick(attack_verb)] with [src] by [user]!</span>")
+		if(attack_verb.len)
+			user.visible_message("<span class='danger'>[M] has been [pick(attack_verb)] with [src] by [user]!</span>")
+		else
+			user.visible_message("<span class='danger'>[M] has been attacked with [src] by [user]!</span>")
+		
 		if (hitsound)
 			playsound(loc, hitsound, 50, 1, -1)
 		switch(damtype)

code/controllers/communications.dm

@@ -307,7 +307,7 @@ var/global/datum/controller/radio/radio_controller
 	//1 = radio transmission
 	//2 = subspace transmission
 
-	var/data = list()
+	var/list/data = list()
 	var/encryption
 
 	var/frequency = 0

code/datums/datumvars.dm

@@ -866,6 +866,7 @@ client
 			return
 
 		var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in typesof(/datum/organ/internal)-/datum/organ/internal
+		if(!new_organ) return
 
 		if(!M)
 			usr << "Mob doesn't exist anymore"

code/datums/mind.dm

@@ -119,7 +119,7 @@ datum/mind
 			"cult",
 			"wizard",
 			"changeling",
-			"nuclear",
+			"mercenary",
 			"traitor", // "traitorchan",
 			"monkey",
 			"malfunction",
@@ -217,23 +217,23 @@ datum/mind
 			sections["changeling"] = text
 
 			/** NUCLEAR ***/
-			text = "nuclear"
-			if (ticker.mode.config_tag=="nuclear")
+			text = "mercenary"
+			if (ticker.mode.config_tag=="mercenary")
 				text = uppertext(text)
 			text = "<i><b>[text]</b></i>: "
 			if (src in ticker.mode.syndicates)
-				text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];nuclear=clear'>nanotrasen</a>"
-				text += "<br><a href='?src=\ref[src];nuclear=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];nuclear=dressup'>dress up</a>."
+				text += "<b>OPERATIVE</b>|<a href='?src=\ref[src];mercenary=clear'>nanotrasen</a>"
+				text += "<br><a href='?src=\ref[src];mercenary=lair'>To shuttle</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];mercenary=dressup'>dress up</a>."
 				var/code
 				for (var/obj/machinery/nuclearbomb/bombue in machines)
 					if (length(bombue.r_code) <= 5 && bombue.r_code != "LOLNO" && bombue.r_code != "ADMIN")
 						code = bombue.r_code
 						break
 				if (code)
-					text += " Code is [code]. <a href='?src=\ref[src];nuclear=tellcode'>tell the code.</a>"
+					text += " Code is [code]. <a href='?src=\ref[src];mercenary=tellcode'>tell the code.</a>"
 			else
-				text += "<a href='?src=\ref[src];nuclear=nuclear'>operative</a>|<b>NANOTRASEN</b>"
-			sections["nuclear"] = text
+				text += "<a href='?src=\ref[src];mercenary=mercenary'>operative</a>|<b>NANOTRASEN</b>"
+			sections["mercenary"] = text
 
 		/** TRAITOR ***/
 		text = "traitor"
@@ -382,7 +382,7 @@ datum/mind
 				if(!def_value)//If it's a custom objective, it will be an empty string.
 					def_value = "custom"
 
-			var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "prevent", "harm", "brig", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
+			var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "prevent", "harm", "brig", "hijack", "escape", "survive", "steal", "download", "mercenary", "capture", "absorb", "custom")
 			if (!new_obj_type) return
 
 			var/datum/objective/new_objective = null
@@ -436,7 +436,7 @@ datum/mind
 					new_objective = new /datum/objective/survive
 					new_objective.owner = src
 
-				if ("nuclear")
+				if ("mercenary")
 					new_objective = new /datum/objective/nuclear
 					new_objective.owner = src
 
@@ -748,12 +748,12 @@ datum/mind
 						current.UpdateAppearance()
 						domutcheck(current, null)
 
-		else if (href_list["nuclear"])
+		else if (href_list["mercenary"])
 			var/mob/living/carbon/human/H = current
 
 			current.hud_updateflag |= (1 << SPECIALROLE_HUD)
 
-			switch(href_list["nuclear"])
+			switch(href_list["mercenary"])
 				if("clear")
 					if(src in ticker.mode.syndicates)
 						ticker.mode.syndicates -= src
@@ -763,7 +763,7 @@ datum/mind
 							objectives-=O
 						current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer an operative!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-merc'd [current].")
-				if("nuclear")
+				if("mercenary")
 					if(!(src in ticker.mode.syndicates))
 						ticker.mode.syndicates += src
 						ticker.mode.update_synd_icons_added(src)

code/defines/obj.dm

@@ -173,10 +173,11 @@ using /obj/effect/datacore/proc/manifest_inject( ), or manifest_insert( )
 */
 
 var/global/list/PDA_Manifest = list()
+var/global/ManifestJSON
 
 /obj/effect/datacore/proc/get_manifest_json()
 	if(PDA_Manifest.len)
-		return PDA_Manifest
+		return
 	var/heads[0]
 	var/sec[0]
 	var/eng[0]
@@ -247,7 +248,8 @@ var/global/list/PDA_Manifest = list()
 		"bot" = bot,\
 		"misc" = misc\
 		)
-	return PDA_Manifest
+	ManifestJSON = list2json(PDA_Manifest)
+	return
 
 
 
@@ -302,7 +304,7 @@ var/global/list/PDA_Manifest = list()
 	throwforce = 0.0
 	throw_speed = 1
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 
 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
 		user.drop_item()

code/defines/obj/weapon.dm

@@ -3,7 +3,7 @@
 	desc = "Should anything ever go wrong..."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "red_phone"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	force = 3.0
 	throwforce = 2.0
 	throw_speed = 1
@@ -22,7 +22,6 @@
 	anchored = 0.0
 	var/stored_matter = 0
 	var/mode = 1
-	flags = TABLEPASS
 	w_class = 3.0
 
 /obj/item/weapon/bananapeel
@@ -92,7 +91,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cane"
 	item_state = "stick"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
@@ -139,7 +138,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/items.dmi'
 	icon_state = "handcuff"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	throwforce = 0
 	w_class = 3.0
 	origin_tech = "materials=1"
@@ -198,7 +197,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	attack_verb = list("warned", "cautioned", "smashed")
 
 /obj/item/weapon/caution/cone
@@ -217,7 +215,7 @@
 	var/traitor_frequency = 0.0
 	var/mob/currentUser = null
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = CONDUCT | ONBELT
 	w_class = 2.0
 	item_state = "radio"
 	throw_speed = 4
@@ -235,7 +233,7 @@
 	var/selfdestruct = 0.0
 	var/traitor_frequency = 0.0
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "radio"
 	throwforce = 5
@@ -255,7 +253,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = NOSHIELD
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 
 /obj/item/weapon/staff/broom
@@ -282,7 +280,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = NOSHIELD
 
 /obj/item/weapon/wire
 	desc = "This is just a simple piece of regular insulated wire."
@@ -304,7 +302,7 @@
 	icon_state = "std_module"
 	w_class = 2.0
 	item_state = "electronic"
-	flags = FPRINT|TABLEPASS|CONDUCT
+	flags = CONDUCT
 	var/mtype = 1						// 1=electronic 2=hardware
 
 /obj/item/weapon/module/card_reader
@@ -385,7 +383,7 @@
 	w_class = 1
 	throwforce = 2
 	var/cigarcount = 6
-	flags = ONBELT | TABLEPASS */
+	flags = ONBELT */
 
 /obj/item/weapon/pai_cable
 	desc = "A flexible coated cable with a universal jack on one end."

code/defines/procs/admin.dm

@@ -1,7 +1,7 @@
 proc/log_and_message_admins(var/message as text)
-	log_admin("[usr]([usr.ckey]) " + message)
-	message_admins("[usr]([usr.ckey]) " + message)
+	log_admin(usr ? "[usr]([usr.ckey]) [message]" : "EVENT [message]")
+	message_admins(usr ? "[usr]([usr.ckey]) [message]" : "EVENT [message]")
 
 proc/admin_log_and_message_admins(var/message as text)
-	log_admin("[key_name(usr)] " + message)
-	message_admins("[key_name_admin(usr)] " + message, 1)
+	log_admin(usr ? "[key_name(usr)] [message]" : "EVENT [message]")
+	message_admins(usr ? "[key_name(usr)] [message]" : "EVENT [message]", 1)

code/defines/procs/hud.dm

@@ -12,7 +12,7 @@ proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt)
 		if(P.Mob.see_invisible < patient.invisibility)
 			continue
 
-		if(!(local_scanner || hassensorlevel(P, SUIT_SENSOR_VITAL)))
+		if(!(local_scanner || hassensorlevel(patient, SUIT_SENSOR_VITAL)))
 			continue
 
 		P.Client.images += patient.hud_list[HEALTH_HUD]

code/defines/procs/radio.dm

@@ -47,7 +47,7 @@
 /proc/get_receiver_reception(var/receiver, var/datum/signal/signal)
 	if(receiver && check_signal(signal))
 		var/turf/pos = get_turf(receiver)
-		if(pos.z in signal.data["level"])
+		if(pos && (pos.z in signal.data["level"]))
 			return TELECOMMS_RECEPTION_RECEIVER
 	return TELECOMMS_RECEPTION_NONE
 

code/game/area/Space Station 13 areas.dm

@@ -349,6 +349,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Centcom"
 	icon_state = "centcom"
 	requires_power = 0
+	unlimited_power = 1
 
 /area/centcom/control
 	name = "\improper Centcom Control"

code/game/atoms.dm

@@ -1,7 +1,7 @@
 /atom
 	layer = 2
 	var/level = 2
-	var/flags = FPRINT
+	var/flags = 0
 	var/list/fingerprints
 	var/list/fingerprintshidden
 	var/fingerprintslast = null
@@ -195,7 +195,10 @@ its easier to just keep the beam vertical.
 			f_name = "some "
 		else
 			f_name = "a "
-		f_name += "<span class='danger'>blood-stained</span> [name][infix]!"
+		if(blood_color != "#030303")
+			f_name += "<span class='danger'>blood-stained</span> [name][infix]!"
+		else
+			f_name += "oil-stained [name][infix]."
 
 	user << "\icon[src] That's [f_name] [suffix]"
 
@@ -231,8 +234,6 @@ its easier to just keep the beam vertical.
 /atom/proc/add_hiddenprint(mob/living/M as mob)
 	if(isnull(M)) return
 	if(isnull(M.key)) return
-	if (!( src.flags ) & FPRINT)
-		return
 	if (ishuman(M))
 		var/mob/living/carbon/human/H = M
 		if (!istype(H.dna, /datum/dna))
@@ -257,8 +258,6 @@ its easier to just keep the beam vertical.
 	if(isnull(M)) return
 	if(isAI(M)) return
 	if(isnull(M.key)) return
-	if (!( src.flags ) & FPRINT)
-		return
 	if (ishuman(M))
 		//Add the list if it does not exist.
 		if(!fingerprintshidden)
@@ -383,7 +382,7 @@ its easier to just keep the beam vertical.
 //returns 1 if made bloody, returns 0 otherwise
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
 
-	if((flags & NOBLOODY) || !(flags & FPRINT))
+	if(flags & NOBLOODY)
 		return 0
 
 	if(!blood_DNA || !istype(blood_DNA, /list))	//if our list of DNA doesn't exist yet (or isn't a list) initialise it.

code/game/gamemodes/cult/cult_items.dm

@@ -3,7 +3,6 @@
 	desc = "An arcane weapon wielded by the followers of Nar-Sie"
 	icon_state = "cultblade"
 	item_state = "cultblade"
-	flags = FPRINT | TABLEPASS
 	w_class = 4
 	force = 30
 	throwforce = 10
@@ -34,7 +33,7 @@
 	icon_state = "culthood"
 	desc = "A hood worn by the followers of Nar-Sie."
 	flags_inv = HIDEFACE
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
+	flags = HEADCOVERSEYES
 	body_parts_covered = HEAD|EYES
 	armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
 	cold_protection = HEAD
@@ -55,7 +54,6 @@
 	desc = "A set of armored robes worn by the followers of Nar-Sie"
 	icon_state = "cultrobes"
 	item_state = "cultrobes"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade)
 	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
@@ -68,7 +66,7 @@
 	item_state = "magus"
 	desc = "A helm worn by the followers of Nar-Sie."
 	flags_inv = HIDEFACE
-	flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 	armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 0
@@ -78,7 +76,6 @@
 	desc = "A set of armored robes worn by the followers of Nar-Sie"
 	icon_state = "magusred"
 	item_state = "magusred"
-	flags = FPRINT | TABLEPASS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/weapon/book/tome,/obj/item/weapon/melee/cultblade)
 	armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)

code/game/gamemodes/cult/ritual.dm

@@ -169,7 +169,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	unique = 1
 	var/notedat = ""
 	var/tomedat = ""

code/game/gamemodes/epidemic/epidemic.dm

@@ -113,7 +113,7 @@
 		world.Reboot()
 
 	var/datum/disease2/disease/lethal = new
-	lethal.makerandom(1)
+	lethal.makerandom(3)
 	lethal.infectionchance = 5
 
 	// the more doctors, the more will be infected

code/game/gamemodes/events/holidays/Christmas.dm

@@ -58,7 +58,6 @@
 	icon_state = "xmashat"
 	desc = "A crappy paper hat that you are REQUIRED to wear."
 	flags_inv = 0
-	flags = FPRINT|TABLEPASS
 	body_parts_covered = 0
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 

code/game/gamemodes/events/space_ninja.dm

@@ -116,7 +116,7 @@ var/ninja_confirmed_selection = 0
 	var/commando_list[] = list()//Commandos.
 
 	//We want the ninja to appear only in certain modes.
-//	var/acceptable_modes_list[] = list("traitor","revolution","cult","wizard","changeling","traitorchan","nuclear","malfunction","monkey")  // Commented out for both testing and ninjas
+//	var/acceptable_modes_list[] = list("traitor","revolution","cult","wizard","changeling","traitorchan","mercenary","malfunction","monkey")  // Commented out for both testing and ninjas
 //	if(!(current_mode.config_tag in acceptable_modes_list))
 //		return
 

code/game/gamemodes/game_mode.dm

@@ -151,8 +151,6 @@
 
 	var/list/area/escape_locations = list(/area/shuttle/escape/centcom, /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom)
 
-	var/pltext = "<font size=2><b>Player list:</b></font>"
-
 	for(var/mob/M in player_list)
 		if(M.client)
 			clients++
@@ -187,7 +185,6 @@
 		text += " (<b>[escaped_total>0 ? escaped_total : "none"] [emergency_shuttle.evac ? "escaped" : "transferred"]</b>) and <b>[ghosts] ghosts</b>.</b><br>"
 	else
 		text += "There were <b>no survivors</b> (<b>[ghosts] ghosts</b>).</b>"
-	text += "<br>" + pltext //print player list after the general info
 	world << text
 
 	if(clients > 0)
@@ -553,7 +550,7 @@ proc/get_nt_opposed()
 			var/list/refined_log = new()
 			for(var/datum/uplink_item/UI in H.purchase_log)
 				var/obj/I = new UI.path
-				refined_log.Add("[H.purchase_log[UI]]x\icon[I][I.name]")
+				refined_log.Add("[H.purchase_log[UI]]x\icon[I][UI.name]")
 				del(I)
 			purchases = english_list(refined_log, nothing_text = "")
 	if(uplink_true)

code/game/gamemodes/mutiny/emergency_authentication_device.dm

@@ -11,7 +11,6 @@
 	var/secondary_key
 	var/activated = 0
 
-	flags = FPRINT
 	use_power = 0
 
 	New(loc, mode)

code/game/gamemodes/nuclear/nuclear.dm

@@ -11,7 +11,7 @@ var/global/list/turf/synd_spawn = list()
 
 /datum/game_mode/nuclear
 	name = "mercenary"
-	config_tag = "nuclear"
+	config_tag = "mercenary"
 	required_players = 15
 	required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining
 	required_enemies = 1
@@ -175,7 +175,7 @@ var/global/list/turf/synd_spawn = list()
 		var/obj/item/weapon/paper/P = new
 		P.info = "The nuclear authorization code is: <b>[nuke_code]</b>"
 		P.name = "nuclear bomb code"
-		if (ticker.mode.config_tag=="nuclear")
+		if (ticker.mode.config_tag=="mercenary")
 			P.loc = code_spawn.loc
 		else
 			var/mob/living/carbon/human/H = synd_mind.current

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -23,7 +23,6 @@ var/bomb_set
 	var/timing_wire
 	var/removal_stage = 0 // 0 is no removal, 1 is covers removed, 2 is covers open,
 	                      // 3 is sealant open, 4 is unwrenched, 5 is removed from bolts.
-	flags = FPRINT
 	use_power = 0
 
 

code/game/gamemodes/nuclear/pinpointer.dm

@@ -2,7 +2,7 @@
 	name = "pinpointer"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "pinoff"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "electronic"

code/game/gamemodes/setupgame.dm

@@ -91,7 +91,7 @@
 	//REMOTEVIEWBLOCK    = getAssignedBlock("REMOTEVIEW",    numsToAssign, DNA_HARDER_BOUNDS)
 	//REGENERATEBLOCK    = getAssignedBlock("REGENERATE",    numsToAssign, DNA_HARDER_BOUNDS)
 	//INCREASERUNBLOCK   = getAssignedBlock("INCREASERUN",   numsToAssign, DNA_HARDER_BOUNDS)
-	//REMOTETALKBLOCK    = getAssignedBlock("REMOTETALK",    numsToAssign, DNA_HARDER_BOUNDS)
+	REMOTETALKBLOCK    = getAssignedBlock("REMOTETALK",    numsToAssign, DNA_HARDER_BOUNDS)
 	//MORPHBLOCK         = getAssignedBlock("MORPH",         numsToAssign, DNA_HARDER_BOUNDS)
 	//COLDBLOCK          = getAssignedBlock("COLD",          numsToAssign)
 	//HALLUCINATIONBLOCK = getAssignedBlock("HALLUCINATION", numsToAssign)

code/game/gamemodes/wizard/artifact.dm

@@ -6,7 +6,6 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "render"
 	item_state = "render"
-	flags = FPRINT | TABLEPASS
 	force = 15
 	throwforce = 10
 	w_class = 3

code/game/gamemodes/wizard/soulstone.dm

@@ -5,7 +5,6 @@
 	item_state = "electronic"
 	desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	origin_tech = "bluespace=4;materials=4"
 	var/imprinted = "empty"
@@ -88,7 +87,6 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "construct"
 	desc = "A wicked machine used by those skilled in magical arts. It is inactive"
-	flags = FPRINT | TABLEPASS
 
 /obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob)
 	if(istype(O, /obj/item/device/soulstone))

code/game/gamemodes/wizard/spellbook.dm

@@ -6,7 +6,6 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	var/uses = 5
 	var/temp = null
 	var/max_uses = 5

code/game/machinery/alarm.dm

@@ -1005,7 +1005,7 @@ Code shamelessly copied from apc_frame
 	desc = "Used for building Air Alarms"
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "alarm_bitem"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 
 /obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
@@ -1340,7 +1340,7 @@ Code shamelessly copied from apc_frame
 	desc = "Used for building Fire Alarms"
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "fire_bitem"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 
 /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))

code/game/machinery/atmoalter/canister.dm

@@ -4,7 +4,7 @@
 	icon_state = "yellow"
 	density = 1
 	var/health = 100.0
-	flags = FPRINT | CONDUCT
+	flags = CONDUCT
 
 	var/valve_open = 0
 	var/release_pressure = ONE_ATMOSPHERE

code/game/machinery/autolathe.dm

@@ -21,10 +21,16 @@
 
 	var/datum/wires/autolathe/wires = null
 
+/obj/machinery/autolathe/proc/update_recipe_list()
+	if(!machine_recipes)
+		machine_recipes = autolathe_recipes
+
 /obj/machinery/autolathe/interact(mob/user as mob)
 
+	update_recipe_list()
+
 	if(..() || (disabled && !panel_open))
-		user << "\red \The [src] is disabled!"
+		user << "<span class='danger'>\The [src] is disabled!</span>"
 		return
 
 	if (shocked)
@@ -97,7 +103,7 @@
 		return
 
 	if (busy)
-		user << "\red \The [src] is busy. Please wait for completion of previous operation."
+		user << "<span class='notice'>\The [src] is busy. Please wait for completion of previous operation.</span>"
 		return
 
 	if(istype(O, /obj/item/weapon/screwdriver))
@@ -157,7 +163,7 @@
 		mass_per_sheet += eating.matter[material]
 
 	if(!filltype)
-		user << "\red \The [src] is full. Please remove material from the autolathe in order to insert more."
+		user << "<span class='notice'>\The [src] is full. Please remove material from the autolathe in order to insert more.</span>"
 		return
 	else if(filltype == 1)
 		user << "You fill \the [src] to capacity with \the [eating]."
@@ -189,7 +195,7 @@
 	add_fingerprint(usr)
 
 	if(busy)
-		usr << "\red The autolathe is busy. Please wait for completion of previous operation."
+		usr << "<span class='notice'>The autolathe is busy. Please wait for completion of previous operation.</span>"
 		return
 
 	if(href_list["change_category"])
@@ -262,11 +268,6 @@
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	RefreshParts()
 
-
-/obj/machinery/autolathe/initialize()
-	..()
-	machine_recipes = autolathe_recipes
-
 //Updates overall lathe storage size.
 /obj/machinery/autolathe/RefreshParts()
 	..()

code/game/machinery/bees_items.dm

@@ -65,7 +65,6 @@
 	name = "bottle of BeezEez"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"
-	flags = FPRINT |  TABLEPASS
 	New()
 		src.pixel_x = rand(-5.0, 5)
 		src.pixel_y = rand(-5.0, 5)

code/game/machinery/bots/cleanbot.dm

@@ -9,7 +9,6 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 3.0
-	flags = TABLEPASS
 	var/created_name = "Cleanbot"
 
 

code/game/machinery/bots/floorbot.dm

@@ -9,7 +9,6 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 3.0
-	flags = TABLEPASS
 	var/created_name = "Floorbot"
 
 /obj/item/weapon/toolbox_tiles_sensor
@@ -22,7 +21,6 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 3.0
-	flags = TABLEPASS
 	var/created_name = "Floorbot"
 
 //Floorbot

code/game/machinery/bots/medbot.dm

@@ -281,9 +281,6 @@
 					src.speak(message)
 					src.visible_message("<b>[src]</b> points at [C.name]!")
 					src.last_newpatient_speak = world.time
-					if(declare_treatment)
-						var/area/location = get_area(src)
-						broadcast_medical_hud_message("[src.name] is treating <b>[C]</b> in <b>[location]</b>", src)
 				break
 			else
 				continue
@@ -438,6 +435,10 @@
 					src.patient.reagents.add_reagent(reagent_id,src.injection_amount)
 				visible_message("\red <B>[src] injects [src.patient] with the syringe!</B>")
 
+				if(declare_treatment)
+					var/area/location = get_area(src)
+					broadcast_medical_hud_message("[src.name] is treating <b>[C]</b> in <b>[location]</b>", src)
+
 			src.icon_state = "medibot[src.on]"
 			src.currently_healing = 0
 			return

code/game/machinery/camera/camera.dm

@@ -36,6 +36,9 @@
 	wires = new(src)
 	assembly = new(src)
 	assembly.state = 4
+
+	invalidateCameraCache()
+
 	/* // Use this to look for cameras that have the same c_tag.
 	for(var/obj/machinery/camera/C in cameranet.cameras)
 		var/list/tempnetwork = C.network&src.network
@@ -61,6 +64,7 @@
 /obj/machinery/camera/emp_act(severity)
 	if(!isEmpProof())
 		if(prob(100/severity))
+			invalidateCameraCache()
 			stat |= EMPED
 			SetLuminosity(0)
 			kick_viewers()
@@ -71,7 +75,7 @@
 				stat &= ~EMPED
 				cancelCameraAlarm()
 				update_icon()
-			
+				invalidateCameraCache()
 			..()
 
 /obj/machinery/camera/bullet_act(var/obj/item/projectile/P)
@@ -118,7 +122,7 @@
 		destroy()
 
 /obj/machinery/camera/attackby(obj/W as obj, mob/living/user as mob)
-
+	invalidateCameraCache()
 	// DECONSTRUCTION
 	if(isscrewdriver(W))
 		//user << "<span class='notice'>You start to [panel_open ? "close" : "open"] the camera's panel.</span>"
@@ -199,6 +203,7 @@
 		//legacy support, if choice is != 1 then just kick viewers without changing status
 		kick_viewers()
 	else
+		invalidateCameraCache()
 		set_status( !src.status )
 		if (!(src.status))
 			visible_message("\red [user] has deactivated [src]!")
@@ -218,6 +223,7 @@
 
 //Used when someone breaks a camera 
 /obj/machinery/camera/proc/destroy()
+	invalidateCameraCache()
 	stat |= BROKEN
 	kick_viewers()
 	triggerCameraAlarm()
@@ -232,6 +238,7 @@
 /obj/machinery/camera/proc/set_status(var/newstatus)
 	if (status != newstatus)
 		status = newstatus
+		invalidateCameraCache()
 		// now disconnect anyone using the camera
 		//Apparently, this will disconnect anyone even if the camera was re-activated.
 		//I guess that doesn't matter since they couldn't use it anyway?

code/game/machinery/camera/tracking.dm

@@ -12,15 +12,11 @@
 	if(src.stat == 2)
 		return
 
-	var/list/L = list()
-	for (var/obj/machinery/camera/C in cameranet.cameras)
-		L.Add(C)
-
-	camera_sort(L)
+	cameranet.process_sort()
 
 	var/list/T = list()
 	T["Cancel"] = "Cancel"
-	for (var/obj/machinery/camera/C in L)
+	for (var/obj/machinery/camera/C in cameranet.cameras)
 		var/list/tempnetwork = C.network&src.network
 		if (tempnetwork.len)
 			T[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C
@@ -226,7 +222,7 @@ mob/living/proc/near_camera()
 	// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
 	if(InvalidPlayerTurf(get_turf(src)))
 		return TRACKING_TERMINATE
-	if(invisibility >= INVISIBILITY_LEVEL_ONE)//cloaked
+	if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked
 		return TRACKING_TERMINATE
 	if(digitalcamo)
 		return TRACKING_TERMINATE

code/game/machinery/computer/HolodeckControl.dm

@@ -418,7 +418,6 @@ var/global/list/holodeck_programs = list(
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "stool"
 	anchored = 1.0
-	flags = FPRINT
 	pressure_resistance = 15
 
 
@@ -454,7 +453,7 @@ var/global/list/holodeck_programs = list(
 	throw_range = 5
 	throwforce = 0
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | NOSHIELD | NOBLOODY
+	flags = NOSHIELD | NOBLOODY
 	var/active = 0
 
 /obj/item/weapon/holo/esword/green

code/game/machinery/computer/camera.dm

@@ -1,5 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
+/proc/invalidateCameraCache()
+	for(var/obj/machinery/computer/security/s in world)
+		s.camera_cache = null
 
 /obj/machinery/computer/security
 	name = "security camera monitor"
@@ -10,6 +13,7 @@
 	var/list/network = list("SS13")
 	var/mapping = 0//For the overview file, interesting bit of code.
 	circuit = /obj/item/weapon/circuitboard/security
+	var/camera_cache = null
 
 	attack_ai(var/mob/user as mob)
 		return attack_hand(user)
@@ -31,29 +35,45 @@
 
 		data["current"] = null
 
-		var/list/L = list()
-		for (var/obj/machinery/camera/C in cameranet.cameras)
-			if(can_access_camera(C))
-				L.Add(C)
+		if(isnull(camera_cache))
+			cameranet.process_sort()
 
-		camera_sort(L)
+			var/cameras[0]
+			for(var/obj/machinery/camera/C in cameranet.cameras)
+				if(!can_access_camera(C))
+					continue
 
-		var/cameras[0]
-		for(var/obj/machinery/camera/C in L)
-			var/cam[0]
-			cam["name"] = C.c_tag
-			cam["deact"] = !C.can_use()
-			cam["camera"] = "\ref[C]"
-			cam["x"] = C.x
-			cam["y"] = C.y
-			cam["z"] = C.z
+				var/cam[0]
+				cam["name"] = sanitize(C.c_tag)
+				cam["deact"] = !C.can_use()
+				cam["camera"] = "\ref[C]"
+				cam["x"] = C.x
+				cam["y"] = C.y
+				cam["z"] = C.z
 
-			cameras[++cameras.len] = cam
+				cameras[++cameras.len] = cam
+
+				if(C == current)
+					data["current"] = cam
+
+				var/list/camera_list = list("cameras" = cameras)
+				camera_cache=list2json(camera_list)
+
+		else
+			if(current)
+				var/cam[0]
+				cam["name"] = current.c_tag
+				cam["deact"] = !current.can_use()
+				cam["camera"] = "\ref[current]"
+				cam["x"] = current.x
+				cam["y"] = current.y
+				cam["z"] = current.z
 
-			if(C == current)
 				data["current"] = cam
 
-		data["cameras"] = cameras
+
+		if(ui)
+			ui.load_cached_data(camera_cache)
 
 		ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 		if (!ui)
@@ -64,6 +84,7 @@
 			// adding a template with the key "mapHeader" replaces the map header content
 			ui.add_template("mapHeader", "sec_camera_map_header.tmpl")
 
+			ui.load_cached_data(camera_cache)
 			ui.set_initial_data(data)
 			ui.open()
 			ui.set_auto_update(1)

code/game/machinery/computer/communications.dm

@@ -496,8 +496,14 @@
 			return
 
 	emergency_shuttle.call_transfer()
-	log_game("[key_name(user)] has called the shuttle.")
-	message_admins("[key_name_admin(user)] has called the shuttle.", 1)
+	
+	//delay events in case of an autotransfer
+	if (isnull(user))
+		event_manager.delay_events(EVENT_LEVEL_MODERATE, 9000) //15 minutes
+		event_manager.delay_events(EVENT_LEVEL_MAJOR, 9000) 
+	
+	log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.")
+	message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
 
 	return
 

code/game/machinery/doors/airlock.dm

@@ -876,6 +876,7 @@ About the new airlock wires panel:
 				src.welded = 1
 			else
 				src.welded = null
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			src.update_icon()
 			return
 		else
@@ -904,7 +905,7 @@ About the new airlock wires panel:
 			beingcrowbarred = 1 //derp, Agouri
 		else
 			beingcrowbarred = 0
-		if( beingcrowbarred && src.p_open && (operating == -1 || (src.locked && welded && !src.arePowerSystemsOn() && BROKEN) || (density && welded && operating != 1 && !src.arePowerSystemsOn() && !src.locked)) )
+		if( beingcrowbarred && src.p_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (stat & BROKEN)))) )
 			playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
 			if(do_after(user,40))
@@ -924,7 +925,7 @@ About the new airlock wires panel:
 				da.created_name = src.name
 				da.update_state()
 
-				if(operating == -1)
+				if(operating == -1 || (stat & BROKEN))
 					new /obj/item/weapon/circuitboard/broken(src.loc)
 					operating = 0
 				else

code/game/machinery/doors/door.dm

@@ -190,7 +190,7 @@
 /obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/device/detective_scanner))
 		return
-	if(src.operating || isrobot(user))	return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
+	if(src.operating > 0 || isrobot(user))	return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
 	src.add_fingerprint(user)
 	if(!Adjacent(user))
 		user = null
@@ -252,13 +252,6 @@
 		repairing = null
 		return
 
-	if(src.density && (operable() && istype(I, /obj/item/weapon/card/emag)))
-		flick("door_spark", src)
-		sleep(6)
-		open()
-		operating = -1
-		return 1
-
 	//psa to whoever coded this, there are plenty of objects that need to call attack() on doors without bludgeoning them.
 	if(src.density && istype(I, /obj/item/weapon) && user.a_intent == "hurt" && !istype(I, /obj/item/weapon/card))
 		var/obj/item/weapon/W = I
@@ -271,6 +264,15 @@
 				take_damage(W.force)
 		return
 
+	if(src.operating) return
+
+	if(src.density && (operable() && istype(I, /obj/item/weapon/card/emag)))
+		flick("door_spark", src)
+		sleep(6)
+		open()
+		operating = -1
+		return 1
+
 	if(src.allowed(user) && operable())
 		if(src.density)
 			open()

code/game/machinery/doors/firedoor.dm

@@ -186,13 +186,14 @@
 	add_fingerprint(user)
 	if(operating)
 		return//Already doing something.
-	if(istype(C, /obj/item/weapon/weldingtool))
+	if(istype(C, /obj/item/weapon/weldingtool) && !repairing)
 		var/obj/item/weapon/weldingtool/W = C
 		if(W.remove_fuel(0, user))
 			blocked = !blocked
 			user.visible_message("<span class='danger'>\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].</span>",\
 			"You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\
 			"You hear something being welded.")
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			update_icon()
 			return
 
@@ -203,7 +204,7 @@
 		update_icon()
 		return
 
-	if(blocked && istype(C, /obj/item/weapon/crowbar))
+	if(blocked && istype(C, /obj/item/weapon/crowbar) && !repairing)
 		if(!hatch_open)
 			user << "<span class='danger'>You must open the maintenance hatch first!</span>"
 		else
@@ -215,19 +216,24 @@
 					user.visible_message("<span class='danger'>[user] has removed the electronics from \the [src].</span>",
 										"You have removed the electronics from [src].")
 
-					new/obj/item/weapon/airalarm_electronics(src.loc)
+					if (stat & BROKEN)
+						new /obj/item/weapon/circuitboard/broken(src.loc)
+					else
+						new/obj/item/weapon/airalarm_electronics(src.loc)
+
 					var/obj/structure/firedoor_assembly/FA = new/obj/structure/firedoor_assembly(src.loc)
 					FA.anchored = 1
 					FA.density = 1
+					FA.wired = 1
 					FA.update_icon()
 					del(src)
 		return
 
 	if(blocked)
-		user << "<span class='danger'>\The [src] is welded solid!</span>"
+		user << "<span class='danger'>\The [src] is welded shut!</span>"
 		return
 
-	if(istype(C, /obj/item/weapon/crowbar) || istype(C,/obj/item/weapon/melee/energy/blade) || istype(C,/obj/item/weapon/twohanded/fireaxe))
+	if(istype(C, /obj/item/weapon/crowbar) || istype(C,/obj/item/weapon/twohanded/fireaxe))
 		if(operating)
 			return
 
@@ -262,6 +268,8 @@
 				spawn(0)
 					close()
 			return
+		
+	return ..()
 
 // CHECK PRESSURE
 /obj/machinery/door/firedoor/process()

code/game/machinery/doors/firedoor_assembly.dm

@@ -5,7 +5,8 @@ obj/structure/firedoor_assembly
 	icon_state = "door_construction"
 	anchored = 0
 	opacity = 0
-	density = 0
+	density = 1
+	var/wired = 0
 
 obj/structure/firedoor_assembly/update_icon()
 	if(anchored)
@@ -14,7 +15,28 @@ obj/structure/firedoor_assembly/update_icon()
 		icon_state = "door_construction"
 
 obj/structure/firedoor_assembly/attackby(C as obj, mob/user as mob)
-	if(istype(C, /obj/item/weapon/airalarm_electronics))
+	if(istype(C, /obj/item/stack/cable_coil) && !wired && anchored)
+		var/obj/item/stack/cable_coil/cable = C
+		if (cable.get_amount() < 1)
+			user << "<span class='warning'>You need one length of coil to wire \the [src].</span>"
+			return
+		user.visible_message("[user] wires \the [src].", "You start to wire \the [src].")
+		if(do_after(user, 40) && !wired && anchored)
+			if (cable.use(1))
+				wired = 1
+				user << "<span class='notice'>You wire \the [src].</span>"
+
+	else if(istype(C, /obj/item/weapon/wirecutters) && wired )
+		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		user.visible_message("[user] cuts the wires from \the [src].", "You start to cut the wires from \the [src].")
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "<span class='notice'>You cut the wires!</span>"
+			new/obj/item/stack/cable_coil(src.loc, 1)
+			wired = 0
+
+	else if(istype(C, /obj/item/weapon/airalarm_electronics) && wired)
 		if(anchored)
 			playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 			user.visible_message("<span class='warning'>[user] has inserted a circuit into \the [src]!</span>",
@@ -26,7 +48,6 @@ obj/structure/firedoor_assembly/attackby(C as obj, mob/user as mob)
 			user << "<span class='warning'>You must secure \the [src] first!</span>"
 	else if(istype(C, /obj/item/weapon/wrench))
 		anchored = !anchored
-		density = !density
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user.visible_message("<span class='warning'>[user] has [anchored ? "" : "un" ]secured \the [src]!</span>",
 							  "You have [anchored ? "" : "un" ]secured \the [src]!")

code/game/machinery/machinery.dm

@@ -230,6 +230,10 @@ Class Procs:
 /mob/living/silicon/ai/canUseTopic(atom/movable/M)
 	if(stat)
 		return
+	// Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
+	// unless it's on the same level as the object it's interacting with.
+	if(!(z == M.z || M.z in config.player_levels))
+		return
 	//stop AIs from leaving windows open and using then after they lose vision
 	//apc_override is needed here because AIs use their own APC when powerless
 	if(cameranet && !cameranet.checkTurfVis(get_turf(M)) && !apc_override)

code/game/machinery/pipe/construction.dm

@@ -60,7 +60,6 @@ Buildable meters
 	icon = 'icons/obj/pipe-item.dmi'
 	icon_state = "simple"
 	item_state = "buildpipe"
-	flags = TABLEPASS|FPRINT
 	w_class = 3
 	level = 2
 
@@ -1133,7 +1132,6 @@ Buildable meters
 	icon = 'icons/obj/pipe-item.dmi'
 	icon_state = "meter"
 	item_state = "buildpipe"
-	flags = TABLEPASS|FPRINT
 	w_class = 4
 
 /obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)

code/game/machinery/portable_turret.dm

@@ -154,6 +154,12 @@
 		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
 		return 0
 
+	if (get_dist(src, user) > 1 && !issilicon(user))
+		user << "<span class='notice'>You are too far away.</span>"
+		user.unset_machine()
+		user << browse(null, "window=turretid")
+		return 0
+
 	if(locked && !issilicon(user))
 		user << "<span class='notice'>Access denied.</span>"
 		return 0
@@ -175,7 +181,6 @@
 				<TT><B>Automatic Portable Turret Installation</B></TT><BR><BR>
 				Status: []<BR>
 				Behaviour controls are [locked ? "locked" : "unlocked"]"},
-
 				"<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>" )
 
 	if(!locked || issilicon(user))

code/game/machinery/spaceheater.dm

@@ -11,8 +11,6 @@
 	var/set_temperature = T0C + 50	//K
 	var/heating_power = 40000
 
-	flags = FPRINT
-
 
 /obj/machinery/space_heater/New()
 	..()

code/game/machinery/status_display_ai.dm

@@ -43,6 +43,7 @@ var/list/ai_status_emotions = list(
 		if(istype(M, /obj/machinery/ai_status_display))
 			var/obj/machinery/ai_status_display/AISD = M
 			AISD.emotion = emote
+			AISD.update()
 		//if Friend Computer, change ALL displays
 		else if(istype(M, /obj/machinery/status_display))
 
@@ -72,6 +73,9 @@ var/list/ai_status_emotions = list(
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
 	src.emotion = emote
 
+/obj/machinery/ai_status_display/process()
+	return
+
 /obj/machinery/ai_status_display/proc/update()
 	if(mode==0) //Blank
 		overlays.Cut()
@@ -91,3 +95,11 @@ var/list/ai_status_emotions = list(
 	if(overlays.len)
 		overlays.Cut()
 	overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
+
+/obj/machinery/ai_status_display/power_change()
+	..()
+	if(stat & NOPOWER)
+		if(overlays.len)
+			overlays.Cut()
+	else
+		update()

code/game/machinery/supply_display.dm

@@ -3,7 +3,7 @@
 
 /obj/machinery/status_display/supply_display/update()
 	if(!..() && mode == STATUS_DISPLAY_CUSTOM)
-		message1 = "SUPPLY"
+		message1 = "CARGO"
 		message2 = ""
 
 		var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle

code/game/machinery/telecomms/telecomunications.dm

@@ -64,36 +64,12 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 			if(long_range_link == 0 && machine.long_range_link == 0)
 				continue
 		// If we're sending a copy, be sure to create the copy for EACH machine and paste the data
-		var/datum/signal/copy = new
+		var/datum/signal/copy
 		if(copysig)
-
+			copy = new
 			copy.transmission_method = 2
 			copy.frequency = signal.frequency
-			// Copy the main data contents! Workaround for some nasty bug where the actual array memory is copied and not its contents.
-			copy.data = list(
-
-			"mob" = signal.data["mob"],
-			"mobtype" = signal.data["mobtype"],
-			"realname" = signal.data["realname"],
-			"name" = signal.data["name"],
-			"job" = signal.data["job"],
-			"key" = signal.data["key"],
-			"vmessage" = signal.data["vmessage"],
-			"vname" = signal.data["vname"],
-			"vmask" = signal.data["vmask"],
-			"compression" = signal.data["compression"],
-			"message" = signal.data["message"],
-			"connection" = signal.data["connection"],
-			"radio" = signal.data["radio"],
-			"slow" = signal.data["slow"],
-			"traffic" = signal.data["traffic"],
-			"type" = signal.data["type"],
-			"server" = signal.data["server"],
-			"reject" = signal.data["reject"],
-			"level" = signal.data["level"],
-			"verb" = signal.data["verb"],
-			"language" = signal.data["language"]
-			)
+			copy.data = signal.data.Copy()
 
 			// Keep the "original" signal constant
 			if(!signal.data["original"])
@@ -101,10 +77,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 			else
 				copy.data["original"] = signal.data["original"]
 
-		else
-			del(copy)
-
-
 		send_count++
 		if(machine.is_freq_listening(signal))
 			machine.traffic++
@@ -232,13 +204,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 	else if(on)
 		produce_heat()
 		delay = initial(delay)
-		
-		
+
+
 
 /obj/machinery/telecomms/proc/produce_heat()
 	if (!produces_heat)
 		return
-	
+
 	if (!use_power)
 		return
 
@@ -252,11 +224,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 			var/datum/gas_mixture/removed = env.remove(transfer_moles)
 
 			if(removed)
-				
+
 				var/heat_produced = idle_power_usage	//obviously can't produce more heat than the machine draws from it's power source
 				if (traffic <= 0)
 					heat_produced *= 0.30	//if idle, produce less heat.
-				
+
 				removed.add_thermal_energy(heat_produced)
 
 			env.merge(removed)

code/game/machinery/teleporter.dm

@@ -91,7 +91,7 @@
 		var/turf/T = get_turf(R)
 		if (!T)
 			continue
-		if(T.z == 2 || T.z > 7)
+		if(!(T.z in config.player_levels))
 			continue
 		var/tmpname = T.loc.name
 		if(areaindex[tmpname])
@@ -118,7 +118,12 @@
 				areaindex[tmpname] = 1
 			L[tmpname] = I
 
-	var/desc = input("Please select a location to lock in.", "Locking Computer") in L
+	var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null
+	if(!desc)
+		return
+	if(get_dist(src, usr) > 1 && !issilicon(usr))
+		return
+
 	src.locked = L[desc]
 	for(var/mob/O in hearers(src, null))
 		O.show_message("\blue Locked In", 2)

code/game/machinery/turret_control.dm

@@ -66,15 +66,20 @@
 	return
 
 /obj/machinery/turretid/proc/can_use(mob/user)
+	if(ailock && issilicon(user))
+		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
+		return 0
+
 	if (get_dist(src, user) > 0 && !issilicon(user))
 		user << "<span class='notice'>You are too far away.</span>"
 		user.unset_machine()
 		user << browse(null, "window=turretid")
 		return 0
 
-	if(ailock && issilicon(user))
-		user << "<span class='notice'>There seems to be a firewall preventing you from accessing this device.</span>"
+	if(locked && !issilicon(user))
+		user << "<span class='notice'>Access denied.</span>"
 		return 0
+
 	return 1
 
 /obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user)
@@ -124,7 +129,9 @@
 	if (!istype(loc, /area))
 		return
 	var/area/area = loc
-	var/dat = ""
+	var/dat = text({"Status: []<BR>
+				Behaviour controls are [locked ? "locked" : "unlocked"]"},
+				"<A href='?src=\ref[src];operation=toggleon'>[enabled ? "On" : "Off"]</A>" )
 
 	if(!locked || issilicon(user))
 		dat += text({"<BR><BR>

code/game/mecha/mecha_parts.dm

@@ -9,7 +9,7 @@
 	icon = 'icons/mecha/mech_construct.dmi'
 	icon_state = "blank"
 	w_class = 5
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	origin_tech = "programming=2;materials=2"
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)
@@ -20,7 +20,7 @@
 	icon_state = "backbone"
 	var/datum/construction/construct
 	construction_cost = list("metal"=20000)
-	flags = FPRINT | CONDUCT
+	flags = CONDUCT
 
 	attackby(obj/item/W as obj, mob/user as mob)
 		if(!construct || !construct.action(W, user))

code/game/mecha/working/hoverpod.dm

@@ -5,7 +5,7 @@
 	initial_icon = "engineering_pod"
 	internal_damage_threshold = 80
 	step_in = 4
-	step_energy_drain = 15
+	step_energy_drain = 10
 	max_temperature = 20000
 	health = 150
 	infra_luminosity = 6

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -114,13 +114,19 @@ var/global/list/image/splatter_cache=list()
         amount = 2
 
 /obj/effect/decal/cleanable/blood/drip
-        name = "drips of blood"
-        desc = "It's red."
-        gender = PLURAL
-        icon = 'icons/effects/drip.dmi'
-        icon_state = "1"
-        random_icon_states = list("1","2","3","4","5")
-        amount = 0
+	name = "drips of blood"
+	desc = "It's red."
+	gender = PLURAL
+	icon = 'icons/effects/drip.dmi'
+	icon_state = "1"
+	random_icon_states = list("1","2","3","4","5")
+	amount = 0
+	var/list/drips = list()
+
+/obj/effect/decal/cleanable/blood/drip/New()
+	..()
+	spawn(1)
+		drips |= icon_state
 
 /obj/effect/decal/cleanable/blood/writing
 	icon_state = "tracks"

code/game/objects/explosion.dm

@@ -70,8 +70,12 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 
 		var/lighting_controller_was_processing = lighting_controller.processing	//Pause the lighting updates for a bit
 		lighting_controller.processing = 0
+
+
+		var/approximate_intensity = (devastation_range * 3) + (heavy_impact_range * 2) + light_impact_range
 		var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild
-		if(defer_powernet_rebuild != 2)
+		// Large enough explosion. For performance reasons, powernets will be rebuilt manually
+		if(!defer_powernet_rebuild && (approximate_intensity > 25))
 			defer_powernet_rebuild = 1
 
 		if(heavy_impact_range > 1)
@@ -110,9 +114,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		sleep(8)
 
 		if(!lighting_controller.processing)	lighting_controller.processing = lighting_controller_was_processing
-		if(!powernet_rebuild_was_deferred_already)
-			if(defer_powernet_rebuild != 2)
-				defer_powernet_rebuild = 0
+		if(!powernet_rebuild_was_deferred_already && defer_powernet_rebuild)
+			makepowernets()
+			defer_powernet_rebuild = 0
 
 	return 1
 

code/game/objects/items.dm

@@ -10,7 +10,6 @@
 	var/burning = null
 	var/hitsound = null
 	var/w_class = 3.0
-	flags = FPRINT | TABLEPASS
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	pass_flags = PASSTABLE
 	pressure_resistance = 5
@@ -35,7 +34,7 @@
 	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
 	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
 	var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
-	var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/list/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
 	var/zoomdevicename = null //name used for message when binoculars/scope is used
@@ -115,12 +114,7 @@
 			size = "bulky"
 		if(5.0)
 			size = "huge"
-		else
-	//if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
-	usr << "This is a [blood_DNA ? blood_color != "#030303" ? "bloody " : "oil-stained " : ""]\icon[src][src.name]. It is a [size] item."
-	if(src.desc)
-		usr << src.desc
-	return
+	return ..(user, distance, "", "It is a [size] item.")
 
 /obj/item/attack_hand(mob/user as mob)
 	if (!user) return

code/game/objects/items/apc_frame.dm

@@ -5,7 +5,7 @@
 	desc = "Used for repairing or building APCs"
 	icon = 'icons/obj/apc_repair.dmi'
 	icon_state = "apc_frame"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 
 /obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()

code/game/objects/items/bodybag.dm

@@ -39,7 +39,7 @@
 	close_sound = 'sound/items/zip.ogg'
 	var/item_path = /obj/item/bodybag
 	density = 0
-	storage_capacity = (mob_size * 2) - 1
+	storage_capacity = (default_mob_size * 2) - 1
 	var/contains_body = 0
 
 /obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob)

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

@@ -10,7 +10,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda"
 	item_state = "electronic"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_ID | SLOT_BELT
 
 	//Main variables
@@ -464,7 +463,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				data["convo_job"] = sanitize(c["job"])
 				break
 	if(mode==41)
-		data["manifest"] = data_core.get_manifest_json()
+		data_core.get_manifest_json()
 
 
 	if(mode==3)
@@ -535,12 +534,19 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 	nanoUI = data
 	// update the ui if it exists, returns null if no ui is passed/found
+	if(ui)
+		ui.load_cached_data(ManifestJSON)
+		
 	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
+	        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "pda.tmpl", title, 520, 400)
 		// when the ui is first opened this is the data it will use
+
+		ui.load_cached_data(ManifestJSON)
+
 		ui.set_initial_data(data)
 		// open the new ui window
 		ui.open()

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

@@ -4,7 +4,6 @@
 	icon_state = "aicard" // aicard-full
 	item_state = "electronic"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	var/flush = null
 	origin_tech = "programming=4;materials=4"

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

@@ -4,7 +4,7 @@
 	desc = "A pair of binoculars."
 	icon_state = "binoculars"
 
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 5.0
 	w_class = 2.0
 	throwforce = 5.0

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

@@ -1,7 +1,7 @@
 /obj/item/device/chameleon
 	name = "chameleon projector"
 	icon_state = "shield0"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	item_state = "electronic"
 	throwforce = 5.0

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

@@ -9,7 +9,7 @@
 	desc = "Used to debug electronic equipment."
 	icon = 'icons/obj/hacktool.dmi'
 	icon_state = "hacktool-g"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 5.0
 	w_class = 2.0
 	throwforce = 5.0

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

@@ -7,7 +7,7 @@
 	w_class = 2.0
 	throw_speed = 4
 	throw_range = 10
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	origin_tech = "magnets=2;combat=1"
 
 	var/times_used = 0 //Number of times it's been used.

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

@@ -5,7 +5,7 @@
 	icon_state = "flashlight"
 	item_state = "flashlight"
 	w_class = 2
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 
 	matter = list("metal" = 50,"glass" = 20)
@@ -106,7 +106,7 @@
 	desc = "A pen-sized light, used by medical staff."
 	icon_state = "penlight"
 	item_state = ""
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	brightness_on = 2
 	w_class = 1
 
@@ -115,7 +115,7 @@
 	desc = "A miniature lamp, that might be used by small robots."
 	icon_state = "penlight"
 	item_state = ""
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	brightness_on = 2
 	w_class = 1
 
@@ -128,7 +128,7 @@
 	item_state = "lamp"
 	brightness_on = 5
 	w_class = 4
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 
 	on = 1
 

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

@@ -47,7 +47,7 @@
 	icon_state = "lightreplacer0"
 	item_state = "electronic"
 
-	flags = FPRINT | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	origin_tech = "magnets=3;materials=2"
 

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

@@ -4,7 +4,7 @@
 	icon_state = "megaphone"
 	item_state = "radio"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 
 	var/spamcheck = 0
 	var/emagged = 0

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

@@ -8,7 +8,7 @@
 	name = "multitool"
 	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
 	icon_state = "multitool"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	force = 5.0
 	w_class = 2.0
 	throwforce = 5.0

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

@@ -4,7 +4,6 @@
 	icon_state = "pai"
 	item_state = "electronic"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=2"
 	var/obj/item/device/radio/radio

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

@@ -6,7 +6,7 @@
 	icon_state = "powersink0"
 	item_state = "electronic"
 	w_class = 4.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	throwforce = 5
 	throw_speed = 1
 	throw_range = 2

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

@@ -4,7 +4,7 @@
 	icon_state = "electropack0"
 	item_state = "electropack"
 	frequency = 1449
-	flags = FPRINT | CONDUCT | TABLEPASS
+	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	w_class = 5.0
 

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

@@ -5,7 +5,7 @@
 	anchored = 1
 	w_class = 4.0
 	canhear_range = 2
-	flags = FPRINT | CONDUCT | TABLEPASS | NOBLOODY
+	flags = CONDUCT | NOBLOODY
 	var/number = 0
 	var/anyai = 1
 	var/mob/living/silicon/ai/ai = list()

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

@@ -20,7 +20,7 @@
 	var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
 	var/maxf = 1499
 //			"Example" = FREQ_LISTENING|FREQ_BROADCASTING
-	flags = FPRINT | CONDUCT | TABLEPASS
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throw_speed = 2
 	throw_range = 9

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

@@ -13,7 +13,6 @@ REAGENT SCANNER
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	icon_state = "t-ray0"
 	var/on = 0
-	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	w_class = 2
 	item_state = "electronic"
@@ -69,7 +68,7 @@ REAGENT SCANNER
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
 	icon_state = "health"
 	item_state = "analyzer"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
@@ -232,7 +231,7 @@ REAGENT SCANNER
 	icon_state = "atmos"
 	item_state = "analyzer"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4
@@ -279,7 +278,7 @@ REAGENT SCANNER
 	icon_state = "spectrometer"
 	item_state = "analyzer"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+	flags = CONDUCT | OPENCONTAINER
 	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4
@@ -353,7 +352,7 @@ REAGENT SCANNER
 	icon_state = "spectrometer"
 	item_state = "analyzer"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4

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

@@ -7,7 +7,7 @@
 	slot_flags = SLOT_BACK	//you can carry it on your back if you want, but it won't do anything unless attached to suit storage
 	
 	//copied from tank.dm
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	force = 5.0
 	throwforce = 10.0
 	throw_speed = 1

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

@@ -15,7 +15,7 @@
 	var/list/storedinfo = new/list()
 	var/list/timestamp = new/list()
 	var/canprint = 1
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	throwforce = 2
 	throw_speed = 4
 	throw_range = 20

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

@@ -22,7 +22,7 @@ effective or pretty fucking useless.
 	w_class = 1.0
 	throw_speed = 4
 	throw_range = 10
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	item_state = "electronic"
 	origin_tech = "magnets=3;combat=3;syndicate=3"
 

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

@@ -4,7 +4,7 @@
 	icon_state = "voice0"
 	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 
 	var/spamcheck = 0
 	var/emagged = 0

code/game/objects/items/robot/robot_parts.dm

@@ -3,7 +3,7 @@
 	icon = 'icons/obj/robot_parts.dmi'
 	item_state = "buildpipe"
 	icon_state = "blank"
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)

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

@@ -3,7 +3,7 @@
 	desc = "Some rods. Can be used for building, or something."
 	singular_name = "metal rod"
 	icon_state = "rods"
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = CONDUCT
 	w_class = 3.0
 	force = 9.0
 	throwforce = 15.0

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

@@ -8,7 +8,7 @@
 	throwforce = 5.0
 	throw_speed = 5
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	max_amount = 60
 
 /obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)

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

@@ -82,7 +82,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	icon_state = "sheet-metal"
 	matter = list("metal" = 3750)
 	throwforce = 14.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	origin_tech = "materials=1"
 
 /obj/item/stack/sheet/metal/cyborg
@@ -91,7 +91,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	singular_name = "metal sheet"
 	icon_state = "sheet-metal"
 	throwforce = 14.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	stacktype = /obj/item/stack/sheet/metal
 
 /obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
@@ -118,7 +118,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	item_state = "sheet-metal"
 	matter = list("metal" = 7500)
 	throwforce = 15.0
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	origin_tech = "materials=2"
 
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
@@ -197,7 +197,6 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	desc = "Large sheets of card, like boxes folded flat."
 	singular_name = "cardboard sheet"
 	icon_state = "sheet-card"
-	flags = FPRINT | TABLEPASS
 	origin_tech = "materials=1"
 
 /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)

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

@@ -1,6 +1,5 @@
 /obj/item/stack/sheet
 	name = "sheet"
-	flags = FPRINT | TABLEPASS
 	w_class = 3.0
 	force = 5
 	throwforce = 5

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

@@ -8,7 +8,7 @@
 	throwforce = 5.0
 	throw_speed = 5
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	max_amount = 60
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
 	var/on = 1

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

@@ -9,7 +9,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT
+	flags = CONDUCT
 	max_amount = 60
 
 /obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)