From 8b3680798860deab796611bf08954427b0bd532e Mon Sep 17 00:00:00 2001 From: Paulo Elienay Date: Thu, 28 Oct 2021 12:47:40 -0300 Subject: [PATCH 1/5] fix(17003): can't dispose abstract items Abstract items (such as slapper) should't be allow to be disposed away. --- code/modules/recycling/disposal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 3e4a1d0c821..656aa4d4b15 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -95,7 +95,7 @@ // attack by item places it in to disposal /obj/machinery/disposal/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN || !I || !user) + if(stat & BROKEN || !I || !user || I.flags & ABSTRACT) return src.add_fingerprint(user) From e0eb271a319f328af0eb5bf2adf1cf3712acf560 Mon Sep 17 00:00:00 2001 From: Elienay Albuquerque Date: Thu, 28 Oct 2021 16:16:34 -0300 Subject: [PATCH 2/5] fix(disposal): DRODEL items now ignored --- code/modules/recycling/disposal.dm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 656aa4d4b15..d492d7193ff 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -95,7 +95,7 @@ // attack by item places it in to disposal /obj/machinery/disposal/attackby(obj/item/I, mob/user, params) - if(stat & BROKEN || !I || !user || I.flags & ABSTRACT) + if(stat & BROKEN || !user || I.flags & ABSTRACT) return src.add_fingerprint(user) @@ -129,21 +129,13 @@ add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL) return - if(!I) + if(QDELETED(I) || !user.drop_item()) return - if(!user.drop_item()) - return - if(I) + if(!QDELETED(I)) I.forceMove(src) - - to_chat(user, "You place [I] into [src].") - for(var/mob/M in viewers(src)) - if(M == user) - continue - M.show_message("[user.name] places [I] into [src].", 3) - - update() + user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") + update() From e3be4db0070533f46ca23b427bd3da0388d9d55a Mon Sep 17 00:00:00 2001 From: Elienay Albuquerque Date: Thu, 28 Oct 2021 17:57:42 -0300 Subject: [PATCH 3/5] refactor: requested changes --- code/modules/recycling/disposal.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index d492d7193ff..eb3aaa965a6 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -132,10 +132,9 @@ if(QDELETED(I) || !user.drop_item()) return - if(!QDELETED(I)) - I.forceMove(src) - user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") - update() + I.forceMove(src) + user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") + update() From c767d4b6e6f4b3911ab3d7683aece6966f330c72 Mon Sep 17 00:00:00 2001 From: Paulo Elienay Date: Fri, 29 Oct 2021 06:02:53 -0300 Subject: [PATCH 4/5] fix: reverts last commit and adds comment --- code/modules/recycling/disposal.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index eb3aaa965a6..5352099ca2b 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -132,9 +132,10 @@ if(QDELETED(I) || !user.drop_item()) return - I.forceMove(src) - user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") - update() + if(!QDELETED(I)) // checking if user.drop_item() didn't delete I + I.forceMove(src) + user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") + update() From e54d406ffbf88b2845e077b6551530ef873a73f8 Mon Sep 17 00:00:00 2001 From: Elienay Albuquerque Date: Fri, 29 Oct 2021 16:18:49 -0300 Subject: [PATCH 5/5] refactor: more requested changes --- code/modules/recycling/disposal.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 5352099ca2b..41ffa226227 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -129,13 +129,12 @@ add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL) return - if(QDELETED(I) || !user.drop_item()) + if(!user.drop_item() || QDELETED(I)) return - if(!QDELETED(I)) // checking if user.drop_item() didn't delete I - I.forceMove(src) - user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") - update() + I.forceMove(src) + user.visible_message("[user] places [I] into [src].", "You place [I] into [src].") + update()