Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	code/modules/power/apc.dm

baystation12.dme

@@ -95,6 +95,7 @@
 #define FILE_DIR "code/modules/clothing/uniforms"
 #define FILE_DIR "code/modules/critters"
 #define FILE_DIR "code/modules/critters/hivebots"
+#define FILE_DIR "code/modules/flufftext"
 #define FILE_DIR "code/modules/food"
 #define FILE_DIR "code/modules/mining"
 #define FILE_DIR "code/modules/mob"
@@ -450,6 +451,7 @@
 #include "code\game\machinery\autolathe.dm"
 #include "code\game\machinery\biogenerator.dm"
 #include "code\game\machinery\camera.dm"
+#include "code\game\machinery\camera_monitor.dm"
 #include "code\game\machinery\cell_charger.dm"
 #include "code\game\machinery\cloning.dm"
 #include "code\game\machinery\constructable_frame.dm"
@@ -509,6 +511,7 @@
 #include "code\game\machinery\computer\crew.dm"
 #include "code\game\machinery\computer\explosive.dm"
 #include "code\game\machinery\computer\hologram.dm"
+#include "code\game\machinery\computer\lockdown.dm"
 #include "code\game\machinery\computer\medical.dm"
 #include "code\game\machinery\computer\Operating.dm"
 #include "code\game\machinery\computer\power.dm"
@@ -658,7 +661,6 @@
 #include "code\game\objects\items\weapons\cigs_lighters.dm"
 #include "code\game\objects\items\weapons\clown_items.dm"
 #include "code\game\objects\items\weapons\dna_injector.dm"
-#include "code\game\objects\items\weapons\evidence.dm"
 #include "code\game\objects\items\weapons\explosives.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
 #include "code\game\objects\items\weapons\grenades.dm"
@@ -677,6 +679,7 @@
 #include "code\game\objects\items\weapons\stungloves.dm"
 #include "code\game\objects\items\weapons\surgery_tools.dm"
 #include "code\game\objects\items\weapons\swords_axes_etc.dm"
+#include "code\game\objects\items\weapons\syndie.dm"
 #include "code\game\objects\items\weapons\table_rack_parts.dm"
 #include "code\game\objects\items\weapons\teleportation.dm"
 #include "code\game\objects\items\weapons\tiles_wires.dm"
@@ -795,6 +798,8 @@
 #include "code\modules\critters\critter_defenses.dm"
 #include "code\modules\critters\critters.dm"
 #include "code\modules\critters\hivebots\hivebot.dm"
+#include "code\modules\flufftext\Dreaming.dm"
+#include "code\modules\flufftext\TextFilters.dm"
 #include "code\modules\food\food.dm"
 #include "code\modules\food\recipes_microwave.dm"
 #include "code\modules\mining\datum_processing_recipe.dm"
@@ -828,6 +833,7 @@
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\blob\blob.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
+#include "code\modules\mob\living\carbon\give.dm"
 #include "code\modules\mob\living\carbon\shock.dm"
 #include "code\modules\mob\living\carbon\alien\alien.dm"
 #include "code\modules\mob\living\carbon\alien\say.dm"
@@ -1027,6 +1033,7 @@
 #include "code\WorkInProgress\Ported\ZeroPoint\LaserComputer.dm"
 #include "code\WorkInProgress\Ported\ZeroPoint\SuperMatter.dm"
 #include "code\WorkInProgress\SkyMarshal\coatrack.dm"
+#include "code\WorkInProgress\SkyMarshal\evidence.dm"
 #include "code\WorkInProgress\SkyMarshal\traitoritems.dm"
 #include "code\WorkInProgress\SkyMarshal\wardrobes.dm"
 #include "code\WorkInProgress\Tastyfish\Eliza.dm"

code/WorkInProgress/Cael_Aislinn/MultiZ.dm

@@ -31,6 +31,55 @@
 
 /obj/multiz/ladder/attack_hand(var/mob/M)
 	M.Move(locate(src.x, src.y, targetZ()))
+
+
+/obj/multiz/ladder/hatch
+	icon_state = "hatchdown"
+	name = "hatch"
+	desc = "A Hatch. You climb down it, and it will automatically seal against pressure loss behind you."
+
+/obj/multiz/ladder/hatch/New()
+	..()
+	if(istop == 1)
+		icon_state = "hatchdown"
+
+/obj/multiz/ladder/hatch/hatchbottom
+	icon_state = "hatchdown"
+
+/obj/multiz/ladder/hatch/hatchbottom/New()
+	istop = 0
+	..()
+
+/obj/multiz/ladder/hatch/attack_hand(var/mob/M)
+	var/obj/multiz/ladder/hatch/Htop
+	var/obj/multiz/ladder/hatch/Hbottom
+	if(!istop && src.z > 1)
+		Htop = locate(/obj/multiz/ladder/hatch, locate(src.x, src.y, src.z-1))
+		Hbottom = src
+	else
+		Hbottom = locate(/obj/multiz/ladder/hatch, locate(src.x, src.y, src.z + 1))
+		Htop = src
+
+	if(!Htop)
+		//world << "Htop == null"
+		return
+	if(!Hbottom)
+		//world << "Hbottom == null"
+		return
+
+	if(Htop.icon_state == "hatchdown")
+		flick("hatchdown-open",Htop)
+		Hbottom.overlays += "green-ladderlight"
+		spawn(7)
+			if(M.z == src.z && get_dist(src,M) <= 1)
+				M.Move(locate(src.x, src.y, targetZ()))
+			flick("hatchdown-close",Htop)
+			Hbottom.overlays -= "green-ladderlight"
+			Hbottom.overlays += "red-ladderlight"
+			spawn(7)
+				Htop.icon_state = "hatchdown"
+				Hbottom.overlays -= "red-ladderlight"
+
 /*
 /obj/multiz/ladder/blob_act()
 	var/newblob = 1
@@ -81,7 +130,7 @@
 /turf/simulated/floor/open
 	name = "open space"
 	intact = 0
-	icon_state = "open"
+	icon_state = "black"
 	pathweight = 100000 //Seriously, don't try and path over this one numbnuts
 	var/icon/darkoverlays = null
 	var/turf/floorbelow
@@ -115,10 +164,22 @@
 			spawn(1)
 				if(AM)
 					AM.Move(locate(x, y, z + 1))
-					if (istype(AM, /mob))
-						AM:bruteloss += 20 //You were totally doin it wrong. 5 damage? Really? - Aryn
-						AM:weakened = max(AM:weakened,5)
-						AM:updatehealth()
+					if (istype(AM, /mob/living/carbon/human))
+						var/mob/living/carbon/human/H = AM
+						var/damage = rand(5,15)
+						H.apply_damage(2*damage, BRUTE, "head")
+						H.apply_damage(2*damage, BRUTE, "chest")
+						H.apply_damage(0.5*damage, BRUTE, "l_leg")
+						H.apply_damage(0.5*damage, BRUTE, "r_leg")
+						H.apply_damage(0.5*damage, BRUTE, "l_arm")
+						H.apply_damage(0.5*damage, BRUTE, "r_arm")
+
+						var/obj/effect/decal/cleanable/blood/B = new(src.loc)
+						B.blood_DNA = H.dna.unique_enzymes
+						B.blood_type = H.b_type
+
+						H:weakened = max(H:weakened,2)
+						H:updatehealth()
 		return ..()
 
 	attackby()
@@ -137,8 +198,8 @@
 		I.layer = TURF_LAYER + 0.2
 		src.addoverlay(I)*/
 
-var/maxZ = 1
-var/minZ = 1
+var/maxZ = 6
+var/minZ = 2
 
 // Maybe it's best to have this hardcoded for whatever we'd add to the map, in order to avoid exploits
 // (such as mining base => admin station)

code/WorkInProgress/Ported/Bureaucracy/filing.dm

@@ -19,5 +19,5 @@
 		user << "The [src] is empty."
 		return
 	var/obj/item/weapon/paper/P = input(user,"Choose a sheet to take out.","[src]", "Cancel") as null|obj in src.contents
-	if(in_range(src,user))
+	if(!isnull(P) && in_range(src,user))
 		P.loc = user.loc

code/WorkInProgress/SkyMarshal/evidence.dm

@@ -16,8 +16,6 @@
 */
 
 /obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
-
-//Now you can put it into a briefcase, if it is in your hand.  Otherwise, if it is evidence on the ground, it picks it up.
 	if(istype(O, /obj/item/weapon/storage) && O in user)
 		user << "You put the evidence bag into the [O]."
 		return ..()
@@ -30,19 +28,17 @@
 	if(src.contents.len > 0)
 		user << "The [src] already has something inside it."
 		return ..()
-	if(istype(O.loc, /obj/item/weapon/storage))
-		user << "This is broke as hell."
-		return
-/*		var/obj/item/weapon/storage/U = O.loc
-		w_class = O.w_class
-		for(var/i, i < U.contents.len, i++)
-			if(O in U.contents[i])
-				U.contents[i] = null
-				O.loc = src
-				continue*/
+	if(istype(O.loc,/obj/item/weapon/storage))
+		var/obj/item/weapon/storage/U = O.loc
+		user.client.screen -= O
+		U.contents.Remove(O)
+	if(istype(O.loc,/obj/item/clothing/suit/storage/))
+		var/obj/item/clothing/suit/storage/U = O.loc
+		user.client.screen -= O
+		U.contents.Remove(O)
 	user << "You put the [O] inside the [src]."
 	icon_state = "evidence"
-	src.underlays += O
+	src.overlays += O
 	desc = "An evidence bag containing \a [O]. [O.desc]"
 	O.loc = src
 	w_class = O.w_class
@@ -53,7 +49,7 @@
 	if (src.contents.len > 0)
 		var/obj/item/I = src.contents[1]
 		user << "You take the [I] out of the [src]."
-		src.underlays -= I
+		src.overlays -= I
 		I.loc = get_turf(user.loc)
 		w_class = 1
 		src.icon_state = "evidenceobj"
@@ -72,7 +68,7 @@
 		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/evidencebag(src)
-		new /obj/item/weapon/f_card(src)
+		new /obj/item/weapon/evidencebag(src)
 		new /obj/item/weapon/f_card(src)
 		..()
 		return

code/WorkInProgress/SkyMarshal/wardrobes.dm

@@ -5,6 +5,7 @@
 	icon_state = "wardrobe"
 	item_state = "wardrobe"
 	w_class = 4
+	layer = 2.9
 	var
 		descriptor = "various clothing."
 
@@ -34,7 +35,7 @@
 	examine()
 		set src in usr
 		..()
-		usr << "It claims to contain [contents.len ? descriptor : descriptor + "...but it looks empty"]"
+		usr << "It claims to contain [contents.len ? descriptor : descriptor + "... but it looks empty"]"
 		return
 
 	update_icon()
@@ -481,7 +482,6 @@
 		new /obj/item/weapon/pen(src)
 		new /obj/item/weapon/clipboard(src)
 		new /obj/item/device/pda/quartermaster(src)
-		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/device/radio/headset/heads/qm(src)
 		new /obj/item/clothing/shoes/black(src)
@@ -497,7 +497,6 @@
 		new /obj/item/weapon/storage/box(BPK)
 		new /obj/item/weapon/pen(src)
 		new /obj/item/device/pda/quartermaster(src)
-		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/device/radio/headset/headset_cargo(src)
 		new /obj/item/clothing/shoes/black(src)
 		new /obj/item/clothing/under/rank/cargo(src)
@@ -518,7 +517,6 @@
 		new /obj/item/weapon/pickaxe(src)
 		new /obj/item/weapon/crowbar(src)
 		new /obj/item/clothing/glasses/meson(src)
-		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/device/radio/headset/headset_mine(src)
 		new /obj/item/clothing/shoes/black(src)
 		new /obj/item/clothing/under/rank/miner(src)

code/WorkInProgress/detective_work.dm

@@ -49,24 +49,42 @@ atom/proc/add_fibers(mob/living/carbon/human/M)
 			suit_fibers += "Material from a pair of [M.gloves.name]."
 	if(!suit_fibers.len) del suit_fibers
 
+#define FINGERPRINT_COMPLETE 6	//This is the output of the stringpercent(print) proc, and means about 80% of
+								//the print must be there for it to be complete.  (Prints are 32 digits)
 
 obj/machinery/computer/forensic_scanning
 	name = "High-Res Forensic Scanning Computer"
 	icon_state = "forensic"
-	var/obj/item/scanning
-	var/temp = ""
-	var/canclear = 1
-	var/authenticated = 0
+	var
+		obj/item/scanning
+		temp = ""
+		canclear = 1
+		authenticated = 0
 
-	var/scan_data = ""
-	var/scan_name = ""
-	var/scan_process = 0
+//Here's the structure for files: each entry is a list, and entry one in that list is the string of their
+//full and scrambled fingerprint.  This acts as the method to arrange evidence.  Each subsequent entry is list
+//in the form (from entries):
+//	1: Object
+//	2: All prints on the object
+//	3: All fibers on the object
+//	4: All blood on the object
+//This is then used to show what objects were used to "find" the full print, as well as the fibers on it.
+		list/files
+//This holds objects (1) without prints, and their fibers(2) and blood(3).
+		list/misc
+		obj/item/weapon/f_card/card
+
+		scan_data = ""
+		scan_name = ""
+		scan_process = 0
 
 	req_access = list(access_forensics_lockers)
 
+
 	attack_ai(mob/user)
 		return attack_hand(user)
 
+
 	attack_hand(mob/user)
 		if(..())
 			return
@@ -86,22 +104,217 @@ obj/machinery/computer/forensic_scanning
 				if(scanning)
 					if(scan_process)
 						dat += "Scan Object: {[scanning.name]}<br>"
-						dat += "<a href='?src=\ref[src];operation=cancel'>{Cancel Scan}</a> {Print}<br><br>"
+						dat += "<a href='?src=\ref[src];operation=cancel'>{Cancel Scan}</a> {Print}<br>"
 					else
 						if(isai) dat += "Scan Object: {[scanning.name]}<br>"
 						else dat += "Scan Object: <a href='?src=\ref[src];operation=eject'>{[scanning.name]}</a><br>"
-						dat += "<a href='?src=\ref[src];operation=scan'>{Scan}</a> <a href='?src=\ref[src];operation=print'>{Print}</a><br><br>"
+						dat += "<a href='?src=\ref[src];operation=scan'>{Scan}</a> <a href='?src=\ref[src];operation=print'>{Print}</a><br>"
 				else
 					if(isai) dat += "{No Object Inserted}<br>"
 					else dat += "<a href='?src=\ref[src];operation=insert'>{No Object Inserted}</a><br>"
-					dat += "{Scan} <a href='?src=\ref[src];operation=print'>{Print}</a><br><br>"
+					dat += "{Scan} <a href='?src=\ref[src];operation=print'>{Print}</a><br>"
+				dat += "<a href='?src=\ref[src];operation=database'>{Access Database}</a><br><br>"
 				dat += "<tt>[scan_data]</tt>"
 				if(scan_data && !scan_process)
 					dat += "<br><a href='?src=\ref[src];operation=erase'>{Erase Data}</a>"
 		user << browse(dat,"window=scanner")
 		onclose(user,"scanner")
+
+
 	ex_act()
 		return
+
+
+	proc/add_data_scanner(var/obj/item/device/detective_scanner/W)
+		for(var/i = 1, i < (W.stored.len + 1), i++)
+			var/list/data = W.stored[i]
+			add_data(data[1],1,data[2],data[3],data[4])
+
+
+	proc/add_data(var/atom/A, var/override = 0, var/tempfingerprints, var/tempsuit_fibers,var/tempblood_DNA)
+//What follows is massive.  It cross references all stored data in the scanner with the other stored data,
+//and what is already in the computer.  Not sure how bad the lag may/may not be.
+		var
+			backup_prints
+			backup_fibers
+			backup_DNA
+		if(override)
+			backup_prints = A.fingerprints
+			A.fingerprints = tempfingerprints
+			backup_fibers = A.suit_fibers
+			A.suit_fibers = tempsuit_fibers
+			backup_DNA = A.blood_DNA
+			A.blood_DNA = tempblood_DNA
+		if((!A.fingerprints || !length(A.fingerprints)))	//No prints
+			var/merged = 0
+			if(!misc)
+				misc = list()
+			if(misc)
+				for(var/i = 1, i < (misc.len + 1), i++)	//Lets see if we can find it.
+					var/list/templist = misc[i]
+					var/check = templist[1]
+					if(check == A) //There it is!
+						merged = 1
+						var/list/fibers = templist[2]
+						if(!fibers)
+							fibers = list()
+						if(A.suit_fibers)
+							for(var/j = 1, j < (A.suit_fibers.len + 1), j++)	//Fibers~~~
+								if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
+									fibers += A.suit_fibers[j]
+						var/list/blood = templist[3]
+						if(!blood)
+							blood = list()
+						if(A.blood_DNA)
+							for(var/j = 1, j < (A.blood_DNA.len + 1), j++)	//Blood~~~
+								if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
+									blood += A.blood_DNA[j]
+						var/list/sum_list[3]	//Pack it back up!
+						sum_list[1] = A
+						sum_list[2] = fibers
+						sum_list[3] = blood
+						misc[i] = sum_list	//Store it!
+						break	//We found it, we're done here.
+			if(!merged)	//Nope!  Guess we have to add it!
+				var/list/templist[3]
+				templist[1] = A
+				templist[2] = A.suit_fibers
+				templist[3] = A.blood_DNA
+				misc.len++
+				misc[misc.len] = templist	//Store it!
+			return !merged
+		else //Has prints.
+			var/list/found_prints[A.fingerprints.len + 1]
+			for(var/i = 1, i < (found_prints.len + 1), i++)
+				found_prints[i] = 0
+			if(!files)
+				files = list()
+			for(var/i = 1, i < (files.len + 1), i++)	//Lets see if we can find the owner of the prints
+				var/list/perp_list = files[i]
+				var/list/perp_prints = params2list(perp_list[1])
+				var/perp = perp_prints[num2text(1)]
+				var/found2 = 0
+				for(var/m = 1, m < (A.fingerprints.len + 1), m++)	//Compare database prints with prints on object.
+					var/list/test_prints_list = params2list(A.fingerprints[m])
+					var/checker = test_prints_list[num2text(1)]
+					if(checker == perp)	//Found 'em!  Merge!
+						found_prints[m] = 1
+						for(var/n = 2, n < (perp_list.len + 1), n++)	//Lets see if it is already in the database
+							var/list/target = perp_list[n]
+							if(target[1] == A)	//Found the original object!
+								found2 = 1
+								var/list/prints = target[2]
+								if(!prints)
+									prints = list()
+								if(A.fingerprints)
+									for(var/j = 1, j < (A.fingerprints.len + 1), j++)	//Fingerprints~~~
+										var/list/print_test1 = params2list(A.fingerprints[j])
+										var/test_print1 = print_test1[num2text(1)]
+										var/found = 0
+										for(var/k = 1, k <= (prints.len + 1), k++)	//Lets see if the print is already in there
+											var/list/print_test2 = params2list(prints[k])
+											var/test_print2 = print_test2[num2text(1)]
+											if(test_print2 == test_print1)	//It is!  Merge!
+												prints[k] = "1=" + test_print2 + "&2=" + stringmerge(print_test2[num2text(2)],print_test1[num2text(2)])
+												found = 1
+												break	//We found it, we're done here.
+										if(!found)	//It isn't!  Add!
+											prints += A.fingerprints[j]
+								var/list/fibers = target[3]
+								if(!fibers)
+									fibers = list()
+								if(A.suit_fibers)
+									for(var/j = 1, j < A.suit_fibers.len, j++)	//Fibers~~~
+										if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
+											fibers += A.suit_fibers[j]
+								var/list/blood = target[4]
+								if(!blood)
+									blood = list()
+								if(A.blood_DNA)
+									for(var/j = 1, j < A.blood_DNA.len, j++)	//Blood~~~
+										if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
+											blood += A.blood_DNA[j]
+								var/list/sum_list[4]	//Pack it back up!
+								sum_list[1] = A
+								sum_list[2] = prints
+								sum_list[3] = fibers
+								sum_list[4] = blood
+								perp_list[n] = sum_list	//Store it!
+								files[i] = perp_list
+								break	//We found it, we're done here.
+						if(!found2) //Add a new datapoint to this perp!
+							var/list/sum_list[4]
+							sum_list[1] = A
+							sum_list[2] = A.fingerprints
+							sum_list[3] = A.suit_fibers
+							sum_list[4] = A.blood_DNA
+							perp_list.len++
+							perp_list[perp_list.len] = sum_list
+							files[i] = perp_list
+			for(var/m = 1, m < found_prints.len, m++)	//Uh Oh!  A print wasn't used!  New datapoint!
+				if(found_prints[m] == 0)
+					var/list/newperp[2]
+					var/list/sum_list[4]
+					sum_list[1] = A
+					sum_list[2] = A.fingerprints
+					sum_list[3] = A.suit_fibers
+					sum_list[4] = A.blood_DNA
+					newperp[2] = sum_list
+					newperp[1] = A.fingerprints[m]
+					if(!files)
+						files = newperp
+					else
+						files.len++
+						files[files.len] = newperp
+			update_fingerprints()	//Lets update the calculated sum of the stored prints.
+			if(override)
+				A.fingerprints = backup_prints
+				A.suit_fibers = backup_fibers
+				A.blood_DNA = backup_DNA
+			return
+
+
+	proc/update_fingerprints()	//I am tired, but this updates the master print, which is used to determine completion of a print.
+		for(var/k = 1, k < (files.len + 1), k++)
+			var/list/perp_list = files[k]
+			var/list/perp_prints = params2list(perp_list[1])
+			var/perp = perp_prints[num2text(1)]
+			var/list/found_prints = list()
+			for(var/i = 2, i < (perp_list.len + 1), i++)
+				var/list/test_list = perp_list[i]
+				var/list/test_prints = test_list[2]
+				for(var/j = 1, j < (test_prints.len + 1), j++)
+					var/list/test_list_2 = params2list(test_prints[j])
+					var/test_prints_2 = test_list_2[num2text(1)]
+					if(test_prints_2 == perp)
+						found_prints += test_list_2[num2text(2)]
+						break
+			for(var/prints in found_prints)
+				perp_prints[num2text(2)] = stringmerge(perp_prints[num2text(2)],prints)
+			perp_list[1] = "1=" + perp + "&2=" + perp_prints[num2text(2)]
+			files[k] = perp_list
+		return
+
+	proc/process_card()	//I am tired, but this updates the master print from a fingerprint card
+						//which is used to determine completion of a print.
+		if(card.fingerprints)
+			for(var/k = 1, k < (card.fingerprints.len + 1), k++)
+				var/list/test_prints = params2list(card.fingerprints[k])
+				var/print = test_prints[num2text(1)]
+				for(var/i = 1, i < (files.len + 1), i++)
+					var/list/test_list = files[i]
+					var/list/perp_prints = params2list(test_list[1])
+					var/perp = perp_prints[num2text(1)]
+					if(perp == print)
+						test_list[1] = "1=" + print + "&2=" + print
+						files[i] = test_list
+						break
+		del(card)
+		return
+
+	proc/get_name(var/atom/A)
+		return A.name
+
 	Topic(href,href_list)
 		switch(href_list["operation"])
 			if("login")
