Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

2020-04-21 01:53:41 +02:00
parent e0d219650f 79eb0f5838
commit c93f028a97
332 changed files with 1368 additions and 761 deletions
@@ -104,7 +104,7 @@ GLOBAL_VAR(antag_prototypes)

 	var/special_statuses = get_special_statuses()
 	if(length(special_statuses))
-		out += get_special_statuses() + "<br>"
+		out += special_statuses + "<br>"

 	if(!GLOB.antag_prototypes)
 		GLOB.antag_prototypes = list()