eh renamed var

cmss13-devs · Nov 24, 2024 · 733344d · 733344d
1 parent c179936
commit 733344d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
@@ -416,7 +416,7 @@ SUBSYSTEM_DEF(minimaps)
 	else if(faction == XENO_HIVE_NORMAL)
 		map_list = GLOB.xeno_svg_tacmap_data
 	else if(faction == FACTION_UPP)
-		map_list = GLOB.uscm_svg_tacmap_data
+		map_list = GLOB.upp_svg_tacmap_data
 	else
 		return null
 
@@ -746,7 +746,7 @@ SUBSYSTEM_DEF(minimaps)
 	owner = xeno_tacmap
 
 /datum/tacmap/drawing/status_tab_view/upp/New()
-	var/datum/tacmap/drawing/status_tab_view/xeno/upp_tacmap
+	var/datum/tacmap/drawing/status_tab_view/upp/upp_tacmap
 	allowed_flags = MINIMAP_FLAG_UPP
 	owner = upp_tacmap
 

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
@@ -176,7 +176,10 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 	else if(href_list["MapView"])
 		if(isxeno(mob))
 			return
-		GLOB.uscm_tacmap_status.tgui_interact(mob)
+		if(mob.faction == FACTION_MARINE)
+			GLOB.uscm_tacmap_status.tgui_interact(mob)
+		if(mob.faction == FACTION_UPP)
+			GLOB.upp_tacmap_status.tgui_interact(mob)
 
 	//NOTES OVERHAUL
 	if(href_list["add_merit_info"])

diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm
@@ -275,6 +275,7 @@
 			ghost_user.join_as_alien()
 		if(NOTIFY_USCM_TACMAP)
 			GLOB.uscm_tacmap_status.tgui_interact(ghost_user)
+			GLOB.upp_tacmap_status.tgui_interact(ghost_user)
 
 		if(NOTIFY_XENO_TACMAP)
 			GLOB.xeno_tacmap_status.tgui_interact(ghost_user)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -370,6 +370,7 @@
 		join_as_alien()
 	if(href_list[NOTIFY_USCM_TACMAP])
 		GLOB.uscm_tacmap_status.tgui_interact(src)
+		GLOB.upp_tacmap_status.tgui_interact(src)
 	if(href_list[NOTIFY_XENO_TACMAP])
 		GLOB.xeno_tacmap_status.tgui_interact(src)