@@ -135,7 +348,7 @@ obj/machinery/computer/forensic_scanning
 					if(istype(I, /obj/item/weapon/evidencebag))
 						scanning = I.contents[1]
 						scanning.loc = src
-						I.underlays = null
+						I.overlays -= scanning
 						I.icon_state = "evidenceobj"
 					else
 						scanning = I
@@ -143,6 +356,141 @@ obj/machinery/computer/forensic_scanning
 						I.loc = src
 				else
 					temp = "Invalid Object Rejected."
+			if("card")
+				var/mob/M = usr
+				var/obj/item/I = M.equipped()
+				if(I && istype(I,/obj/item/weapon/f_card))
+					card = I
+					M.drop_item()
+					I.loc = src
+					process_card()
+					usr << "You insert the card, and it is destroyed by the machinery in the process of comparing prints."
+				else
+					usr << "\red Invalid Object Rejected."
+			if("database")
+				canclear = 1
+				if(!misc && !files)
+					temp = "Database is empty."
+				else
+					if(files)
+						temp = "<b>Criminal Evidence Database</b><br><br>"
+						temp += "Consolidated data points:<br>"
+						for(var/i = 1, i < (files.len + 1), i++)
+							temp += "<a href='?src=\ref[src];operation=record;identifier=[i]'>{Dossier [i]}</a><br>"
+						temp += "<br><a href='?src=\ref[src];operation=card'>{Insert Finger Print Card}</a><br><br><br>"
+					else
+						temp = ""
+					if(misc)
+						temp += "<b>Auxiliary Evidence Database</b><br><br>"
+						temp += "This is where anything without fingerprints goes.<br><br>"
+						for(var/i = 1, i < (misc.len + 1), i++)
+							var/list/temp_list = misc[i]
+							var/item_name = get_name(temp_list[1])
+							temp += "<a href='?src=\ref[src];operation=auxiliary;identifier=[i]'>{[item_name]}</a><br>"
+			if("record")
+				canclear = 0
+				if(files)
+					temp = "<b>Criminal Evidence Database</b><br><br>"
+					temp += "Consolidated data points: Dossier [href_list["identifier"]]<br>"
+					var/identifier = text2num(href_list["identifier"])
+					var/list/dossier = files[identifier]
+					var/list/prints = params2list(dossier[1])
+					var/print_string = "Fingerprints: Print not complete!<br>"
+					if(stringpercent(prints[num2text(2)]) <= FINGERPRINT_COMPLETE)
+						print_string = "Fingerprints: (80% or higher completion reached)<br>" + prints[num2text(2)] + "<br>"
+					temp += print_string
+					for(var/i = 2, i < (dossier.len + 1), i++)
+						var/list/outputs = dossier[i]
+						var/item_name = get_name(outputs[1])
+						var/list/prints_len = outputs[2]
+						temp += "Object: [item_name]<br>"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;[prints_len.len] Unique fingerprints found.<br>"
+						var/list/fibers = outputs[3]
+						if(fibers)
+							var/dat = "[fibers[1]]"
+							for(var/j = 2, j < (fibers.len + 1), j++)
+								dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+						else
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found.<br>"
+						var/list/blood = outputs[4]
+						if(blood)
+							var/dat = "[blood[1]]"
+							if(blood.len > 1)
+								for(var/j = 2, j < (blood.len + 1), j++)
+									dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+						else
+							temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
+				else
+					temp = "ERROR.  Database not found!<br>"
+				temp += "<br><a href='?src=\ref[src];operation=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
+			if("databaseprint")
+				if(files)
+					var/obj/item/weapon/paper/P = new(loc)
+					P.name = "Database File (Dossier [href_list["identifier"]])"
+					P.overlays += "paper_words"
+					P.info = "<b>Criminal Evidence Database</b><br><br>"
+					P.info += "Consolidated data points: Dossier [href_list["identifier"]]<br>"
+					var/list/dossier = files[text2num(href_list["identifier"])]
+					var/list/prints = params2list(dossier[1])
+					var/print_string = "Fingerprints: Print not complete!<br>"
+					if(stringpercent(prints[num2text(2)]) <= FINGERPRINT_COMPLETE)
+						print_string = "Fingerprints: " + prints[num2text(2)] + "<BR>"
+					P.info += print_string
+					for(var/i = 2, i < (dossier.len + 1), i++)
+						var/list/outputs = dossier[i]
+						var/item_name = get_name(outputs[1])
+						var/list/prints_len = outputs[2]
+						P.info += "Object: [item_name]<br>"
+						P.info += "&nbsp;&nbsp;&nbsp;&nbsp;[prints_len.len] Unique fingerprints found.<br>"
+						var/list/fibers = outputs[3]
+						if(fibers)
+							var/dat = "[fibers[1]]"
+							for(var/j = 2, j < (fibers.len + 1), j++)
+								dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+						else
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found.<br>"
+						var/list/blood = outputs[4]
+						if(blood)
+							var/dat = "[blood[1]]"
+							if(blood.len > 1)
+								for(var/j = 2, j < (blood.len + 1), j++)
+									dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+						else
+							P.info += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found."
+				else
+					usr << "ERROR.  Database not found!<br>"
+			if("auxiliary")
+				canclear = 0
+				if(misc)
+					temp = "<b>Auxiliary Evidence Database</b><br><br>"
+					var/identifier = text2num(href_list["identifier"])
+					var/list/outputs = misc[identifier]
+					var/item_name = get_name(outputs[1])
+					temp += "Consolidated data points: [item_name]<br>"
+					var/list/fibers = outputs[2]
+					if(fibers)
+						var/dat = "[fibers[1]]"
+						for(var/j = 2, j < (fibers.len + 1), j++)
+							dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[fibers[j]]"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;Fibers: [dat]<br>"
+					else
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;No fibers found."
+					var/list/blood = outputs[3]
+					if(blood)
+						var/dat = "[blood[1]]"
+						for(var/j = 2, j < (blood.len + 1), j++)
+							dat += ",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[blood[j]]"
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;Blood: [dat]<br>"
+					else
+						temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
+				else
+					temp = "ERROR.  Database not found!<br>"
+				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
 			if("scan")
 				if(scanning)
 					scan_process = 3
@@ -174,20 +522,20 @@ obj/machinery/computer/forensic_scanning
 					scan_data = "<u>[scanning]</u><br><br>"
 					if (scanning.blood_DNA)
 						scan_data += "Blood Found:<br>"
-						scan_data += "-Blood type: [scanning.blood_type]\nDNA: [scanning.blood_DNA]<br><br>"
+						for(var/i = 1, i < (scanning.blood_DNA.len + 1), i++)
+							var/list/templist = scanning.blood_DNA[i]
+							scan_data += "-Blood type: [templist[2]]\nDNA: [templist[1]]<br><br>"
 					else
 						scan_data += "No Blood Found<br><br>"
-					if (!( scanning.fingerprints ))
+					if (!length(scanning.fingerprints))
 						scan_data += "No Fingerprints Found<br><br>"
 					else
-						var/list/L = params2list(scanning.fingerprints)
-						scan_data += "Isolated [L.len] Fingerprints:<br>"
-						for(var/i in L)
-							scan_data += "#[L.Find(i)] - [i]<br>"
-						scan_data += "<br>"
+						var/list/L = scanning.fingerprints
+						scan_data += "Isolated [L.len] Fingerprints.  Loaded into database.<br>"
+						add_data(scanning)
 
 					if(!scanning.suit_fibers)
-						if(istype(scanning,/obj/item/device/detective_scanner))
+						/*if(istype(scanning,/obj/item/device/detective_scanner))
 							var/obj/item/device/detective_scanner/scanner = scanning
 							if(scanner.stored_name)
 								scan_data += "Fibers/Materials Data - [scanner.stored_name]:<br>"
@@ -195,21 +543,26 @@ obj/machinery/computer/forensic_scanning
 									scan_data += "- [data]<br>"
 							else
 								scan_data += "No Fibers/Materials Data<br>"
-						else
-							scan_data += "No Fibers/Materials Located<br>"
+						else*/
+						scan_data += "No Fibers/Materials Located<br>"
 					else
-						if(istype(scanning,/obj/item/device/detective_scanner))
+						/*if(istype(scanning,/obj/item/device/detective_scanner))
 							var/obj/item/device/detective_scanner/scanner = scanning
 							if(scanner.stored_name)
 								scan_data += "Fibers/Materials Data - [scanner.stored_name]:<br>"
 								for(var/data in scanner.stored_fibers)
 									scan_data += "- [data]<br>"
 							else
-								scan_data += "No Fibers/Materials Data<br>"
+								scan_data += "No Fibers/Materials Data<br>"*/
 
 						scan_data += "Fibers/Materials Found:<br>"
 						for(var/data in scanning.suit_fibers)
 							scan_data += "- [data]<br>"
+					if(istype(scanning,/obj/item/device/detective_scanner))
+						scan_data += "<br><b>Data transfered from Scanner to Database.</b><br>"
+						add_data_scanner(scanning)
+					else if(!length(scanning.fingerprints))
+						scan_data += "<br><b><a href='?src=\ref[src];operation=add'>Add to Database?</a></b><br>"
 				else
 					temp = "Scan Failed: No Object"
 
@@ -227,6 +580,11 @@ obj/machinery/computer/forensic_scanning
 				scan_data = ""
 			if("cancel")
 				scan_process = 0
+			if("add")
+				if(scanning)
+					add_data(scanning)
+				else
+					temp = "Data Transfer Failed: No Object."
 		updateUsrDialog()
 
 	detective
@@ -244,10 +602,12 @@ mob/var
 obj/item/clothing/gloves/var
 	transfer_blood = 0
 	mob/living/carbon/human/bloody_hands_mob
-/*
-obj/decal/cleanable/blood/var/track_amt = 3
 
 
+obj/effect/decal/cleanable/blood/var
+	track_amt = 3
+	mob/blood_owner
+
 turf/Exited(mob/living/carbon/human/M)
 	if(istype(M,/mob/living))
 		if(!istype(src, /turf/space))  // Bloody tracks code starts here
@@ -271,9 +631,9 @@ turf/Entered(mob/living/carbon/human/M)
 					M.shoes.track_blood--
 					src.add_bloody_footprints(M.shoes.track_blood_mob,0,M.dir,M.shoes.name)
 
-		for(var/obj/decal/cleanable/blood/B in src)
+		for(var/obj/effect/decal/cleanable/blood/B in src)
 			if(B.track_amt <= 0) continue
-			if(B.type != /obj/decal/cleanable/blood/tracks && B.type != /obj/decal/cleanable/blood/drip)
+			if(B.type != /obj/effect/decal/cleanable/blood/tracks)
 				if(istype(M,/mob/living/carbon/human))
 					if(M.shoes)
 						M.shoes.add_blood(B.blood_owner)
@@ -282,30 +642,31 @@ turf/Entered(mob/living/carbon/human/M)
 				else
 					M.add_blood(B.blood_owner)
 					M.track_blood_mob = B.blood_owner
-					M.track_blood = max(M.track_blood,8)
+					M.track_blood = max(M.track_blood,rand(4,8))
 				B.track_amt--
 				break
 	. = ..()
 
 turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info)
-	for(var/obj/decal/cleanable/blood/tracks/T in src)
+	for(var/obj/effect/decal/cleanable/blood/tracks/T in src)
 		if(T.dir == d)
 			if((leaving && T.icon_state == "steps2") || (!leaving && T.icon_state == "steps1"))
 				T.desc = "These bloody footprints appear to have been made by [info]."
 				if(istype(M,/mob/living/carbon/human))
-					T.blood_DNA = M.dna.unique_enzymes
-					T.blood_type = M.b_type
+					T.blood_DNA.len++
+					T.blood_DNA[T.blood_DNA.len] = list(M.dna.unique_enzymes,M.b_type)
 				return
-	var/obj/decal/cleanable/blood/tracks/this = new(src)
+	var/obj/effect/decal/cleanable/blood/tracks/this = new(src)
+	this.icon = 'footprints.dmi'
 	if(leaving)
-		this.icon_state = "steps2"
+		this.icon_state = "blood2"
 	else
-		this.icon_state = "steps1"
+		this.icon_state = "blood1"
 	this.dir = d
 	this.desc = "These bloody footprints appear to have been made by [info]."
 	if(istype(M,/mob/living/carbon/human))
-		this.blood_DNA = M.dna.unique_enzymes
-		this.blood_type = M.b_type
+		this.blood_DNA.len++
+		this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.b_type)
 
 proc/get_tracks(mob/M)
 	if(istype(M,/mob/living))
@@ -320,8 +681,8 @@ proc/get_tracks(mob/M)
 
 proc/blood_incompatible(donor,receiver)
 	var
-		donor_antigen = copytext(donor,1,2)
-		receiver_antigen = copytext(receiver,1,2)
+		donor_antigen = copytext(donor,1,lentext(donor))
+		receiver_antigen = copytext(receiver,1,lentext(receiver))
 		donor_rh = findtext("+",donor)
 		receiver_rh = findtext("+",receiver)
 	if(donor_rh && !receiver_rh) return 1
@@ -333,5 +694,4 @@ proc/blood_incompatible(donor,receiver)
 		if("O")
 			if(donor_antigen != "O") return 1
 		//AB is a universal receiver.
-	return 0
-*/
+	return 0

code/WorkInProgress/meteors.dm

@@ -0,0 +1,154 @@
+#define METEOR_TEMPERATURE
+
+/var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds
+//set to at least 100 unless you want evarr ruining every round
+
+/var/const/meteors_in_wave = 20
+/var/const/meteors_in_small_wave = 10
+
+/proc/meteor_wave(var/number = meteors_in_wave)
+	if(!ticker || wavesecret)
+		return
+
+	var/startx
+	var/starty
+	var/endx
+	var/endy
+	var/turf/pickedstart
+	var/turf/pickedgoal
+	switch(pick(1,2,3,4))
+		if(1) //NORTH
+			starty = world.maxy-3
+			startx = rand(1, world.maxx-1)
+			endy = 1
+			endx = rand(1, world.maxx-1)
+		if(2) //EAST
+			starty = rand(1,world.maxy-1)
+			startx = world.maxx-3
+			endy = rand(1, world.maxy-1)
+			endx = 1
+		if(3) //SOUTH
+			starty = 3
+			startx = rand(1, world.maxx-1)
+			endy = world.maxy-1
+			endx = rand(1, world.maxx-1)
+		if(4) //WEST
+			starty = rand(1, world.maxy-1)
+			startx = 3
+			endy = rand(1,world.maxy-1)
+			endx = world.maxx-1
+	pickedstart = locate(startx, starty, 1)
+	pickedgoal = locate(endx, endy, 1)
+	wavesecret = 1
+	for(var/i = 0 to number)
+		spawn(rand(10,100))
+			spawn_meteor(pickedstart, pickedgoal)
+	spawn(meteor_wave_delay)
+		wavesecret = 0
+
+/proc/spawn_meteors(var/turf/pickedstart, var/turf/pickedgoal, var/number = meteors_in_small_wave)
+	for(var/i = 0; i < number; i++)
+		spawn(0)
+			spawn_meteor(pickedstart, pickedgoal)
+
+/proc/spawn_meteor(var/turf/pickedstart, var/turf/pickedgoal)
+
+	var/route = rand(1,5)
+	var/turf/tempgoal = pickedgoal
+	for(var/i, i < route, i++)
+		tempgoal = get_step(tempgoal,rand(1,8))
+
+	var/obj/effect/meteor/M
+	switch(rand(1, 100))
+		if(1 to 15)
+			M = new /obj/effect/meteor/big(pickedstart)
+		if(16 to 75)
+			M = new /obj/effect/meteor( pickedstart )
+		if(76 to 100)
+			M = new /obj/effect/meteor/small( pickedstart )
+
+	M.dest = tempgoal
+
+	do
+		sleep(1)
+		walk_towards(M, M.dest, 1)
+	while (!istype(M.loc, /turf/space) || pickedstart.loc.name != "Space" ) //FUUUCK, should never happen.
+
+	return
+
+/obj/effect/meteor
+	name = "meteor"
+	icon = 'meteor.dmi'
+	icon_state = "flaming"
+	density = 1
+	anchored = 1.0
+	var/hits = 1
+	var/dest
+	pass_flags = PASSTABLE
+
+/obj/effect/meteor/small
+	name = "small meteor"
+	icon_state = "smallf"
+	pass_flags = PASSTABLE | PASSGRILLE
+
+/obj/effect/meteor/Move()
+	var/turf/T = src.loc
+	if (istype(T, /turf))
+		T.hotspot_expose(METEOR_TEMPERATURE, 1000)
+	..()
+	return
+
+/obj/effect/meteor/Bump(atom/A)
+	spawn(0)
+		for(var/mob/M in range(10, src))
+			if(!M.stat && !istype(M, /mob/living/silicon/ai)) //bad idea to shake an ai's view
+				shake_camera(M, 3, 1)
+		if (A)
+			A.meteorhit(src)
+			playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+		if (--src.hits <= 0)
+			if(prob(15))// && !istype(A, /obj/structure/grille))
+				explosion(src.loc, 4, 5, 6, 7, 0)
+				playsound(src.loc, "explosion", 50, 1)
+			del(src)
+	return
+
+
+/obj/effect/meteor/ex_act(severity)
+
+	if (severity < 4)
+		del(src)
+	return
+
+/obj/effect/meteor/big
+	name = "big meteor"
+	hits = 5
+
+	ex_act(severity)
+		return
+
+	Bump(atom/A)
+		spawn(0)
+			for(var/mob/M in range(10, src))
+				if(!M.stat && !istype(M, /mob/living/silicon/ai)) //bad idea to shake an ai's view
+					shake_camera(M, 3, 1)
+			if (A)
+				if(isobj(A))
+					del(A)
+				else
+					A.meteorhit(src)
+				src.hits--
+				return
+				playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+			if (--src.hits <= 0)
+				if(prob(15) && !istype(A, /obj/structure/grille))
+					explosion(src.loc, 1, 2, 3, 4, 0)
+					playsound(src.loc, "explosion", 50, 1)
+				del(src)
+		return
+
+/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/pickaxe))
+		del(src)
+		return
+	..()

