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

2019-11-10 23:17:58 +01:00
parent 29daa0c908 c4849ead74
commit e977ba6729
1123 changed files with 5708 additions and 6725 deletions
@@ -111,7 +111,7 @@
 	var/list/targets = list()
 	for(var/H in GLOB.network_holopads)
 		var/area/A = get_area(H)
-		if(findtextEx(A, "AI") || !(A in pop_areas) || !is_station_level(H))
+		if(!A || findtextEx(A.name, "AI") || !(A in pop_areas) || !is_station_level(H))
 			continue
 		targets += H