From fbf6c88f42ec43932c4e36f8a5ffe6ccc8362cce Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 6 Apr 2023 02:03:18 +0300 Subject: [PATCH] small runtime fixy and sorter buff --- code/modules/recycling/recycling.dm | 10 +++++----- modular_chomp/code/modules/recycling/v_garbosystem.dm | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/recycling/recycling.dm b/code/modules/recycling/recycling.dm index 688cfb4ac0..8d92958b6f 100644 --- a/code/modules/recycling/recycling.dm +++ b/code/modules/recycling/recycling.dm @@ -3,7 +3,7 @@ active_power_usage = 500 density = TRUE anchored = TRUE - + var/working = FALSE var/negative_dir = null //VOREStation Addition @@ -22,7 +22,7 @@ /obj/machinery/recycling/attackby(obj/item/O, mob/user) if(!isliving(user) || !Adjacent(user)) return - + if(working) to_chat("\The [src] is busy! Wait until it's idle.") return @@ -33,7 +33,7 @@ return if(default_part_replacement(user, O)) return - + var/mob/living/M = user if(can_accept_item(O)) M.drop_from_inventory(O) @@ -135,7 +135,7 @@ working = TRUE icon_state = "sorter-process" update_use_power(USE_POWER_ACTIVE) - sleep(5 SECONDS) + sleep(2 SECONDS) //CHOMPEdit sort_item(O) dispense_if_possible() update_use_power(USE_POWER_IDLE) @@ -193,7 +193,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) warning("Dust in [src] had material_name [D.material_name], which can't be made into stacks") return - + var/stacktype = M.stack_type var/turf/T = get_step(src, dir) var/obj/item/stack/S = locate(stacktype) in T diff --git a/modular_chomp/code/modules/recycling/v_garbosystem.dm b/modular_chomp/code/modules/recycling/v_garbosystem.dm index 0799b68bcb..408aeb92f8 100644 --- a/modular_chomp/code/modules/recycling/v_garbosystem.dm +++ b/modular_chomp/code/modules/recycling/v_garbosystem.dm @@ -89,8 +89,9 @@ else A.SpinAnimation(5,3) spawn(15) - A.forceMove(src) - qdel(A) + if(A) + A.forceMove(src) + qdel(A) items_taken++ if(items_taken >= voracity) break