From 196b23d3d5af26ef2ba036e142a477958cb87907 Mon Sep 17 00:00:00 2001 From: dearmochi Date: Sun, 21 Feb 2021 22:45:32 +0100 Subject: [PATCH] Fixes some overlay screwery on death and revival (#15192) * Toggles fullscreens off/on on death/revival instead of deleting them Fixes a lot of issues regarding fullscreens (vulpkanin NV/welding shield overlay vanishing, crit overlay not persisting on defib) * Restores blind effect when defibrillated back to life Fixes issue where the blind overlay wouldn't appear when defibrillated, even though the patient is unconscious/blind --- code/game/objects/items/weapons/defib.dm | 4 ++-- code/modules/mob/living/carbon/human/death.dm | 2 +- code/modules/mob/living/death.dm | 2 +- code/modules/mob/living/stat_states.dm | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 0dcce288a1a..f3fb6da6f20 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -428,8 +428,8 @@ H.adjustBruteLoss(tobehealed) user.visible_message("[defib] pings: Resuscitation successful.") playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0) - H.update_revive(FALSE) - H.KnockOut(FALSE) + H.update_revive() + H.KnockOut() H.Paralyse(5) H.emote("gasp") if(tplus > tloss) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 1ec9bb19c3b..fd2f8bcb1b2 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -108,7 +108,7 @@ if(SSticker && SSticker.mode) SSblackbox.ReportDeath(src) -/mob/living/carbon/human/update_revive() +/mob/living/carbon/human/update_revive(updating) . = ..() if(. && healthdoll) // We're alive again, so re-build the entire healthdoll diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 0d831fe5760..593dab0b6f9 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -67,7 +67,7 @@ if(mind && suiciding) mind.suicided = TRUE reset_perspective(null) - clear_fullscreens() + hud_used?.reload_fullscreen() update_sight() update_action_buttons_icon() diff --git a/code/modules/mob/living/stat_states.dm b/code/modules/mob/living/stat_states.dm index fb54bcff2a5..7860aeab41d 100644 --- a/code/modules/mob/living/stat_states.dm +++ b/code/modules/mob/living/stat_states.dm @@ -61,6 +61,7 @@ update_blind_effects() update_sight() updatehealth("update revive") + hud_used?.reload_fullscreen() SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, updating) for(var/s in ownedSoullinks)