From 8a1b57f10bddefe6e289fdb6b3f0c844fe0bccc2 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 9 Mar 2020 21:01:03 -0700
Subject: [PATCH] k

---
 code/controllers/subsystem/minimaps.dm | 5 ++++-
 code/modules/mapping/minimaps.dm       | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/controllers/subsystem/minimaps.dm b/code/controllers/subsystem/minimaps.dm
index c2848f0fd3..9209a3f3ca 100644
--- a/code/controllers/subsystem/minimaps.dm
+++ b/code/controllers/subsystem/minimaps.dm
@@ -2,6 +2,7 @@ SUBSYSTEM_DEF(minimaps)
 	name = "Minimaps"
 	flags = SS_NO_FIRE
 	var/list/station_minimaps = list()
+	var/datum/minimap_group/station_minimap
 
 /datum/controller/subsystem/minimaps/Initialize()
 	if(!CONFIG_GET(flag/minimaps_enabled))
@@ -13,4 +14,6 @@ SUBSYSTEM_DEF(minimaps)
 /datum/controller/subsystem/minimaps/proc/build_minimaps()
 	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
 		var/datum/space_level/SL = SSmapping.get_level(z)
-		station_minimaps[(SL.name == initial(SL.name))? "[z] - Station" : "[z] - [SL.name]"] = new /datum/minimap(z)
+		var/name = (SL.name == initial(SL.name))? "[z] - Station" : "[z] - [SL.name]"
+		station_minimaps = new /datum/minimap(z, name = name)
+	station_minimap = new(station_minimaps, "Station")
diff --git a/code/modules/mapping/minimaps.dm b/code/modules/mapping/minimaps.dm
index c21f06c376..b949f61da2 100644
--- a/code/modules/mapping/minimaps.dm
+++ b/code/modules/mapping/minimaps.dm
@@ -1,4 +1,5 @@
 /datum/minimap
+	var/name
 	var/icon/map_icon
 	var/icon/meta_icon
 	var/icon/overlay_icon
@@ -11,7 +12,8 @@
 	var/id = 0
 	var/static/next_id = 0
 
-/datum/minimap/New(z, x1 = 1, y1 = 1, x2 = world.maxx, y2 = world.maxy)
+/datum/minimap/New(z, x1 = 1, y1 = 1, x2 = world.maxx, y2 = world.maxy, name)
+	src.name = name
 	id = ++next_id
 	z_level = z
 
@@ -68,9 +70,12 @@
 	var/list/minimaps = list()
 	var/static/next_id = 0
 	var/id
+	var/name
 
-/datum/minimap_group/New()
+/datum/minimap_group/New(list/maps, name)
 	id = ++next_id
+	src.name = name
+	minimaps = SANITIZELIST(maps)
 
 /datum/minimap_group/proc/show(mob/user)
 	if(!length(minimaps))