TGS Test Merge (#19541)

code/datums/actions/items/cult_dagger.dm

@@ -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(grant_to))
+		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

code/game/gamemodes/cult/cult.dm

@@ -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

code/modules/antagonists/cult/cult.dm

@@ -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