From 7d6da68300c597ffe6d4bcb7187eff3b73bb96f4 Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Thu, 29 Dec 2022 09:33:06 -0600 Subject: [PATCH] Fixes a disposals runtime and cleans up a touch of disposals grammar (#20007) * Fixes a disposals runtime + fixes a disposals grammar issue * Ryan's suggestion Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> --- code/modules/recycling/disposal.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 233f60f4c41..8e8d4332dbf 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -495,7 +495,7 @@ update() else for(var/mob/M in viewers(src)) - M.show_message("\the [I] bounces off of \the [src]'s rim!.", 3) + M.show_message("\the [I] bounces off of \the [src]'s rim!", 3) return 0 else return ..(mover, target, height) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index d097ec9d0e4..30e36351f70 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -257,7 +257,7 @@ destination_tagger.ui_interact(user) /obj/machinery/disposal/deliveryChute - name = "Delivery chute" + name = "delivery chute" desc = "A chute for big and small packages alike!" density = TRUE icon_state = "intake" @@ -279,7 +279,8 @@ return /obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute - if(istype(AM, /obj/item/projectile) || isAI(AM)) return + if(istype(AM, /obj/item/projectile) || isAI(AM) || QDELETED(AM)) + return switch(dir) if(NORTH) if(AM.loc.y != loc.y + 1) return