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

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)