Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not

2021-10-08 21:05:41 -03:00
parent 5aa12b4716 3cfaad31c1
commit 437b3105d1
135 changed files with 144395 additions and 145067 deletions
@@ -71,6 +71,8 @@
 	///What character we spawned in as- either at roundstart or latejoin, so we know for persistent scars if we ended as the same person or not
 	var/mob/original_character

+	/// A lazy list of statuses to add next to this mind in the traitor panel
+	var/list/special_statuses

 /datum/mind/New(var/key)
 	skill_holder = new(src)