shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5492 from Citadel-Station-13/upstream-merge-35664

Browse Source 
[MIRROR] Fixes some tooltip runtimes
This commit is contained in:
deathride58
2018-02-16 01:10:28 +00:00
committed by GitHub
parent 1cda9ef2b4 a018b63bf8
commit 6802b64db7
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/action_button.dm
+2 -1
View File
@@ -108,7 +108,8 @@
/obj/screen/movable/action_button/MouseEntered(location,control,params)
openToolTip(usr,src,params,title = name,content = desc,theme = actiontooltipstyle)
if(!QDELETED(src))
openToolTip(usr,src,params,title = name,content = desc,theme = actiontooltipstyle)
/obj/screen/movable/action_button/MouseExited()
code/_onclick/hud/alert.dm
+2 -1
View File
@@ -101,7 +101,8 @@
/obj/screen/alert/MouseEntered(location,control,params)
openToolTip(usr,src,params,title = name,content = desc,theme = alerttooltipstyle)
if(!QDELETED(src))
openToolTip(usr,src,params,title = name,content = desc,theme = alerttooltipstyle)
/obj/screen/alert/MouseExited()
code/game/objects/items.dm
+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.