code/datums/mind.dm

@@ -309,13 +309,13 @@ 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", "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","decapitate", "debrain", "protect", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
 			if (!new_obj_type) return
 
 			var/datum/objective/new_objective = null
 
 			switch (new_obj_type)
-				if ("assassinate","protect","debrain")
+				if ("assassinate","protect","debrain","decapitate")
 					//To determine what to name the objective in explanation text.
 					var/objective_type_capital = uppertext(copytext(new_obj_type, 1,2))//Capitalize first letter.
 					var/objective_type_text = copytext(new_obj_type, 2)//Leave the rest of the text.
@@ -327,7 +327,7 @@ datum/mind
 							possible_targets += possible_target.current
 
 					var/mob/def_target = null
-					var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
+					var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/decapitate)
 					if (objective&&(objective.type in objective_list) && objective:target)
 						def_target = objective:target.current
 

code/datums/sun.dm

@@ -42,7 +42,7 @@
 
 
 	for(var/obj/machinery/power/tracker/T in machines)
-		T.set_angle()
+		T.set_angle(angle)
 
 	for(var/obj/machinery/power/solar/S in machines)
 		if(S.control)

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

@@ -100,6 +100,8 @@ proc/process_ghost_teleport_locs()
 /*-----------------------------------------------------------------------------*/
 
 /area/engine/
+	name = "Engineering"
+	icon_state = "engine"
 
 /area/turret_protected/
 
@@ -671,23 +673,73 @@ proc/process_ghost_teleport_locs()
 //Engineering
 
 /area/engine
+	engineering
+
 	engine_smes
 		name = "Engineering SMES"
 		icon_state = "engine_smes"
 		requires_power = 0//This area only covers the batteries and they deal with their own power
 
-	engineering
-		name = "Engineering"
-		icon_state = "engine"
-
 	particle_accelerator
 		name = "Particle Accelerator"
-		icon_state = "engine_smes" // not really, but it's some way to distinguish
+		icon_state = "engine_pa"
 
 	chiefs_office
 		name = "Chief Engineers office"
+		icon_state = "engine_ce"
+
+//new engine areas
+	control
+		name = "Engineering Control"
 		icon_state = "engine_control"
 
+	port
+		name = "Engineering Port"
+		icon_state = "engine_port"
+
+	starboard
+		name = "Engineering Starboard"
+		icon_state = "engine_starboard"
+
+	fore
+		name = "Engineering Fore"
+		icon_state = "engine_fore"
+
+	aft
+		name = "Engineering Aft"
+		icon_state = "engine_aft"
+
+	locker
+		name = "Engineering Locker Room"
+		icon_state = "engine_locker"
+
+	construction_storage
+		name = "Engineering Construction Storage"
+		icon_state = "engine_construction"
+
+	atmos_storage
+		name = "Engineering Atmos Storage"
+		icon_state = "engine_atmos"
+
+	electrical_storage
+		name = "Engineering Electrical Storage"
+		icon_state = "engine_electrical"
+
+	secure_storage
+		name = "Engineering Secure Storage"
+		icon_state = "engine_secure"
+
+	foyer
+		name = "Engineering Foyer"
+		icon_state = "engine_foyer"
+
+	breakroom
+		name = "Engineering Break Room"
+		icon_state = "engine_breakroom"
+
+	core
+		name = "Engineering Core"
+		icon_state = "engine_core"
 
 //Solars
 

code/defines/atom.dm

@@ -2,11 +2,10 @@
 	layer = 2
 	var/level = 2
 	var/flags = FPRINT
-	var/fingerprints = null
+	var/list/fingerprints = list()
 	var/list/fingerprintshidden = new/list()
 	var/fingerprintslast = null
-	var/blood_DNA = null
-	var/blood_type = null
+	var/list/blood_DNA = null
 	var/last_bumped = 0
 	var/pass_flags = 0
 

code/defines/global.dm

@@ -169,6 +169,7 @@ var
 	//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
 	const/MAX_MESSAGE_LEN = 1024
 	const/MAX_PAPER_MESSAGE_LEN = 3072
+	const/MAX_BOOK_MESSAGE_LEN = 9216
 
 	list/paper_blacklist = list("script","frame","iframe","input","button","a","embed","object")
 

code/defines/mob/mob.dm

@@ -164,7 +164,7 @@
 	var/logged_in = 0
 
 	var/underwear = 1//Human
-	var/be_syndicate = 0//This really should be a client variable.
+	var/be_syndicate = 0 //This really should be a client variable.  EDIT: Hijacked for my own nefarious purposes!  --SkyMarshal
 	var/be_random_name = 0
 	var/const/blindness = 1//Carbon
 	var/const/deafness = 2//Carbon

code/defines/obj/closet.dm

@@ -13,6 +13,7 @@
 	var/health = 100	//Might be a bit much, dono can always change later	//Nerfed -Pete
 	var/lastbang	//
 	var/lasttry = 0
+	layer = 2.8
 
 /obj/structure/closet/acloset
 	name = "Strange closet"

code/defines/obj/computer.dm

@@ -237,6 +237,23 @@
 	network = "MINE"
 	circuit = "/obj/item/weapon/circuitboard/mining"
 
+/obj/machinery/computer/security/engineering
+	name = "Engineering Cameras"
+	desc = "Used to access the various cameras in engineering."
+	icon_state = "engineeringcameras"
+	network = "ENGINEERING"
+	circuit = "/obj/item/weapon/circuitboard/engineeringcam"
+
+/obj/machinery/computer/lockdown
+	/*
+	name = "Lockdown Control"
+	desc = "Used to control blast doors."
+	icon_state = "lockdown"
+	circuit = "/obj/item/weapon/circuitboard/lockdown"
+	var/connectedDoorIds[0]
+	var/department = ""
+	var/connected_doors[0][0]
+	*/
 
 /obj/machinery/computer/crew
 	name = "Crew monitoring computer"

code/defines/obj/decal.dm

@@ -49,9 +49,9 @@
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	var/list/viruses = list()
-	blood_DNA = null
-	blood_type = null
+	blood_DNA = list()
 	var/datum/disease2/disease/virus2 = null
+	var/OriginalMob = null
 
 	Del()
 		for(var/datum/disease/D in viruses)

code/defines/obj/door.dm

@@ -39,6 +39,7 @@
 	icon = 'rapid_pdoor.dmi'
 	icon_state = "pdoor1"
 	var/id = 1.0
+	var/networkTag = ""
 
 /obj/machinery/door/poddoor/two_tile_hor
 	var/obj/machinery/door/poddoor/filler_object/f1

code/defines/obj/storage.dm

@@ -337,6 +337,13 @@
 	icon_state = "yellow"
 	item_state = "toolbox_yellow"
 
+/obj/item/weapon/storage/PCMBox
+	name = "spare power control modules"
+	desc = "A box of spare power control module circuit boards."
+	icon = 'storage.dmi'
+	icon_state = "circuit"
+	item_state = "syringe_kit"
+
 /obj/item/weapon/storage/toolbox/syndicate
 	name = "Suspicious looking toolbox"
 	icon_state = "syndicate"

code/defines/obj/supplypacks.dm

@@ -31,6 +31,14 @@
 	containertype = "/obj/structure/closet/crate"
 	containername = "Empty Box crate"
 
+/datum/supply_packs/pcm
+	name = "Power Control Module supplies"
+	contains = list("/obj/item/weapon/storage/PCMBox",
+	"/obj/item/weapon/storage/PCMBox")
+	cost = 25
+	containertype = "/obj/structure/closet/crate"
+	containername = "Power Control Module crate"
+
 /datum/supply_packs/body_bags
 	name = "Body Bag supplies"
 	contains = list(

code/defines/procs/AStar.dm

@@ -122,7 +122,7 @@ proc
 		var/closed[] = new()
 		var/path[]
 		start = get_turf(start)
-		if(!start) return 0
+		if(!start || !end) return 0
 
 		open.Enqueue(new /PathNode(start,null,0,call(start,dist)(end)))
 

code/defines/procs/gamehelpers.dm

@@ -187,4 +187,107 @@
 		var/dy = T.y - centerturf.y
 		if(dx*dx + dy*dy <= rsq)
 			turfs += T
-	return turfs
+	return turfs
+
+proc/check_can_reach(atom/user, atom/target)
+	var/direct = get_dir(user, target)
+	var/obj/item/weapon/dummy/D = new /obj/item/weapon/dummy( user.loc )
+	var/ok = 0
+	if ( (direct - 1) & direct)
+
+		// ------- CLICKED OBJECT IS LOCATED IN A DIAGONAL POSITION FROM THE PERSON -------
+
+		var/turf/Step_1
+		var/turf/Step_2
+		switch(direct)
+			if(5.0)
+				Step_1 = get_step(user, NORTH)
+				Step_2 = get_step(user, EAST)
+
+			if(6.0)
+				Step_1 = get_step(user, SOUTH)
+				Step_2 = get_step(user, EAST)
+
+			if(9.0)
+				Step_1 = get_step(user, NORTH)
+				Step_2 = get_step(user, WEST)
+
+			if(10.0)
+				Step_1 = get_step(user, SOUTH)
+				Step_2 = get_step(user, WEST)
+
+			else
+		if(Step_1 && Step_2)
+
+			// ------- BOTH CARDINAL DIRECTIONS OF THE DIAGONAL EXIST IN THE GAME WORLD -------
+
+			var/check_1 = 0
+			var/check_2 = 0
+			if(step_to(D, Step_1))
+				check_1 = 1
+				for(var/obj/border_obstacle in Step_1)
+					if(border_obstacle.flags & ON_BORDER)
+						if(!border_obstacle.CheckExit(D, target))
+							check_1 = 0
+							// ------- YOU TRIED TO CLICK ON AN ITEM THROUGH A WINDOW (OR SIMILAR THING THAT LIMITS ON BORDERS) ON ONE OF THE DIRECITON TILES -------
+				for(var/obj/border_obstacle in get_turf(target))
+					if((border_obstacle.flags & ON_BORDER) && (target != border_obstacle))
+						if(!border_obstacle.CanPass(D, D.loc, 1, 0))
+							// ------- YOU TRIED TO CLICK ON AN ITEM THROUGH A WINDOW (OR SIMILAR THING THAT LIMITS ON BORDERS) ON THE TILE YOU'RE ON -------
+							check_1 = 0
+
+			D.loc = user.loc
+			if(step_to(D, Step_2))
+				check_2 = 1
+
+				for(var/obj/border_obstacle in Step_2)
+					if(border_obstacle.flags & ON_BORDER)
+						if(!border_obstacle.CheckExit(D, target))
+							check_2 = 0
+				for(var/obj/border_obstacle in get_turf(target))
+					if((border_obstacle.flags & ON_BORDER) && (target != border_obstacle))
+						if(!border_obstacle.CanPass(D, D.loc, 1, 0))
+							check_2 = 0
+
+
+			if(check_1 || check_2)
+				ok = 1
+				// ------- YOU CAN REACH THE ITEM THROUGH AT LEAST ONE OF THE TWO DIRECTIONS. GOOD. -------
+
+			/*
+				More info:
+					If you're trying to click an item in the north-east of your mob, the above section of code will first check if tehre's a tile to the north or you and to the east of you
+					These two tiles are Step_1 and Step_2. After this, a new dummy object is created on your location. It then tries to move to Step_1, If it succeeds, objects on the turf you're on and
+					the turf that Step_1 is are checked for items which have the ON_BORDER flag set. These are itmes which limit you on only one tile border. Windows, for the most part.
+					CheckExit() and CanPass() are use to determine this. The dummy object is then moved back to your location and it tries to move to Step_2. Same checks are performed here.
+					If at least one of the two checks succeeds, it means you can reach the item and ok is set to 1.
+			*/
+	else
+		// ------- OBJECT IS ON A CARDINAL TILE (NORTH, SOUTH, EAST OR WEST OR THE TILE YOU'RE ON) -------
+		if(target.loc == user.loc)
+			ok = 1
+			// ------- OBJECT IS ON THE SAME TILE AS YOU -------
+		else
+			ok = 1
+
+			//Now, check objects to block exit that are on the border
+			for(var/obj/border_obstacle in user.loc)
+				if(border_obstacle.flags & ON_BORDER)
+					if(!border_obstacle.CheckExit(D, target))
+						ok = 0
+
+			//Next, check objects to block entry that are on the border
+			for(var/obj/border_obstacle in get_turf(target))
+				if((border_obstacle.flags & ON_BORDER) && (target != border_obstacle))
+					if(!border_obstacle.CanPass(D, D.loc, 1, 0))
+						ok = 0
+		/*
+			See the previous More info, for... more info...
+		*/
+
+	if(get_dist(user, target) > 1)
+		return 0
+
+	del(D)
+	// ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE -------
+	return ok

code/defines/procs/helpers.dm

@@ -1254,7 +1254,7 @@ proc/listclearnulls(list/list)
 		return 0
 
 /proc/do_after(mob/M as mob, time as num)
-	var/turf/T = M.loc
+	var/turf/T = get_turf(M)
 	var/holding = M.equipped()
 	sleep(time)
 	if(M)
@@ -1490,4 +1490,37 @@ proc/get_opposite(var/checkdir)
 		list += found_string
 		found_char = findtext(cur_text,character,last_found)
 	list += copytext(cur_text,last_found,length(cur_text)+1)
-	return list
+	return list
+
+/proc/stringmerge(var/text,var/compare,replace = "*")
+//This proc fills in all spaces with the "replace" var (* by default) with whatever
+//is in the other string at the same spot (assuming it is not a replace char).
+//This is used for fingerprints
+	var/newtext = text
+	if(lentext(text) != lentext(compare))
+		return 0
+	for(var/i = 1, i < lentext(text), i++)
+		var/a = copytext(text,i,i+1)
+		var/b = copytext(compare,i,i+1)
+//if it isn't both the same letter, or if they are both the replacement character
+//(no way to know what it was supposed to be)
+		if(a != b)
+			if(a == replace) //if A is the replacement char
+				newtext = copytext(newtext,1,i) + b + copytext(newtext, i+1)
+			else if(b == replace) //if B is the replacement char
+				newtext = copytext(newtext,1,i) + a + copytext(newtext, i+1)
+			else //The lists disagree, Uh-oh!
+				return 0
+	return newtext
+
+/proc/stringpercent(var/text,character = "*")
+//This proc returns the number of chars of the string that is the character
+//This is used for detective work to determine fingerprint completion.
+	if(!text || !character)
+		return 0
+	var/count = 0
+	for(var/i = 1, i < lentext(text), i++)
+		var/a = copytext(text,i,i+1)
+		if(a == character)
+			count++
+	return count

code/defines/turf.dm

@@ -146,7 +146,11 @@
 			return get_dist(src,t)
 
 	Distance_ortho(turf/t)
-		return abs(src.x - t.x) + abs(src.y - t.y)
+		if(t != null && src != null)
+			return abs(src.x - t.x) + abs(src.y - t.y)
+
+		else
+			return 99999
 
 	AdjacentTurfsSpace()
 		var/L[] = new()

code/game/atom_procs.dm

@@ -93,22 +93,31 @@
 				src.fingerprintshidden += text("(Wearing gloves). Real name: [], Key: []",H.real_name, H.key)
 				src.fingerprintslast = H.key
 			return 0
-		if (!( src.fingerprints ))
-			src.fingerprints = text("[]", md5(H.dna.uni_identity))
-			if(src.fingerprintslast != H.key)
-				src.fingerprintshidden += text("Real name: [], Key: []",H.real_name, H.key)
-				src.fingerprintslast = H.key
-			return 1
 		else
-			var/list/L = params2list(src.fingerprints)
-			L -= md5(H.dna.uni_identity)
-			while(L.len >= 3)
-				L -= L[1]
-			L += md5(H.dna.uni_identity)
-			src.fingerprints = list2params(L)
 			if(src.fingerprintslast != H.key)
 				src.fingerprintshidden += text("Real name: [], Key: []",H.real_name, H.key)
 				src.fingerprintslast = H.key
+			var/new_prints = 0
+			var/prints
+			for(var/i = 1, i < (src.fingerprints.len + 1), i++)
+				var/list/L = params2list(src.fingerprints[i])
+				if(L.len > 1)
+					if(L[num2text(1)] == md5(H.dna.uni_identity))
+						new_prints = i
+						prints = L[num2text(2)]
+						break
+					else
+						src.fingerprints[i] = "1=" + L[num2text(1)] + "&2=" + stars(L[num2text(2)], rand(80,90))
+				else
+					var/turf/T = get_turf(src)
+					for (var/mob/N in world)
+						if (N.client && N.client.holder)
+							N << "<span class=\"gfartadmin\"><span class=\"prefix\">ERROR:</span><span class=\"message\">Fingerprint application failed!  Important data: [src.name] at [T.x], [T.y], [T.z] with the print string [L[1]]</span></span>"
+			if(new_prints)
+				src.fingerprints[new_prints] = text("1=[]&2=[]", md5(H.dna.uni_identity), stringmerge(prints,stars(md5(H.dna.uni_identity), rand(15,30))))
+			else if(new_prints == 0)
+				src.fingerprints += text("1=[]&2=[]", md5(H.dna.uni_identity), stars(md5(H.dna.uni_identity), rand(15,30)))
+			return 1
 	else
 		if(src.fingerprintslast != M.key)
 			src.fingerprintshidden += text("Real name: [], Key: []",M.real_name, M.key)
@@ -130,26 +139,37 @@
 			I.Blend(new /icon('blood.dmi', "itemblood"),ICON_MULTIPLY)
 			I.Blend(new /icon(src.icon, src.icon_state),ICON_UNDERLAY)
 			src.icon = I
-			src.blood_DNA = M.dna.unique_enzymes
-			src.blood_type = M.b_type
+			if(src.blood_DNA)
+				src.blood_DNA.len++
+				src.blood_DNA[src.blood_DNA.len] = list(M.dna.unique_enzymes,M.b_type)
+			else
+				var/list/blood_DNA_temp[1]
+				blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.b_type)
+				src.blood_DNA =  blood_DNA_temp
 		else if (istype(src, /turf/simulated))
 			var/turf/simulated/source2 = src
 			var/list/objsonturf = range(0,src)
