diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index d05f6855fb4..240ab23f739 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -435,6 +435,9 @@ Example config: if("feedbacklink") if(currentmap.map_name == SSmapping.current_map.map_name) SSmapping.current_map.feedback_link = data + if("webmap_url") + if(currentmap.map_name == SSmapping.current_map.map_name) + SSmapping.current_map.mapping_url = data else log_config("Unknown command in map vote config: '[command]'") diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 8bbf73ab58e..bc937d4007c 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -785,7 +785,3 @@ // If set, enables the "Link forum account" OOC verb /datum/config_entry/string/forum_link_uri - -/datum/config_entry/string/webmap_url - //ex: "https://webmap.affectedarc07.co.uk/maps/tgstation/" - default = "" diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index f31406e1017..2c0f4e3eb2a 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -106,9 +106,6 @@ SUBSYSTEM_DEF(mapping) if(!current_map || current_map.defaulted) to_chat(world, span_boldannounce("Unable to load next or default map config, defaulting to [old_config.map_name].")) current_map = old_config - var/mapping_url = config.Get(/datum/config_entry/string/webmap_url) - if(mapping_url != "") - current_map.mapping_url = mapping_url plane_offset_to_true = list() true_to_offset_planes = list() plane_to_offset = list() diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 57ba60d8870..de1dd79672e 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -139,9 +139,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!SSmapping.current_map.mapping_url) return if(is_station_level(mob.z)) - src << link("[SSmapping.current_map.mapping_url][LOWER_TEXT(sanitize_css_class_name(SSmapping.current_map.map_name))]/?x=[mob.x]&y=[mob.y]&zoom=6") + src << link("[SSmapping.current_map.mapping_url]/?x=[mob.x]&y=[mob.y]&zoom=6") else - src << link("[SSmapping.current_map.mapping_url][LOWER_TEXT(sanitize_css_class_name(SSmapping.current_map.map_name))]") + src << link("[SSmapping.current_map.mapping_url]") if (hsrc) var/datum/real_src = hsrc if(QDELETED(real_src)) diff --git a/config/maps.txt b/config/maps.txt index 710c945992f..c367a77d241 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -11,7 +11,8 @@ Format: voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it) disabled (disables the map) votable (is this map votable) - feedbackurl (link in-game shown to players to leave feedback for the map) + feedbacklink (link in-game shown to players to leave feedback for the map) + webmap_url (link to the a webmap to see the map in the user's browser) endmap # Production-level maps. @@ -42,6 +43,7 @@ map metastation #voteweight 0.5 votable #feedbacklink https://www.youtube.com/watch?v=XG8b7WhANNA + #webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/metastation endmap map tramstation