diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 361339ec34b..a98d7e1950c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1328,10 +1328,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. . = ..() if(in_inventory || in_storage) var/mob/user = usr - if(!(user.client.prefs.toggles_secondary & HIDE_ITEM_TOOLTIPS)) - tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), 8, TIMER_STOPPABLE) if(QDELETED(src)) return + if(!(user.client.prefs.toggles_secondary & HIDE_ITEM_TOOLTIPS)) + tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), 8, TIMER_STOPPABLE) if(!(user.client.prefs.toggles_secondary & SEE_ITEM_OUTLINES)) return var/mob/living/L = user diff --git a/html/changelogs/hellfirejag-combitool-timer-runtime.yml b/html/changelogs/hellfirejag-combitool-timer-runtime.yml new file mode 100644 index 00000000000..8fbb59129e9 --- /dev/null +++ b/html/changelogs/hellfirejag-combitool-timer-runtime.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a runtime error on objects caused by timers being created on objects that are already being qdel'ed."