Skip to content

Commit

Permalink
Conveyer belts and Disposals units no longer steal items on nonhelp i…
Browse files Browse the repository at this point in the history
…ntents (#26717)

* no stealing batons

* belts too

* kick that unit
  • Loading branch information
HMBGERDO authored Sep 12, 2024
1 parent 6e36351 commit 2b90084
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
12 changes: 8 additions & 4 deletions code/modules/recycling/conveyor2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand All @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/recycling/disposal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 2b90084

Please sign in to comment.