From cd7951a0bb604db9fa83c620c376885f1f7df34d Mon Sep 17 00:00:00 2001
From: harryob <55142896+harryob@users.noreply.github.com>
Date: Fri, 17 Nov 2023 23:12:13 +0000
Subject: [PATCH] resolves soft conflict with minimaps

---
 code/controllers/subsystem/minimap.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index d28fe916291a..64f4b92a1edd 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -874,7 +874,7 @@ SUBSYSTEM_DEF(minimaps)
 			if(faction == FACTION_MARINE)
 				COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time)
 				var/mob/living/carbon/human/human_leader = user
-				for(var/datum/squad/current_squad in RoleAuthority.squads)
+				for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads)
 					current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:")
 				human_leader.visible_message(SPAN_BOLDNOTICE("Tactical map update in progress..."))
 				playsound_client(human_leader.client, "sound/effects/sos-morse-code.ogg")