Merge pull request #35664 from AnturK/tooltipruntimes

Fixes some tooltip runtimes
This commit is contained in:
Jordan Brown
2018-02-15 09:50:11 -05:00
committed by CitadelStationBot
parent 95582c597b
commit 7b493c30d7
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -735,7 +735,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
openToolTip(user,src,params,title = name,content = "[desc]<br><b>Force:</b> [force_string]",theme = "")
/obj/item/MouseEntered(location, control, params)
if((item_flags & IN_INVENTORY) && usr.client.prefs.enable_tips)
if((item_flags & IN_INVENTORY) && usr.client.prefs.enable_tips && !QDELETED(src))
var/timedelay = usr.client.prefs.tip_delay/100
var/user = usr
tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it.