Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530

[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -05:00
parent a41d17c9b9 79b484261a
commit 1763c4b65d
8 changed files with 23 additions and 17 deletions
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(events)
 	//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
 	var/list/danger_areas = list(
 	/area/engine/break_room,
-	/area/engine/chiefs_office)
+	/area/crew_quarters/heads/chief)

 	//Need to locate() as it's just a list of paths.
 	return locate(pick((GLOB.the_station_areas - safe_areas) + danger_areas))