Merge remote-tracking branch 'refs/remotes/origin/globbification' int…

…o globbification
cmss13-devs · Nov 16, 2023 · cc02ef8 · cc02ef8
2 parents 58e32a6 + 33e6ef5
commit cc02ef8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
@@ -133,7 +133,6 @@ GLOBAL_LIST_EMPTY(active_areas)
 GLOBAL_LIST_EMPTY(all_areas)
 
 GLOBAL_LIST_EMPTY(turfs)
-GLOBAL_LIST_EMPTY(z1turfs)
 
 GLOBAL_LIST(objects_of_interest) // This is used to track the stealing objective for Agents.
 

diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
@@ -30,10 +30,6 @@ GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
 GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST))
 GLOBAL_LIST_INIT(reverse_dir, list(2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63))
 
-GLOBAL_LIST_EMPTY(combatlog)
-GLOBAL_LIST_EMPTY(IClog)
-GLOBAL_LIST_EMPTY(OOClog)
-GLOBAL_LIST_EMPTY(adminlog)
 
 
 GLOBAL_VAR(join_motd)

diff --git a/code/controllers/mc/admin.dm b/code/controllers/mc/admin.dm
@@ -97,7 +97,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
 	set name = "Debug Role Authority"
 
 	if(!GLOB.RoleAuthority)
-		to_chat(usr, "GLOB.RoleAuthority not found!")
+		to_chat(usr, "RoleAuthority not found!")
 		return
 	debug_variables(GLOB.RoleAuthority)
 	message_admins("Admin [key_name_admin(usr)] is debugging the Role Authority.")
diff --git a/code/modules/mob/living/silicon/ai/freelook/read_me.dm b/code/modules/mob/living/silicon/ai/freelook/read_me.dm
@@ -43,7 +43,7 @@ sight; for example, we don't update glass airlocks or floors.
 
 WHERE IS EVERYTHING?
 
-GLOB.cameranet.dm = Everything about the cameranet datum.
+cameranet.dm = Everything about the cameranet datum.
 chunk.dm = Everything about the chunk datum.
 eye.dm = Everything about the AI and the AIEye.
 updating.dm = Everything about triggers that will update chunks.