-			var/i
-			for(i=1, i<=objsonturf.len, i++)
-				if(istype(objsonturf[i],/obj/effect/decal/cleanable/blood))
-					return
+			if(objsonturf)
+				for(var/i=1, i<=objsonturf.len, i++)
+					if(istype(objsonturf[i],/obj/effect/decal/cleanable/blood))
+						return
 			var/obj/effect/decal/cleanable/blood/this = new /obj/effect/decal/cleanable/blood(source2)
-			this.blood_DNA = M.dna.unique_enzymes
-			this.blood_type = M.b_type
+			var/list/blood_DNA_temp[1]
+			blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.b_type)
+			this.blood_DNA =  blood_DNA_temp
 			this.virus2 = M.virus2
 			for(var/datum/disease/D in M.viruses)
 				var/datum/disease/newDisease = new D.type
 				this.viruses += newDisease
 				newDisease.holder = this
 		else if (istype(src, /mob/living/carbon/human))
-			src.blood_DNA = M.dna.unique_enzymes
-			src.blood_type = M.b_type
+			if(src.blood_DNA)
+				src.blood_DNA.len++
+				src.blood_DNA[src.blood_DNA.len] = list(M.dna.unique_enzymes,M.b_type)
+			else
+				var/list/blood_DNA_temp[1]
+				blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.b_type)
+				src.blood_DNA =  blood_DNA_temp
 		else
 			return
 	else

code/game/dna.dm

@@ -4,6 +4,7 @@
 	var/struc_enzymes = null
 	var/uni_identity = null
 	var/original_name = "Unknown"
+	var/b_type = "A+"
 
 /datum/dna/proc/check_integrity()
 	//Lazy.

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -59,9 +59,6 @@
 
 /datum/game_mode/traitor/autotraitor/post_setup()
 	..()
-	for(var/mob/T in world)
-		if(T.mind in possible_traitors)
-			T.be_syndicate = 1
 	abandon_allowed = 1
 	traitorcheckloop()
 
@@ -79,7 +76,7 @@
 				playercount += 1
 			if (player.client && player.mind && player.mind.special_role && player.stat != 2)
 				traitorcount += 1
-			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && player.be_syndicate && !jobban_isbanned(player, "Syndicate"))
+			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.be_syndicate & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
 				possible_traitors += player
 		//message_admins("Live Players: [playercount]")
 		//message_admins("Live Traitors: [traitorcount]")
@@ -162,7 +159,7 @@
 	if(emergency_shuttle.departed)
 		return
 	//message_admins("Late Join Check")
-	if(character.be_syndicate == 1 && !jobban_isbanned(character, "Syndicate"))
+	if((character.be_syndicate & BE_TRAITOR) && !jobban_isbanned(character, "Syndicate"))
 		//message_admins("Late Joiner has Be Syndicate")
 		//message_admins("Checking number of players")
 		var/playercount = 0

code/game/gamemodes/game_mode.dm

@@ -53,7 +53,9 @@ Devices and Tools;
 /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox;
 /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module;
 /obj/item/device/radio/headset/traitor:3:Headset with Binary Translator;
-/obj/item/weapon/plastique:2:C-4;
+/obj/item/weapon/plastique:2:C-4 (Destroys walls);
+/obj/item/weapon/syndie/c4explosive:4:Low Power Explosive Charge, with Detonator;
+/obj/item/weapon/syndie/c4explosive/heavy:7:High (!) Power Explosive Charge, with Detonator;
 /obj/item/device/powersink:5:Powersink (DANGER!);
 /obj/machinery/singularity_beacon/syndicate:7:Singularity Beacon (DANGER!);
 Whitespace:Seperator;
@@ -64,7 +66,8 @@ Implants;
 /obj/item/weapon/storage/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
 Whitespace:Seperator;
 Badassery;
-/obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"}
+/obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);
+Whitespace:Seperator;"}
 
 /datum/game_mode/proc/announce() //to be calles when round starts
 	world << "<B>Notice</B>: [src] did not define announce()"

code/game/gamemodes/objective.dm

@@ -29,6 +29,39 @@ datum/objective
 
 
 
+datum/objective/decapitate
+	find_target()
+		..()
+		if(target && target.current)
+			explanation_text = "[target.current.real_name], the [target.assigned_role], has defied us for the last time.  Make an example of him, and bring us his severed head."
+		else
+			explanation_text = "Free Objective"
+		return target
+
+
+	find_target_by_role(role, role_type=0)
+		..(role, role_type)
+		if(target && target.current)
+			explanation_text = "[target.current.real_name], the [!role_type ? target.assigned_role : target.special_role], has defied us for the last time.  Make an example of him, and bring us his severed head."
+		else
+			explanation_text = "Free Objective"
+		return target
+
+
+	check_completion()
+		if(target && target.current)
+			if(!owner.current||owner.current.stat==2)//If you're otherwise dead.
+				return 0
+			var/list/all_items = owner.current.get_contents()
+			for(var/obj/item/weapon/organ/head/mmi in all_items)
+				if(mmi.brainmob&&mmi.brainmob.mind==target)
+					return 1
+			return 0
+		else
+			return 1
+
+
+
 datum/objective/assassinate
 	find_target()
 		..()

code/game/gamemodes/revolution/rp-revolution.dm

@@ -183,7 +183,7 @@
 
 	for(var/mob/living/carbon/human/player in world)
 		if(player.client)
-			if(player.be_syndicate)
+			if(player.be_syndicate & BE_REV)
 				candidates += player.mind
 
 	if(candidates.len < 1)

code/game/gamemodes/traitor/traitor.dm

@@ -88,34 +88,86 @@
 			traitor.objectives += block_objective
 
 	else
-		var/list/target = traitor.objectives
 		for(var/i = 1, i <= rand(1,3), i++)
-			var/datum/objective/objective
 			switch(rand(1,100))
 				if(1 to 30)
-					var/datum/objective/assassinate/kill_objective = new
-					kill_objective.owner = traitor
-					kill_objective.find_target()
-					objective = kill_objective
+					if(!locate(/datum/objective/assassinate) in traitor.objectives && !locate(/datum/objective/protect) in traitor.objectives)
+						var/datum/objective/assassinate/kill_objective = new
+						kill_objective.owner = traitor
+						kill_objective.find_target()
+						traitor.objectives += kill_objective
+					else
+						var/works = 1
+						var/datum/objective/assassinate/kill_objective = new
+						kill_objective.owner = traitor
+						kill_objective.find_target()
+						for(var/j, j < traitor.objectives.len, j++)
+							var/compare = istype(traitor.objectives[j],/datum/objective/assassinate)
+							if(compare)
+								var/datum/objective/assassinate/test = traitor.objectives[j]
+								if(test.target == kill_objective.target)
+									works = 0
+									break
+							compare = istype(traitor.objectives[j],/datum/objective/protect)
+							if(compare)
+								var/datum/objective/protect/test = traitor.objectives[j]
+								if(test.target == kill_objective.target)
+									works = 0
+									break
+						if(works)
+							traitor.objectives += kill_objective
+						else
+							i -= 1
 				if(31 to 40)
-					var/datum/objective/protect/protect_objective = new
-					protect_objective.owner = traitor
-					protect_objective.find_target()
-					objective = protect_objective
+					if(!locate(/datum/objective/assassinate) in traitor.objectives && !locate(/datum/objective/protect) in traitor.objectives)
+						var/datum/objective/protect/protect_objective = new
+						protect_objective.owner = traitor
+						protect_objective.find_target()
+						traitor.objectives += protect_objective
+					else
+						var/works = 1
+						var/datum/objective/protect/protect_objective = new
+						protect_objective.owner = traitor
+						protect_objective.find_target()
+						for(var/j, j < traitor.objectives.len, j++)
+							var/compare = istype(traitor.objectives[j],/datum/objective/assassinate)
+							if(compare)
+								var/datum/objective/assassinate/test = traitor.objectives[j]
+								if(test.target == protect_objective.target)
+									works = 0
+									break
+							compare = istype(traitor.objectives[j],/datum/objective/protect)
+							if(compare)
+								var/datum/objective/protect/test = traitor.objectives[j]
+								if(test.target == protect_objective.target)
+									works = 0
+									break
+						if(works)
+							traitor.objectives += protect_objective
+						else
+							i -= 1
 				else
-					var/datum/objective/steal/steal_objective = new
-					steal_objective.owner = traitor
-					steal_objective.find_target()
-					objective = steal_objective
-			var/inthere = 0
-			for(var/j, j<= target.len, j++)
-				if(target[j] == objective)
-					inthere = 1
-					break
-			if(!inthere)
-				traitor.objectives += objective
-			else
-				i -= 1
+					if(!locate(/datum/objective/steal) in traitor.objectives)
+						var/datum/objective/steal/steal_objective = new
+						steal_objective.owner = traitor
+						steal_objective.find_target()
+						traitor.objectives += steal_objective
+					else
+						var/works = 1
+						var/datum/objective/steal/steal_objective = new
+						steal_objective.owner = traitor
+						steal_objective.find_target()
+						for(var/j, j < traitor.objectives.len, j++)
+							var/compare = istype(traitor.objectives[j],/datum/objective/steal)
+							if(compare)
+								var/datum/objective/steal/test = traitor.objectives[j]
+								if(test.target_name == steal_objective.target_name)
+									works = 0
+									break
+						if(works)
+							traitor.objectives += steal_objective
+						else
+							i -= 1
 		if (!(locate(/datum/objective/escape) in traitor.objectives))
 			var/datum/objective/escape/escape_objective = new
 			escape_objective.owner = traitor
@@ -137,6 +189,10 @@
 
 /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor)
 	traitor.current << "<B><font size=3 color=red>You are the traitor.</font></B>"
+	traitor.current << "\red <B>REPEAT</B>"
+	traitor.current << "\red <B>You are the traitor.</B>"
+	spawn(rand(600,1800))			//Strumpetplaya - Just another friendly reminder so people don't forget they're the traitor.
+		traitor.current << "\red <B>In case you missed it the first time - YOU ARE THE TRAITOR!</B>"
 	var/obj_count = 1
 	for(var/datum/objective/objective in traitor.objectives)
 		traitor.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
@@ -175,6 +231,8 @@
 	else
 		killer << "Unfortunately, the Syndicate did not provide you with a code response."
 	killer << "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe."
+	spawn(30)
+		killer << sound('AISyndiHack.ogg',volume=50)
 	//End code phrase.
 
 
@@ -318,4 +376,6 @@
 		else
 			traitor_mob << "Unfortunately, the Syndicate did not provide you with a code response."
 		traitor_mob << "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe."
+		spawn(30)
+			traitor_mob << sound('syndicate intro.ogg',volume=50)
 	//End code phrase.

code/game/jobs/job/civilian.dm

