Merge branch 'master' into upstream-merge-32188

code/modules/recycling/conveyor2.dm

@@ -179,12 +179,6 @@
 	if(C)
 		C.set_operable(stepdir, id, op)
 
-/*
-/obj/machinery/conveyor/verb/destroy()
-	set src in view()
-	src.broken()
-*/
-
 /obj/machinery/conveyor/power_change()
 	..()
 	update()

code/modules/recycling/disposal/bin.dm

@@ -213,6 +213,8 @@
 
 // called when holder is expelled from a disposal
 /obj/machinery/disposal/proc/expel(obj/structure/disposalholder/H)
+	H.active = FALSE
+
 	var/turf/T = get_turf(src)
 	var/turf/target
 	playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)

code/modules/recycling/disposal/construction.dm

@@ -26,11 +26,6 @@
 		setDir(make_from.dir)
 		anchored = TRUE
 
-		if(istype(make_from, /obj/structure/disposalpipe))
-			var/obj/structure/disposalpipe/D = make_from
-			if(D.construct_type)
-				pipe_type = D.construct_type
-
 	else
 		if(_pipe_type)
 			pipe_type = _pipe_type

code/modules/recycling/disposal/outlet.dm

@@ -11,7 +11,7 @@
 	var/obj/structure/disposalpipe/trunk/trunk // the attached pipe trunk
 	var/obj/structure/disposalconstruct/stored
 	var/start_eject = 0
-	var/eject_range = 3
+	var/eject_range = 2
 
 /obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from)
 	. = ..()
@@ -42,6 +42,7 @@
 // expel the contents of the holder object, then delete it
 // called when the holder exits the outlet
 /obj/structure/disposaloutlet/proc/expel(obj/structure/disposalholder/H)
+	H.active = FALSE
 	flick("outlet-open", src)
 	if((start_eject + 30) < world.time)
 		start_eject = world.time

code/modules/recycling/disposal/pipe.dm

@@ -14,7 +14,6 @@
 	layer = DISPOSAL_PIPE_LAYER			// slightly lower than wires and other pipes
 	var/dpdir = NONE					// bitmask of pipe directions
 	var/initialize_dirs = NONE			// bitflags of pipe directions added on init, see \code\_DEFINES\pipe_construction.dm
-	var/construct_type					// If set, used as type for pipe constructs. If not set, src.type is used.
 	var/flip_type						// If set, the pipe is flippable and becomes this type when flipped
 	var/obj/structure/disposalconstruct/stored
 
@@ -29,14 +28,6 @@
 	else
 		stored = new /obj/structure/disposalconstruct(src, make_from=src)
 
-		// Hack for old map pipes to work, remove after all maps are updated
-		if(flip_type)
-			var/obj/structure/disposalpipe/flip = flip_type
-			if(icon_state == initial(flip.icon_state))
-				initialize_dirs = initial(flip.initialize_dirs)
-				construct_type = flip_type
-
-
 	if(dir in GLOB.diagonals) // Bent pipes already have all the dirs set
 		initialize_dirs = NONE
 
@@ -199,28 +190,10 @@
 		deconstruct()
 
 
-// Straight pipe segment
 /obj/structure/disposalpipe/segment
 	icon_state = "pipe"
 	initialize_dirs = DISP_DIR_FLIP
 
-/obj/structure/disposalpipe/segment/Initialize()
-	// Hacks for old map pipes to work, remove after all maps are updated
-	if(icon_state == "pipe-c")
-		switch(dir)
-			if(NORTH)
-				dir = NORTHEAST
-			if(SOUTH)
-				dir = SOUTHWEST
-			if(EAST)
-				dir = SOUTHEAST
-			if(WEST)
-				dir = NORTHWEST
-
-	if(icon_state != "pipe")
-		icon_state = "pipe"
-	. = ..()
-
 
 // A three-way junction with dir being the dominant direction
 /obj/structure/disposalpipe/junction
@@ -228,14 +201,6 @@
 	initialize_dirs = DISP_DIR_RIGHT | DISP_DIR_FLIP
 	flip_type = /obj/structure/disposalpipe/junction/flip
 
-/obj/structure/disposalpipe/junction/Initialize()
-	if(icon_state == "pipe-y")	// Hack for old map pipes to work, remove after all maps are updated
-		initialize_dirs = DISP_DIR_LEFT | DISP_DIR_RIGHT
-		flip_type = null
-		construct_type = /obj/structure/disposalpipe/junction/yjunction
-	. = ..()
-
-
 // next direction to move
 // if coming in from secondary dirs, then next is primary dir
 // if coming in from primary dir, then next is equal chance of other dirs
@@ -323,8 +288,8 @@
 		else
 			var/obj/machinery/disposal/D = linked
 			D.expel(H)	// expel at disposal
-	else
-		expel(H, get_turf(src), 0)	// expel at turf
+
+	// Returning null without expelling holder makes the holder expell itself
 	return null
 
 /obj/structure/disposalpipe/trunk/nextdir(obj/structure/disposalholder/H)

code/modules/recycling/disposal/pipe_sorting.dm

@@ -92,11 +92,3 @@
 	icon_state = "pipe-j2s"
 	flip_type = /obj/structure/disposalpipe/sorting/wrap
 	initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP
-
-
-// Hacks for old map pipes to work, remove after all maps are updated
-/obj/structure/disposalpipe/wrapsortjunction
-	parent_type = /obj/structure/disposalpipe/sorting/wrap
-
-/obj/structure/disposalpipe/sortjunction
-	parent_type = /obj/structure/disposalpipe/sorting/mail