Merge branch 'master' into HeadCorgi

code/modules/recycling/disposal/bin.dm

@@ -362,6 +362,12 @@
 			. = TRUE
 	ui.soft_update_fields()
 
+/obj/machinery/disposal/bin/alt_attack_hand(mob/user)
+	if(can_interact(usr))
+		flush = !flush
+		update_icon()
+		return TRUE
+	return FALSE
 
 /obj/machinery/disposal/bin/hitby(atom/movable/AM)
 	if(isitem(AM) && AM.CanEnterDisposals())

code/modules/recycling/disposal/multiz.dm

@@ -0,0 +1,49 @@
+#define MULTIZ_PIPE_UP 1 ///Defines for determining which way a multiz disposal element should travel
+#define MULTIZ_PIPE_DOWN 2 ///Defines for determining which way a multiz disposal element should travel
+
+
+/obj/structure/disposalpipe/trunk/multiz
+	name = "Disposal trunk that goes up"
+	icon_state = "pipe-up"
+	var/multiz_dir = MULTIZ_PIPE_UP ///Set the multiz direction of your trunk. 1 = up, 2 = down
+
+/obj/structure/disposalpipe/trunk/multiz/down
+	name = "Disposal trunk that goes down"
+	icon_state = "pipe-down"
+	multiz_dir = MULTIZ_PIPE_DOWN
+
+/obj/structure/disposalpipe/trunk/multiz/transfer(obj/structure/disposalholder/H)
+	if(H.dir == DOWN)		//Since we're a trunk, you can still place a chute / bin over us. If theyve entered from there, treat this as a normal trunk
+		return ..()
+	// otherwise, go to the linked object
+	if(multiz_dir) //Are we a trunk that goes up? Or down?
+		var/turf/T = null
+		if(multiz_dir == MULTIZ_PIPE_UP)
+			T = SSmapping.get_turf_above(get_turf(src)) //Get the turf above us
+		if(multiz_dir == MULTIZ_PIPE_DOWN)
+			T = SSmapping.get_turf_below(get_turf(src))
+		if(!T)
+			expel(H)
+			return //Nothing located.
+		var/obj/structure/disposalpipe/trunk/multiz/pipe = locate(/obj/structure/disposalpipe/trunk/multiz) in T
+		if(pipe)
+			var/obj/structure/disposalholder/destination = new(pipe) //For future reference, the disposal holder is the thing that carries mobs
+			destination.init(pipe) //This instantiates it
+			destination.merge(H) //This takes the contents of H (Our disposal holder that's travelling into us) and puts them into the destination holder
+			destination.active = TRUE //Active allows it to process and move
+			destination.setDir(DOWN) //This tells the trunk above us NOT to loop it back down to us, or else you get an infinite loop
+			destination.move()
+			return null //Which removes the disposalholder
+	else
+		var/obj/structure/disposaloutlet/O = linked
+		if(istype(O))
+			O.expel(H)	// expel at outlet
+		else
+			var/obj/machinery/disposal/D = linked
+			D.expel(H)	// expel at disposal
+
+	// Returning null without expelling holder makes the holder expell itself
+	return null
+
+#undef MULTIZ_PIPE_UP
+#undef MULTIZ_PIPE_DOWN