Skip to content

Commit

Permalink
Posession now does revive the dead and turns them into temporary vass…
Browse files Browse the repository at this point in the history
…als (#1077)

* Makes the check for consciousness rack-specific

* I honestly don't remember why I set it to TRUE
  • Loading branch information
FernandoJ8 authored Mar 15, 2024
1 parent 434c8be commit 36ce0c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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!"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 36ce0c0

Please sign in to comment.