Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

Conflicts: baystation12.dme code/ATMOSPHERICS/components/unary/vent_pump.dm code/ATMOSPHERICS/components/unary/vent_scrubber.dm code/__HELPERS/game.dm code/controllers/shuttle_controller.dm code/datums/datumvars.dm code/datums/supplypacks.dm code/defines/obj/storage.dm code/defines/obj/vending.dm code/defines/obj/weapon.dm code/defines/procs/command_alert.dm code/game/area/Space Station 13 areas.dm code/game/atoms.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/gamemodes/events/dust.dm code/game/gamemodes/events/miniblob.dm code/game/gamemodes/events/ninja_equipment.dm code/game/gamemodes/factions.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/jobs/access.dm code/game/jobs/job/assistant.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/engineering.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job_controller.dm code/game/machinery/alarm.dm code/game/machinery/atmo_control.dm code/game/machinery/atmoalter/area_atmos_computer.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/HolodeckControl.dm code/game/machinery/computer/ai_core.dm code/game/machinery/computer/atmos_alert.dm code/game/machinery/computer/card.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/computer.dm code/game/machinery/computer/message.dm code/game/machinery/computer/pod.dm code/game/machinery/computer/prisoner.dm code/game/machinery/computer/syndicate_shuttle.dm code/game/machinery/constructable_frame.dm code/game/machinery/doors/door.dm code/game/machinery/doors/firedoor.dm code/game/machinery/newscaster.dm code/game/machinery/recharger.dm code/game/machinery/spaceheater.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/logbrowser.dm code/game/machinery/telecomms/machine_interactions.dm code/game/machinery/teleporter.dm code/game/machinery/wishgranter.dm code/game/mecha/mech_fabricator.dm code/game/mecha/working/ripley.dm code/game/objects/items.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/flashlight.dm code/game/objects/items/devices/radio/encryptionkey.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/medical.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/gift_wrappaper.dm code/game/objects/items/weapons/hydroponics.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/secstorage/secstorage.dm code/game/objects/items/weapons/storage/backpack.dm code/game/objects/items/weapons/storage/firstaid.dm code/game/objects/items/weapons/storage/kit.dm code/game/objects/items/weapons/storage/storage.dm code/game/objects/items/weapons/storage/toolbox.dm code/game/objects/items/weapons/storage/uplink_kits.dm code/game/objects/items/weapons/stunbaton.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/tools.dm code/game/objects/structures/crates_lockers/closets/secure/cargo.dm code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm code/game/objects/structures/crates_lockers/closets/secure/scientist.dm code/game/objects/structures/crates_lockers/closets/secure/security.dm code/game/objects/structures/electricchair.dm code/game/objects/structures/extinguisher.dm code/game/objects/structures/watercloset.dm code/game/objects/weapons.dm code/game/turfs/turf.dm code/game/vehicles/airtight/airtight.dm code/game/vehicles/vehicle.dm code/global.dm code/modules/DetectiveWork/evidence.dm code/modules/admin/IsBanned.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/diagnostics.dm code/modules/admin/verbs/getlogs.dm code/modules/client/preferences.dm code/modules/clothing/masks/miscellaneous.dm code/modules/clothing/spacesuits/rig.dm code/modules/clothing/suits/miscellaneous.dm code/modules/critters/critter_defenses.dm code/modules/detectivework/scanner.dm code/modules/flufftext/Hallucination.dm code/modules/food/recipes_microwave.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm code/modules/mob/living/carbon/alien/special/facehugger.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/carbon_defines.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/carbon/metroid/metroid.dm code/modules/mob/living/living.dm code/modules/mob/living/silicon/ai/life.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_transformation_simple.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/folders.dm code/modules/paperwork/paper.dm code/modules/paperwork/paperbin.dm code/modules/paperwork/pen.dm code/modules/power/cable.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/projectile/revolver.dm code/modules/projectiles/projectile/change.dm code/modules/projectiles/projectile/special.dm code/modules/reagents/Chemistry-Reagents.dm code/modules/reagents/reagent_containers/glass.dm code/modules/reagents/reagent_containers/hypospray.dm code/modules/recycling/sortingmachinery.dm code/modules/research/designs.dm config/config.txt html/changelog.html icons/mob/head.dmi icons/mob/hud.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/mask.dmi icons/mob/suit.dmi icons/mob/ties.dmi icons/mob/uniform.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/ties.dmi icons/obj/grenade.dmi icons/obj/projectiles.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-08-29 06:57:42 +01:00 · 2013-01-11 22:12:31 +10:00
parent 891ae8e063 2855cd6237
commit bdeb96b7e5
637 changed files with 28812 additions and 21593 deletions
@@ -37,6 +37,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	var/notehtml = ""
 	var/cart = "" //A place to stick cartridge menu information
 	var/detonate = 1 // Can the PDA be blown up?
