Merge branch 'master' into bleeding-edge-freeze

Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2013-05-16 12:21:55 +01:00
21 changed files with 78 additions and 83 deletions
@@ -150,6 +150,17 @@ obj/structure/ex_act(severity)
pod_moving = 1
close_animation()
sleep(CLOSE_DURATION + 2)
//reverse directions for automated cycling
var/turf/next_loc = get_step(loc, pod.dir)
var/obj/structure/transit_tube/nexttube
for(var/obj/structure/transit_tube/tube in next_loc)
if(tube.has_entrance(pod.dir))
nexttube = tube
break
if(!nexttube)
pod.dir = turn(pod.dir, 180)
if(icon_state == "closed" && pod)
pod.follow_tube()