diff --git a/aurorastation.dme b/aurorastation.dme index 0fc78bf765b..55e6e022802 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -482,7 +482,6 @@ #include "code\datums\ert\outsider.dm" #include "code\datums\ert\responseteam.dm" #include "code\datums\ert\tcfl.dm" -#include "code\datums\helper_datums\away_mission.dm" #include "code\datums\helper_datums\construction_datum.dm" #include "code\datums\helper_datums\getrev.dm" #include "code\datums\helper_datums\stack_end_detector.dm" diff --git a/code/controllers/subsystems/initialization/map_finalization.dm b/code/controllers/subsystems/initialization/map_finalization.dm index 0d926e09797..314d0f0258c 100644 --- a/code/controllers/subsystems/initialization/map_finalization.dm +++ b/code/controllers/subsystems/initialization/map_finalization.dm @@ -5,64 +5,11 @@ SUBSYSTEM_DEF(finalize) flags = SS_NO_FIRE | SS_NO_DISPLAY init_order = INIT_ORDER_MAPFINALIZE - var/dmm_suite/maploader - var/datum/away_mission/selected_mission - /datum/controller/subsystem/finalize/Initialize(timeofday) // Setup the global antag uplink. This needs to be done after SSatlas as it requires current_map. - global.uplink = new - - var/time = world.time - SSatlas.current_map.finalize_load() - log_subsystem_mapfinalization("Finalized map in [(world.time - time)/10] seconds.") - - load_space_ruin() - - if(GLOB.config.generate_asteroid) - time = world.time - SSatlas.current_map.generate_asteroid() - log_subsystem_mapfinalization("Generated asteroid in [(world.time - time)/10] seconds.") - - // Generate the area list. - require_area_resort() + GLOB.uplink = new // This is dependant on markers. populate_antag_spawns() - // Generate contact report. - generate_contact_report() - return SS_INIT_SUCCESS - -/datum/controller/subsystem/finalize/proc/load_space_ruin() - maploader = new - - if(!selected_mission) - log_subsystem_mapfinalization("Not loading away mission, because no mission has been selected.") - admin_notice(SPAN_DANGER("Not loading away mission, because no mission has been selected."), R_DEBUG) - return - for(var/map in selected_mission.map_files) - var/mfile = "[selected_mission.base_dir][map]" - var/time = world.time - LOG_DEBUG("Attempting to load [mfile]") - - if (!maploader.load_map(file(mfile), 0, 0, no_changeturf = TRUE)) - log_subsystem_mapfinalization_error("Failed to load '[mfile]'!") - log_mapping("Failed to load '[mfile]'!") - admin_notice(SPAN_DANGER("Failed to load '[mfile]'!"), R_DEBUG) - else - log_subsystem_mapfinalization("Loaded away mission on z [world.maxz] in [(world.time - time)/10] seconds.") - admin_notice(SPAN_DANGER("Loaded away mission on z [world.maxz] in [(world.time - time)/10] seconds."), R_DEBUG) - SSatlas.current_map.restricted_levels.Add(world.maxz) - QDEL_NULL(maploader) - -/datum/controller/subsystem/finalize/proc/generate_contact_report() - if(!selected_mission) - return - var/report_text = selected_mission.get_contact_report() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) - if(C.name == "Mission Paper") - var/obj/item/paper/P = new /obj/item/paper(get_turf(C)) - P.name = "Icarus reading report" - P.info = report_text - P.update_icon() diff --git a/code/datums/helper_datums/away_mission.dm b/code/datums/helper_datums/away_mission.dm deleted file mode 100644 index d1f35e3f52d..00000000000 --- a/code/datums/helper_datums/away_mission.dm +++ /dev/null @@ -1,41 +0,0 @@ -/datum/away_mission - var/name - var/weight = 1 - var/autoselect = TRUE - var/list/map_files = null - var/list/valid_sectors = null - var/list/characteristics = null - - var/base_dir = null - -/datum/away_mission/New(var/list/config, var/i_base_dir) - name = config["name"] - weight = config["weight"] - autoselect = config["autoselect"] - map_files = config["map_files"] - valid_sectors = config["valid_sectors"] - characteristics = config["characteristics"] - base_dir = i_base_dir - -/datum/away_mission/proc/validate_maps() - for(var/map in map_files) - if(!fexists("[base_dir][map]")) - LOG_DEBUG("[base_dir][map] does not exist") - return FALSE - return TRUE - -/datum/away_mission/proc/get_contact_report() - var/list/schar = sortList(characteristics) //Sort them alphabetically to avoid metaing based on the order - var/ruintext = "


