diff --git a/code/modules/mob/living/simple_animal/aliens/mimic.dm b/code/modules/mob/living/simple_animal/aliens/mimic.dm index fff75ecbe7..3456b02739 100644 --- a/code/modules/mob/living/simple_animal/aliens/mimic.dm +++ b/code/modules/mob/living/simple_animal/aliens/mimic.dm @@ -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 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6fe1d6bdc8..30e966173e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -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)) ..() diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm index afdc50d883..e1cb3a16c3 100644 --- a/code/modules/mob/mob_planes.dm +++ b/code/modules/mob/mob_planes.dm @@ -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