Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor

code/modules/recycling/disposal/construction.dm

@@ -14,12 +14,12 @@
 	var/obj/pipe_type = /obj/structure/disposalpipe/segment
 	var/pipename
 
-/obj/structure/disposalconstruct/Initialize(loc, _pipe_type, _dir = SOUTH, flip = FALSE, obj/make_from)
+/obj/structure/disposalconstruct/Initialize(mapload, _pipe_type, _dir = SOUTH, flip = FALSE, obj/make_from)
 	. = ..()
 	if(make_from)
 		pipe_type = make_from.type
 		setDir(make_from.dir)
-		anchored = TRUE
+		set_anchored(TRUE)
 
 	else
 		if(_pipe_type)
@@ -34,6 +34,8 @@
 
 	update_icon()
 
+	// AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
+
 /obj/structure/disposalconstruct/Move()
 	var/old_dir = dir
 	..()

code/modules/recycling/disposal/holder.dm

@@ -73,14 +73,16 @@
 /obj/structure/disposalholder/proc/move()
 	set waitfor = FALSE
 	var/obj/structure/disposalpipe/last
+	var/ticks = 1
 	while(active)
 		var/obj/structure/disposalpipe/curr = loc
 		last = curr
+		set_glide_size(DELAY_TO_GLIDE_SIZE(ticks * world.tick_lag))
 		curr = curr.transfer(src)
 		if(!curr && active)
 			last.expel(src, loc, dir)
 
-		stoplag()
+		ticks = stoplag()
 		if(!(count--))
 			active = FALSE