+	var/hidden = 0 // Is the PDA hidden from the PDA list?

 	var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
 	var/ownjob = null //related to above
@@ -129,7 +130,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-syn"
 	name = "Military PDA"
 	owner = "John Doe"
-	toff = 1
+	hidden = 1

 /obj/item/device/pda/chaplain
 	icon_state = "pda-holy"
@@ -165,6 +166,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	icon_state = "pda-bar"

 /obj/item/device/pda/atmos
+	default_cartridge = /obj/item/weapon/cartridge/atmos
 	icon_state = "pda-atmo"

 /obj/item/device/pda/chemist
@@ -181,10 +183,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	ttone = "data"
 	detonate = 0

-/obj/item/device/pda/pai
-	icon_state = "NONE"
-	ttone = "data"
-	detonate = 0
+/obj/item/device/pda/ai/can_use()
+	return 1

 /obj/item/device/pda/ai/attack_self(mob/user as mob)
 	if ((honkamt > 0) && (prob(60)))//For clown virus.
@@ -192,6 +192,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
 	return

+/obj/item/device/pda/ai/pai
+	ttone = "assist"
+
 /*
 *	The Actual PDA
 */
@@ -222,8 +225,6 @@ var/global/list/obj/item/device/pda/PDAs = list()

 /obj/item/device/pda/proc/can_use()

-	if(istype(src, /obj/item/device/pda/ai) || istype(src, /obj/item/device/pda/pai))
-		return 1
 	if(!ismob(loc))
 		return 0

@@ -235,6 +236,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		return 0

+/obj/item/device/pda/GetAccess()
+	if(id)
+		return id.GetAccess()
+	else
+		return ..()
+
+/obj/item/device/pda/GetID()
+	return id
+
 /obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location)
 	var/mob/M = usr
 	if((!istype(over_object, /obj/screen)) && !M.restrained() && !M.stat && can_use())
@@ -321,13 +331,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				dat += "<ul>"
 				if (cartridge)
 					if (cartridge.access_janitor)
-						dat += "<li><a href='byond://?src=\ref[src];choice=49'><img src=pda_bucket.png> Equipment Locator</a></li>"
+						dat += "<li><a href='byond://?src=\ref[src];choice=49'><img src=pda_bucket.png> Custodial Locator</a></li>"
 					if (istype(cartridge.radio, /obj/item/radio/integrated/signal))
 						dat += "<li><a href='byond://?src=\ref[src];choice=40'><img src=pda_signaler.png> Signaler System</a></li>"
 					if (cartridge.access_reagent_scanner)
 						dat += "<li><a href='byond://?src=\ref[src];choice=Reagent Scan'><img src=pda_reagent.png> [scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner</a></li>"
 					if (cartridge.access_engine)
 						dat += "<li><a href='byond://?src=\ref[src];choice=Halogen Counter'><img src=pda_reagent.png> [scanmode == 4 ? "Disable" : "Enable"] Halogen Counter</a></li>"
