From 900d19369be111e69c69c784926552b3c5f4e4e8 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:47:07 +0100 Subject: [PATCH] Quick and easy replacing (#24352) --- code/game/gamemodes/scoreboard.dm | 2 +- code/modules/antagonists/vampire/vamp_datum.dm | 1 - code/modules/mining/lavaland/loot/colossus_loot.dm | 2 +- code/modules/mob/living/living.dm | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index f21e18ea015..8cafc4e29fc 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -129,7 +129,7 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been /datum/scoreboard/proc/check_station_player(mob/M) - if(!is_station_level(M.z) || M.stat < DEAD) + if(!is_station_level(M.z) || M.stat != DEAD) return if(isAI(M)) dead_ai = TRUE diff --git a/code/modules/antagonists/vampire/vamp_datum.dm b/code/modules/antagonists/vampire/vamp_datum.dm index 14fae8b6418..3b5b91c81a0 100644 --- a/code/modules/antagonists/vampire/vamp_datum.dm +++ b/code/modules/antagonists/vampire/vamp_datum.dm @@ -134,7 +134,6 @@ owner.current.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, owner.current.nutrition + 5)) continue - if(H.stat != DEAD || H.has_status_effect(STATUS_EFFECT_RECENTLY_SUCCUMBED)) if(H.ckey || H.player_ghosted) //Requires ckey regardless if monkey or humanoid, or the body has been ghosted before it died blood = min(20, H.blood_volume) diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 1a1bbd268bd..38d4653f196 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -292,7 +292,7 @@ . = ..() if(isliving(target) && target != src) var/mob/living/L = target - if(L.stat < DEAD) + if(L.stat != DEAD) L.heal_overall_damage(heal_power, heal_power) new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 999f80125d5..9d8e832a937 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1104,7 +1104,7 @@ if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life GLOB.dead_mob_list -= src GLOB.alive_mob_list += src - if((stat < DEAD) && (var_value == DEAD))//Kill he + if((stat != DEAD) && (var_value == DEAD))//Kill he GLOB.alive_mob_list -= src GLOB.dead_mob_list += src . = ..()