Merge branch 'master' into tools_andstuff

This commit is contained in:
Trilbyspaceclone
2020-04-14 10:10:32 -04:00
committed by GitHub
624 changed files with 7433 additions and 4664 deletions
+2
View File
@@ -50,3 +50,5 @@ GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area)
GLOBAL_LIST_EMPTY(all_abstract_markers)
GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms
GLOBAL_LIST_EMPTY(holodeck_areas_prototypes) //List of holodeck area prototypes per holodeck computer type