+					if (cartridge.access_atmos)
+						dat += "<li><a href='byond://?src=\ref[src];choice=Gas Scan'><img src=pda_reagent.png> [scanmode == 5 ? "Disable" : "Enable"] Gas Scanner</a></li>"
 					if (cartridge.access_remote_door)
 						dat += "<li><a href='byond://?src=\ref[src];choice=Toggle Door'><img src=pda_rdoor.png> Toggle Remote Door</a></li>"
 				dat += "<li><a href='byond://?src=\ref[src];choice=3'><img src=pda_atmos.png> Atmospheric Scan</a></li>"
@@ -367,7 +379,7 @@ var/global/list/obj/item/device/pda/PDAs = list()

 				if (!toff)
 					for (var/obj/item/device/pda/P in sortAtom(PDAs))
-						if (!P.owner||P.toff||P == src)	continue
+						if (!P.owner||P.toff||P == src||P.hidden)	continue
 						dat += "<li><a href='byond://?src=\ref[src];choice=Message;target=\ref[P]'>[P]</a>"
 						if (istype(cartridge, /obj/item/weapon/cartridge/syndicate) && P.detonate)
 							dat += " (<a href='byond://?src=\ref[src];choice=Detonate;target=\ref[P]'><img src=pda_boom.png>*Detonate*</a>)"
@@ -537,6 +549,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					if ( !(last_honk && world.time < last_honk + 20) )
 						playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
 						last_honk = world.time
+				if("Gas Scan")
+					if(scanmode == 5)
+						scanmode = 0
+					else if((!isnull(cartridge)) && (cartridge.access_atmos))
+						scanmode = 5

 //MESSENGER/NOTE FUNCTIONS===================================

@@ -676,7 +693,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 //EXTRA FUNCTIONS===================================

 	if (mode == 2||mode == 21)//To clear message overlays.
-		overlays = null
+		overlays.Cut()

 	if ((honkamt > 0) && (prob(60)))//For clown virus.
 		honkamt--
@@ -770,21 +787,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(P.loc && isliving(P.loc))
 			L = P.loc
 		//Maybe they are a pAI!
-		else if(istype(P, /obj/item/device/pda/pai) && P.loc)
-			//Search through the location's contents
-			for(var/obj/item/device/paicard/Pcard in P.loc)
-				//If there's a Pcard there then get the mind inside
-				if(Pcard.pai)
-					var/mob/living/silicon/pai/pai = Pcard.pai
-					//Is it the pAI that is receiving the message?
-					if(pai.pda && pai.pda == P)
-						L = pai
-						break
+		else
+			L = get(P, /mob/living/silicon)
+
 		if(L)
 			L << "\icon[P] <b>Message from [src.owner] ([ownjob]), </b>\"[t]\" (<a href='byond://?src=\ref[P];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)"

 		log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
-		P.overlays = null
+		P.overlays.Cut()
 		P.overlays += image('icons/obj/pda.dmi', "pda-r")
 	else
 		U << "<span class='notice'>ERROR: Server isn't responding.</span>"
@@ -967,6 +977,63 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			else
 				user << "\blue No significant chemical agents found in [A]."

+		if(5)
+			if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
+				var/obj/icon = A
+				for (var/mob/O in viewers(user, null))
+					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()
+
+				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)]%"
+					user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]&deg;C"
+				else
+					user << "\blue Tank is empty!"
+
+			if (istype(A, /obj/machinery/atmospherics/pipe/tank))
+				var/obj/icon = A
+				for (var/mob/O in viewers(user, null))
+					O << "\red [user] has used [src] on \icon[icon] [A]"
+
+				var/pressure = A:parent.air.return_pressure()
+				var/total_moles = A:parent.air.total_moles()
+
+				user << "\blue Results of analysis of \icon[icon]"
+				if (total_moles>0)
+					var/o2_concentration = A:parent.air.oxygen/total_moles
+					var/n2_concentration = A:parent.air.nitrogen/total_moles
+					var/co2_concentration = A:parent.air.carbon_dioxide/total_moles
+					var/plasma_concentration = A: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)]%"
+					user << "\blue Temperature: [round(A: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
@@ -1031,6 +1098,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	for (var/obj/item/device/pda/P in PDAs)
 		if (!P.owner)
 			continue
