Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314

[MIRROR] Datum var cleanup

code/datums/callback.dm

@@ -89,7 +89,7 @@
 			calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean
 		else
 			calling_arguments = args
-	if(var_edited)
+	if(datum_flags & DF_VAR_EDITED)
 		return WrapAdminProcCall(object, delegate, calling_arguments)
 	if (object == GLOBAL_PROC)
 		return call(delegate)(arglist(calling_arguments))
@@ -115,7 +115,7 @@
 			calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean
 		else
 			calling_arguments = args
-	if(var_edited)
+	if(datum_flags & DF_VAR_EDITED)
 		return WrapAdminProcCall(object, delegate, calling_arguments)
 	if (object == GLOBAL_PROC)
 		return call(delegate)(arglist(calling_arguments))

code/datums/components/forensics.dm

@@ -139,7 +139,8 @@
 		if(laststamppos)
 			LAZYSET(hiddenprints, M.key, copytext(hiddenprints[M.key], 1, laststamppos))
 		hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"	//made sure to be existing by if(!LAZYACCESS);else
-	parent.fingerprintslast = M.ckey
+	var/atom/A = parent
+	A.fingerprintslast = M.ckey
 	return TRUE
 
 /datum/component/forensics/proc/add_blood_DNA(list/dna)		//list(dna_enzymes = type)

code/datums/datum.dm

@@ -1,14 +1,13 @@
 /datum
-    var/gc_destroyed //Time when this object was destroyed.
-    var/list/active_timers  //for SStimer
-    var/list/datum_components //for /datum/components
-    var/ui_screen = "home"  //for tgui
-    var/use_tag = FALSE
-    var/datum/weakref/weak_reference
+	var/gc_destroyed //Time when this object was destroyed.
+	var/list/active_timers  //for SStimer
+	var/list/datum_components //for /datum/components
+	var/datum_flags = NONE
+	var/datum/weakref/weak_reference
 
 #ifdef TESTING
-    var/running_find_references
-    var/last_find_references = 0
+	var/running_find_references
+	var/last_find_references = 0
 #endif
 
 // Default implementation of clean-up code.
@@ -38,10 +37,4 @@
 			qdel(C, FALSE, TRUE)
 		dc.Cut()
 
-	var/list/focusers = src.focusers
-	if(focusers)
-		for(var/i in 1 to focusers.len)
-			var/mob/M = focusers[i]
-			M.set_focus(M)
-
 	return QDEL_HINT_QUEUE

code/datums/datumvars.dm

@@ -1,18 +1,11 @@
-/datum
-	var/var_edited = FALSE //Warrenty void if seal is broken
-	var/fingerprintslast = null
-
 /datum/proc/can_vv_get(var_name)
 	return TRUE
 
 /datum/proc/vv_edit_var(var_name, var_value) //called whenever a var is edited
-	switch(var_name)
-		if ("vars")
-			return FALSE
-		if ("var_edited")
-			return FALSE
-	var_edited = TRUE
+	if(var_name == NAMEOF(src, vars))
+		return FALSE
 	vars[var_name] = var_value
+	datum_flags |= DF_VAR_EDITED
 
 /datum/proc/vv_get_var(var_name)
 	switch(var_name)
@@ -109,7 +102,7 @@
 	if(holder && holder.marked_datum && holder.marked_datum == D)
 		marked = "<br><font size='1' color='red'><b>Marked Object</b></font>"
 	var/varedited_line = ""
-	if(!islist && D.var_edited)
+	if(!islist && (D.datum_flags & DF_VAR_EDITED))
 		varedited_line = "<br><font size='1' color='red'><b>Var Edited</b></font>"
 
 	var/list/dropdownoptions = list()