From ff423b2ba60d0922ba6b453781673ac528f2aef1 Mon Sep 17 00:00:00 2001
From: "n3ophyt3@gmail.com"
 <n3ophyt3@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 7 Feb 2011 16:51:42 +0000
Subject: [PATCH] Multiple immovable rods hitting the station in one shot
 should now only produce one Centcomm report once they are gone.

MPort's space dust now moves as it is supposed to, at least on my test server.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@983 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/gamemodes/events/clang.dm | 14 +++++++++-----
 code/game/gamemodes/events/dust.dm  |  3 ++-
 tgstation.dme                       |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index f2cc3c4cd09..7b165dba172 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -67,12 +67,16 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	var/obj/immovablerod/immrod = new /obj/immovablerod(locate(startx, starty, 1))
 //	world << "Rod in play, starting at [start.loc.x],[start.loc.y] and going to [end.loc.x],[end.loc.y]"
 	var/end = locate(endx, endy, 1)
-	while (immrod.loc != end)
+	spawn(0)
+		walk_towards(immrod, end,1)
+	sleep(1)
+	while (immrod)
 		if (immrod.z != 1)
 			immrod.z = 1
-		step_towards(immrod, end)
-		sleep(1)
-
-	del(immrod)
+		if(immrod.loc == end)
+			del(immrod)
+		sleep(10)
+	for(var/obj/immovablerod/imm in world)
+		return
 	sleep(50)
 	command_alert("What the fuck was that?!", "General Alert")
\ No newline at end of file
diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm
index a8aac075941..a4b5658fb1b 100644
--- a/code/game/gamemodes/events/dust.dm
+++ b/code/game/gamemodes/events/dust.dm
@@ -79,9 +79,10 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 				startx = 1
 				endy = rand(1,world.maxy-1)
 				endx = world.maxx-1
-		var/goal = locate(endx, endy, src.z)
+		var/goal = locate(endx, endy, 1)
 		src.x = startx
 		src.y = starty
+		src.z = 1
 		spawn(0)
 			walk_towards(src, goal, 1)
 		return
diff --git a/tgstation.dme b/tgstation.dme
index 5a074771973..af6514e92da 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -759,5 +759,5 @@
 #include "code\WorkInProgress\recycling\disposal.dm"
 #include "code\WorkInProgress\recycling\scrap.dm"
 #include "interface\skin.dmf"
-#include "maps\tgstation.2.0.1.dmm"
+#include "maps\tgstation.2.0.0.dmm"
 // END_INCLUDE