+		else if(P.hidden)
+			continue
 		else if (P == src)
 			continue
 		else if (P.toff)
@@ -1094,39 +1163,27 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		usr << "You do not have a PDA. You should make an issue report about this."

-
-
-
 //Some spare PDAs in a box
-
-/obj/item/weapon/storage/PDAbox
+/obj/item/weapon/storage/box/PDAs
 	name = "spare PDAs"
 	desc = "A box of spare PDA microcomputers."
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "pdabox"
-	item_state = "syringe_kit"
-	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap

-/obj/item/weapon/storage/PDAbox/New()
-	..()
-	new /obj/item/device/pda(src)
-	new /obj/item/device/pda(src)
-	new /obj/item/device/pda(src)
-	new /obj/item/device/pda(src)
-
-	var/newcart = pick(1,2,3,4)
-	switch(newcart)
-		if(1)
-			new /obj/item/weapon/cartridge/engineering(src)
-		if(2)
-			new /obj/item/weapon/cartridge/security(src)
-		if(3)
-			new /obj/item/weapon/cartridge/medical(src)
-		if(4)
-			new /obj/item/weapon/cartridge/signal/toxins(src)
-
-	new /obj/item/weapon/cartridge/head(src)
+	New()
+		..()
+		new /obj/item/device/pda(src)
+		new /obj/item/device/pda(src)
+		new /obj/item/device/pda(src)
+		new /obj/item/device/pda(src)
+		new /obj/item/weapon/cartridge/head(src)

+		var/newcart = pick(	/obj/item/weapon/cartridge/engineering,
+							/obj/item/weapon/cartridge/security,
+							/obj/item/weapon/cartridge/medical,
+							/obj/item/weapon/cartridge/signal/toxins,
+							/obj/item/weapon/cartridge/quartermaster)
+		new newcart(src)

 // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
 /obj/item/device/pda/emp_act(severity)
@@ -9,6 +9,7 @@
 	var/obj/item/radio/integrated/radio = null
 	var/access_security = 0
 	var/access_engine = 0
+	var/access_atmos = 0
 	var/access_medical = 0
 	var/access_manifest = 1 // Make all jobs able to access the manifest
 	var/access_clown = 0
@@ -37,6 +38,11 @@
 		icon_state = "cart-e"
 		access_engine = 1

+	atmos
+		name = "BreatheDeep Cartridge"
+		icon_state = "cart-a"
+		access_atmos = 1
+
 	medical
 		name = "Med-U Cartridge"
 		icon_state = "cart-m"
@@ -102,7 +108,8 @@
 			name = "Signal Ace 2"
 			desc = "Complete with integrated radio signaler!"
 			icon_state = "cart-tox"
-//			access_reagent_scanner = 1
+			access_reagent_scanner = 1
+			access_atmos = 1

 		New()
 			..()
@@ -134,6 +141,8 @@
 		access_manifest = 1
 		access_status_display = 1
 		access_quartermaster = 1
+		access_janitor = 1
+		access_security = 1

 		New()
 			..()
@@ -158,6 +167,7 @@
 		access_manifest = 1
 		access_status_display = 1
 		access_engine = 1
+		access_atmos = 1

 	cmo
 		name = "Med-U DELUXE"
@@ -172,7 +182,8 @@
 		icon_state = "cart-rd"
 		access_manifest = 1
 		access_status_display = 1
-//		access_reagent_scanner = 1
+		access_reagent_scanner = 1
+		access_atmos = 1

 		New()
 			..()
@@ -189,6 +200,7 @@
 		access_medical = 1
 		access_reagent_scanner = 1
 		access_status_display = 1
+		access_atmos = 1

 	syndicate
 		name = "Detomatix Cartridge"
@@ -10,13 +10,12 @@
 	m_amt = 50
 	g_amt = 20
 	icon_action_button = "action_flashlight"