@@ -82,7 +82,6 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/cargo(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/quartermaster(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
 		H.equip_if_possible(new /obj/item/weapon/clipboard(H), H.slot_r_store)
 		return 1
@@ -104,7 +103,6 @@
 		H.equip_if_possible(new /obj/item/clothing/under/rank/cargo(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
 		H.equip_if_possible(new /obj/item/device/pda/quartermaster(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		return 1
 
 
@@ -124,7 +122,6 @@
 		H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/miner(H), H.slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves)
 		H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_in_backpack)
 		H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_in_backpack)
 		return 1

code/game/machinery/Sleeper.dm

@@ -171,20 +171,20 @@
 		if((!( istype(G, /obj/item/weapon/grab)) || !( ismob(G.affecting))))
 			return
 		if(src.occupant)
-			user << "\blue <B>The sleeper is already occupied!</B>"
+			user << "\blue <B>The [src.name] is already occupied!</B>"
 			return
 
 		for(var/mob/living/carbon/metroid/M in range(1,G.affecting))
 			if(M.Victim == G.affecting)
-				usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head."
+				usr << "[G.affecting.name] will not fit into the [src.name] because they have a Metroid latched onto their head."
 				return
 
 		for (var/mob/V in viewers(user))
-			V.show_message("[user] starts putting [G.affecting.name] into the sleeper.", 3)
+			V.show_message("[user] starts putting [G.affecting.name] into the [src.name].", 3)
 
 		if(do_after(user, 20))
 			if(src.occupant)
-				user << "\blue <B>The sleeper is already occupied!</B>"
+				user << "\blue <B>The [src.name] is already occupied!</B>"
 				return
 			if(!G || !G.affecting) return
 			var/mob/M = G.affecting
@@ -259,7 +259,7 @@
 			src.occupant.client.perspective = MOB_PERSPECTIVE
 		src.occupant.loc = src.loc
 		src.occupant = null
-		if(orient == "RIGHT")
+		if(orient == "RIGHT" && !istype(src,/obj/machinery/sleeper/syndicate))
 			icon_state = "sleeper_0-r"
 		return
 
@@ -345,9 +345,12 @@
 		set src in oview(1)
 		if(usr.stat != 0)
 			return
-		if(orient == "RIGHT")
-			icon_state = "sleeper_0-r"
-		src.icon_state = "sleeper_0"
+		if(!istype(src,/obj/machinery/sleeper/syndicate))
+			if(orient == "RIGHT")
+				icon_state = "sleeper_0-r"
+			src.icon_state = "sleeper_0"
+		else
+			src.icon_state = "syndi_0"
 		src.go_out()
 		add_fingerprint(usr)
 		return
@@ -360,8 +363,11 @@
 
 		if(usr.stat != 0)
 			return
+		if(istype(src,/obj/machinery/sleeper/syndicate))
+			usr << "\red You really want to get into an illegal stasis pod? Are you dumb?"
+			return
 		if(src.occupant)
-			usr << "\blue <B>The sleeper is already occupied!</B>"
+			usr << "\blue <B>The [src.name] is already occupied!</B>"
 			return
 
 		for(var/mob/living/carbon/metroid/M in range(1,usr))
@@ -369,22 +375,40 @@
 				usr << "You're too busy getting your life sucked out of you."
 				return
 		for(var/mob/V in viewers(usr))
-			V.show_message("[usr] starts climbing into the sleeper.", 3)
+			V.show_message("[usr] starts climbing into the [src.name].", 3)
 		if(do_after(usr, 20))
 			if(src.occupant)
-				usr << "\blue <B>The sleeper is already occupied!</B>"
+				usr << "\blue <B>The [src.name] is already occupied!</B>"
 				return
 			usr.pulling = null
 			usr.client.perspective = EYE_PERSPECTIVE
 			usr.client.eye = src
 			usr.loc = src
 			src.occupant = usr
-			src.icon_state = "sleeper_1"
-			if(orient == "RIGHT")
-				icon_state = "sleeper_1-r"
+			if(!istype(src,/obj/machinery/sleeper/syndicate))
+				src.icon_state = "sleeper_1"
+				if(orient == "RIGHT")
+					icon_state = "sleeper_1-r"
+			else
+				src.icon_state = "syndi_1"
 
 			for(var/obj/O in src)
 				del(O)
 			src.add_fingerprint(usr)
 			return
 		return
+
+
+
+/obj/machinery/sleeper/syndicate
+	name = "Illegal Stasis Pod"
+	icon = 'Cryogenic2.dmi'
+	icon_state = "syndi_0"
+	density = 1
+	anchored = 1
+
+	process()
+		if(src.occupant)
+			src.occupant.sleeping = 5
+		return
+

code/game/machinery/alarm.dm

@@ -89,8 +89,8 @@
 		"carbon dioxide" = new/datum/tlv(-1.0, -1.0,   5,  10), // Partial pressure, kpa
 		"plasma"         = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa
 		"other"          = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa
-		"pressure"       = new/datum/tlv(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.40,ONE_ATMOSPHERE*1.60), /* kpa */
-		"temperature"    = new/datum/tlv(40, 60, 100, 120), // K
+		"pressure"       = new/datum/tlv(ONE_ATMOSPHERE*0.20,ONE_ATMOSPHERE*0.35,ONE_ATMOSPHERE*0.8,ONE_ATMOSPHERE*0.9), /* kpa */
+		"temperature"    = new/datum/tlv(40, 60, 150, 160), // K
 	)
 
 //all air alarms in area are connected via magic

code/game/machinery/bots/mulebot.dm

@@ -698,8 +698,13 @@
 // calculates a path to the current destination
 // given an optional turf to avoid
 /obj/machinery/bot/mulebot/proc/calc_path(var/turf/avoid = null)
-	src.path = AStar(src.loc, src.target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_ortho, 0, 250, id=botcard, exclude=avoid)
-	src.path = reverselist(src.path)
+	if(src.target)
+		src.path = AStar(src.loc, src.target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_ortho, 0, 250, id=botcard, exclude=avoid)
+		src.path = reverselist(src.path)
+	else
+		for (var/mob/M in world)
+			if (M.client && M.client.holder)
+				M << "<span class=\"gfartadmin\"><span class=\"prefix\">ERROR:</span><span class=\"message\">A Mulebot has attempted to path to a null target!  This is a bug!</span></span>"
 
 
 // sets the current destination
@@ -805,8 +810,8 @@
 	H.apply_damage(0.5*damage, BRUTE, "r_arm")
 
 	var/obj/effect/decal/cleanable/blood/B = new(src.loc)
-	B.blood_DNA = H.dna.unique_enzymes
-	B.blood_type = H.b_type
+	B.blood_DNA.len++
+	B.blood_DNA[B.blood_DNA.len] = list(H.dna.unique_enzymes, H.b_type)
 
 	bloodiness += 4
 

code/game/machinery/camera_monitor.dm

@@ -0,0 +1,108 @@
+
+//the researchable camera circuit that can connect to any camera network
+
+/obj/item/weapon/circuitboard/camera
+	//name = "Circuit board (Camera)"
+	var/secured = 1
+	var/authorised = 0
+	var/possibleNets[0]
+	var/network = ""
+	build_path = 0
+
+//when adding a new camera network, you should only need to update these two procs
+	New()
+		possibleNets["Engineering"] = access_engine
+		possibleNets["SS13"] = access_security
+		possibleNets["Outpost"] = access_mining
+
+	proc/updateBuildPath()
+		build_path = ""
+		if(authorised && secured)
+			switch(network)
+				if("SS13")
+					build_path = "/obj/machinery/computer/security"
+				if("Engineering")
+					build_path = "/obj/machinery/computer/security/engineeringcam"
+				if("Outpost")
+					build_path = "/obj/machinery/computer/security/mining"
+
+	attackby(var/obj/item/I, var/mob/user)//if(health > 50)
+		..()
+		if(istype(I,/obj/item/weapon/card/emag))
+			if(network)
+				authorised = 1
+				user << "\blue You authorised the circuit network!"
+				updateDialog()
+			else
+				user << "\blue You must select a camera network circuit!"
+		else if(istype(I,/obj/item/weapon/screwdriver))
+			secured = !secured
+			user.visible_message("\blue The [src] can [secured ? "no longer" : "now"] be modified.")
+			updateBuildPath()
+		return
+
+	attack_self(var/mob/user)
+		if(!secured && ishuman(user))
+			user.machine = src
+			interact(user, 0)
+
+	proc/interact(var/mob/user, var/ai=0)
+		if(secured)
+			return
+		if (!ishuman(user))
+			return ..(user)
+		var/t = "<B>Circuitboard Console - Camera Monitoring Computer</B><BR>"
+		t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+		t += "<hr> Please select a camera network:<br>"
+
+		for(var/curNet in possibleNets)
+			if(network == curNet)
+				t += "- [curNet]<br>"
+			else
+				t += "- <A href='?src=\ref[src];net=[curNet]'>[curNet]</A><BR>"
+		t += "<hr>"
+		if(network)
+			if(authorised)
+				t += "Authenticated <A href='?src=\ref[src];removeauth=1'>(Clear Auth)</A><BR>"
+			else
+				t += "<A href='?src=\ref[src];auth=1'><b>*Authenticate*</b></A> (Requires an appropriate access ID)<br>"
+		else
+			t += "<A href='?src=\ref[src];auth=1'>*Authenticate*</A> (Requires an appropriate access ID)<BR>"
+		t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+		user << browse(t, "window=camcircuit;size=500x400")
+		onclose(user, "camcircuit")
+
+	Topic(href, href_list)
+		..()
+		if( href_list["close"] )
+			usr << browse(null, "window=camcircuit")
+			usr.machine = null
+			return
+		else if(href_list["net"])
+			network = href_list["net"]
+			authorised = 0
+		else if( href_list["auth"] )
+			var/mob/M = usr
+			var/obj/item/weapon/card/id/I = M.equipped()
+			if (istype(I, /obj/item/device/pda))
+				var/obj/item/device/pda/pda = I
+				I = pda.id
+			if (I && istype(I))
+				if(access_captain in I.access)
+					authorised = 1
+				else if (possibleNets[network] in I.access)
+					authorised = 1
+			if(istype(I,/obj/item/weapon/card/emag))
+				if(network)
+					authorised = 1
+					usr << "\blue You authorised the circuit network!"
+					updateDialog()
+				else
+					usr << "\blue You must select a camera network circuit!"
+		else if( href_list["removeauth"] )
+			authorised = 0
+		updateDialog()
+
+	updateDialog()
+		if(istype(src.loc,/mob))
+			attack_self(src.loc)

code/game/machinery/computer/Operating.dm

@@ -32,7 +32,7 @@
 <B>Patient Information:</B><BR>
 <BR>
 <B>Name:</B> [src.victim.real_name]<BR>
-<B>Age:</B> [src.victim.age]<BR>
+<B>Age:</B> [!isnull(src.victim.age) ? src.victim.age : "Undetermined"]<BR>
 <B>Blood Type:</B> [src.victim.b_type]<BR>
 <BR>
 <B>Health:</B> [src.victim.health]<BR>

code/game/machinery/computer/buildandrepair.dm

@@ -28,9 +28,6 @@
 		frame_desc = null
 		contain_parts = 1
 
-/obj/item/weapon/circuitboard/security
-	name = "Circuit board (Security)"
-	build_path = "/obj/machinery/computer/security"
 /obj/item/weapon/circuitboard/aicore
 	name = "Circuit board (AI core)"
 	origin_tech = "programming=4;biotech=2"
@@ -154,10 +151,22 @@
 	name = "Circuit board (Operating Computer)"
 	build_path = "/obj/machinery/computer/operating"
 	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/mining
-	name = "Circuit board (Outpost Status Display)"
-	build_path = "/obj/machinery/computer/security/mining"
+/obj/item/weapon/circuitboard/camera
+	name = "Circuit board (Camera)"
 	origin_tech = "programming=2"
+	build_path = ""		//build path has to be manually set
+/obj/item/weapon/circuitboard/security
+	name = "Circuit board (Security Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security"
+/obj/item/weapon/circuitboard/security/engineering
+	name = "Circuit board (Engineering Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/engineering"
+/obj/item/weapon/circuitboard/security/mining
+	name = "Circuit board (Mining Outpost Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/mining"
 /obj/item/weapon/circuitboard/comm_monitor
 	name = "Circuit board (Telecommunications Monitor)"
 	build_path = "/obj/machinery/computer/telecomms/monitor"
@@ -204,12 +213,15 @@
 			if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
 				var/obj/item/weapon/circuitboard/B = P
 				if(B.board_type == "computer")
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
-					user << "\blue You place the circuit board inside the frame."
-					src.icon_state = "1"
-					src.circuit = P
-					user.drop_item()
-					P.loc = src
+					if(B.build_path != "")
+						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+						user << "\blue You place the circuit board inside the frame."
+						src.icon_state = "1"
+						src.circuit = P
+						user.drop_item()
+						P.loc = src
+					else
+						user << "\red That circuit board requires additional modifications before it can be used."
 				else
 					user << "\red This frame does not accept circuit boards of this type!"
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)

code/game/machinery/computer/lockdown.dm

@@ -0,0 +1,132 @@
+//this computer displays status and remotely activates multiple shutters / blast doors
+//might even make it able to lock / electrify area doors, later
+
+/obj/machinery/computer/lockdown
+	name = "Lockdown Control"
+	desc = "Used to control blast doors."
+	icon_state = "lockdown"
+	circuit = "/obj/item/weapon/circuitboard/lockdown"
+	var/connectedDoorIds[0][0]
+	var/department = ""
+	var/connected_doors[0][0]
+	///obj/machinery/door/poddoor
+
+	New()
+		..()
+
+		//only load blast doors for map-defined departments for the moment
+		switch(department)
+			if("Engineering")
+				connectedDoorIds.Add("Engineering Primary Access")
+				connectedDoorIds.Add("Engineering Secondary Access")
+				connectedDoorIds.Add("Fore Maintenance Access")
+				connectedDoorIds.Add("Aft Maintenance Access")
+				connectedDoorIds.Add("Particle Accelerator Rad Shielding")
+				connectedDoorIds.Add("Foreward Emitter Array Rad Shielding")
+				connectedDoorIds.Add("Aftward Emitter Array Rad Shielding")
+				connectedDoorIds.Add("Starboard Observation Rad Shielding")
+				connectedDoorIds.Add("Atmospheric Storage Rad Shielding")
+				connectedDoorIds.Add("Construction Storage Rad Shielding")
+				connectedDoorIds.Add("Engineering Secure Storage")
+
+		//loop through the world, grabbing all the relevant doors
+		spawn(1)
+			for(var/networkId in connectedDoorIds)
+				//world << "\blue Creating [networkId]"
+				for(var/obj/machinery/door/poddoor/D in world)
+					if(D.id == networkId)
+						connected_doors.Add(D)
+						//world << "\blue 	Added [D]"
+
+	attack_ai(mob/user)
+		attack_hand(user)
+
+	attack_hand(mob/user)
+		add_fingerprint(user)
+		if(stat & (BROKEN|NOPOWER))
+			return
+		interact(user)
+
+	power_change()
+		if(stat & BROKEN)
+			icon_state = "broken"
+		else
+			if( powered() )
+				icon_state = initial(icon_state)
+				stat &= ~NOPOWER
+			else
+				spawn(rand(0, 15))
+					src.icon_state = "c_unpowered"
+					stat |= NOPOWER
+
+	Topic(href, href_list)
+		..()
+		if( href_list["close"] )
+			usr << browse(null, "window=lockdown")
+			usr.machine = null
+			return
+
+		if( href_list["openDoor"] )
+			var/obj/machinery/door/poddoor/D = href_list["door"]
+			if(D.density)
+				D.open()
+			src.updateDialog()
+			return
+
+		if( href_list["closeDoor"] )
+			var/obj/machinery/door/poddoor/D = href_list["door"]
+			if(!D.density)
+				D.close()
+			src.updateDialog()
+			return
+
+		if( href_list["close_all"] )
+			for(var/obj/machinery/door/poddoor/D in connected_doors)
+				if(D.id == href_list["netId"])
+					if(!D.density)
+						spawn(0)
+							D.close()
+			src.updateDialog()
+			return
+
+		if( href_list["open_all"] )
+			for(var/obj/machinery/door/poddoor/D in connected_doors)
+				if(D.id == href_list["netId"])
+					if(D.density)
+						spawn(0)
+							D.open()
+			src.updateDialog()
+			return
+
+		if(href_list["update"])
+			src.updateDialog()
+			return
+
+	proc
+		interact(mob/user)
+			if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
+				if (!istype(user, /mob/living/silicon))
+					user.machine = null
+					user << browse(null, "window=lockdown")
+					return
+			var/t = "<B>Lockdown Control</B><BR>"
+			t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+			t += "<table border=1>"
+			for(var/curNetId in connectedDoorIds)
+				t += "<tr>"
+				t += "<td><b>" + curNetId + "<b></td>"
+				t += "<td><b><a href='?src=\ref[src];open_all=1;netId=[curNetId]'>Open All</a> / <a href='?src=\ref[src];close_all=0;netId=[curNetId]'>Close All</a></b></td>"
+				t += "</tr>"
+				for(var/obj/machinery/door/poddoor/D in connected_doors)
+					if(D.id == curNetId )
+						t += "<tr>"
+						t += "<td>	[D.networkTag]</td>"
+						if(D.density)
+							t += "<td><a href='?src=\ref[D];open=1'>Open</a> - Close</td>"
+						else
+							t += "<td>Open - <a href='?src=\ref[D];close=1'>Close</a></td>"
+						t += "</tr>"
+			t += "</table>"
+			t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
+			user << browse(t, "window=lockdown;size=500x800")
+			onclose(user, "lockdown")

code/game/machinery/doors/airlock.dm

@@ -429,6 +429,8 @@ About the new airlock wires panel:
 		return 0
 	if(!prob(prb))
 		return 0 //you lucked out, no shock for you
+	if(istype(usr.equipped(),/obj/item/weapon/shard))
+		return 0
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(5, 1, src)
 	s.start() //sparks always.
@@ -817,10 +819,10 @@ About the new airlock wires panel:
 		usr.machine = src
 		if (href_list["wires"])
 			var/t1 = text2num(href_list["wires"])
-			if (!( istype(usr.equipped(), /obj/item/weapon/wirecutters) ))
+			if (!istype(usr.equipped(), /obj/item/weapon/wirecutters) || !istype(usr.equipped(),/obj/item/weapon/shard))
 				usr << "You need wirecutters!"
 				return
-			if (src.isWireColorCut(t1))
+			if (src.isWireColorCut(t1) && istype(usr.equipped(), /obj/item/weapon/wirecutters))
 				src.mend(t1)
 			else
 				src.cut(t1)

code/game/machinery/doors/poddoor.dm

@@ -1,3 +1,10 @@
+//cael - added this for the lockdown computer
+/obj/machinery/door/poddoor/Topic(href, href_list)
+	if(href_list["close"])
+		close()
+	if(href_list["open"])
+		open()
+
 /obj/machinery/door/poddoor/Bumped(atom/AM)
 	if(!density)
 		return ..()

code/game/magic/cultist/ritual.dm

@@ -555,8 +555,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				R.word2 = w2
 				R.word3 = w3
 				R.check_icon()
-				R.blood_DNA = H.dna.unique_enzymes
-				R.blood_type = H.b_type
+				R.blood_DNA.len++
+				R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.b_type)
 			return
 		else
 			user << "The book seems full of illegible scribbles. Is this a joke?"
@@ -601,8 +601,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 			var/obj/effect/rune/R = new /obj/effect/rune
 			if(istype(user, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = user
-				R.blood_DNA = H.dna.unique_enzymes
-				R.blood_type = H.b_type
+				R.blood_DNA.len++
+				R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.b_type)
 			switch(r)
 				if("teleport")
 					var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")

code/game/magic/cultist/runes.dm

@@ -898,7 +898,7 @@ var/list/sacrificed = list()
 					culcount++
 			if(culcount >= 5)
 				for(var/obj/effect/rune/R in world)
-					if(R.blood_DNA == src.blood_DNA && R.blood_type == src.blood_type)
+					if(R.blood_DNA == src.blood_DNA)
 						for(var/mob/living/M in orange(2,R))
 							M.take_overall_damage(0,15)
 							if (R.invisibility>M.see_invisible)
@@ -908,7 +908,7 @@ var/list/sacrificed = list()
 							var/turf/T = get_turf(R)
 							T.hotspot_expose(700,125)
 				for(var/obj/effect/decal/cleanable/blood/B in world)
-					if(B.blood_DNA == src.blood_DNA && B.blood_type == src.blood_type)
+					if(B.blood_DNA == src.blood_DNA)
 						for(var/mob/living/M in orange(1,B))
 							M.take_overall_damage(0,5)
 							M << "\red Blood suddenly ignites, burning you!"

code/game/magic/library.dm

@@ -232,11 +232,11 @@
 						if ((!in_range(src, usr) && src.loc != user && src.loc.loc != user && user.equipped() != W))
 							return
 
-						if(lentext(t) >= MAX_PAPER_MESSAGE_LEN)
+						if(lentext(t) >= MAX_BOOK_MESSAGE_LEN)
 							var/cont = input(user, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
 							if(cont == "no")
 								break
-					while(lentext(t) > MAX_PAPER_MESSAGE_LEN)
+					while(lentext(t) > MAX_BOOK_MESSAGE_LEN)
 
 					if ((!in_range(src, usr) && src.loc != user && src.loc.loc != user && user.equipped() != W))
 						return

code/game/objects/blood.dm

@@ -20,6 +20,8 @@
 			sleep(3)
 			if (i > 0)
 				var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+				b.blood_DNA = blood_DNA
+				b.OriginalMob = OriginalMob
 				for(var/datum/disease/D in src.viruses)
 					b.viruses += D
 			if (step_to(src, get_step(src, direction), 0))

code/game/objects/closets/secure/security.dm

@@ -85,7 +85,7 @@
 /obj/structure/closet/secure_closet/detective
 	name = "Detective"
 	req_access = list(access_forensics_lockers)
-	icon_state = "cabinetdetective"
+	icon_state = "cabinetdetective_locked"
 	icon_closed = "cabinetdetective"
 	icon_locked = "cabinetdetective_locked"
 	icon_opened = "cabinetdetective_open"

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

@@ -743,7 +743,9 @@
 				else
 					user << "\blue Blood found on [C]. Analysing..."
 					spawn(15)
-						user << "\blue Blood type: [C:blood_type]\nDNA: [C:blood_DNA]"
+						for(var/i = 1, i < C:blood_DNA.len, i++)
+							var/list/templist = C:blood_DNA[i]
+							user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
 
 			if(4)
 				for (var/mob/O in viewers(C, null))
@@ -761,10 +763,9 @@
 			if (!A.fingerprints)
 				user << "\blue Unable to locate any fingerprints on [A]!"
 			else
-				var/list/L = params2list(A:fingerprints)
-				user << "\blue Isolated [L.len] fingerprints."
-				for(var/i in L)
-					user << "\blue \t [i]"
+				user << "\blue Isolated [A:fingerprints.len] fingerprints."
+//				for(var/i in L)
+//					user << "\blue \t [i]"
 
 		if(3)
 			if(!isnull(A.reagents))

code/game/objects/devices/scanners.dm

@@ -65,107 +65,189 @@ MASS SPECTROMETER
 	icon_state = "forensic0"
 	var/amount = 20.0
 	var/printing = 0.0
-	var/list/stored_fibers = null
-	var/stored_name = null
+	var/list/stored = list()
 	w_class = 3.0
 	item_state = "electronic"
 	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY
 
 
-/obj/item/device/detective_scanner/attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)
-	..()
+	attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)
+		..()
+		if (istype(W, /obj/item/weapon/f_card))
+			if (W.fingerprints)
+				return
+			if (src.amount == 20)
+				return
+			if (W.amount + src.amount > 20)
+				src.amount = 20
+				W.amount = W.amount + src.amount - 20
+			else
+				src.amount += W.amount
+				//W = null
+				del(W)
+			src.add_fingerprint(user)
+			if (W)
+				W.add_fingerprint(user)
+		return
 
-	if (istype(W, /obj/item/weapon/f_card))
-		if (W.fingerprints)
-			return
-		if (src.amount == 20)
-			return
-		if (W.amount + src.amount > 20)
-			src.amount = 20
-			W.amount = W.amount + src.amount - 20
+	attack_self(mob/user as mob)
+		src.printing = !( src.printing )
+		if(src.printing)
+			user << "\blue Printing turned on"
 		else
-			src.amount += W.amount
-			//W = null
-			del(W)
-		src.add_fingerprint(user)
-		if (W)
-			W.add_fingerprint(user)
-	return
-
-/obj/item/device/detective_scanner/attack_self(mob/user as mob)
-
-	src.printing = !( src.printing )
-	if(src.printing)
-		user << "\blue Printing turned on"
-	else
-		user << "\blue Printing turned off"
-	src.icon_state = text("forensic[]", src.printing)
-	add_fingerprint(user)
-	return
-
-/obj/item/device/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
-
-	if (!ishuman(M))
-		user << "\red [M] is not humas and cannot have the fingerprints."
-		return 0
-	if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
-		user << "\blue No fingerprints found on [M]"
-		return 0
-	else
-		if ((src.amount < 1 && src.printing))
-			user << text("\blue Fingerprints scanned on [M]. Need more cards to print.")
-			src.printing = 0
+			user << "\blue Printing turned off"
 		src.icon_state = text("forensic[]", src.printing)
-		if (src.printing)
-			src.amount--
-			var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
-			F.amount = 1
-			F.fingerprints = md5(M.dna.uni_identity)
-			F.icon_state = "fingerprint1"
-			F.name = text("FPrintC- '[M.name]'")
-			user << "\blue Done printing."
-		user << text("\blue [M]'s Fingerprints: [md5(M.dna.uni_identity)]")
-	if ( !(M.blood_DNA) )
-		user << "\blue No blood found on [M]"
-	else
-		user << "\blue Blood found on [M]. Analysing..."
-		spawn(15)
-			user << "\blue Blood type: [M.blood_type]\nDNA: [M.blood_DNA]"
-	return
+		add_fingerprint(user)
+		return
 
-/obj/item/device/detective_scanner/afterattack(atom/A as mob|obj|turf|area, mob/user as mob)
+	attack(mob/living/carbon/human/M as mob, mob/user as mob)
+		if (!ishuman(M))
+			user << "\red [M] is not human and cannot have the fingerprints."
+			return 0
+		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
+			user << "\blue No fingerprints found on [M]"
+			return 0
+		else
+			if ((src.amount < 1 && src.printing))
+				user << text("\blue Fingerprints scanned on [M]. Need more cards to print.")
+				src.printing = 0
+			src.icon_state = text("forensic[]", src.printing)
+			if (src.printing)
+				src.amount--
+				var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
+				F.amount = 1
+				F.fingerprints = md5(M.dna.uni_identity)
+				F.icon_state = "fingerprint1"
+				F.name = text("FPrintC- '[M.name]'")
+				user << "\blue Done printing."
+			user << text("\blue [M]'s Fingerprints: [md5(M.dna.uni_identity)]")
+		if ( !(M.blood_DNA) )
+			user << "\blue No blood found on [M]"
+		else
+			user << "\blue Blood found on [M]. Analysing..."
+			spawn(15)
+				for(var/i = 1, i < M.blood_DNA.len, i++)
+					var/list/templist = M.blood_DNA[i]
+					user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
+		return
 
