Revert "pls"

This reverts commit 8c97511871.

code/modules/recycling/disposal/bin.dm

@@ -132,7 +132,12 @@
 
 /obj/machinery/disposal/proc/can_stuff_mob_in(mob/living/target, mob/living/user, pushing = FALSE)
 	if(!pushing && !iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
-		return FALSE
+		if (iscyborg(user))
+			var/mob/living/silicon/robot/borg = user
+			if (!borg.module || !borg.module.canDispose)
+				return
+		else
+			return FALSE
 	if(!isturf(user.loc)) //No magically doing it from inside closets
 		return FALSE
 	if(target.buckled || target.has_buckled_mobs())
@@ -283,7 +288,7 @@
 /obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/storage/bag/trash))	//Not doing component overrides because this is a specific type.
 		var/obj/item/storage/bag/trash/T = I
-		GET_COMPONENT_FROM(STR, /datum/component/storage, T)
+		var/datum/component/storage/STR = T.GetComponent(/datum/component/storage)
 		to_chat(user, "<span class='warning'>You empty the bag.</span>")
 		for(var/obj/item/O in T.contents)
 			STR.remove_from_storage(O,src)
@@ -354,6 +359,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/construction.dm

@@ -29,7 +29,7 @@
 	pipename = initial(pipe_type.name)
 
 	if(flip)
-		GET_COMPONENT(rotcomp,/datum/component/simple_rotation)
+		var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 		rotcomp.BaseRot(null,ROTATION_FLIP)
 
 	update_icon()

code/modules/recycling/disposal/holder.dm

@@ -52,6 +52,10 @@
 		if(istype(AM, /obj/item/smallDelivery) && !hasmob)
 			var/obj/item/smallDelivery/T = AM
 			src.destinationTag = T.sortTag
+		else if(istype(AM, /mob/living/silicon/robot))
+			var/obj/item/destTagger/borg/tagger = locate() in AM
+			if (tagger)
+				src.destinationTag = tagger.currTag
 
 
 // start the movement process

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

code/modules/recycling/sortingmachinery.dm

@@ -147,6 +147,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "cargotagger"
 	var/currTag = 0 //Destinations are stored in code\globalvars\lists\flavor_misc.dm
+	var/locked_destination = FALSE //if true, users can't open the destination tag window to prevent changing the tagger's current destination
 	w_class = WEIGHT_CLASS_TINY
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -154,6 +155,10 @@
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
 
+/obj/item/destTagger/borg
+	name = "cyborg destination tagger"
+	desc = "Used to fool the disposal mail network into thinking that you're a harmless parcel. Does actually work as a regular destination tagger as well."
+
 /obj/item/destTagger/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] begins tagging [user.p_their()] final destination!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	if (islizard(user))
@@ -179,8 +184,9 @@
 	onclose(user, "destTagScreen")
 
 /obj/item/destTagger/attack_self(mob/user)
-	openwindow(user)
-	return
+	if(!locked_destination)
+		openwindow(user)
+		return
 
 /obj/item/destTagger/Topic(href, href_list)
 	add_fingerprint(usr)