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

2020-02-10 04:29:22 -07:00
parent 3cd3578761 4e45525a26
commit 690c14a716
227 changed files with 7890 additions and 7395 deletions
@@ -214,4 +214,4 @@ GLOBAL_VAR(antag_prototypes)
 	var/datum/browser/panel = new(usr, "traitorpanel", "", 600, 600)
 	panel.set_content(out)
 	panel.open()
-	return
+	return