From 2b900840b30d01db424e5bf6a4c583744690897f Mon Sep 17 00:00:00 2001
From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:37:46 +0200
Subject: [PATCH] Conveyer belts and Disposals units no longer steal items on
 nonhelp intents (#26717)

* no stealing batons

* belts too

* kick that unit
---
 code/modules/recycling/conveyor2.dm | 12 ++++++++----
 code/modules/recycling/disposal.dm  |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 56221bed2e5..3f3b9fba58f 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -55,7 +55,8 @@ GLOBAL_LIST_EMPTY(conveyor_switches)
 /obj/machinery/conveyor/attackby(obj/item/I, mob/user)
 	if(stat & BROKEN)
 		return ..()
-	else if(istype(I, /obj/item/conveyor_switch_construct))
+
+	if(istype(I, /obj/item/conveyor_switch_construct))
 		var/obj/item/conveyor_switch_construct/S = I
 		if(S.id == id)
 			return ..()
@@ -64,11 +65,14 @@ GLOBAL_LIST_EMPTY(conveyor_switches)
 				CS.conveyors -= src
 		id = S.id
 		to_chat(user, "<span class='notice'>You link [I] with [src].</span>")
-	else if(user.a_intent != INTENT_HARM)
+		return
+
+	if(user.a_intent == INTENT_HELP)
 		if(user.drop_item())
 			I.forceMove(loc)
-	else
-		return ..()
+		return
+
+	return ..()
 
 
 /obj/machinery/conveyor/crowbar_act(mob/user, obj/item/I)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index f31c086481a..1448089796b 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -127,6 +127,9 @@
 	if(stat & BROKEN || !user || I.flags & ABSTRACT)
 		return
 
+	if(user.a_intent != INTENT_HELP)
+		return ..()
+
 	src.add_fingerprint(user)
 
 	if(istype(I, /obj/item/melee/energy/blade))