Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

another attempt at fixing cult #19541

Merged
merged 4 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
another attempt at fixing cult
  • Loading branch information
JohnFulpWillard committed Jul 6, 2023
commit 95dbef07f6cef8cfb1e77c6fa79354609a516926
9 changes: 5 additions & 4 deletions code/datums/actions/items/cult_dagger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@

default_button_position = "6:157,4:-2"

/datum/action/item_action/cult_dagger/Grant(mob/M)
if(iscultist(M))
return ..()
Remove(owner)
/datum/action/item_action/cult_dagger/Grant(mob/grant_to)
if(!iscultist(M))
return

return ..()

/datum/action/item_action/cult_dagger/Trigger(trigger_flags)
for(var/obj/item/held_item as anything in owner.held_items) // In case we were already holding a dagger
Expand Down
5 changes: 4 additions & 1 deletion code/game/gamemodes/cult/cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@
return ..()

/datum/game_mode/cult/check_finished(force_ending)
if (..())
if(!SSticker.setup_done || !gamemode_ready)
return FALSE
. = ..()
if (.)
return TRUE

return !main_cult.check_sacrifice_status() //we should remove this any time soon
Expand Down
1 change: 0 additions & 1 deletion code/modules/antagonists/cult/cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
owner.announce_objectives()

/datum/antagonist/cult/on_gain()
// add_objectives() figure it out sometime later (remove cult the gamemode in favor of dynamic ruleset)
. = ..()
add_objectives()
var/mob/living/current = owner.current
Expand Down