From 36ce0c0c43e97eae4df4cb9ee39c18d983df37a0 Mon Sep 17 00:00:00 2001 From: A miscellaneous Fern <80640114+FernandoJ8@users.noreply.github.com> Date: Fri, 15 Mar 2024 06:43:59 +0100 Subject: [PATCH] Posession now does revive the dead and turns them into temporary vassals (#1077) * Makes the check for consciousness rack-specific * I honestly don't remember why I set it to TRUE --- .../bloodsuckers/bloodsucker/bloodsucker_conversion.dm | 2 +- .../code/modules/bloodsuckers/structures/bloodsucker_crypt.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm index 0674abb65551..7cf8ea6c97e5 100644 --- a/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm +++ b/monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_conversion.dm @@ -25,7 +25,7 @@ * conversion_target - Person being vassalized */ /datum/antagonist/bloodsucker/proc/can_make_vassal(mob/living/conversion_target) - if(!iscarbon(conversion_target) || conversion_target.stat > UNCONSCIOUS) + if(!iscarbon(conversion_target)) return FALSE if(length(vassals) == return_current_max_vassals()) to_chat(owner.current, span_danger("You find that your powers run thin and are unable to dominate their mind with your blood!")) diff --git a/monkestation/code/modules/bloodsuckers/structures/bloodsucker_crypt.dm b/monkestation/code/modules/bloodsuckers/structures/bloodsucker_crypt.dm index c67b48946bd6..e90a5e174ea2 100644 --- a/monkestation/code/modules/bloodsuckers/structures/bloodsucker_crypt.dm +++ b/monkestation/code/modules/bloodsuckers/structures/bloodsucker_crypt.dm @@ -272,6 +272,10 @@ */ /obj/structure/bloodsucker/vassalrack/proc/torture_victim(mob/living/user, mob/living/target) var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(/datum/antagonist/bloodsucker) + if(target.stat > UNCONSCIOUS) + balloon_alert(user, "too badly injured!") + return FALSE + if(IS_VASSAL(target)) var/datum/antagonist/vassal/vassaldatum = target.mind.has_antag_datum(/datum/antagonist/vassal) if(!vassaldatum.master.broke_masquerade)