Merge pull request #13727 from Citadel-Station-13/silicons-patch-11

no more typing indicators while dead
This commit is contained in:
Lin
2020-12-04 22:52:04 +00:00
committed by GitHub
3 changed files with 4 additions and 1 deletions
+2
View File
@@ -839,6 +839,8 @@
/mob/living/carbon/update_stat()
if(status_flags & GODMODE)
return
if(stat != CONSCIOUS)
clear_typing_indicator()
if(stat != DEAD)
if(health <= HEALTH_THRESHOLD_DEAD && !HAS_TRAIT(src, TRAIT_NODEATH))
death()
+1
View File
@@ -78,6 +78,7 @@
update_mobility()
med_hud_set_health()
med_hud_set_status()
clear_typing_indicator()
if(!gibbed && !QDELETED(src))
addtimer(CALLBACK(src, .proc/med_hud_set_status), (DEFIB_TIME_LIMIT * 10) + 1)
stop_pulling()
+1 -1
View File
@@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
* @param force - shows even if src.typing_indcator_enabled is FALSE.
*/
/mob/proc/display_typing_indicator(timeout_override = TYPING_INDICATOR_TIMEOUT, state_override = generate_typing_indicator(), force = FALSE)
if((!typing_indicator_enabled && !force) || typing_indicator_current)
if(((!typing_indicator_enabled || (stat != CONSCIOUS)) && !force) || typing_indicator_current)
return
typing_indicator_current = state_override
add_overlay(state_override)