From ce1707c9a0c3249d259718ee5fc7e3ba19de354b Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Fri, 29 Nov 2024 21:21:01 +0100 Subject: [PATCH] Fixed Odyssey subsystem processing even when there's no Odyssey scenario running (#20207) Fixed Odyssey subsystem processing even when there's no Odyssey scenario running --- .../subsystems/processing/odyssey.dm | 6 +- .../fluffyghost-fixodysseyssprocessing.yml | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/fluffyghost-fixodysseyssprocessing.yml diff --git a/code/controllers/subsystems/processing/odyssey.dm b/code/controllers/subsystems/processing/odyssey.dm index a072fbdbb3f..f7555aff5df 100644 --- a/code/controllers/subsystems/processing/odyssey.dm +++ b/code/controllers/subsystems/processing/odyssey.dm @@ -2,6 +2,7 @@ SUBSYSTEM_DEF(odyssey) name = "Odyssey" init_order = INIT_ORDER_ODYSSEY runlevels = RUNLEVELS_PLAYING + can_fire = FALSE //We process only if we are running an odyssey scenario, this is set to TRUE by `pick_odyssey()` /// The selected scenario singleton. var/singleton/scenario/scenario @@ -74,9 +75,12 @@ SUBSYSTEM_DEF(odyssey) scenario = pickweight(possible_scenarios) setup_scenario_variables() - // Now that we actually have an odyssey, the subsystem can fire! var/list/possible_station_levels = SSmapping.levels_by_all_traits(list(ZTRAIT_STATION)) main_map = GLOB.map_sectors["[pick(possible_station_levels)]"] + + // Now that we actually have an odyssey, the subsystem can fire! + can_fire = TRUE + return TRUE /** diff --git a/html/changelogs/fluffyghost-fixodysseyssprocessing.yml b/html/changelogs/fluffyghost-fixodysseyssprocessing.yml new file mode 100644 index 00000000000..b67423aeda5 --- /dev/null +++ b/html/changelogs/fluffyghost-fixodysseyssprocessing.yml @@ -0,0 +1,58 @@ +################################ +# 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: + - bugfix: "Fixed Odyssey subsystem processing even when there's no Odyssey scenario running."