From 5ada289c6c5fee9dc441b11f1821dfa47d5172ee Mon Sep 17 00:00:00 2001 From: doom Date: Fri, 29 Sep 2023 08:19:04 -0700 Subject: [PATCH] ... --- code/_globalvars/misc.dm | 2 +- code/controllers/subsystem/minimap.dm | 9 ++++++++- code/game/machinery/computer/groundside_operations.dm | 4 ---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index ce1c64d4ada6..956f5fddf0b4 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -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()) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 2248730a7ca6..fc50a24f84e6 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -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 @@ -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 @@ -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") diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm index 4578f5a1a18a..5f1abeb84899 100644 --- a/code/game/machinery/computer/groundside_operations.dm +++ b/code/game/machinery/computer/groundside_operations.dm @@ -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()