merge conflicts + getting rid of commented code for now

2020-01-21 11:23:33 +08:00
parent a100f9382e 25050d7bb6
commit c2bcbe868e
26 changed files with 283 additions and 207 deletions
@@ -120,5 +120,8 @@
 	var/registered_z

 	var/mob/audiovisual_redirect //Mob to redirect messages, speech, and sounds to
+
 	var/siliconaccessareas = list()
-	var/siliconaccesstoggle = FALSE
+	var/siliconaccesstoggle = FALSE
+
+	var/voluntary_ghosted = FALSE		//whether or not they voluntarily ghosted.