Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tacmap access for main platoon #463

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/controllers/subsystem/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
Expand Down Expand Up @@ -1071,4 +1073,3 @@ SUBSYSTEM_DEF(minimaps)

#undef CANVAS_COOLDOWN_TIME
#undef FLATTEN_MAP_COOLDOWN_TIME
#undef can_draw
3 changes: 2 additions & 1 deletion code/modules/cm_marines/overwatch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading