diff --git a/fulp_modules/features/antagonists/antag_datum.dm b/fulp_modules/Z_edits/antag_edits/antag_datum.dm similarity index 92% rename from fulp_modules/features/antagonists/antag_datum.dm rename to fulp_modules/Z_edits/antag_edits/antag_datum.dm index ed0c7f9063be..9afdbeff00e2 100644 --- a/fulp_modules/features/antagonists/antag_datum.dm +++ b/fulp_modules/Z_edits/antag_edits/antag_datum.dm @@ -1,5 +1,5 @@ // Removing self-assigning objectives until we have a policy on that /datum/antagonist/New() - . = ..() + ..() can_assign_self_objectives = FALSE diff --git a/fulp_modules/Z_edits/antag_edits/heretic_ascension_fix.dm b/fulp_modules/Z_edits/antag_edits/heretic_ascension_fix.dm new file mode 100644 index 000000000000..b1314697c9a8 --- /dev/null +++ b/fulp_modules/Z_edits/antag_edits/heretic_ascension_fix.dm @@ -0,0 +1,6 @@ +// Removes the check for can_assign_self_objectives, since that'll always be FALSE here +/datum/antagonist/heretic/can_ascend() + for(var/datum/objective/must_be_done as anything in objectives) + if(!must_be_done.check_completion()) + return FALSE + return TRUE diff --git a/tgstation.dme b/tgstation.dme index d2eeeae795e7..ed89c1365f49 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5976,7 +5976,6 @@ #include "fulp_modules\_defines\signals.dm" #include "fulp_modules\_defines\species_defines.dm" #include "fulp_modules\_defines\traits.dm" -#include "fulp_modules\features\antagonists\antag_datum.dm" #include "fulp_modules\features\antagonists\antag_tips\antag_tip_integration.dm" #include "fulp_modules\features\antagonists\antag_tips\preference.dm" #include "fulp_modules\features\antagonists\bloodsuckers\code\assets\bloodsucker_assets.dm" @@ -6149,8 +6148,10 @@ #include "fulp_modules\Z_edits\job_edits.dm" #include "fulp_modules\Z_edits\nightmare_edit.dm" #include "fulp_modules\Z_edits\upstream_bot.dm" +#include "fulp_modules\Z_edits\antag_edits\antag_datum.dm" #include "fulp_modules\Z_edits\antag_edits\changeling_spiders.dm" #include "fulp_modules\Z_edits\antag_edits\cult_stun.dm" +#include "fulp_modules\Z_edits\antag_edits\heretic_ascension_fix.dm" #include "fulp_modules\Z_edits\emote_edits\cooldowns.dm" #include "fulp_modules\Z_edits\emote_edits\scream.dm" #include "fulp_modules\Z_edits\erp_removal\double_beds.dm"