-	src.add_fingerprint(user)
-	if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
-		if(A.blood_DNA)
-			user << "\blue Blood type: [A.blood_type]\nDNA: [A.blood_DNA]"
-	else if (A.blood_DNA)
-		user << "\blue Blood found on [A]. Analysing..."
-		sleep(15)
-		user << "\blue Blood type: [A.blood_type]\nDNA: [A.blood_DNA]"
-	else
-		user << "\blue No blood found on [A]."
-	if (!( A.fingerprints ))
-		user << "\blue Unable to locate any fingerprints on [A]!"
-		return 0
-	else
-		if ((src.amount < 1 && src.printing))
-			user << "\blue Fingerprints found. Need more cards to print."
-			src.printing = 0
-	src.icon_state = text("forensic[]", src.printing)
-	if (src.printing)
-		src.amount--
-		var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
-		F.amount = 1
-		F.fingerprints = A.fingerprints
-		F.icon_state = "fingerprint1"
-		user << "\blue Done printing."
-	var/list/L = params2list(A.fingerprints)
-	user << text("\blue Isolated [L.len] fingerprints.")
-	for(var/i in L)
-		user << text("\blue \t [i]")
-		//Foreach goto(186)
-	return
+	afterattack(atom/A as obj|turf|area, mob/user as mob)
+		if(src.loc != user)
+			return 0
+		src.add_fingerprint(user)
+		if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
+			if(!isnull(A.blood_DNA.len))
+				for(var/i = 1, i < A.blood_DNA.len, i++)
+					var/list/templist = A.blood_DNA[i]
+					user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
+			return
+		var/duplicate = 0
+		if ((!A.fingerprints || A.fingerprints.len == 0) && !(A.suit_fibers) && !(A.blood_DNA))
+			user << "\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!"
+			return 0
+		else if (A.blood_DNA)
+			user << "\blue Blood found on [A]. Analysing..."
+			sleep(15)
+			if(!duplicate)
+				duplicate = 1
+				var/i = add_data(A)
+				if(i)
+					user << "\blue Blood already in memory."
+			for(var/i = 1, i < (A.blood_DNA.len + 1), i++)
+				var/list/templist = A.blood_DNA[i]
+				user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
+		else
+			user << "\blue No Blood Located"
+		if(!A.fingerprints || A.fingerprints.len == 0)
+			user << "\blue No Fingerprints Located."
+		else
+			user << text("\blue Isolated [A.fingerprints.len] fingerprints: Data Stored: Scan with Hi-Res Forensic Scanner to retrieve.")
+			if(!duplicate)
+				duplicate = 1
+				var/i = add_data(A)
+				if(i)
+					user << "\blue Fingerprints already in memory."
+		if(!A.suit_fibers)
+			user << "\blue No Fibers/Materials Located."
+		else
+			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+
+			if(!duplicate)
+				duplicate = 1
+				var/i = add_data(A)
+				if(i)
+					user << "\blue Fibers/Materials already in memory."
+	//	else
+	//		if ((src.amount < 1 && src.printing))
+	//			user << "\blue Fingerprints found. Need more cards to print."
+	//			src.printing = 0
+	//	src.icon_state = text("forensic[]", src.printing)
+	//	if (src.printing)
+	//		src.amount--
+	//		var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user.loc )
+	//		F.amount = 1
+	//		F.fingerprints = A.fingerprints
+	//		F.icon_state = "fingerprint1"
+	//		user << "\blue Done printing."
+	//	for(var/i in L)
+	//		user << text("\blue \t [i]")
+	//		//Foreach goto(186)
+		return
+
+	proc/add_data(atom/A as mob|obj|turf|area)
+		var/merged = 0
+		for(var/i = 1, i < (stored.len + 1), i++)	//Lets see if the object is already in there!
+			var/list/temp = stored[i]
+			var/checker = temp[1]
+			if(checker == A)	//It is!  Merge!
+				merged = 1
+				var/list/prints = temp[2]
+				if(!prints)
+					prints = list()
+				if(A.fingerprints)
+					for(var/j = 1, j < (A.fingerprints.len + 1), j++)	//Fingerprints~~~
+						var/list/print_test1 = params2list(A.fingerprints[j])
+						var/test_print1 = print_test1[num2text(1)]
+						var/found = 0
+						for(var/k = 1, k < (prints.len + 1), k++)	//Lets see if the print is already in there
+							var/list/print_test2 = params2list(prints[k])
+							var/test_print2 = print_test2[num2text(1)]
+							if(test_print2 == test_print1)	//It is!  Merge!
+								prints[k] = test_print2 + "&" + stringmerge(print_test2[num2text(2)],print_test1[num2text(2)])
+								found = 1
+								break	//We found it, we're done here.
+						if(!found)	//It isn't!  Add!
+							prints += A.fingerprints[j]
+				var/list/fibers = temp[3]
+				if(!fibers)
+					fibers = list()
+				if(A.suit_fibers)
+					for(var/j = 1, j < (A.suit_fibers.len + 1), j++)	//Fibers~~~
+						if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
+							fibers += A.suit_fibers[j]
+				var/list/blood = temp[4]
+				if(!blood)
+					blood = list()
+				if(A.blood_DNA)
+					for(var/j = 1, j < (A.blood_DNA.len + 1), j++)	//Blood~~~
+						if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
+							blood += A.blood_DNA[j]
+				var/list/sum_list[4]	//Pack it back up!
+				sum_list[1] = A
+				sum_list[2] = prints
+				sum_list[3] = fibers
+				sum_list[4] = blood
+				stored[i] = sum_list	//Store it!
+				break	//We found it, we're done here.
+		if(!merged)	//Uh, oh!  New data point!
+			var/list/sum_list[4]	//Pack it back up!
+			sum_list[1] = A
+			sum_list[2] = A.fingerprints
+			sum_list[3] = A.suit_fibers
+			sum_list[4] = A.blood_DNA
+			stored.len++
+			stored[stored.len] = sum_list
+		return merged
 
 
 /obj/item/device/healthanalyzer
@@ -181,50 +263,50 @@ MASS SPECTROMETER
 	m_amt = 200
 	origin_tech = "magnets=1;biotech=1"
 
-/obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob)
-	if ((user.mutations & CLUMSY || user.getBrainLoss() >= 60) && prob(50))
-		user << text("\red You try to analyze the floor's vitals!")
+	attack(mob/M as mob, mob/user as mob)
+		if ((user.mutations & CLUMSY || user.getBrainLoss() >= 60) && prob(50))
+			user << text("\red You try to analyze the floor's vitals!")
+			for(var/mob/O in viewers(M, null))
+				O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
+			user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
+			user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
+			user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
+			user.show_message("\blue Body Temperature: ???", 1)
+			return
+		if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+			usr << "\red You don't have the dexterity to do this!"
+			return
 		for(var/mob/O in viewers(M, null))
-			O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
-		user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
-		user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
+			O.show_message(text("\red [] has analyzed []'s vitals!", user, M), 1)
+			//Foreach goto(67)
+		var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
+		if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath))
+			user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1)
+			user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
+		else
+			user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health))), 1)
+			user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
 		user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
-		user.show_message("\blue Body Temperature: ???", 1)
+		user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
+		if((M.changeling && M.changeling.changeling_fakedeath) ||  (M.reagents && M.reagents.has_reagent("zombiepowder")))
+			user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
+		else
+			user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
+		if (M.getCloneLoss())
+			user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1)
+		for(var/datum/disease/D in M.viruses)
+			if(!D.hidden[SCANNER])
+				user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
+		if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
+			user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1)
+		if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
+			user.show_message(text("\red Subject is brain dead."), 1)
+		else if (M.getBrainLoss() >= 60)
+			user.show_message(text("\red Severe brain damage detected. Subject likely to have mental retardation."), 1)
+		else if (M.getBrainLoss() >= 10)
+			user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1)
+		src.add_fingerprint(user)
 		return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		usr << "\red You don't have the dexterity to do this!"
-		return
-	for(var/mob/O in viewers(M, null))
-		O.show_message(text("\red [] has analyzed []'s vitals!", user, M), 1)
-		//Foreach goto(67)
-	var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
-	if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath))
-		user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1)
-		user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
-	else
-		user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health))), 1)
-		user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
-	user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
-	user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
-	if((M.changeling && M.changeling.changeling_fakedeath) ||  (M.reagents && M.reagents.has_reagent("zombiepowder")))
-		user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
-	else
-		user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
-	if (M.getCloneLoss())
-		user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1)
-	for(var/datum/disease/D in M.viruses)
-		if(!D.hidden[SCANNER])
-			user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))
-	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-		user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1)
-	if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
-		user.show_message(text("\red Subject is brain dead."), 1)
-	else if (M.getBrainLoss() >= 60)
-		user.show_message(text("\red Severe brain damage detected. Subject likely to have mental retardation."), 1)
-	else if (M.getBrainLoss() >= 10)
-		user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1)
-	src.add_fingerprint(user)
-	return
 
 
 /obj/item/device/analyzer

code/game/objects/gibs.dm

@@ -1,7 +1,7 @@
 //HUMANS
 
-/proc/gibs(atom/location, var/list/viruses)
-	new /obj/effect/gibspawner/human(get_turf(location),viruses)
+/proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA)
+	new /obj/effect/gibspawner/human(get_turf(location),viruses,MobDNA)
 
 /proc/xgibs(atom/location, var/list/viruses)
 	new /obj/effect/gibspawner/xeno(get_turf(location),viruses)
@@ -16,13 +16,13 @@
 	var/list/gibamounts = list()
 	var/list/gibdirections = list() //of lists
 
-	New(location, var/list/viruses)
+	New(location, var/list/viruses, var/datum/dna/MobDNA)
 		..()
 
 		if(istype(loc,/turf)) //basically if a badmin spawns it
-			Gib(loc,viruses)
+			Gib(loc,viruses,MobDNA)
 
-	proc/Gib(atom/location, var/list/viruses = list())
+	proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null)
 		if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
 			world << "\red Gib list length mismatch!"
 			return
@@ -50,6 +50,11 @@
 								gib.viruses += viruus
 								viruus.holder = gib
 								viruus.spread_type = CONTACT_FEET
+					if(MobDNA)
+						gib.blood_DNA.len++
+						gib.blood_DNA[gib.blood_DNA.len] = list(MobDNA.unique_enzymes, MobDNA.b_type)
+						if(MobDNA.original_name != "Unknown")
+							gib.OriginalMob = MobDNA.original_name
 					var/list/directions = gibdirections[i]
 					if(directions.len)
 						gib.streak(directions)

code/game/objects/items/item.dm

@@ -162,7 +162,7 @@
 	if(isalien(user)) // -- TLE
 		var/mob/living/carbon/alien/A = user
 
-		if(!A.has_fine_manipulation || w_class >= 4)
+		if(!A.has_fine_manipulation || w_class <= 4)
 			user << "Your claws aren't capable of such fine manipulation."
 			return
 
@@ -196,20 +196,23 @@
 
 /obj/item/attackby(obj/item/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/packageWrap))
+		var/location = get_turf(src.loc)
 		if(istype(src,/obj/item/weapon/storage) && istype(src.loc, /mob))	//Put it into the bag
 			return
-		if(istype(src.loc,/obj/item/weapon/storage) || istype(src.loc,/obj/item/clothing/suit/storage/))	//Taking stuff out of storage duplicates it.
-			user << "\blue Do not do this, it is broken as all hell.  Take it out of the container first."
-			return
-		for(var/obj/item/T in user)	//Lets remove it from their inventory
-			if(T == src)
-				user.remove_from_mob(T)
-				break
+		if(istype(src.loc,/obj/item/weapon/storage))	//Taking stuff out of storage duplicates it.
+			var/obj/item/weapon/storage/U = src.loc
+			user.client.screen -= src
+			U.contents.Remove(src)
+		if(istype(src.loc,/obj/item/clothing/suit/storage/))
+			var/obj/item/clothing/suit/storage/X = src.loc
+			user.client.screen -= src
+			X.contents.Remove(src)
+		if(src in user)
+			user.remove_from_mob(src)
 		var/obj/item/weapon/packageWrap/O = W
 		if (O.amount > 1)
-			var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(src.loc))
+			var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(location)
 			P.wrapped = src
-
 			src.loc = P
 			O.amount -= 1
 	else if(istype(W,/obj/item/wardrobe))
@@ -218,13 +221,14 @@
 			if (I.contents.len < 20)
 				if(istype(O,/obj/item/wardrobe))
 					continue
-				if(O.anchored || O.density)
+				if(O.anchored || O.density || istype(O,/obj/structure))
 					continue
 				I.contents += O;
 			else
 				user << "\blue The wardrobe is full."
 				return
 		user << "\blue You pick up all the items."
+		user.visible_message("\blue [user] gathers up the pile of stuff, and puts it into \the [W]")
 		I.update_icon()
 
 /obj/item/attack_self(mob/user as mob)

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

@@ -201,11 +201,11 @@ FINGERPRINT CARD
 
 /obj/item/weapon/f_card/proc/display()
 
-	if (src.fingerprints)
+	if (length(src.fingerprints))
 		var/dat = "<B>Fingerprints on Card</B><HR>"
-		var/L = params2list(src.fingerprints)
-		for(var/i in L)
-			dat += text("[]<BR>", i)
+		for(var/i = 1, i < (src.fingerprints.len + 1), i++)
+			var/list/L = params2list(src.fingerprints[i])
+			dat += text("[]<BR>", L[1])
 			//Foreach goto(41)
 		return dat
 	else
@@ -270,7 +270,7 @@ FINGERPRINT CARD
 
 	..()
 	if (!istype(usr, /mob/living/silicon))
-		if (src.fingerprints)
+		if (length(src.fingerprints))
 			if (src.amount > 1)
 				var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( (ismob(src.loc) ? src.loc.loc : src.loc) )
 				F.amount = --src.amount

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

@@ -533,8 +533,9 @@ CIRCULAR SAW
 
 	else
 		// bone surgery doable?
-		if(!try_bone_surgery(M, user))
-			return ..()
+		try_bone_surgery(M, user)
+//		if(!try_bone_surgery(M, user))
+//			return ..()
 
 /obj/item/weapon/cautery/proc/try_bone_surgery(mob/living/carbon/human/H as mob, mob/living/user as mob)
 	if(!istype(H))
@@ -575,6 +576,8 @@ CIRCULAR SAW
 		S.open = 0
 		if(S.display_name == "chest" && H:embryo_op_stage == 1.0)
 			H:embryo_op_stage = 0.0
+		if(S.display_name == "groin" && H:appendix_op_stage == 1.0)
+			H:appendix_op_stage = 0.0
 
 		H.updatehealth()
 		H.UpdateDamageIcon()
@@ -630,13 +633,13 @@ CIRCULAR SAW
 	if(user.zone_sel.selecting == "groin")
 		if(istype(M, /mob/living/carbon/human))
 			switch(M:appendix_op_stage)
-				if(0.0)
-					if(M != user)
-						for(var/mob/O in (viewers(M) - user - M))
-							O.show_message("\red [M] is beginning to have \his abdomen cut open with [src] by [user].", 1)
-						M << "\red [user] begins to cut open your abdomen with [src]!"
-						user << "\red You cut [M]'s abdomen open with [src]!"
-						M:appendix_op_stage = 1.0
+//				if(0.0)
+//					if(M != user)
+//						for(var/mob/O in (viewers(M) - user - M))
+//							O.show_message("\red [M] is beginning to have \his abdomen cut open with [src] by [user].", 1)
+//						M << "\red [user] begins to cut open your abdomen with [src]!"
+//						user << "\red You cut [M]'s abdomen open with [src]!"
+//						M:appendix_op_stage = 1.0
 				if(3.0)
 					if(M != user)
 						for(var/mob/O in (viewers(M) - user - M))
@@ -644,7 +647,7 @@ CIRCULAR SAW
 						M << "\red [user] begins to seperate your appendix with [src]!"
 						user << "\red You seperate [M]'s appendix with [src]!"
 						M:appendix_op_stage = 4.0
-		return
+						return
 
 	if(user.zone_sel.selecting == "head" || istype(M, /mob/living/carbon/metroid))
 
@@ -857,6 +860,8 @@ CIRCULAR SAW
 		S.bleeding = 1
 		if(S.display_name == "chest")
 			H:embryo_op_stage = 1.0
+		if(S.display_name == "groin")
+			H:appendix_op_stage = 1.0
 
 		H.updatehealth()
 		H.UpdateDamageIcon()
@@ -925,7 +930,7 @@ CIRCULAR SAW
 					return
 				for(var/mob/O in viewers(H, null))
 					O.show_message(text("\red [H] gets \his [S.display_name] sawed at with [src] by [user].... It looks like [user] is trying to cut it off!"), 1)
-				if(!do_after(rand(50,70)))
+				if(!do_after(user,rand(50,70)))
 					for(var/mob/O in viewers(H, null))
 						O.show_message(text("\red [user] tried to cut [H]'s [S.display_name] off with [src], but failed."), 1)
 					return
@@ -1009,14 +1014,14 @@ CIRCULAR SAW
 				..()
 		return
 
-	else if(user.zone_sel.selecting != "chest" && user.zone_sel.selecting != "groin" && istype(M, /mob/living/carbon/human))
+	else if(user.zone_sel.selecting != "chest" && istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/datum/organ/external/S = H.organs[user.zone_sel.selecting]
 		if(S.destroyed)
 			return
 		for(var/mob/O in viewers(H, null))
 			O.show_message(text("\red [H] gets \his [S.display_name] sawed at with [src] by [user].... It looks like [user] is trying to cut it off!"), 1)
-		if(!do_after(rand(20,80)))
+		if(!do_after(user, rand(20,80)))
 			for(var/mob/O in viewers(H, null))
 				O.show_message(text("\red [user] tried to cut [H]'s [S.display_name] off with [src], but failed."), 1)
 			return

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

@@ -0,0 +1,84 @@
+/obj/item/weapon/syndie
+	icon = 'syndieweapons.dmi'
+
+/*C-4 explosive charge and etc, replaces the old syndie transfer valve bomb.*/
+
+
+/*The explosive charge itself.  Flashes for five seconds before exploding.*/
+
+/obj/item/weapon/syndie/c4explosive
+	icon_state = "c-4small_0"
+	item_state = "c-4small"
+	name = "mysterious package"
+	desc = "A mysterious package."
+	w_class = 3
+
+	var/power = 1  /*Size of the explosion.*/
+	var/size = "small"  /*Used for the icon, this one will make c-4small_0 for the off state.*/
+
+/obj/item/weapon/syndie/c4explosive/heavy
+	icon_state = "c-4large_0"
+	item_state = "c-4large"
+	desc = "A mysterious package, it's quite heavy."
+	power = 2
+	size = "large"
+
+/obj/item/weapon/syndie/c4explosive/New()
+	var/K = rand(1,2000)
+	K = md5(num2text(K)+name)
+	K = copytext(K,1,7)
+	src.desc += "\n You see [K] engraved on \the [src]"
+	var/obj/item/weapon/syndie/c4detonator/detonator = new(src.loc)
+	detonator.desc += "\n You see [K] engraved on \the [src]"
+	detonator.bomb = src
+
+/obj/item/weapon/syndie/c4explosive/proc/detonate()
+	icon_state = "c-4[size]_1"
+	spawn(50)
+		explosion(get_turf(src), power, power*2, power*3, power*4, power*4)
+		for(var/dirn in cardinal)		//This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors.
+			var/turf/simulated/wall/T = get_step(src,dirn)
+			if(locate(/obj/machinery/door/airlock) in T)
+				var/obj/machinery/door/airlock/D = locate() in T
+				if(D.density)
+					D.open()
+			if(istype(T,/turf/simulated/wall))
+				T.dismantle_wall(1)
+		del(src)
+
+
+/*Detonator, disguised as a lighter*/
+/*Click it when closed to open, when open to bring up a prompt asking you if you want to close it or press the button.*/
+
+/obj/item/weapon/syndie/c4detonator
+	icon_state = "c-4detonator_0"
+	item_state = "c-4detonator"
+	name = "lighter"  /*Sneaky, thanks Dreyfus.*/
+	desc = "A disposable lighter, it's quite heavy."
+	w_class = 1
+
+	var/obj/item/weapon/syndie/c4explosive/bomb
+	var/pr_open = 0  /*Is the "What do you want to do?" prompt open?*/
+
+/obj/item/weapon/syndie/c4detonator/attack_self(mob/user as mob)
+	switch(src.icon_state)
+		if("c-4detonator_0")
+			src.icon_state = "c-4detonator_1"
+			user << "You flick open the lighter."
+
+		if("c-4detonator_1")
+			if(!pr_open)
+				pr_open = 1
+				switch(alert(user, "What would you like to do?", "Lighter", "Press the button.", "Close the lighter."))
+					if("Press the button.")
+						user << "\red You press the button."
+						flick("c-4detonator_click", src)
+						if(src.bomb)
+							src.bomb.detonate()
+							log_admin("[user.real_name]([user.ckey]) has triggered [src.bomb] with [src].")
+							message_admins("\red [user.real_name]([user.ckey]) has triggered [src.bomb] with [src].")
+
+					if("Close the lighter.")
+						src.icon_state = "c-4detonator_0"
+						user << "You close the lighter."
+				pr_open = 0

code/game/objects/stacks/stack.dm

@@ -82,7 +82,6 @@
 
 /obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
 	src.blood_DNA = from.blood_DNA
-	src.blood_type = from.blood_type
 	src.fingerprints  = from.fingerprints
 	src.fingerprintshidden  = from.fingerprintshidden
 	src.fingerprintslast  = from.fingerprintslast
@@ -157,7 +156,7 @@
 					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
 			if (!(max_multiplier in multipliers))
 				t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
-				
+
 	t1 += "</TT></body></HTML>"
 	user << browse(t1, "window=stack")
 	onclose(user, "stack")

code/game/verbs/suicide.dm

@@ -11,8 +11,14 @@
 		src << "You can't commit suicide before the game starts!"
 		return
 
+	var/permitted = 0
 	var/list/allowed = list("Syndicate","traitor","Wizard","Head Revolutionary","Cultist","Changeling")
-	if (mind.special_role in allowed)
+	for(var/T in allowed)
+		if(mind.special_role == T)
+			permitted = 1
+			break
+
+	if(!permitted)
 		message_admins("[ckey] has tried to suicide, but they were not permitted due to not being antagonist as human.", 1)
 		src << "No.  Adminhelp if there is a legitimate reason."
 		return

code/game/verbs/who.dm

@@ -33,7 +33,9 @@
 			if(usr.client.holder)
 				usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " <i>(as [M.client.fakekey])</i>" : ""]"
 			else if(!M.client.stealth && (M.client.holder.level != -3))
