cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conveyer belts and Disposals units no longer steal items on nonhelp intents (#26717)

Browse Source 
* no stealing batons

* belts too

* kick that unit
This commit is contained in:
HMBGERDO
2024-09-12 17:37:46 +00:00
committed by GitHub
parent 6e3635171c
commit 2b900840b3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+8 -4
View File
@@ -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)
code/modules/recycling/disposal.dm
+3
View File
@@ -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))