Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
doom committed Sep 29, 2023
1 parent 6e0f7b2 commit 5ada289
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GLOBAL_VAR_INIT(minimum_exterior_lighting_alpha, 255)
GLOBAL_DATUM_INIT(item_to_box_mapping, /datum/item_to_box_mapping, init_item_to_box_mapping())

//global tacmap for action button access
GLOBAL_DATUM(tacmap_datum, /datum/tacmap/status_tab_view)
GLOBAL_DATUM_INIT(tacmap_datum, /datum/tacmap/status_tab_view, new)

/// Offset for the Operation time
GLOBAL_VAR_INIT(time_offset, setup_offset())
Expand Down
9 changes: 8 additions & 1 deletion code/controllers/subsystem/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,12 @@ SUBSYSTEM_DEF(minimaps)
allowed_flags = minimap_type
owner = source


/datum/tacmap/status_tab_view/New()
var/datum/tacmap/status_tab_view/uscm_tacmap
allowed_flags = MINIMAP_FLAG_USCM
owner = uscm_tacmap

/datum/tacmap/Destroy()
map_holder = null
owner = null
Expand Down Expand Up @@ -660,7 +666,7 @@ SUBSYSTEM_DEF(minimaps)
. = TRUE

if ("updateCanvas")
// forces state change
// forces state change, this will export the svg.
toolbar_updated_selection = "export"
updated_canvas = TRUE
. = TRUE
Expand Down Expand Up @@ -704,6 +710,7 @@ SUBSYSTEM_DEF(minimaps)
current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:")

human_leader.visible_message(SPAN_BOLDNOTICE("Tactical map update in progress..."))
human_leader << 'sound/effects/sos-morse-code.ogg'
COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time)

message_admins("[key_name(user)] has updated the tactical map")
Expand Down
4 changes: 0 additions & 4 deletions code/game/machinery/computer/groundside_operations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(disable_pmc))
tacmap = new(src, minimap_type)

// global tacmap for marines to access through an action button.
// dumb implementation for testing, fix later.
var/datum/tacmap/status_tab_view/uscm_tacmap
GLOB.tacmap_datum = new(uscm_tacmap, minimap_type)
return ..()

/obj/structure/machinery/computer/groundside_operations/Destroy()
Expand Down

0 comments on commit 5ada289

Please sign in to comment.