Merge conflict begone

code/modules/recycling/conveyor2.dm

@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 /obj/machinery/conveyor/centcom_auto
 	id = "round_end_belt"
 
-
 /obj/machinery/conveyor/inverted //Directions inverted so you can use different corner peices.
 	icon_state = "conveyor_map_inverted"
 	verted = -1
@@ -37,10 +36,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 
 // Auto conveyour is always on unless unpowered
 
+/obj/machinery/conveyor/auto
+	processing_flags = START_PROCESSING_ON_INIT
+
 /obj/machinery/conveyor/auto/Initialize(mapload, newdir)
-	. = ..()
 	operating = TRUE
-	update_move_direction()
+	return ..()
 
 /obj/machinery/conveyor/auto/update()
 	. = ..()
@@ -250,9 +251,11 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 		id = newid
 	update_icon()
 	LAZYADD(GLOB.conveyors_by_id[id], src)
+	wires = new /datum/wires/conveyor(src)
 
 /obj/machinery/conveyor_switch/Destroy()
 	LAZYREMOVE(GLOB.conveyors_by_id[id], src)
+	QDEL_NULL(wires)
 	. = ..()
 
 /obj/machinery/conveyor_switch/vv_edit_var(var_name, var_value)
@@ -332,6 +335,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 		transfer_fingerprints_to(C)
 		to_chat(user, "<span class='notice'>You detach the conveyor switch.</span>")
 		qdel(src)
+	if(is_wire_tool(I))
+		wires.interact(user)
+		return TRUE
 
 /obj/machinery/conveyor_switch/oneway
 	icon_state = "conveyor_switch_oneway"

code/modules/recycling/disposal/outlet.dm

@@ -13,6 +13,8 @@
 	var/obj/structure/disposalconstruct/stored
 	var/start_eject = 0
 	var/eject_range = 2
+	/// how fast we're spitting fir- atoms
+	var/eject_speed = EJECT_SPEED_MED
 
 /obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from)
 	. = ..()
@@ -61,7 +63,7 @@
 		var/atom/movable/AM = A
 		AM.forceMove(T)
 		AM.pipe_eject(dir)
-		AM.throw_at(target, eject_range, 1)
+		AM.throw_at(target, eject_range, eject_speed)
 
 	H.vent_gas(T)
 	qdel(H)
@@ -80,3 +82,39 @@
 		stored = null
 		qdel(src)
 	return TRUE
+
+/obj/structure/disposaloutlet/examine(mob/user)
+	. = ..()
+	switch(eject_speed)
+		if(EJECT_SPEED_SLOW)
+			. += "<span class='info'>An LED image of a turtle is displayed on the side of the outlet.</span>"
+		if(EJECT_SPEED_MED)
+			. += "<span class='info'>An LED image of a bumblebee is displayed on the side of the outlet.</span>"
+		if(EJECT_SPEED_FAST)
+			. += "<span class='info'>An LED image of a speeding bullet is displayed on the side of the outlet.</span>"
+		if(EJECT_SPEED_YEET)
+			. += "<span class='info'>An LED image of a grawlix is displayed on the side of the outlet.</span>"
+
+/obj/structure/disposaloutlet/multitool_act(mob/living/user, obj/item/I)
+	. = ..()
+	to_chat(user, "<span class='notice'>You adjust the ejection force on \the [src].</span>")
+	switch(eject_speed)
+		if(EJECT_SPEED_SLOW)
+			eject_speed = EJECT_SPEED_MED
+		if(EJECT_SPEED_MED)
+			eject_speed = EJECT_SPEED_FAST
+		if(EJECT_SPEED_FAST)
+			if(obj_flags & EMAGGED)
+				eject_speed = EJECT_SPEED_YEET
+			else
+				eject_speed = EJECT_SPEED_SLOW
+		if(EJECT_SPEED_YEET)
+			eject_speed = EJECT_SPEED_SLOW
+	return TRUE
+
+/obj/structure/disposaloutlet/emag_act(mob/user, obj/item/card/emag/E)
+	. = ..()
+	if(obj_flags & EMAGGED)
+		return
+	to_chat(user, "<span class='notice'>You silently disable the sanity checking on \the [src]'s ejection force.</span>")
+	obj_flags |= EMAGGED