-	light_on = 0
-	brightness_on = 4 //luminosity when on
-	var brightness = 0
+	var/on = 0
+	var/brightness_on = 4 //luminosity when on

 /obj/item/device/flashlight/initialize()
 	..()
-	if(light_on)
+	if(on)
 		icon_state = "[initial(icon_state)]-on"
 		SetLuminosity(brightness_on)
 	else
@@ -24,31 +23,31 @@
 		SetLuminosity(0)

 /obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
-	if(light_on)
+	if(on)
 		icon_state = "[initial(icon_state)]-on"
-		if((loc == user) && (user.luminosity < brightness_on))
-			user.SetLuminosity(brightness_on)
+		if(loc == user)
+			user.SetLuminosity(user.luminosity + brightness_on)
 		else if(isturf(loc))
 			SetLuminosity(brightness_on)
 	else
 		icon_state = initial(icon_state)
 		if(loc == user)
-			user.SetLuminosity(search_light(user, src))
+			user.SetLuminosity(user.luminosity - brightness_on)
 		else if(isturf(loc))
 			SetLuminosity(0)

 /obj/item/device/flashlight/attack_self(mob/user)
 	if(!isturf(user.loc))
 		user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities.
-		return
-	light_on = !light_on
+		return 0
+	on = !on
 	update_brightness(user)
-	return
+	return 1


 /obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
 	add_fingerprint(user)
-	if(light_on && user.zone_sel.selecting == "eyes")
+	if(on && user.zone_sel.selecting == "eyes")

 		if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))	//too dumb to use flashlight properly
 			return ..()	//just hit them in the head
@@ -89,24 +88,15 @@


 /obj/item/device/flashlight/pickup(mob/user)
-	if(light_on)
-		if (user.luminosity < brightness_on)
-			user.SetLuminosity(brightness_on)
+	if(on)
+		user.SetLuminosity(user.luminosity + brightness_on)
 		SetLuminosity(0)


 /obj/item/device/flashlight/dropped(mob/user)
-	if(light_on)
-		if ((layer <= 3) || (loc != user.loc))
-			user.SetLuminosity(search_light(user, src))
-			SetLuminosity(brightness_on)
-
-
-/obj/item/device/flashlight/equipped(mob/user, slot)
-	if(light_on)
-		if (user.luminosity < brightness_on)
-			user.SetLuminosity(brightness_on)
-		SetLuminosity(0)
+	if(on)
+		user.SetLuminosity(user.luminosity - brightness_on)
+		SetLuminosity(brightness_on)


 /obj/item/device/flashlight/pen
@@ -129,7 +119,7 @@
 	flags = FPRINT | TABLEPASS | CONDUCT
 	m_amt = 0
 	g_amt = 0
-	light_on = 1
+	on = 1


 // green-shaded desk lamp
@@ -163,21 +153,22 @@
 	var/produce_heat = 1500

 /obj/item/device/flashlight/flare/New()
-	fuel = rand(1500, 2000) // Last 10 to 15 minutes.
+	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
 	..()

 /obj/item/device/flashlight/flare/process()
 	var/turf/pos = get_turf(src)
-	pos.hotspot_expose(produce_heat, 5)
+	if(pos)
+		pos.hotspot_expose(produce_heat, 5)
 	fuel = max(fuel - 1, 0)
-	if(!fuel || !light_on)
+	if(!fuel || !on)
 		turn_off()
 		if(!fuel)
 			src.icon_state = "[initial(icon_state)]-empty"
 		processing_objects -= src

 /obj/item/device/flashlight/flare/proc/turn_off()
-	light_on = 0
+	on = 0
 	src.force = initial(src.force)
 	src.damtype = initial(src.damtype)
 	if(ismob(loc))
@@ -187,19 +178,18 @@
 		update_brightness(null)

 /obj/item/device/flashlight/flare/attack_self(mob/user)
+
 	// Usual checks