-				usr << "\t[M.client]"
+				usr << "\t[pick(nobles)] [M.client]"
+
+var/list/nobles = list("Baron","Bookkeeper","Captain of the Guard","Chief medical dwarf","Count","Dungeon master","Duke","General","Mayor","Outpost liaison","Sheriff","Champion")
 
 /client/verb/active_players()
 	set category = "OOC"

code/modules/admin/admin.dm

@@ -1485,17 +1485,12 @@
 					else
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return
-				if("schoolgirl")
+				/*if("schoolgirl")
 					if (src.rank in list("Badmin", "Game Admin", "Game Master"))
-						for(var/obj/item/clothing/under/W in world)
-							W.icon_state = "schoolgirl"
-							W.item_state = "w_suit"
-							W.color = "schoolgirl"
-						message_admins("[key_name_admin(usr)] activated Japanese Animes mode")
-						world << sound('animes.ogg')
+						alert("You cannot perform this action. It is unbelievably stupid.")
 					else
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
-						return
+						return*/
 				if("dorf")
 					if (src.rank in list("Badmin","Game Admin", "Game Master"))
 						for(var/mob/living/carbon/human/B in world)
@@ -1695,7 +1690,7 @@
 					dat += "<table cellspacing=5><tr><th>Name</th><th>DNA</th><th>Blood Type</th></tr>"
 					for(var/mob/living/carbon/human/H in world)
 						if(H.dna && H.ckey)
-							dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.b_type]</td></tr>"
+							dat += "<tr><td>[H]</td><td>[H.dna.unique_enzymes]</td><td>[H.dna.b_type]</td></tr>"
 					dat += "</table>"
 					usr << browse(dat, "window=DNA;size=440x410")
 				if("fingerprints")
@@ -2141,7 +2136,6 @@
 <A href='?src=\ref[src];secretsfun=flicklights'>Ghost Mode</A><BR>
 <A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
 <A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
-<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
 <A href='?src=\ref[src];secretsfun=moveadminshuttle'>Move Administration Shuttle</A><BR>
 <A href='?src=\ref[src];secretsfun=moveferry'>Move Ferry</A><BR>
 <A href='?src=\ref[src];secretsfun=movealienship'>Move Alien Dinghy</A><BR>

code/modules/admin/verbs/adminhelp.dm

@@ -19,9 +19,10 @@
 	usr << "Your message has been broadcast to administrators."
 	log_admin("HELP: [key_name(src)]: [msg]")
 
-	var/list/replacechars = list("'","\"",">","<","(",")")
+/*	var/list/replacechars = list("'","\"",">","<","(",")")
 	for(var/rep in replacechars)
-		msg = dd_list2text((dd_text2list(msg, rep)))
+		msg = dd_replacetext(msg, rep, "")
+	world << msg*/
 	send2adminirc("#bs12admin","HELP: [src.key]: [msg]")
 	if(tension_master)
 		tension_master.new_adminhelp()

code/modules/admin/verbs/randomverbs.dm

@@ -339,7 +339,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			new_character.name = record_found.fields["name"]
 			new_character.gender = record_found.fields["sex"]//Sex
 			new_character.age = record_found.fields["age"]//Age
-			new_character.b_type = record_found.fields["b_type"]//Blood type
+			new_character.dna.b_type = record_found.fields["b_type"]//Blood type
 			//We will update their appearance when determining DNA.
 		else
 			new_character.gender = MALE

code/modules/chemical/Chemistry-Machinery.dm

@@ -196,19 +196,27 @@
 		return
 
 	attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob)
-		if(!istype(B, /obj/item/weapon/reagent_containers/glass))
+		if(!istype(B, /obj/item/weapon/reagent_containers/glass) && !istype(B,/obj/item/weapon/reagent_containers/syringe))
 			return
 
 		if(src.beaker)
-			user << "A beaker is already loaded into the machine."
+			if(istype(beaker,/obj/item/weapon/reagent_containers/syringe))
+				user << "A syringe is already loaded into the machine."
+			else
+				user << "A beaker is already loaded into the machine."
 			return
 
 		src.beaker =  B
 		user.drop_item()
 		B.loc = src
-		user << "You add the beaker to the machine!"
-		src.updateUsrDialog()
-		icon_state = "mixer1"
+		if(istype(B,/obj/item/weapon/reagent_containers/syringe))
+			user << "You add the syringe to the machine!"
+			src.updateUsrDialog()
+			icon_state = "mixers"
+		else
+			user << "You add the beaker to the machine!"
+			src.updateUsrDialog()
+			icon_state = "mixer1"
 
 	Topic(href, href_list)
 		if(stat & BROKEN) return
@@ -222,7 +230,18 @@
 		if (href_list["analyze"])
 			var/dat = ""
 			if(!condi)
-				dat += "<TITLE>Chemmaster 3000</TITLE>Chemical infos:<BR><BR>Name:<BR>[href_list["name"]]<BR><BR>Description:<BR>[href_list["desc"]]<BR><BR><BR><A href='?src=\ref[src];main=1'>(Back)</A>"
+				if(href_list["name"] == "Blood")
+					var/datum/reagent/blood/G
+					for(var/datum/reagent/F in R.reagent_list)
+						if(F.name == href_list["name"])
+							G = F
+							break
+					var/A = G.name
+					var/B = G.data["blood_type"]
+					var/C = G.data["blood_DNA"]
+					dat += "<TITLE>Chemmaster 3000</TITLE>Chemical infos:<BR><BR>Name:<BR>[A]<BR><BR>Description:<BR>Blood Type: [B]<br>DNA: [C]<BR><BR><BR><A href='?src=\ref[src];main=1'>(Back)</A>"
+				else
+					dat += "<TITLE>Chemmaster 3000</TITLE>Chemical infos:<BR><BR>Name:<BR>[href_list["name"]]<BR><BR>Description:<BR>[href_list["desc"]]<BR><BR><BR><A href='?src=\ref[src];main=1'>(Back)</A>"
 			else
 				dat += "<TITLE>Condimaster 3000</TITLE>Condiment infos:<BR><BR>Name:<BR>[href_list["name"]]<BR><BR>Description:<BR>[href_list["desc"]]<BR><BR><BR><A href='?src=\ref[src];main=1'>(Back)</A>"
 			usr << browse(dat, "window=chem_master;size=575x400")
@@ -316,7 +335,7 @@
 				dat += "Add to buffer:<BR>"
 				for(var/datum/reagent/G in R.reagent_list)
 					dat += "[G.name] , [G.volume] Units - "
-					dat += "<A href='?src=\ref[src];analyze=1;desc=[G.description];name=[G.name]'>(Analyze)</A> "
+					dat += "<A href='?src=\ref[src];analyze=1;desc=[G.description];name=[G.name];reagent=[G]'>(Analyze)</A> "
 					dat += "<A href='?src=\ref[src];add1=[G.id]'>(1)</A> "
 					if(G.volume >= 5) dat += "<A href='?src=\ref[src];add5=[G.id]'>(5)</A> "
 					if(G.volume >= 10) dat += "<A href='?src=\ref[src];add10=[G.id]'>(10)</A> "

code/modules/chemical/Chemistry-Reagents.dm

@@ -101,6 +101,12 @@ datum
 			id = "blood"
 			reagent_state = LIQUID
 			color = "#C80000" // rgb: 200, 0, 0
+			on_mob_life(var/mob/living/M)
+				if(istype(M, /mob/living/carbon/human) && blood_incompatible(data["blood_type"],M.dna.b_type))
+					M.adjustToxLoss(rand(1.5,3))
+					M.adjustOxyLoss(rand(1.5,3))
+				..()
+				return
 
 			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 				var/datum/reagent/blood/self = src
@@ -149,8 +155,8 @@ datum
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
 					if(!blood_prop) //first blood!
 						blood_prop = new(T)
-						blood_prop.blood_DNA = self.data["blood_DNA"]
-						blood_prop.blood_type = self.data["blood_type"]
+						blood_prop.blood_DNA.len++
+						blood_prop.blood_DNA[blood_prop.blood_DNA.len] = list(self.data["blood_DNA"], self.data["blood_type"])
 
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
@@ -174,7 +180,7 @@ datum
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
 					if(!blood_prop)
 						blood_prop = new(T)
-						blood_prop.blood_DNA = self.data["blood_DNA"]
+						blood_prop.blood_DNA = list(self.data["blood_DNA"])
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
 						blood_prop.viruses += newVirus
@@ -191,7 +197,7 @@ datum
 					var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
 					if(!blood_prop)
 						blood_prop = new(T)
-						blood_prop.blood_DNA = self.data["blood_DNA"]
+						blood_prop.blood_DNA = list(self.data["blood_DNA"])
 					for(var/datum/disease/D in self.data["viruses"])
 						var/datum/disease/newVirus = new D.type
 						blood_prop.viruses += newVirus

code/modules/chemical/Chemistry-Tools.dm

@@ -863,6 +863,7 @@
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = null //list(5,10,15)
 	volume = 15
+	var/has_blood = 0
 	var/mode = SYRINGE_DRAW
 
 	on_reagent_change()
@@ -950,8 +951,7 @@
 						if(T.resistances&&T.resistances.len)
 							B.data["resistances"] = T.resistances.Copy()
 						if(istype(target, /mob/living/carbon/human))//I wish there was some hasproperty operation...
-							var/mob/living/carbon/human/HT = target
-							B.data["blood_type"] = copytext(HT.b_type,1,0)
+							B.data["blood_type"] = copytext(T.dna.b_type,1,0)
 						var/list/temp_chem = list()
 						for(var/datum/reagent/R in target.reagents.reagent_list)
 							temp_chem += R.name
@@ -1024,6 +1024,10 @@
 
 	update_icon()
 		var/rounded_vol = round(reagents.total_volume,5)
+		has_blood = 0
+		for(var/datum/reagent/blood/B in reagents.reagent_list)
+			has_blood = 1
+			break
 		if(ismob(loc))
 			var/mode_t
 			switch(mode)
@@ -1031,9 +1035,9 @@
 					mode_t = "d"
 				if (SYRINGE_INJECT)
 					mode_t = "i"
-			icon_state = "[mode_t][rounded_vol]"
+			icon_state = "[mode_t][(has_blood?"b":"")][rounded_vol]"
 		else
-			icon_state = "[rounded_vol]"
+			icon_state = "[(has_blood?"b":"")][rounded_vol]"
 		item_state = "syringe_[rounded_vol]"
 
 

code/modules/flufftext/Dreaming.dm

@@ -0,0 +1,25 @@
+mob/living/carbon/proc/dream()
+	dreaming = 1
+	var/list/dreams = list(
+		"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
+		"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
+		"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
+		"a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights",
+		"a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
+		"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying"
+		)
+	for(var/i = rand(1,4),i > 0, i--)
+		var/dream_image = pick(dreams)
+		dreams -= dream_image
+		src << "\blue <i>... [dream_image] ...</i>"
+		sleep(rand(40,70))
+		if(paralysis <= 0)
+			dreaming = 0
+			return 0
+	dreaming = 0
+	return 1
+
+mob/living/carbon/proc/handle_dreams()
+	if(prob(5) && !dreaming) dream()
+
+mob/living/carbon/var/dreaming = 0

code/modules/flufftext/Hallucination.dm

@@ -0,0 +1,175 @@
+/*
+Ideas for the subtle effects of hallucination:
+
+Light up oxygen/plasma indicators (done)
+Cause health to look critical/dead, even when standing (done)
+Characters silently watching you
+Brief flashes of fire/space/bombs/c4/dangerous shit (done)
+Items that are rare/traitorous/don't exist appearing in your inventory slots (done)
+Strange audio (should be rare) (done)
+Gunshots/explosions/opening doors/less rare audio (done)
+
+*/
+
+mob/living/carbon/var
+	image/halimage
+	obj/halitem
+	hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator
+	handling_hal = 0
+
+mob/living/carbon/proc/handle_hallucinations()
+	if(handling_hal) return
+	handling_hal = 1
+	while(hallucination > 20)
+		sleep(rand(200,500))
+		var/halpick = rand(1,100)
+		switch(halpick)
+			if(0 to 15)
+				//Screwy HUD
+				//src << "Screwy HUD"
+				hal_screwyhud = pick(1,2,3,3,4,4)
+				spawn(rand(100,250))
+					hal_screwyhud = 0
+			if(16 to 25)
+				//Strange items
+				//src << "Traitor Items"
+				halitem = new
+				var/list/slots_free = list("1,1","3,1")
+				if(l_hand) slots_free -= "1,1"
+				if(r_hand) slots_free -= "3,1"
+				if(istype(src,/mob/living/carbon/human))
+					var/mob/living/carbon/human/H = src
+					if(!H.belt) slots_free += "3,0"
+					if(!H.l_store) slots_free += "4,0"
+					if(!H.r_store) slots_free += "5,0"
+				if(slots_free.len)
+					halitem.screen_loc = pick(slots_free)
+					halitem.layer = 50
+					switch(rand(1,6))
+						if(1) //revolver
+							halitem.icon = 'gun.dmi'
+							halitem.icon_state = "revolver"
+							halitem.name = "Revolver"
+						if(2) //c4
+							halitem.icon = 'syndieweapons.dmi'
+							halitem.icon_state = "c4small_0"
+							halitem.name = "Mysterious Package"
+							if(prob(25))
+								halitem.icon_state = "c4small_1"
+						if(3) //sword
+							halitem.icon = 'weapons.dmi'
+							halitem.icon_state = "sword1"
+							halitem.name = "Sword"
+						if(4) //stun baton
+							halitem.icon = 'weapons.dmi'
+							halitem.icon_state = "stunbaton"
+							halitem.name = "Stun Baton"
+						if(5) //emag
+							halitem.icon = 'card.dmi'
+							halitem.icon_state = "emag"
+							halitem.name = "Cryptographic Sequencer"
+						if(6) //flashbang
+							halitem.icon = 'grenade.dmi'
+							halitem.icon_state = "flashbang1"
+							halitem.name = "Flashbang"
+					if(client) client.screen += halitem
+					spawn(rand(100,250))
+						del halitem
+			if(26 to 40)
+				//Flashes of danger
+				//src << "Danger Flash"
+				var/possible_points = list()
+				for(var/turf/simulated/floor/F in view(src,world.view))
+					possible_points += F
+				var/turf/simulated/floor/target = pick(possible_points)
+
+				switch(rand(1,3))
+					if(1)
+						//src << "Space"
+						halimage = image('space.dmi',target,"[rand(1,25)]",TURF_LAYER)
+					if(2)
+						//src << "Fire"
+						halimage = image('fire.dmi',target,"1",TURF_LAYER)
+					if(3)
+						//src << "C4"
+						halimage = image('syndieweapons.dmi',target,"c4small_1",OBJ_LAYER+0.01)
+
+
+				if(client) client.images += halimage
+				spawn(rand(10,50)) //Only seen for a brief moment.
+					if(client) client.images -= halimage
+					halimage = null
+
+
+			if(41 to 65)
+				//Strange audio
+				src << "Strange Audio"
+				switch(rand(1,12))
+					if(1) src << 'airlock.ogg'
+					if(2)
+						if(prob(50))src << 'Explosion1.ogg'
+						else src << 'Explosion2.ogg'
+					if(3) src << 'explosionfar.ogg'
+					if(4) src << 'Glassbr1.ogg'
+					if(5) src << 'Glassbr2.ogg'
+					if(6) src << 'Glassbr3.ogg'
+					if(7) src << 'twobeep.ogg'
+					if(8) src << 'windowdoor.ogg'
+					if(9)
+						//To make it more realistic, I added two gunshots (enough to kill)
+						src << 'Gunshot.ogg'
+						spawn(rand(10,30))
+							src << 'Gunshot.ogg'
+					if(10) src << 'smash.ogg'
+					if(11)
+						//Same as above, but with tasers.
+						src << 'Taser.ogg'
+						spawn(rand(10,30))
+							src << 'Taser.ogg'
+				//Rare audio
+					if(12)
+						switch(rand(1,4))
+							if(1) src << 'ghost.ogg'
+							if(2) src << 'ghost2.ogg'
+							if(3) src << 'Heart Beat.ogg'
+							if(4) src << 'screech.ogg'
+	handling_hal = 0
+
+
+
+
+/*obj/machinery/proc/mockpanel(list/buttons,start_txt,end_txt,list/mid_txts)
+
+	if(!mocktxt)
+
+		mocktxt = ""
+
+		var/possible_txt = list("Launch Escape Pods","Self-Destruct Sequence","\[Swipe ID\]","De-Monkify",\
+		"Reticulate Splines","Plasma","Open Valve","Lockdown","Nerf Airflow","Kill Traitor","Nihilism",\
+		"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Captain IQ","Retrieve Arms",\
+		"Play Charades","Oxygen","Inject BeAcOs","Ninja Lizards","Limit Break","Build Sentry")
+
+		if(mid_txts)
+			while(mid_txts.len)
+				var/mid_txt = pick(mid_txts)
+				mocktxt += mid_txt
+				mid_txts -= mid_txt
+
+		while(buttons.len)
+
+			var/button = pick(buttons)
+
+			var/button_txt = pick(possible_txt)
+
+			mocktxt += "<a href='?src=\ref[src];[button]'>[button_txt]</a><br>"
+
+			buttons -= button
+			possible_txt -= button_txt
+
+	return start_txt + mocktxt + end_txt + "</TT></BODY></HTML>"
+
+proc/check_panel(mob/M)
+	if (istype(M, /mob/living/carbon/human) || istype(M, /mob/living/silicon/ai))
+		if(M.hallucination < 15)
+			return 1
+	return 0*/

code/modules/flufftext/TextFilters.dm

