From 0ffddcc9da53903ad5951f00b4862180333b4d73 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Sat, 21 Sep 2024 03:10:25 -0400 Subject: [PATCH] initial --- code/controllers/subsystem/minimap.dm | 5 +++-- code/modules/cm_marines/overwatch.dm | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index a09bf8df50..8de2aec9bc 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -539,7 +539,9 @@ SUBSYSTEM_DEF(minimaps) qdel(svg_store_overlay) debug_log("SVG coordinates for [faction] are not implemented!") -#define can_draw(faction, user) ((faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT)) || (faction == XENO_HIVE_NORMAL && isqueen(user))) +/datum/tacmap/drawing/proc/can_draw(faction, mob/user) + var/datum/squad/main_squad_path = MAIN_SHIP_PLATOON + return ((faction == main_squad_path::faction && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT)) || (faction == XENO_HIVE_NORMAL && isqueen(user))) /datum/controller/subsystem/minimaps/proc/fetch_tacmap_datum(zlevel, flags) var/hash = "[zlevel]-[flags]" @@ -1071,4 +1073,3 @@ SUBSYSTEM_DEF(minimaps) #undef CANVAS_COOLDOWN_TIME #undef FLATTEN_MAP_COOLDOWN_TIME -#undef can_draw diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 4b0ec5fff6..ceee199367 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -40,7 +40,8 @@ /obj/structure/machinery/computer/overwatch/Initialize() . = ..() - if (faction == FACTION_MARINE) + var/datum/squad/main_squad_path = MAIN_SHIP_PLATOON + if (faction == main_squad_path::faction) tacmap = new /datum/tacmap/drawing(src, minimap_type) else tacmap = new(src, minimap_type) // Non-drawing version