-	if(loc != usr)
-		return
 	if(!fuel)
 		user << "<span class='notice'>It's out of fuel.</span>"
 		return
-	if(!light_on)
-		user.visible_message("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
-	else
+	if(on)
 		return
+
+	. = ..()
 	// All good, turn it on.
-	light_on = 1
-	update_brightness(user)
-	src.force = on_damage
-	src.damtype = "fire"
-	processing_objects += src
+	if(.)
+		user.visible_message("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
+		src.force = on_damage
+		src.damtype = "fire"
+		processing_objects += src
@@ -110,12 +110,12 @@

 /obj/item/device/paicard/proc/removePersonality()
 	src.pai = null
-	src.overlays = null
+	src.overlays.Cut()
 	src.overlays += "pai-off"

 /obj/item/device/paicard/proc/setEmotion(var/emotion)
 	if(pai)
-		src.overlays = null
+		src.overlays.Cut()
 		switch(emotion)
 			if(1) src.overlays += "pai-happy"
 			if(2) src.overlays += "pai-cat"
@@ -72,7 +72,7 @@
 	name = "Captain's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cap_cypherkey"
-	channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0)
+	channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)

 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
@@ -102,8 +102,8 @@
 	name = "Head of Personnel's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "hop_cypherkey"
-	channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0)
-
+	channels = list("Supply" = 1, "Command" = 1, "Security" = 0)
+/*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
@@ -115,13 +115,12 @@
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "qm_cypherkey"
 	channels = list("Cargo" = 1, "Mining" = 1)
-
+*/
 /obj/item/device/encryptionkey/headset_cargo
-	name = "Cargo Radio Encryption Key"
+	name = "Supply Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cargo_cypherkey"
-	channels = list("Cargo" = 1)
-
+	channels = list("Supply" = 1)
 /obj/item/device/encryptionkey/ert
 	name = "NanoTrasen ERT Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
@@ -95,7 +95,7 @@

 /obj/item/device/radio/headset/heads/captain
 	name = "captain's headset"
-	desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
+	desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :m - medical, :n - science."
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/captain
@@ -130,11 +130,11 @@

 /obj/item/device/radio/headset/heads/hop
 	name = "head of personnel's headset"
-	desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining."
+	desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :c - command, :s - security"
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/hop
-
+/*
 /obj/item/device/radio/headset/headset_mine
 	name = "mining radio headset"
 	desc = "Headset used by miners. How useless. To access the mining channel, use :d."
@@ -148,10 +148,10 @@
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/qm
-
+*/
 /obj/item/device/radio/headset/headset_cargo
-	name = "cargo radio headset"
-	desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
+	name = "supply radio headset"
+	desc = "A headset used by the QM and his slaves. To access the supply channel, use :u."
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
@@ -497,10 +497,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					freq_text = "Engineering"
 				if(1359)
 					freq_text = "Security"
-				if(1349)
-					freq_text = "Mining"
+//				if(1349)
+//					freq_text = "Mining"
 				if(1347)
-					freq_text = "Cargo"
+					freq_text = "Supply"
 			//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO

 			if(!freq_text)
@@ -257,6 +257,23 @@ MASS SPECTROMETER
 	src.add_fingerprint(user)
 	return

+/obj/item/device/mass_spectrometer
+	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+	name = "mass-spectrometer"
+	icon_state = "spectrometer"
+	item_state = "analyzer"
+	w_class = 2.0
+	flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+	slot_flags = SLOT_BELT
+	throwforce = 5
+	throw_speed = 4
+	throw_range = 20
+	m_amt = 30
+	g_amt = 20
+	origin_tech = "magnets=2;biotech=2"
+	var/details = 0
+	var/recent_fail = 0
+
 /obj/item/device/mass_spectrometer/New()
 	..()
 	var/datum/reagents/R = new/datum/reagents(5)
@@ -307,3 +324,8 @@ MASS SPECTROMETER
 		reagents.clear_reagents()
 	return

