From 1d20768b4c261693e74f5b564f0945cbbb39fce1 Mon Sep 17 00:00:00 2001
From: "mport2004@gmail.com"
 <mport2004@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 25 Aug 2011 08:53:01 +0000
Subject: [PATCH] Space drugs should no longer cause people to act weird inside
 lockers and such. Tele now ignores beacons and trackers on Z2 Singularity
 grav range reduced a bit due to lag

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2047 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/machinery/teleporter.dm             | 6 +++++-
 code/modules/chemical/Chemistry-Reagents.dm   | 4 +++-
 code/modules/power/singularity/singularity.dm | 9 ++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 28265607a5..196cfd0c58 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -46,8 +46,9 @@
 	var/list/areaindex = list()
 
 	for(var/obj/item/device/radio/beacon/R in world)
-		var/turf/T = find_loc(R)
+		var/turf/T = get_turf(R)
 		if (!T)	continue
+		if(T.z == 2)	continue
 		var/tmpname = T.loc.name
 		if(areaindex[tmpname])
 			tmpname = "[tmpname] ([++areaindex[tmpname]])"
@@ -63,6 +64,9 @@
 			if (M.stat == 2)
 				if (M.timeofdeath + 6000 < world.time)
 					continue
+			var/turf/T = get_turf(M)
+			if(T)	continue
+			if(T.z == 2)	continue
 			var/tmpname = M.real_name
 			if(areaindex[tmpname])
 				tmpname = "[tmpname] ([++areaindex[tmpname]])"
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 38714f246a..a009a2f0db 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -414,7 +414,9 @@ datum
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				M.druggy = max(M.druggy, 15)
-				if(M.canmove) step(M, pick(cardinal))
+				if(isturf(M.loc))
+					if(M.canmove)
+						step(M, pick(cardinal))
 				if(prob(7)) M:emote(pick("twitch","drool","moan","giggle"))
 				holder.remove_reagent(src.id, 0.2)
 				return
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 8c6dae813f..b6a99c29b9 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -168,7 +168,7 @@ var/global/list/uneatable = list(
 					icon_state = "singularity_s9"
 					pixel_x = -128
 					pixel_y = -128
-					grav_pull = 15//This might cause some lag, dono though
+					grav_pull = 10
 					consume_range = 4
 					dissipate = 0 //It cant go smaller due to e loss
 			if(current_size == allowed_size)
@@ -200,6 +200,7 @@ var/global/list/uneatable = list(
 
 
 		eat()
+			set background = 1
 			for(var/atom/movable/X in orange(consume_range,src))
 				consume(X)
 			for(var/turf/X in orange(consume_range,src))
@@ -362,9 +363,7 @@ var/global/list/uneatable = list(
 
 
 		toxmob()
-			var/toxrange = 8
-			if (src.energy>1000)
-				toxrange += 6
+			var/toxrange = 10
 			var/toxloss = 4
 			var/radiation = 5
 			if (src.energy>200)
@@ -426,7 +425,7 @@ var/global/list/uneatable = list(
 
 
 		emp_area()
-			empulse(src, 6, 8)
+			empulse(src, 8, 10)
 			return