@@ -0,0 +1,81 @@
+proc/Intoxicated(phrase)
+	phrase = html_decode(phrase)
+	var
+		leng=lentext(phrase)
+		counter=lentext(phrase)
+		newphrase="";newletter=""
+	while(counter>=1)
+		newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
+		if(rand(1,3)==3)
+			if(lowertext(newletter)=="o")	newletter="u"
+			if(lowertext(newletter)=="s")	newletter="ch"
+			if(lowertext(newletter)=="a")	newletter="ah"
+			if(lowertext(newletter)=="c")	newletter="k"
+		switch(rand(1,7))
+			if(1,3,5,8)	newletter="[lowertext(newletter)]"
+			if(2,4,6,15)	newletter="[uppertext(newletter)]"
+			if(7)	newletter+="'"
+			//if(9,10)	newletter="<b>[newletter]</b>"
+			//if(11,12)	newletter="<big>[newletter]</big>"
+			//if(13)	newletter="<small>[newletter]</small>"
+		newphrase+="[newletter]";counter-=1
+	return newphrase
+
+proc/NewStutter(phrase,stunned)
+	phrase = html_decode(phrase)
+
+	var/list/split_phrase = dd_text2list(phrase," ") //Split it up into words.
+
+	var/list/unstuttered_words = split_phrase.Copy()
+	var/i = rand(1,3)
+	if(stunned) i = split_phrase.len
+	for(,i > 0,i--) //Pick a few words to stutter on.
+
+		if (!unstuttered_words.len)
+			break
+		var/word = pick(unstuttered_words)
+		unstuttered_words -= word //Remove from unstuttered words so we don't stutter it again.
+		var/index = split_phrase.Find(word) //Find the word in the split phrase so we can replace it.
+
+		//Search for dipthongs (two letters that make one sound.)
+		var/first_sound = copytext(word,1,3)
+		var/first_letter = copytext(word,1,2)
+		if(lowertext(first_sound) in list("ch","th","sh"))
+			first_letter = first_sound
+
+		//Repeat the first letter to create a stutter.
+		var/rnum = rand(1,3)
+		switch(rnum)
+			if(1)
+				word = "[first_letter]-[word]"
+			if(2)
+				word = "[first_letter]-[first_letter]-[word]"
+			if(3)
+				word = "[first_letter]-[word]"
+
+		split_phrase[index] = word
+
+	return sanitize(dd_list2text(split_phrase," "))
+
+proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness.
+	step(M, pick(d,turn(d,90),turn(d,-90)))
+
+proc/Ellipsis(original_msg, chance = 50)
+	if(chance <= 0) return "..."
+	if(chance >= 100) return original_msg
+
+	var/list
+		words = dd_text2list(original_msg," ")
+		new_words = list()
+
+	var/new_msg = ""
+
+	for(var/w in words)
+		if(prob(chance))
+			new_words += "..."
+		else
+			new_words += w
+
+	new_msg = dd_list2text(new_words," ")
+
+	return new_msg

code/modules/mining/mine_items.dm

@@ -2,7 +2,7 @@
 
 //this item is intended to give the effect of entering the mine, so that light gradually fades
 /obj/effect/light_emitter
-	name = "Light-emtter"
+	name = "Light-emitter"
 	anchored = 1
 	unacidable = 1
 	luminosity = 8

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

@@ -379,7 +379,7 @@
 		if (!t1)
 			t1 = wear_suit.icon_state
 		overlays += image("icon" = 'mob.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-		if (wear_suit.blood_DNA)
+		if (wear_suit.blood_DNA.len)
 			if (istype(wear_suit, /obj/item/clothing/suit/armor))
 				overlays += image("icon" = 'blood.dmi', "icon_state" = "armorblood[!lying ? "" : "2"]", "layer" = MOB_LAYER)
 			else
@@ -404,7 +404,7 @@
 		if (!t1)
 			t1 = head.icon_state
 		overlays += image("icon" = 'mob.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-		if (head.blood_DNA)
+		if (head.blood_DNA.len)
 			overlays += image("icon" = 'blood.dmi', "icon_state" = "helmetblood[!lying ? "" : "2"]", "layer" = MOB_LAYER)
 		head.screen_loc = ui_oclothing
 

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

@@ -280,6 +280,8 @@
 
 			if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
 
+			if (!src.hud_used)
+				src.hud_used = new/obj/hud(src)
 			client.screen -= hud_used.blurry
 			client.screen -= hud_used.druggy
 			client.screen -= hud_used.vimpaired

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

@@ -0,0 +1,104 @@
+mob/living/carbon/verb/give()
+	set category = "IC"
+	set name = "Give"
+	set src in view(1)
+	if(src.stat == 2 || usr.stat == 2|| src.client == null)
+		return
+	if(src == usr)
+		usr << "I feel stupider, suddenly."
+		return
+	var/obj/item/I
+	if(!usr.hand && usr.r_hand == null)
+		usr << "You don't have anything in your right hand to give to [src.name]"
+		return
+	if(usr.hand && usr.l_hand == null)
+		usr << "You don't have anything in your left hand to give to [src.name]"
+		return
+	if(usr.hand)
+		I = usr.l_hand
+	else if(!usr.hand)
+		I = usr.r_hand
+	if(!I)
+		return
+	var/obj/item/weapon/T = new(usr.loc)
+	if(!src.loc.Enter(T))
+		usr << "Can't reach him"
+		del(T)
+		return
+	del(T)
+	if(src.r_hand == null)
+		switch(alert(src,"[usr.name] wants to give you \a [I.name]?",,"Yes","No"))
+			if("Yes")
+				if(!check_can_reach(usr,src))
+					usr << "You need to keep in reaching distance."
+					src << "[usr.name] moved too far away."
+					return
+				if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
+					usr << "You need to keep the item in your active hand."
+					src << "[usr.name] seem to have given up on giving \the [I.name] to you."
+					return
+				if(src.r_hand != null)
+					if(src.l_hand == null)
+						usr.drop_item(I)
+						src.l_hand = I
+					else
+						usr << "Their hands are full."
+						return
+				else
+					usr.drop_item(I)
+					src.r_hand = I
+				I.loc = src
+				I.layer = 20
+				I.add_fingerprint(src)
+				src.update_clothing()
+				usr.update_clothing()
+				action_message(src,"[usr.name] handed \the [I.name] to [src.name].")
+			if("No")
+				action_message(src,"[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
+	else if(src.l_hand == null)
+		switch(alert(src,"[src.name] wants to give you \a [I.name]?",,"Yes","No"))
+			if("Yes")
+				if(!check_can_reach(usr,src))
+					usr << "You need to keep in reaching distance."
+					src << "[usr.name] moved too far away."
+					return
+				if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
+					usr << "You need to keep the item in your active hand."
+					src << "[usr.name] seem to have given up on giving \the [I.name] to you."
+					return
+				if(src.l_hand != null)
+					if(src.r_hand == null)
+						usr.drop_item(I)
+						src.r_hand = I
+					else
+						usr << "Their hands are full."
+						return
+				else
+					usr.drop_item(I)
+					src.l_hand = I
+				I.loc = src
+				I.layer = 20
+				I.add_fingerprint(src)
+				src.update_clothing()
+				usr.update_clothing()
+				action_message(src,"[usr.name] handed \the [I.name] to [src.name].")
+			if("No")
+				action_message(src,"[usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
+	else
+		usr << "[src.name]\s hands are full."
+
+proc/action_message(var/mob/living/carbon/A,var/message)
+	if (message != "")
+		if (1 & 1)
+			for (var/mob/O in viewers(A.loc, null))
+				O.show_message(message, 1)
+		else if (1 & 2)
+			for (var/mob/O in hearers(A.loc, null))
+				O.show_message(message, 1)
+	else if (message != "")
+		if (1 & 1)
+			for (var/mob/O in viewers(A, null))
+				O.show_message(message, 1)
+		else if (1 & 2)
+			for (var/mob/O in hearers(A, null))
+				O.show_message(message, 1)

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

@@ -21,7 +21,7 @@
 	var/b_eyes = 0.0
 	var/s_tone = 0.0
 	var/age = 30.0
-	var/b_type = "A+"
+	var/b_type
 
 	var/obj/item/clothing/suit/wear_suit = null
 	var/obj/item/clothing/under/w_uniform = null
@@ -61,6 +61,7 @@
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	nodamage = 1
+	universal_speak = 1
 
 
 

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

@@ -112,6 +112,7 @@ emp_act
 				else					H.add_blood(src)
 				if(H.wear_suit)			H.wear_suit.add_blood(src)
 				else if(H.w_uniform)	H.w_uniform.add_blood(src)
+				if(H.shoes)				H.shoes.add_blood(src)
 
 		switch(hit_area)
 			if("head")//Harder to score a stun but if you do it lasts a bit longer

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

@@ -253,7 +253,7 @@
 			var/datum/gas_mixture/environment = loc.return_air()
 			var/datum/air_group/breath
 			// HACK NEED CHANGING LATER
-			if(health < (config.health_threshold_dead + 50)) //PEOPLE ARE NOT DYING, DAMMIT
+			if(health < config.health_threshold_dead)
 				losebreath++
 
 			if(losebreath>0 && prob(90)) //Suffocating so do not take a breath
@@ -630,7 +630,7 @@
 					apply_damage(0.4*discomfort, BURN, "r_arm")
 
 		handle_chemicals_in_body()
-			if(reagents) reagents.metabolize(src)
+			if(reagents && stat != 2) reagents.metabolize(src)
 
 			if(mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
 				var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
@@ -755,6 +755,7 @@
 						lying = 1
 						stat = 0
 					if (paralysis > 0)
+						handle_dreams()
 						AdjustParalysis(-1)
 						blinded = 1
 						lying = 1

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

@@ -1,4 +1,4 @@
-/mob/living/carbon/var/traumatic_shock = 0
+/mob/living/var/traumatic_shock = 0
 /mob/living/carbon/var/shock_stage = 0
 
 // proc to find out in how much pain the mob is at the moment

code/modules/mob/living/say.dm

@@ -136,7 +136,7 @@
 	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
 		message_mode = "whisper"
 
-	if(src.stunned > 0)
+	if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
 		message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
 
 

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

@@ -54,7 +54,11 @@
 			if (!(ticker && ticker.mode && (mind in ticker.mode.malf_ai)))
 				show_laws()
 				src << "<b>These laws may be changed by other players, or by you being the traitor.</b>"
-
+				src << "<br><b><font color=red>IMPORTANT GAMEPLAY ASPECTS:</font></b>"
+				src << "1.) Act like an AI.  If someone is breaking into your upload, say something like \"Alert.  Unauthorised Access Detected: AI Upload.\" not \"Help! Urist is trying to subvert me!\""
+				src << "2.) Do not watch the traitor like a hawk alerting the station to his/her every move.  This relates to 1."
+				src << "3.) You are theoretically omniscient, but you should not be Beepsky 5000, laying down the law left and right.  That is security's job.  Instead, try to keep the station productive and effective.  (Feel free to report the location of major violence and crimes and all that, just do not be the evil thing looking over peoples shoulders)"
+				src << "<br>We want everyone to have a good time, so we, the admins, will try to correct you if you stray from these rules.  Just try to keep it sensible."
 			job = "AI"
 
 			spawn(0)

code/modules/mob/mob.dm

@@ -797,7 +797,7 @@
 			else if (istype(src, /mob/living/carbon/alien))
 				xgibs(loc, viruses)
 			else
-				gibs(loc, viruses)
+				gibs(loc, viruses, dna)
 
 		else
 			if(istype(src, /mob/living/silicon))
@@ -805,7 +805,7 @@
 			else if(istype(src, /mob/living/carbon/alien))
 				xgibs(loc, viruses)
 			else
-				gibs(loc, viruses)
+				gibs(loc, viruses, dna)
 		sleep(15)
 		for(var/obj/item/I in src.contents)
 			I.loc = get_turf(src)

code/modules/mob/new_player/new_player.dm

@@ -258,7 +258,7 @@
 		job_master.EquipRank(character, rank, 1)
 		EquipCustomItems(character)
 		character.loc = pick(latejoin)
-		character.be_syndicate = src.preferences.be_special & BE_TRAITOR
+		character.be_syndicate = src.preferences.be_special
 		ticker.mode.latespawn(character)
 		AnnounceArrival(character, rank)
 
@@ -303,7 +303,7 @@
 			G.fields["fingerprint"] = text("[]", md5(H.dna.uni_identity))
 			G.fields["p_stat"] = "Active"
 			G.fields["m_stat"] = "Stable"
-			M.fields["b_type"] = text("[]", H.b_type)
+			M.fields["b_type"] = text("[]", H.dna.b_type)
 			M.fields["b_dna"] = H.dna.unique_enzymes
 			M.fields["mi_dis"] = "None"
 			M.fields["mi_dis_d"] = "No minor disabilities have been declared."
@@ -327,7 +327,7 @@
 			L.fields["age"] = H.age
 			L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]")
 			L.fields["rank"] = H.mind.assigned_role
-			L.fields["b_type"] = H.b_type
+			L.fields["b_type"] = H.dna.b_type
 			L.fields["b_dna"] = H.dna.unique_enzymes
 			L.fields["enzymes"] = H.dna.struc_enzymes
 			L.fields["identity"] = H.dna.uni_identity

code/modules/mob/new_player/preferences.dm

@@ -669,7 +669,8 @@ datum/preferences
 		character.gender = gender
 
 		character.age = age
-		character.b_type = b_type
+		character.dna.b_type = b_type
+		character.be_syndicate = be_special
 
 		character.r_eyes = r_eyes
 		character.g_eyes = g_eyes

code/modules/mob/organ/organ_external.dm

@@ -92,8 +92,13 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	if(!istype(H))
 		return
 	if(H.dna)
-		blood_DNA = H.dna.unique_enzymes
-	blood_type = H.b_type
+		if(blood_DNA)
+			blood_DNA.len++
+			blood_DNA[blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type)
+		else
+			var/templist[1]
+			templist[1] = list(H.dna.unique_enzymes, H.dna.b_type)
+			blood_DNA = templist
 
 	var/icon/I = new /icon(icon, icon_state)
 

code/modules/mob/screen.dm

@@ -429,6 +429,11 @@
 					O.show_message(text("\red <B>[] resists!</B>", usr), 1)
 
 			if(usr:handcuffed && usr:canmove && (usr.last_special <= world.time))
+				var/breakouttime = 1200
+				var/displaytime = 2
+				if(!usr:canmove)
+					breakouttime = 2400
+					displaytime = 4
 				usr.next_move = world.time + 100
 				usr.last_special = world.time + 100
 				if(isalienadult(usr) || usr.mutations & HULK)//Don't want to do a lot of logic gating here.
@@ -444,17 +449,31 @@
 							del(usr:handcuffed)
 							usr:handcuffed = null
 				else
-					usr << "\red You attempt to remove your handcuffs. (This will take around 2 minutes and you need to stand still)"
+					usr << "\red You attempt to remove your handcuffs. (This will take around [displaytime] minutes and you need to stand still)"
 					for(var/mob/O in viewers(usr))
 						O.show_message(text("\red <B>[] attempts to remove the handcuffs!</B>", usr), 1)
 					spawn(0)
-						if(do_after(usr, 1200))
-							if(!usr:handcuffed) return
-							for(var/mob/O in viewers(usr))
-								O.show_message(text("\red <B>[] manages to remove the handcuffs!</B>", usr), 1)
-							usr << "\blue You successfully remove your handcuffs."
-							usr:handcuffed:loc = usr:loc
-							usr:handcuffed = null
+						var/increment = 150
+						for(var/i = 0, i < breakouttime, i += increment)
+							if(!do_after(usr, increment))
+								return
+
+							else
+								usr << pick("You hear something click, but it doesn't open yet.",	// - Uristqwerty
+											"The latch resists!",									// - IRC: BowlSoldier
+											"The chain is starting to give!",						// - IRC: BowlSoldier
+											"The chain bends a little.",							// - IRC: STALKER
+											"Your wrist hurts.",									// - IRC: STALKER
+											"Unnng",												// - IRC: Doug_H_Nuts
+											"The chain jangles a bit.",								// - SkyMarshal
+											"\red Hurry up, dammit!",								// - SkyMarshal
+											"This is exhausting!")									// - SkyMarshal
+						if(!usr:handcuffed) return
+						for(var/mob/O in viewers(usr))
+							O.show_message(text("\red <B>[] manages to remove the handcuffs!</B>", usr), 1)
+						usr << "\blue You successfully remove your handcuffs."
+						usr:handcuffed:loc = usr:loc
+						usr:handcuffed = null
 
 			if(istype(usr, /mob/living/carbon/human) && istype(usr:wear_suit, /obj/item/clothing/suit/straight_jacket) && usr:canmove && (usr.last_special <= world.time))
 				usr.next_move = world.time + 200

code/modules/power/apc.dm

@@ -873,18 +873,23 @@
 /obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)
 	if(!istype(malf))
 		return
-	if(src.z != 1)
-		return
+	if(src.z != 1)
+		return
+	
 	src.occupant = new /mob/living/silicon/ai(src,malf.laws,null,1)
 	src.occupant.adjustOxyLoss(malf.getOxyLoss())
 	src.occupant.name = "[malf.name] APC Copy"
+	
 	if(malf.parent)
 		src.occupant.parent = malf.parent
 	else
 		src.occupant.parent = malf
+	
 	malf.mind.transfer_to(src.occupant)
+	
 	if(malf.parent)
 		del(malf)
+	
 	src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupant.cancel_camera()
 

code/modules/power/tracker.dm

@@ -16,8 +16,7 @@
 
 
 	// called by datum/sun/calc_position() as sun's angle changes
-	proc/set_angle()
-		var/angle = sun.angle
+	proc/set_angle(angle)
 
 		//set icon dir to show sun illumination
 		dir = turn(NORTH, -angle - 22.5)	// 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST

code/modules/research/designs.dm

@@ -67,14 +67,14 @@ datum
 
 ///////////////////Computer Boards///////////////////////////////////
 
-		seccamera
-			name = "Circuit Design (Security)"
-			desc = "Allows for the construction of circuit boards used to build security camera computers."
-			id = "seccamera"
+		camera
+			name = "Circuit Design (Camera)"
+			desc = "Allows for the construction of circuit boards used to build camera network computers."
+			id = "camera"
 			req_tech = list("programming" = 2)
 			build_type = IMPRINTER
 			materials = list("$glass" = 2000, "acid" = 20)
-			build_path = "/obj/item/weapon/circuitboard/security"
+			build_path = "/obj/item/weapon/circuitboard/camera"
 
 		aicore
 			name = "Circuit Design (AI Core)"

code/unused/pda2/scanners.dm

@@ -65,7 +65,9 @@
 				if ( !(H.blood_DNA) )
 					dat += "\blue No blood found on [H]\n"
 				else
-					dat += "\blue Blood type: [H.blood_type]\nDNA: [H.blood_DNA]\n"
+					for(var/i = 1, i < H.blood_DNA.len, i++)
+						var/list/templist = H.blood_DNA[i]
+						user << "\blue Blood type: [templist[2]]\nDNA: [templist[1]]"
 
 			if (!A.fingerprints)
 				dat += "\blue Unable to locate any fingerprints on [A]!\n"

config/config.txt

@@ -41,7 +41,7 @@ SQL_ENABLED 0
 ## set to 0 to disable that mode
 ## Cult mode is in alpha test, enable at your own risk
 PROBABILITY EXTENDED 0
-PROBABILITY TRAITOR 4
+PROBABILITY TRAITOR 3
 PROBABILITY METEOR 0
 PROBABILITY MALFUNCTION 0
 PROBABILITY BLOB 1
@@ -54,6 +54,7 @@ PROBABILITY CHANGELING 0
 PROBABILITY CULT 1
 PROBABILITY MONKEY 0
 PROBABILITY TRAITORCHAN 0
+PROBABILITY EXTEND-A-TRAITORMONGOUS 3
 ## if amount of traitors scales or not
 TRAITOR_SCALING