+/obj/item/device/mass_spectrometer/adv
+	name = "advanced mass-spectrometer"
+	icon_state = "adv_spectrometer"
+	details = 1
+	origin_tech = "magnets=4;biotech=2"
@@ -1,32 +0,0 @@
-/obj/item/weapon/cloaking_device
-	name = "cloaking device"
-	desc = "Use this to become invisible to the human eyesocket."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "shield0"
-	var/active = 0.0
-	flags = FPRINT | TABLEPASS| CONDUCT
-	item_state = "electronic"
-	throwforce = 10.0
-	throw_speed = 2
-	throw_range = 10
-	w_class = 2.0
-	origin_tech = "magnets=3;syndicate=4"
-
-
-/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
-		user << "\blue The cloaking device is now active."
-		src.icon_state = "shield1"
-	else
-		user << "\blue The cloaking device is now inactive."
-		src.icon_state = "shield0"
-	src.add_fingerprint(user)
-	return
-
-/obj/item/weapon/cloaking_device/emp_act(severity)
-	active = 0
-	icon_state = "shield0"
-	if(ismob(loc))
-		loc:update_icons()
-	..()
@@ -115,7 +115,7 @@
 			toggle = 1

 /obj/item/device/transfer_valve/update_icon()
-	overlays = null
+	overlays.Cut()
 	underlays = null

 	if(!tank_one && !tank_two && !attached_device)
@@ -164,16 +164,16 @@
 		else
 			attacher_name = "[attacher.name]([attacher.ckey])"

-		var/log_str = "Bomb valve opened in <A HREF='?src=%holder_ref%;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name]</a> "
+		var/log_str = "Bomb valve opened in <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name]</a> "
 		log_str += "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]"

 		if(attacher)
-			log_str += "(<A HREF='?src=%holder_ref%;adminmoreinfo=\ref[attacher]'>?</A>)"
+			log_str += "(<A HREF='?_src_=holder;adminmoreinfo=\ref[attacher]'>?</A>)"

 		var/mob/mob = get_mob_by_key(src.fingerprintslast)
 		var/last_touch_info = ""
 		if(mob)
-			last_touch_info = "(<A HREF='?src=%holder_ref%;adminmoreinfo=\ref[mob]'>?</A>)"
+			last_touch_info = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[mob]'>?</A>)"

 		log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
 		bombers += log_str
@@ -59,12 +59,18 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			continue

 		path_obj = text2path(path_text)
-		item = new path_obj()
-		name = O[3]
-		del item

-		dat += "<A href='byond://?src=\ref[src];buy_item=[path_text];cost=[cost]'>[name]</A> ([cost])<BR>"
-		category_items++
+		// Because we're using strings, this comes up if item paths change.
+		// Failure to handle this error borks uplinks entirely.  -Sayu
+		if(!path_obj)
+			error("Syndicate item is not a valid path: [path_text]")
+		else
+			item = new path_obj()
+			name = O[3]
+			del item
+
+			dat += "<A href='byond://?src=\ref[src];buy_item=[path_text];cost=[cost]'>[name]</A> ([cost])<BR>"
+			category_items++

 	dat += "<A href='byond://?src=\ref[src];buy_item=random'>Random Item (??)</A><br>"
 	dat += "<HR>"
@@ -81,7 +87,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid

 	if(uses > 9)
 		randomItems.Add("/obj/item/toy/syndicateballoon")//Syndicate Balloon
-		randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_uplink") //Uplink Implanter
+		randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_uplink") //Uplink Implanter
 		randomItems.Add("/obj/item/weapon/storage/box/syndicate") //Syndicate bundle

 	//if(uses > 8)	//Nothing... yet.
@@ -104,15 +110,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 		randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector

 	if(uses > 2)
