diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index d6d1d198cee..fbb3029b4f0 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -71,7 +71,6 @@ #define INIT_ORDER_TIMER 1 #define INIT_ORDER_DEFAULT 0 #define INIT_ORDER_AIR -1 -#define INIT_ORDER_MINIMAP -3 #define INIT_ORDER_ASSETS -4 #define INIT_ORDER_ICON_SMOOTHING -5 #define INIT_ORDER_OVERLAY -6 diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 0eb81fa2254..21b0acd0407 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -326,8 +326,6 @@ /datum/config_entry/flag/allow_map_voting -/datum/config_entry/flag/generate_minimaps - /datum/config_entry/number/client_warn_version config_entry_value = null min_val = 500 diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm deleted file mode 100644 index e8c40448dda..00000000000 --- a/code/controllers/subsystem/minimap.dm +++ /dev/null @@ -1,125 +0,0 @@ -SUBSYSTEM_DEF(minimap) - name = "Minimap" - init_order = INIT_ORDER_MINIMAP - flags = SS_NO_FIRE - var/const/MINIMAP_SIZE = 2048 - var/const/TILE_SIZE = 8 - - var/list/z_levels - -/datum/controller/subsystem/minimap/Initialize(timeofday) - z_levels = SSmapping.levels_by_trait(ZTRAIT_STATION) - var/list/hashlist = list() - for (var/file in SSmapping.config.GetFullMapPaths()) - hashlist += md5(file2text(file)) - var/hash = hashlist.Join("\n") - if(CONFIG_GET(flag/generate_minimaps)) - if(hash == trim(file2text(hash_path()))) - for(var/z in z_levels) //We have these files cached, let's register them - register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) - return ..() - for(var/z in z_levels) - generate(z) - register_asset("minimap_[z].png", fcopy_rsc(map_path(z))) - fdel(hash_path()) - text2file(hash, hash_path()) - else - to_chat(world, "Minimap generation disabled. Loading from cache...") - var/fileloc = 0 - if(check_files(0)) //Let's first check if we have maps cached in the data folder. NOTE: This will override the backup files even if this map is older. - if(hash != trim(file2text(hash_path()))) - to_chat(world, "Loaded cached minimap is outdated. There may be minor discrepancies in layout." ) - fileloc = 0 - else - if(!check_files(1)) - to_chat(world, "Failed to load backup minimap file. Aborting." ) - return - fileloc = 1 //No map image cached with the current map, and we have a backup. Let's fall back to it. - to_chat(world, "No cached minimaps detected. Backup files loaded.") - for(var/z in z_levels) - register_asset("minimap_[z].png", fcopy_rsc(map_path(z,fileloc))) - return ..() - -/datum/controller/subsystem/minimap/proc/check_files(backup) // If the backup argument is true, looks in the icons folder. If false looks in the data folder. - for(var/z in z_levels) - if(!fexists(file(map_path(z,backup)))) //Let's make sure we have a file for this map - if(backup) - log_world("Failed to find backup file for map [SSmapping.config.map_name] on zlevel [z].") - return FALSE - return TRUE - - -/datum/controller/subsystem/minimap/proc/hash_path(backup) - if(backup) - return "icons/minimaps/[SSmapping.config.map_name].md5" - else - return "data/minimaps/[SSmapping.config.map_name].md5" - -/datum/controller/subsystem/minimap/proc/map_path(z,backup) - if(backup) - return "icons/minimaps/[SSmapping.config.map_name]_[z].png" - else - return "data/minimaps/[SSmapping.config.map_name]_[z].png" - -/datum/controller/subsystem/minimap/proc/send(client/client) - for(var/z in z_levels) - send_asset(client, "minimap_[z].png") - -/datum/controller/subsystem/minimap/proc/generate(z, x1 = 1, y1 = 1, x2 = world.maxx, y2 = world.maxy) - // Load the background. - var/icon/minimap = new /icon('icons/minimap.dmi') - // Scale it up to our target size. - minimap.Scale(MINIMAP_SIZE, MINIMAP_SIZE) - - // Loop over turfs and generate icons. - for(var/T in block(locate(x1, y1, z), locate(x2, y2, z))) - generate_tile(T, minimap) - - // Create a new icon and insert the generated minimap, so that BYOND doesn't generate different directions. - var/icon/final = new /icon() - final.Insert(minimap, "", SOUTH, 1, 0) - fcopy(final, map_path(z)) - -/datum/controller/subsystem/minimap/proc/generate_tile(turf/tile, icon/minimap) - var/icon/tile_icon - var/obj/obj - var/list/obj_icons - // Don't use icons for space, just add objects in space if they exist. - if(isspaceturf(tile)) - obj = locate(/obj/structure/lattice/catwalk) in tile - if(obj) - tile_icon = new /icon('icons/obj/smooth_structures/catwalk.dmi', "catwalk", SOUTH) - obj = locate(/obj/structure/lattice) in tile - if(obj) - tile_icon = new /icon('icons/obj/smooth_structures/lattice.dmi', "lattice", SOUTH) - obj = locate(/obj/structure/grille) in tile - if(obj) - tile_icon = new /icon('icons/obj/structures.dmi', "grille", SOUTH) - obj = locate(/obj/structure/transit_tube) in tile - if(obj) - tile_icon = new /icon('icons/obj/atmospherics/pipes/transit_tube.dmi', obj.icon_state, obj.dir) - else - tile_icon = new /icon(tile.icon, tile.icon_state, tile.dir) - obj_icons = list() - - obj = locate(/obj/structure) in tile - if(obj) - obj_icons += new /icon(obj.icon, obj.icon_state, obj.dir, 1, 0) - obj = locate(/obj/machinery) in tile - if(obj) - obj_icons += new /icon(obj.icon, obj.icon_state, obj.dir, 1, 0) - obj = locate(/obj/structure/window) in tile - if(obj) - obj_icons += new /icon('icons/obj/smooth_structures/window.dmi', "window", SOUTH) - obj = locate(/obj/structure/table) in tile - if(obj) - obj_icons += new /icon('icons/obj/smooth_structures/table.dmi', "table", SOUTH) - for(var/I in obj_icons) - var/icon/obj_icon = I - tile_icon.Blend(obj_icon, ICON_OVERLAY) - - if(tile_icon) - // Scale the icon. - tile_icon.Scale(TILE_SIZE, TILE_SIZE) - // Add the tile to the minimap. - minimap.Blend(tile_icon, ICON_OVERLAY, ((tile.x - 1) * TILE_SIZE), ((tile.y - 1) * TILE_SIZE)) diff --git a/config/config.txt b/config/config.txt index 7ad7db8bb35..29dd6a48cc2 100644 --- a/config/config.txt +++ b/config/config.txt @@ -373,10 +373,6 @@ AUTOADMIN_RANK Game Master ## Uncomment to automatically give that admin rank to all players #AUTOADMIN -## GENERATE_MINIMAPS -## Generating minimaps(For crew monitor) is slow and bogs down testing, so its disabled by default and must be enabled by uncommenting this config if you are running a production server. -#GENERATE_MINIMAPS - ## CLIENT VERSION CONTROL ## This allows you to configure the minimum required client version, as well as a warning version, and message for both. ## These trigger for any version below (non-inclusive) the given version, so 510 triggers on 509 or lower. diff --git a/icons/minimaps/Box Station_2.png b/icons/minimaps/Box Station_2.png deleted file mode 100644 index d14145b5604..00000000000 Binary files a/icons/minimaps/Box Station_2.png and /dev/null differ diff --git a/icons/minimaps/Delta Station_2.png b/icons/minimaps/Delta Station_2.png deleted file mode 100644 index 4b17d6177c4..00000000000 Binary files a/icons/minimaps/Delta Station_2.png and /dev/null differ diff --git a/icons/minimaps/MetaStation_2.png b/icons/minimaps/MetaStation_2.png deleted file mode 100644 index bf8a6ed430a..00000000000 Binary files a/icons/minimaps/MetaStation_2.png and /dev/null differ diff --git a/icons/minimaps/OmegaStation_2.png b/icons/minimaps/OmegaStation_2.png deleted file mode 100644 index dc02e49a203..00000000000 Binary files a/icons/minimaps/OmegaStation_2.png and /dev/null differ diff --git a/tgstation.dme b/tgstation.dme index cf4966d9a98..2b2018dc3f1 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -229,7 +229,6 @@ #include "code\controllers\subsystem\machines.dm" #include "code\controllers\subsystem\mapping.dm" #include "code\controllers\subsystem\medals.dm" -#include "code\controllers\subsystem\minimap.dm" #include "code\controllers\subsystem\mobs.dm" #include "code\controllers\subsystem\moods.dm" #include "code\controllers\subsystem\nightshift.dm" diff --git a/tools/deploy.sh b/tools/deploy.sh index 807dfed1c39..a4795ea06a4 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -11,7 +11,7 @@ fi mkdir -p \ $1/_maps \ - $1/icons/minimaps \ + $1/icons \ $1/sound/chatter \ $1/sound/voice/complionator \ $1/sound/instruments \ @@ -25,7 +25,6 @@ fi cp tgstation.dmb tgstation.rsc $1/ cp -r _maps/* $1/_maps/ cp icons/default_title.dmi $1/icons/ -cp -r icons/minimaps/* $1/icons/minimaps/ cp -r sound/chatter/* $1/sound/chatter/ cp -r sound/voice/complionator/* $1/sound/voice/complionator/ cp -r sound/instruments/* $1/sound/instruments/