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