Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

2020-09-21 03:13:51 -07:00
parent 0745f4ccd3 21903d3a24
commit 9fef16964c
220 changed files with 12697 additions and 7656 deletions
@@ -197,10 +197,9 @@
 	var/list/banned_edits = list(NAMEOF(src, entries_by_type), NAMEOF(src, entries), NAMEOF(src, directory))
 	return !(var_name in banned_edits) && ..()

-/datum/controller/configuration/stat_entry()
-	if(!statclick)
-		statclick = new/obj/effect/statclick/debug(null, "Edit", src)
-	stat("[name]:", statclick)
+/datum/controller/configuration/stat_entry(msg)
+	msg = "Edit"
+	return msg

 /// Your typical GET but returns a config.
 /datum/controller/configuration/proc/GetEntryDatum(entry_type)