cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

More antag datum cleanup / code QoL improvements (#17517)

Browse Source 
* on-removal-purge

* this does break malf AI

* rebase and fix conflicts
This commit is contained in:
SteelSlayer
2022-05-09 12:44:42 +01:00
committed by GitHub
parent 3961ede300
commit c35ac9149d
8 changed files with 141 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+26 -19
View File
@@ -1116,7 +1116,6 @@
switch(href_list["traitor"])
if("clear")
if(has_antag_datum(/datum/antagonist/traitor))
to_chat(current, "<span class='warning'><FONT size = 3><B>You have been brainwashed! You are no longer a traitor!</B></FONT></span>")
remove_antag_datum(/datum/antagonist/traitor)
log_admin("[key_name(usr)] has de-traitored [key_name(current)]")
message_admins("[key_name_admin(usr)] has de-traitored [key_name_admin(current)]")
@@ -1464,9 +1463,14 @@
edit_memory()
// Datum antag mind procs
/datum/mind/proc/add_antag_datum(datum_type_or_instance, team)
/**
* Create and/or add the `datum_type_or_instance` antag datum to the src mind.
*
* Arguments:
* * datum_type - an antag datum typepath or instance
* * datum/team/team - the antag team that the src mind should join, if any
*/
/datum/mind/proc/add_antag_datum(datum_type_or_instance, datum/team/team = null)
if(!datum_type_or_instance)
return
var/datum/antagonist/A
@@ -1476,11 +1480,6 @@
return
else
A = new datum_type_or_instance()
//Choose snowflake variation if antagonist handles it
var/datum/antagonist/S = A.specialization(src)
if(S && S != A)
qdel(A)
A = S
if(!A.can_be_owned(src))
qdel(A)
return
@@ -1494,25 +1493,33 @@
A.on_gain()
return A
/**
* Remove the specified `datum_type` antag datum from the src mind.
*
* Arguments:
* * datum_type - an antag datum typepath
*/
/datum/mind/proc/remove_antag_datum(datum_type)
if(!datum_type)
return
var/datum/antagonist/A = has_antag_datum(datum_type)
if(A)
if(!A.owner?.current)
CRASH("attempted to remove an antag datum ([A.type]) that didn't have an owner or owner.current")
A.on_removal()
return TRUE
qdel(A)
/**
* Removes all antag datums from the src mind.
*/
/datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us.
for(var/a in antag_datums)
var/datum/antagonist/A = a
if(!A.owner?.current)
stack_trace("attempted to remove an antag datum ([A.type]) that didn't have an owner or owner.current")
continue
A.on_removal()
qdel(A)
/**
* Returns an antag datum instance if the src mind has the specified `datum_type`. Returns `null` otherwise.
*
* Arguments:
* * datum_type - an antag datum typepath
* * check_subtypes - TRUE if this proc will consider subtypes of `datum_type` as valid. FALSE if only the exact same type should be considered.
*/
/datum/mind/proc/has_antag_datum(datum_type, check_subtypes = TRUE)
if(!datum_type)
return