From c5ff7f13aa506117886ce64907ef6c8fff2e48de Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:44:42 +0200 Subject: [PATCH] [MIRROR] [NO GBP] Fixes conveyor belt runtimes from screentips [MDB IGNORE] (#23849) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [NO GBP] Fixes conveyor belt runtimes from screentips (#78478) ## About The Pull Request In #78278 it looks like I missed confirming for `tool_behavior` when mousing over on screentips, causing them to throw runtimes when not holding the correct tool. Oops. This corrects that, now properly providing screentips based on wrench and screwdriver mouseover. ## Why It's Good For The Game Runtimes bad. 🐛 💥 ## Changelog :cl: fix: Conveyor belts now properly show their new screentips on mouseover with tools. /:cl: * [NO GBP] Fixes conveyor belt runtimes from screentips --------- Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- code/modules/recycling/conveyor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index b68230686a8..cb1a0800c51 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -58,10 +58,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) if(istype(held_item, /obj/item/stack/conveyor)) context[SCREENTIP_CONTEXT_LMB] = "Extend current conveyor belt" return CONTEXTUAL_SCREENTIP_SET - if(held_item.tool_behaviour == TOOL_WRENCH) + if(held_item?.tool_behaviour == TOOL_WRENCH) context[SCREENTIP_CONTEXT_LMB] = "Rotate conveyor belt" return CONTEXTUAL_SCREENTIP_SET - if(held_item.tool_behaviour == TOOL_SCREWDRIVER) + if(held_item?.tool_behaviour == TOOL_SCREWDRIVER) context[SCREENTIP_CONTEXT_LMB] = "Invert conveyor belt" context[SCREENTIP_CONTEXT_RMB] = "Flip conveyor belt" return CONTEXTUAL_SCREENTIP_SET