Merge pull request #5517 from Anewbe/hud_invis

Low alpha now makes HUDs and tooltips not show up on you
This commit is contained in:
Atermonera
2018-08-24 15:47:22 -07:00
committed by GitHub
3 changed files with 13 additions and 3 deletions

View File

@@ -48,8 +48,9 @@
..()
qdel(src)
/mob/living/simple_animal/hostile/mimic/MouseEntered(location, control, params)
return // Do not call parent: Mimics shouldn't have tooltips!
/mob/living/simple_animal/hostile/mimic/will_show_tooltip()
return FALSE
//
// Crate Mimic

View File

@@ -1144,8 +1144,13 @@ mob/proc/yank_out_object()
/mob/proc/throw_item(atom/target)
return
/mob/proc/will_show_tooltip()
if(alpha <= EFFECTIVE_INVIS)
return FALSE
return TRUE
/mob/MouseEntered(location, control, params)
if(usr != src && usr.is_preference_enabled(/datum/client_preference/mob_tooltips))
if(usr != src && usr.is_preference_enabled(/datum/client_preference/mob_tooltips) && src.will_show_tooltip())
openToolTip(user = usr, tip_src = src, params = params, title = get_nametag_name(usr), content = get_nametag_desc(usr))
..()

View File

@@ -52,6 +52,10 @@
var/obj/screen/plane_master/PM = plane_masters[which]
if(!PM)
crash_with("Tried to alter [which] in plane_holder on [my_mob]!")
if(my_mob.alpha <= EFFECTIVE_INVIS)
state = FALSE
PM.set_visibility(state)
if(PM.sub_planes)
var/list/subplanes = PM.sub_planes