cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14592 from Heroman3003/indicator-hopefully-fix

Browse Source 
Hopefully fixes stuck typing indicators when changing bubble mid-typing
This commit is contained in:
Heroman3003
2023-03-08 11:49:15 +10:00
committed by GitHub
parent 62591a9224 aa5b2eec76
commit 5d5aa17d8c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/brain.dm
+6 -2
View File
@@ -66,11 +66,15 @@
init_typing_indicator("[cur_bubble_appearance]_typing")
if(state && !typing)
loc.add_overlay(typing_indicator, TRUE)
add_overlay(typing_indicator, TRUE)
typing = TRUE
typing_indicator_active = typing_indicator
else if(typing)
loc.cut_overlay(typing_indicator, TRUE)
cut_overlay(typing_indicator_active, TRUE)
typing = FALSE
if(typing_indicator_active != typing_indicator)
qdel(typing_indicator_active)
typing_indicator_active = null
return state
code/modules/mob/mob_defines.dm
+1
View File
@@ -218,6 +218,7 @@
var/typing
var/obj/effect/decal/typing_indicator
var/obj/effect/decal/typing_indicator_active
var/cur_typing_indicator
var/custom_speech_bubble = "default"
code/modules/mob/typing_indicator.dm
+5 -1
View File
@@ -35,9 +35,13 @@
if(state && !typing)
add_overlay(typing_indicator, TRUE)
typing = TRUE
typing_indicator_active = typing_indicator
else if(typing)
cut_overlay(typing_indicator, TRUE)
cut_overlay(typing_indicator_active, TRUE)
typing = FALSE
if(typing_indicator_active != typing_indicator)
qdel(typing_indicator_active)
typing_indicator_active = null
return state