From a3ca6214ea02b3c0ad9cc0824d7b94e75afc3b59 Mon Sep 17 00:00:00 2001
From: silencer-pl <103842328+silencer-pl@users.noreply.github.com>
Date: Tue, 17 Sep 2024 20:16:56 -0400
Subject: [PATCH] fixes tacmap display

---
 code/controllers/subsystem/minimap.dm  | 6 ++++--
 code/game/objects/items/misc.dm        | 1 +
 code/modules/gear_presets/xenosurge.dm | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index 2a0dac8aaa..13257d42bd 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -730,7 +730,7 @@ SUBSYSTEM_DEF(minimaps)
 	old_map = get_tacmap_data_png(faction)
 	current_svg = get_tacmap_data_svg(faction)
 
-	var/use_live_map = skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno
+	var/use_live_map = skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) || is_xeno
 
 	if(use_live_map && !map_holder)
 		var/level = SSmapping.levels_by_trait(targeted_ztrait)
@@ -802,9 +802,11 @@ SUBSYSTEM_DEF(minimaps)
 	data["canViewTacmap"] = is_xeno
 	data["canViewCanvas"] = (faction in FACTION_LIST_HUMANOID) || faction == XENO_HIVE_NORMAL
 
+	if(skillcheck(user, SKILL_OVERWATCH, SKILL_OVERWATCH_TRAINED) || faction == XENO_HIVE_NORMAL && isqueen(user))
+		data["canViewTacmap"] = TRUE
+
 	if(skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || faction == XENO_HIVE_NORMAL && isqueen(user))
 		data["canDraw"] = TRUE
-		data["canViewTacmap"] = TRUE
 
 	return data
 
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index f2d122cbe4..3b28420b5c 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -411,6 +411,7 @@
 	var/datum/tacmap/map
 	var/minimap_type = MINIMAP_FLAG_USCM
 	var/faction = FACTION_MARINE
+	w_class = SIZE_SMALL
 
 /obj/item/tacmap_view/Initialize()
 	. = ..()
diff --git a/code/modules/gear_presets/xenosurge.dm b/code/modules/gear_presets/xenosurge.dm
index d2acfea9f8..5ed214a47b 100644
--- a/code/modules/gear_presets/xenosurge.dm
+++ b/code/modules/gear_presets/xenosurge.dm
@@ -14,6 +14,7 @@
 		SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 	)
 
 /datum/job/marine/pve/base