-		randomItems.Add("/obj/item/weapon/storage/emp_kit") //EMP Grenades
+		randomItems.Add("/obj/item/weapon/storage/box/emps") //EMP Grenades
 		randomItems.Add("/obj/item/weapon/pen/paralysis") //Paralysis Pen
 		randomItems.Add("/obj/item/weapon/cartridge/syndicate") //Detomatix Cartridge
 		randomItems.Add("/obj/item/clothing/under/chameleon") //Chameleon Jumpsuit
 		randomItems.Add("/obj/item/weapon/card/id/syndicate") //Agent ID Card
 		randomItems.Add("/obj/item/weapon/card/emag") //Cryptographic Sequencer
-		randomItems.Add("/obj/item/weapon/storage/syndie_kit/space") //Syndicate Space Suit
+		randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/space") //Syndicate Space Suit
 		randomItems.Add("/obj/item/device/encryptionkey/binary") //Binary Translator Key
-		randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_freedom") //Freedom Implant
+		randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_freedom") //Freedom Implant
 		randomItems.Add("/obj/item/clothing/glasses/thermal/syndi") //Thermal Imaging Goggles

 	if(uses > 1)
@@ -142,7 +148,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 		switch(buyItem) //Ok, this gets a little messy, sorry.
 			if("/obj/item/weapon/circuitboard/teleporter")
 				uses -= 20
-			if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate")
+			if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/box/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate")
 				uses -= 10
 			if("/obj/item/weapon/aiModule/syndicate" , "/obj/item/device/radio/beacon/syndicate")
 				uses -= 7
@@ -152,9 +158,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 				uses -= 5
 			if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon")
 				uses -= 4
-			if("/obj/item/weapon/storage/emp_kit" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \
-			"/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \
-			"/obj/item/weapon/storage/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi")
+			if("/obj/item/weapon/storage/box/emps" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \
+			"/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/box/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \
+			"/obj/item/weapon/storage/box/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi")
 				uses -= 3
 			if("/obj/item/ammo_magazine/a357" , "/obj/item/clothing/shoes/syndigaloshes" , "/obj/item/weapon/plastique", "/obj/item/weapon/card/id/syndicate")
 				uses -= 2
@@ -172,7 +178,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			feedback_add_details("traitor_uplink_items_bought","TP")
 		if("/obj/item/toy/syndicateballoon")
 			feedback_add_details("traitor_uplink_items_bought","BS")
-		if("/obj/item/weapon/storage/syndie_kit/imp_uplink")
+		if("/obj/item/weapon/storage/box/syndie_kit/imp_uplink")
 			feedback_add_details("traitor_uplink_items_bought","UI")
 		if("/obj/item/weapon/storage/box/syndicate")
 			feedback_add_details("traitor_uplink_items_bought","BU")
@@ -192,7 +198,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			feedback_add_details("traitor_uplink_items_bought","VC")
 		if("/obj/item/device/chameleon")
 			feedback_add_details("traitor_uplink_items_bought","CP")
-		if("/obj/item/weapon/storage/emp_kit")
+		if("/obj/item/weapon/storage/box/emps")
 			feedback_add_details("traitor_uplink_items_bought","EM")
 		if("/obj/item/weapon/pen/paralysis")
 			feedback_add_details("traitor_uplink_items_bought","PP")
@@ -204,11 +210,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			feedback_add_details("traitor_uplink_items_bought","AC")
 		if("/obj/item/weapon/card/emag")
 			feedback_add_details("traitor_uplink_items_bought","EC")
-		if("/obj/item/weapon/storage/syndie_kit/space")
+		if("/obj/item/weapon/storage/box/syndie_kit/space")
 			feedback_add_details("traitor_uplink_items_bought","SS")
 		if("/obj/item/device/encryptionkey/binary")
 			feedback_add_details("traitor_uplink_items_bought","BT")
-		if("/obj/item/weapon/storage/syndie_kit/imp_freedom")
+		if("/obj/item/weapon/storage/box/syndie_kit/imp_freedom")
 			feedback_add_details("traitor_uplink_items_bought","FI")
 		if("/obj/item/clothing/glasses/thermal/syndi")
 			feedback_add_details("traitor_uplink_items_bought","TM")