Icarus Reading Report

" - ruintext += "The NDV Icarus sensors have located an away site with the following possible characteristics:
" - - ruintext += "This reading has been detected within shuttle range of the [SSatlas.current_map.station_name] and deemed safe for survey by [SSatlas.current_map.company_name] personnel. \ - The designated research director, or a captain level decision may determine the goal of any missions to this site. On-site command is deferred to any nearby command staff.
" - - return ruintext diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index ea058a20189..bb4a79dfb6c 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -1,4 +1,4 @@ -var/datum/uplink/uplink +GLOBAL_DATUM(uplink, /datum/uplink) /datum/uplink var/list/items_assoc diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 1bf01b530ab..0247b6d3fa6 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -130,7 +130,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin return 1 if(action == "buy_item") - var/datum/uplink_item/UI = (locate(params["buy_item"]) in uplink.items) + var/datum/uplink_item/UI = (locate(params["buy_item"]) in GLOB.uplink.items) UI.buy(src, usr) else if(action == "lock") toggle() @@ -142,7 +142,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin if(params["id"]) exploit_id = params["id"] if(params["category"]) - category = locate(params["category"]) in uplink.categories + category = locate(params["category"]) in GLOB.uplink.categories if(action == "contract_interact") var/list/params_webint = list("location" = "contract_details", "contract" = params["contract_interact"]) usr.client.process_webint_link("interface/login/sso_server", list2params(params_webint)) @@ -173,7 +173,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin if(tgui_menu == 0) var/list/categories = list() var/list/items = list() - for(var/datum/uplink_category/category in uplink.categories) + for(var/datum/uplink_category/category in GLOB.uplink.categories) if(category.can_view(src)) categories[++categories.len] = list("name" = category.name, "ref" = "[REF(category)]") for(var/datum/uplink_item/item in category.items) diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm index 59e479e2751..1d3292fd31c 100644 --- a/code/game/objects/items/devices/uplink_random_lists.dm +++ b/code/game/objects/items/devices/uplink_random_lists.dm @@ -26,7 +26,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra var/datum/uplink_random_item/RI = pick(items) if(!prob(RI.keep_probability)) continue - var/datum/uplink_item/I = uplink.items_assoc[RI.uplink_item] + var/datum/uplink_item/I = GLOB.uplink.items_assoc[RI.uplink_item] if(I.telecrystal_cost(telecrystals) > telecrystals) continue if(bought_items && (I in bought_items) && !prob(RI.reselect_probability)) @@ -93,6 +93,6 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra A.print_player_summary() /proc/debug_uplink_item_assoc_list() - for(var/key in uplink.items_assoc) - to_world("[key] - [uplink.items_assoc[key]]") + for(var/key in GLOB.uplink.items_assoc) + to_world("[key] - [GLOB.uplink.items_assoc[key]]") #endif diff --git a/html/changelogs/fluffyghost-removeawaymissiondeprecated.yml b/html/changelogs/fluffyghost-removeawaymissiondeprecated.yml new file mode 100644 index 00000000000..d4e8fc131e3 --- /dev/null +++ b/html/changelogs/fluffyghost-removeawaymissiondeprecated.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - server: "Removed away_mission deprecated system, made initialization a little faster." + - server: "Made global uplink datum a GLOB." diff --git a/maps/_common/mapsystem/map.dm b/maps/_common/mapsystem/map.dm index b746ce8c1e9..771e9f176be 100644 --- a/maps/_common/mapsystem/map.dm +++ b/maps/_common/mapsystem/map.dm @@ -156,9 +156,6 @@ if(!LAZYLEN(planet_size)) planet_size = list(world.maxx, world.maxy) -/datum/map/proc/generate_asteroid() - return - // Override to set custom access requirements for camera networks. /datum/map/proc/get_network_access(var/network) return 0 @@ -179,9 +176,6 @@ return pick(empty_levels) /datum/map/proc/setup_shuttles() - -// Called right after SSatlas finishes loading the map & multiz is setup. -/datum/map/proc/finalize_load() return /datum/map/proc/build_exoplanets()