Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
doom committed Sep 27, 2023
1 parent 7319fa6 commit 47241c9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ GLOBAL_LIST_INIT(pill_icon_mappings, map_pill_icons())
/// In-round override to default OOC color
GLOBAL_VAR(ooc_color_override)

// tacmap cooldown for xenos and marines
GLOBAL_VAR_INIT(uscm_canvas_cooldown, 0)
GLOBAL_VAR_INIT(xeno_canvas_cooldown, 0)

/// List of roles that can be setup for each gamemode
GLOBAL_LIST_INIT(gamemode_roles, list())

Expand Down
9 changes: 6 additions & 3 deletions code/controllers/subsystem/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@ SUBSYSTEM_DEF(minimaps)

var/canvas_cooldown_time = 4 MINUTES
var/flatten_map_cooldown_time = 3 MINUTES
COOLDOWN_DECLARE(canvas_cooldown)
COOLDOWN_DECLARE(flatten_map_cooldown)

//tacmap holder for holding the minimap
Expand Down Expand Up @@ -561,7 +560,10 @@ SUBSYSTEM_DEF(minimaps)
data["toolbarColorSelection"] = toolbar_color_selection
data["toolbarUpdatedSelection"] = toolbar_updated_selection
data["worldtime"] = world.time
data["canvasCooldown"] = canvas_cooldown
if(isxeno(user))
data["canvasCooldown"] = GLOB.xeno_canvas_cooldown
else
data["canvasCooldown"] = GLOB.uscm_canvas_cooldown
data["nextCanvasTime"] = canvas_cooldown_time
data["updatedCanvas"] = updated_canvas

Expand Down Expand Up @@ -638,7 +640,6 @@ SUBSYSTEM_DEF(minimaps)
. = TRUE

if ("selectAnnouncement")
COOLDOWN_START(src, canvas_cooldown, canvas_cooldown_time)

var/current_map_asset = get_current_map(user, TRUE)
var/datum/svg_overlay/svg_overlay = new(params["image"], current_map_asset)
Expand All @@ -654,6 +655,7 @@ SUBSYSTEM_DEF(minimaps)
xeno = user
xeno_announcement(outgoing_message, xeno.hivenumber)
GLOB.xeno_flat_tacmap += svg_overlay
COOLDOWN_START(GLOB, xeno_canvas_cooldown, canvas_cooldown_time)
else
GLOB.uscm_flat_tacmap += svg_overlay
var/mob/living/carbon/human/H = user
Expand All @@ -662,6 +664,7 @@ SUBSYSTEM_DEF(minimaps)
var/paygrade = get_paygrades(id.paygrade, FALSE, H.gender)
signed = "[paygrade] [id.registered_name]"
marine_announcement(outgoing_message, "Tactical Map Announcement", signature = signed)
COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time)

message_admins("[key_name(user)] has made a tactical map announcement.")
log_announcement("[key_name(user)] has announced the following: [outgoing_message]")
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/TacticalMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const TacticalMap = (props, context) => {
};

return (
<Window width={650} height={850} theme={data.isXeno ? 'xeno' : 'crtblue'}>
<Window width={700} height={850} theme={data.isXeno ? 'xeno' : 'crtblue'}>
<Window.Content>
<Section
fontSize="20px"
Expand Down

0 comments on commit 47241c9

Please sign in to comment.