Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

code/defines/obj/weapon.dm

@@ -583,6 +583,10 @@
 	var/over_jumpsuit = 1 // If set to 0, it won't display on top of the mob's jumpsuit
 	var/dorm = 0		// determines if this ID has claimed a dorm already
 
+	var/blood_type = "\[UNSET\]"
+	var/dna_hash = "\[UNSET\]"
+	var/fingerprint_hash = "\[UNSET\]"
+
 /obj/item/weapon/card/id/silver
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."

code/defines/procs/gamehelpers.dm

@@ -48,6 +48,9 @@
 		return 1
 	else
 		if (istype(user, /mob/living/carbon))
+			if (usr.tkdisable != 0) //Remote Viewing + TK = oh god wat
+				user << "\red Your mind is too strained right now!"
+				return 0
 			if (user:mutations & TK)
 				var/X = source:x
 				var/Y = source:y

code/game/machinery/computer/id.dm

@@ -153,7 +153,14 @@
 						accesses += "<br>"
 					accesses += "</td>"
 				accesses += "</tr></table>"
-			body = "[carddesc]<br>[jobs]<br><br>[accesses]" //CHECK THIS
+
+			var/biometric = ""
+			biometric += 	"<b>Biometric Data</b>:<br />\
+							Blood type: <a href='?src=\ref[src];choice=bio_btype'>[modify.blood_type]</a><br />\
+							DNA hash: <a href='?src=\ref[src];choice=bio_dna'>[modify.dna_hash]</a><br />\
+							Fingerprint hash: <a href='?src=\ref[src];choice=bio_fprint'>[modify.fingerprint_hash]</a>"
+
+			body = "[carddesc]<br>[jobs]<br>[biometric]<br><br>[accesses]" //CHECK THIS
 		else
 			body = "<a href='?src=\ref[src];choice=auth'>{Log in}</a> <br><hr>"
 			body += "<a href='?src=\ref[src];choice=mode;mode_target=1'>Access Crew Manifest</a>"
@@ -167,6 +174,17 @@
 		return
 	usr.machine = src
 	switch(href_list["choice"])
+		if("bio_btype")
+			var/new_b_type = input("Please input the blood type.", "Biometric Input")  as null|anything in list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-" )
+			if(new_b_type)
+				modify.blood_type = new_b_type
+
+		if("bio_dna")
+			modify.dna_hash = input("Please input the DNA hash.", "Biometric Input", modify.dna_hash)
+
+		if("bio_fprint")
+			modify.fingerprint_hash = input("Please input the fingerprint hash.", "Biometric Input", modify.fingerprint_hash)
+
 		if ("modify")
 			if (modify)
 				data_core.manifest_modify(modify.registered_name, modify.assignment)

code/game/machinery/doors/door.dm

@@ -128,7 +128,6 @@
 					E.uses--
 				else
 					return
-			src.operating = -1
 			if(istype(I, /obj/item/weapon/melee/energy/blade))
 				if(istype(src, /obj/machinery/door/airlock))
 					var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()

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

@@ -28,6 +28,17 @@ FINGERPRINT CARD
 
 
 // ID CARDS
+/obj/item/weapon/card/id/examine()
+	..()
+	read()
+
+/obj/item/weapon/card/id/New()
+	..()
+	spawn(30)
+	if(istype(loc, /mob/living/carbon/human))
+		blood_type = loc:dna:b_type
+		dna_hash = loc:dna:unique_enzymes
+		fingerprint_hash = md5(loc:dna:uni_identity)
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
@@ -50,6 +61,9 @@ FINGERPRINT CARD
 	set src in usr
 
 	usr << text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment)
+	usr << "The blood type on the card is [blood_type]."
+	usr << "The DNA hash on the card is [dna_hash]."
+	usr << "The fingerprint hash on the card is [fingerprint_hash]."
 	return
 /obj/item/weapon/card/id/syndicate/var/mob/registered_user = null
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)

code/game/topic.dm

@@ -30,7 +30,6 @@
 		s["end"] = "#end"
 
 		// 7 + s["players"] + 1 = index of s["revinfo"]
-		s["revision"] = revdata.revision
 		s["admins"] = admins
 
 		return list2params(s)

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

@@ -2830,11 +2830,13 @@ It can still be worn/put on as normal.
 		reset_view(0)
 		remoteobserve = null
 		src.verbs -= /mob/living/carbon/human/proc/remoteobserve
+		src.tkdisable = 0
 		return
 
 	if(client.eye != client.mob)
 		reset_view(0)
 		remoteobserve = null
+		src.tkdisable = 0
 		return
 
 	var/list/mob/creatures = list()
@@ -2850,6 +2852,8 @@ It can still be worn/put on as normal.
 	if (target)
 		reset_view(target)
 		remoteobserve = target
+		src.tkdisable = 1
 	else
 		reset_view(0)
 		remoteobserve = null
+		src.tkdisable = 0

code/modules/mob/mob_defines.dm

@@ -201,6 +201,7 @@
 	//clumsy = 16
 	//obese = 32
 	//husk = 64
+	var/tkdisable = 0//For remote viewing and stuff. Disables TK.
 
 	var/voice_name = "unidentifiable voice"
 	var/voice_message = null // When you are not understood by others (replaced with just screeches, hisses, chimpers etc.)
@@ -288,4 +289,4 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 	var/grav_delay = 0
 	var/being_strangled = 0
 
-	var/datum/preferences/storedpreferences = null
+	var/datum/preferences/storedpreferences = null

code/modules/mob/new_player/preferences.dm

@@ -644,11 +644,11 @@ datum/preferences
 		if(link_tags["age"])
 			switch(link_tags["age"])
 				if("input")
-					var/new_age = input(user, "Please select type in age: 15-45", "Character Generation")  as num
+					var/new_age = input(user, "Please enter an age ([minimum_age]-[maximum_age])", "Character Generation")  as num
 					if(new_age)
-						age = max(min(round(text2num(new_age)), 65), 20)
+						age = max(min(round(text2num(new_age)), maximum_age), minimum_age)
 				if("random")
-					age = rand (20, 45)
+					age = rand (minimum_age, maximum_age)
 
 		if(link_tags["OOC"])
 			var/tempnote = ""
@@ -1044,4 +1044,4 @@ datum/preferences
 		character.disabilities = disabilities
 
 #undef UI_OLD
-#undef UI_NEW
+#undef UI_NEW

code/modules/mob/new_player/preferences_setup.dm

@@ -15,7 +15,7 @@ datum/preferences
 		underwear = 1
 		backbag = 2
 		b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
-		age = rand(20,65)
+		age = rand(minimum_age, maximum_age)
 		copy_to(H,1)
 
 	proc/randomize_name()
@@ -263,4 +263,4 @@ datum/preferences
 			if(H.name == f_style)
 				facial_hair_style = H
 			else
-				del(H)
+				del(H)

code/setup.dm

@@ -284,4 +284,8 @@ var/static/list/scarySounds = list('thudswoosh.ogg','Taser.ogg','armbomb.ogg','h
 #define SEC_LEVEL_RED 2
 #define SEC_LEVEL_DELTA 3
 
-#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level
+#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level
+
+// Maximum and minimum character ages.
+var/const/minimum_age = 20
+var/const/maximum_age = 65