Fixed and improved object mind transfer. It will work properly now.

Fixed teleporting randomly on clown planet z level (with hand tele). Probably won't work on extended but who cares.
Some misc improvements to code words.
Cut down on the amount of chloralhydrate in the sleepypen since it was fatal, apparently.
Fixed observing. Entry shuttle starts with less sleepers than before.
Some more wip stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1670 316c924e-a436-60f5-8080-3fe189b3f50e

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

@@ -300,7 +300,7 @@
 	..()
 	var/mob/living/U = usr
 	//Looking for master was kind of pointless since PDAs don't appear to have one.
-	if ( U.contents.Find(src) || ( istype(loc, /turf) && in_range(src, U) ) )
+	if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ) )
 		if ( !(U.stat || U.restrained()) )
 
 			add_fingerprint(U)
@@ -358,7 +358,7 @@
 
 				if("Light")
 					fon = (!fon)
-					if (U.contents.Find(src))
+					if (src in U.contents)
 						if (fon)
 							U.sd_SetLuminosity(U.luminosity + f_lum)
 						else
@@ -627,7 +627,7 @@
 			var/input=alert("Would you like to inert the card or update owner information?",,"Insert","Update")
 			//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
 
-			if ( (user.contents.Find(src) && user.contents.Find(C)) || (istype(loc, /turf) && in_range(src, user) && user.contents.Find(C)) )
+			if ( ( (src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
 				if ( !(user.stat || user.restrained()) )//If they can still act.
 					if(input=="Insert")
 						id_check(user, 2)

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

@@ -238,7 +238,7 @@ Code:
 			if(441)
 				menu = "<h4><img src=pda_medical.png> Medical Record</h4>"
 
-				if (istype(active1, /datum/data/record) && data_core.general.Find(active1))
+				if (istype(active1, /datum/data/record) && (active1 in data_core.general))
 					menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]<br>"
 					menu += "Sex: [active1.fields["sex"]]<br>"
 					menu += "Age: [active1.fields["age"]]<br>"
@@ -251,7 +251,7 @@ Code:
 				menu += "<br>"
 
 				menu += "<h4><img src=pda_medical.png> Medical Data</h4>"
-				if (istype(active2, /datum/data/record) && data_core.medical.Find(active2))
+				if (istype(active2, /datum/data/record) && (active2 in data_core.medical))
 					menu += "Blood Type: [active2.fields["b_type"]]<br><br>"
 
 					menu += "Minor Disabilities: [active2.fields["mi_dis"]]<br>"
@@ -281,7 +281,7 @@ Code:
 			if(451)
 				menu = "<h4><img src=pda_cuffs.png> Security Record</h4>"
 
-				if (istype(active1, /datum/data/record) && data_core.general.Find(active1))
+				if (istype(active1, /datum/data/record) && (active1 in data_core.general))
 					menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]<br>"
 					menu += "Sex: [active1.fields["sex"]]<br>"
 					menu += "Age: [active1.fields["age"]]<br>"
@@ -294,7 +294,7 @@ Code:
 				menu += "<br>"
 
 				menu += "<h4><img src=pda_cuffs.png> Security Data</h4>"
-				if (istype(active3, /datum/data/record) && data_core.security.Find(active3))
+				if (istype(active3, /datum/data/record) && (active3 in data_core.security))
 					menu += "Criminal Status: [active3.fields["criminal"]]<br>"
 
 					menu += "Minor Crimes: [active3.fields["mi_crim"]]<br>"
@@ -505,7 +505,7 @@ Code:
 			var/datum/data/record/M = locate(href_list["target"])
 			loc:mode = 441
 			mode = 441
-			if (data_core.general.Find(R))
+			if (R in data_core.general)
 				for (var/datum/data/record/E in data_core.medical)
 					if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 						M = E
@@ -518,7 +518,7 @@ Code:
 			var/datum/data/record/S = locate(href_list["target"])
 			loc:mode = 451
 			mode = 451
-			if (data_core.general.Find(R))
+			if (R in data_core.general)
 				for (var/datum/data/record/E in data_core.security)
 					if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
 						S = E

code/game/objects/items.dm

@@ -160,7 +160,7 @@
 	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("chloralhydrate", 30)	//Used to be 100 sleep toxin
+	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
 //	R.add_reagent("impedrezene", 100)
 //	R.add_reagent("cryptobiolin", 100)
 	..()

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

@@ -116,7 +116,9 @@ Frequency:
 		if(T.x>world.maxx-4 || T.x<4)	continue	//putting them at the edge is dumb
 		if(T.y>world.maxy-4 || T.y<4)	continue
 		turfs += T
-	if(turfs)	L["None (Dangerous)"] = pick(turfs)
+	var/turf/current_location = locate(user.x,user.y,user.z)//Can't teleport randomly on clown-planet z-level.
+	if(turfs&&current_location.z!=6)//Which is z level 6.
+		L["None (Dangerous)"] = pick(turfs)
 	var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") in L
 	if ((user.equipped() != src || user.stat || user.restrained()))
 		return