diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a12ebd90c11..7460df6829c 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -74,11 +74,7 @@ /datum/mind/Destroy() SSticker.minds -= src if(islist(antag_datums)) - for(var/i in antag_datums) - var/datum/antagonist/antag_datum = i - if(antag_datum.delete_on_mind_deletion) - qdel(i) - antag_datums = null + QDEL_LIST(antag_datums) return ..() /datum/mind/proc/get_language_holder() diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 91624443f3e..4b862b51248 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -9,7 +9,6 @@ GLOBAL_LIST_EMPTY(antagonists) var/silent = FALSE //Silent will prevent the gain/lose texts to show var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with - var/delete_on_mind_deletion = TRUE var/job_rank var/replace_banned = TRUE //Should replace jobbanned player with ghosts if granted. var/list/objectives = list() diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm index db9ca2832fc..04459050d21 100644 --- a/code/modules/antagonists/devil/devil.dm +++ b/code/modules/antagonists/devil/devil.dm @@ -89,8 +89,6 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", roundend_category = "devils" antagpanel_category = "Devil" job_rank = ROLE_DEVIL - //Don't delete upon mind destruction, otherwise soul re-selling will break. - delete_on_mind_deletion = FALSE var/obligation var/ban var/bane