Skip to content

Commit

Permalink
Vassal fold ensures you're a revenge vassal (#1196)
Browse files Browse the repository at this point in the history
* Fixes vassal folding

* we gotta return it ourselves

* fix to something else entirely

* Update vassal_fold.dm

Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>

---------

Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>
  • Loading branch information
JohnFulpWillard and Bilbo367 authored Apr 10, 2024
1 parent 60f8fca commit bd8e860
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
if(bloodsuckerdatum_power.bloodsucker_blood_volume <= 0)
to_chat(user, span_warning("You don't have the blood to upkeep [src]."))
return FALSE
else if(user.blood_volume <= 0)
else
if(user.blood_volume <= 0)
to_chat(user, span_warning("You don't have the blood to upkeep [src]."))
return FALSE
return TRUE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
. = ..()
if(!.)
return FALSE
var/datum/antagonist/vassal/revenge/revenge_vassal = owner.mind.has_antag_datum(/datum/antagonist/ex_vassal)
if(revenge_vassal)
var/datum/antagonist/vassal/revenge/revenge_vassal = owner.mind.has_antag_datum(/datum/antagonist/vassal/revenge)
if(isnull(revenge_vassal))
stack_trace("[user] has [src] action but is not a revenge vassal. This should not be happening!")
return FALSE

if(trigger_flags & TRIGGER_SECONDARY_ACTION)
if(!revenge_vassal.ex_vassals.len)
if(!length(revenge_vassal.ex_vassals))
owner.balloon_alert(owner, "no vassals!")
return FALSE
return TRUE
Expand Down

0 comments on commit bd8e860

Please sign in to comment.