Skip to content

Commit

Permalink
[MIRROR] Fixes the typing indicator [MDB IGNORE] (#25475)
Browse files Browse the repository at this point in the history
* Fixes the typing indicator (#80153)

## About The Pull Request
It was very specifically broken by [this
commit](tgstation/tgstation@94d00aa),
because it wrongfully changed the logic. Now the typing indicator is
back, it's no longer just the thinking indicator.

## Why It's Good For The Game
Typing indicator is meant to be there, now it's back! No more awkward
flickering!

## Changelog

:cl: GoldenAlpharex
fix: The typing indicator has overcome its shyness and is now back to
its usual form.
/:cl:

* Fixes the typing indicator

---------

Co-authored-by: GoldenAlpharex <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Dec 7, 2023
1 parent a7b5732 commit 81cd23e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/datums/brain_damage/imaginary_friend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,13 @@
add_image_to_clients(active_typing_indicator, group_clients())

/mob/camera/imaginary_friend/remove_typing_indicator()
REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
if(!active_typing_indicator)
return FALSE
remove_image_from_clients(active_typing_indicator, group_clients())
active_typing_indicator = null

/mob/camera/imaginary_friend/remove_all_indicators()
REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
remove_thinking_indicator()
remove_typing_indicator()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/tgui_input/say_modal/typing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
play_fov_effect(src, 6, "talk", ignore_self = TRUE)

/mob/living/remove_thinking_indicator()
REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
if(!active_thinking_indicator)
return FALSE
cut_overlay(active_thinking_indicator)
Expand All @@ -104,6 +103,7 @@
active_typing_indicator = null

/mob/living/remove_all_indicators()
REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
remove_thinking_indicator()
remove_typing_indicator()

0 comments on commit 81cd23e

Please sign in to comment.