Bugfixes and stuff.

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

code/datums/helper_datums/teleport.dm

@@ -107,6 +107,10 @@
 
 		playSpecials(curturf,effectin,soundin)
 
+		// Remove any luminosity etc.
+		var/prevlum = teleatom.luminosity
+		teleatom.luminosity = 0
+
 		if(force_teleport)
 			teleatom.forceMove(destturf)
 			playSpecials(destturf,effectout,soundout)
@@ -114,6 +118,10 @@
 			if(teleatom.Move(destturf))
 				playSpecials(destturf,effectout,soundout)
 
+		// Re-Apply lum
+		teleatom.sd_SetLuminosity(prevlum)
+
+
 		return 1
 
 	proc/teleport()

code/game/machinery/telecomms/machine_interactions.dm

@@ -216,13 +216,14 @@
 
 		if(href_list["unlink"])
 
-			var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])]
+			if(text2num(href_list["unlink"]) <= length(links))
-			temp = "<font color = #666633>-% Removed \ref[T] [T.name] from linked entities. %-</font color>"
+				var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])]
+				temp = "<font color = #666633>-% Removed \ref[T] [T.name] from linked entities. %-</font color>"
 
-			// Remove link entries from both T and src.
+				// Remove link entries from both T and src.
-			if(src in T.links)
+				if(src in T.links)
-				T.links.Remove(src)
+					T.links.Remove(src)
-			links.Remove(T)
+				links.Remove(T)
 
 		if(href_list["link"])
 

code/game/machinery/telecomms/telecomunications.dm

@@ -404,8 +404,10 @@
 				log.parameters["name"] = signal.data["name"]
 				log.parameters["realname"] = signal.data["realname"]
 
-				if(!istype(M, /mob/new_player))
+				if(!istype(M, /mob/new_player) && M)
 					log.parameters["uspeech"] = M.universal_speak
+				else
+					log.parameters["uspeech"] = 0
 
 				// If the signal is still compressed, make the log entry gibberish
 				if(signal.data["compression"] > 0)

code/game/step_triggers.dm

@@ -11,6 +11,8 @@
 
 /obj/step_trigger/HasEntered(H as mob|obj)
 	..()
+	if(!H)
+		return
 	if(istype(H, /mob/dead/observer) && !affect_ghosts)
 		return
 	Trigger(H)
@@ -22,7 +24,7 @@
 /obj/step_trigger/thrower
 	var/direction = SOUTH // the direction of throw
 	var/tiles = 3	// if 0: forever until atom hits a stopper
-	var/immobilize = 0 // if nonzero: prevents mobs from moving while they're being flung
+	var/immobilize = 1 // if nonzero: prevents mobs from moving while they're being flung
 	var/speed = 1	// delay of movement
 	var/facedir = 0 // if 1: atom faces the direction of movement
 	var/nostop = 0 // if 1: will only be stopped by teleporters
@@ -62,10 +64,11 @@
 					if(T.stopper)
 						stopthrow = 1
 
-			var/predir = A.dir
+			if(A)
-			step(A, direction)
+				var/predir = A.dir
-			if(!facedir)
+				step(A, direction)
-				A.dir = predir
+				if(!facedir)
+					A.dir = predir
 
 
 

code/modules/scripting/IDE.dm

@@ -24,7 +24,7 @@ client/verb/tcssave()
 client/verb/tcscompile()
 	set hidden = 1
 	if(mob.machine || issilicon(mob))
-		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || issilicon(mob))
+		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || (issilicon(mob) && istype(mob.machine, /obj/machinery/computer/telecomms/traffic) ))
 			var/obj/machinery/computer/telecomms/traffic/Machine = mob.machine
 			if(Machine.editingcode != mob)
 				return
@@ -75,7 +75,7 @@ client/verb/tcscompile()
 client/verb/tcsrun()
 	set hidden = 1
 	if(mob.machine || issilicon(mob))
-		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || issilicon(mob))
+		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || (issilicon(mob) && istype(mob.machine, /obj/machinery/computer/telecomms/traffic) ))
 			var/obj/machinery/computer/telecomms/traffic/Machine = mob.machine
 			if(Machine.editingcode != mob)
 				return
@@ -141,7 +141,7 @@ client/verb/tcsrun()
 client/verb/exittcs()
 	set hidden = 1
 	if(mob.machine || issilicon(mob))
-		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || issilicon(mob))
+		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || (issilicon(mob) && istype(mob.machine, /obj/machinery/computer/telecomms/traffic) ))
 			var/obj/machinery/computer/telecomms/traffic/Machine = mob.machine
 			if(Machine.editingcode == mob)
 				Machine.storedcode = "[winget(mob, "tcscode", "text")]"
@@ -153,7 +153,7 @@ client/verb/exittcs()
 client/verb/tcsrevert()
 	set hidden = 1
 	if(mob.machine || issilicon(mob))
-		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || issilicon(mob))
+		if((istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && mob.machine in view(1, mob)) || (issilicon(mob) && istype(mob.machine, /obj/machinery/computer/telecomms/traffic) ))
 			var/obj/machinery/computer/telecomms/traffic/Machine = mob.machine
 			if(Machine.editingcode != mob)
 				return

code/modules/scripting/Parser/Expressions.dm

@@ -276,7 +276,13 @@
 			exp.func_name=curToken.value
 			NextToken() //skip function name
 			NextToken() //skip open parenthesis, already found
+			var/loops = 0
+
 			for()
+				loops++
+				if(loops>=1000)
+					CRASH("Something TERRIBLE has gone wrong in ParseFunctionExpression ;__;")
+
 				if(istype(curToken, /token/symbol) && curToken.value==")")
 					return exp
 				exp.parameters+=ParseParamExpression()