diff --git a/code/controllers/subsystems/processing/odyssey.dm b/code/controllers/subsystems/processing/odyssey.dm index cc41a5f2e99..b3ed4b5cd78 100644 --- a/code/controllers/subsystems/processing/odyssey.dm +++ b/code/controllers/subsystems/processing/odyssey.dm @@ -81,7 +81,6 @@ SUBSYSTEM_DEF(odyssey) * Note that Storytellers spawn through a ghost role. */ /datum/controller/subsystem/odyssey/proc/gamemode_setup() - SHOULD_CALL_PARENT(TRUE) var/datum/game_mode/odyssey/ody_gamemode = GLOB.gamemode_cache["odyssey"] if(scenario) ody_gamemode.required_players = scenario.min_player_amount @@ -136,7 +135,7 @@ SUBSYSTEM_DEF(odyssey) data["scenario_name"] = SSodyssey.scenario.name data["scenario_desc"] = SSodyssey.scenario.desc data["scenario_canonicity"] = SSodyssey.scenario.scenario_type == SCENARIO_TYPE_CANON ? "Canon" : "Non-Canon" - data["is_storyteller"] = isstoryteller(user) || check_rights(R_ADMIN, user = user) + data["is_storyteller"] = isstoryteller(user) || check_rights(R_ADMIN, FALSE, user) if(length(scenario.roles)) data["scenario_roles"] = list() @@ -161,6 +160,8 @@ SUBSYSTEM_DEF(odyssey) if(!ismob(odyssey_user)) return + var/is_admin = check_rights(R_ADMIN, FALSE, odyssey_user) + switch(action) if("equip_outfit") if(!ishuman(odyssey_user)) @@ -182,7 +183,7 @@ SUBSYSTEM_DEF(odyssey) return TRUE if("edit_scenario_name") - if(!isstoryteller(odyssey_user) && !check_rights(R_ADMIN, user = odyssey_user)) + if(!isstoryteller(odyssey_user) && !is_admin) return var/new_scenario_name = tgui_input_text(usr, "Insert the new name for your scenario. Remember that this will be visible for anyone in the Stat Panel.", "Odyssey Panel", max_length = MAX_NAME_LEN) @@ -194,7 +195,7 @@ SUBSYSTEM_DEF(odyssey) return TRUE if("edit_scenario_desc") - if(!isstoryteller(odyssey_user) && !check_rights(R_ADMIN, user = odyssey_user)) + if(!isstoryteller(odyssey_user) && !is_admin) return var/new_scenario_desc = tgui_input_text(odyssey_user, "Insert the new description for your scenario. This is visible only in the Odyssey Panel.", "Odyssey Panel", max_length = MAX_MESSAGE_LEN) @@ -206,7 +207,7 @@ SUBSYSTEM_DEF(odyssey) return TRUE if("edit_role") - if(!isstoryteller(odyssey_user) && !check_rights(R_ADMIN)) + if(!isstoryteller(odyssey_user) && !is_admin) return var/role_path = text2path(params["role_type"]) diff --git a/code/game/gamemodes/odyssey/odyssey.dm b/code/game/gamemodes/odyssey/odyssey.dm index 535b2d20b8f..545369992df 100644 --- a/code/game/gamemodes/odyssey/odyssey.dm +++ b/code/game/gamemodes/odyssey/odyssey.dm @@ -9,9 +9,6 @@ antag_tags = list(MODE_ACTOR) antag_scaling_coeff = 1 - // Unvotable while we don't have that many maps. - votable = FALSE - /datum/game_mode/odyssey/pre_game_setup() SSticker.prevent_unready = TRUE @@ -19,7 +16,6 @@ return FALSE var/odyssey_message = "The scenario picked for this round is: [SPAN_BOLD(SPAN_NOTICE(SSodyssey.scenario.name))].
\ - [SPAN_ITALIC(SSodyssey.scenario.desc)]
\ It is a [SPAN_BOLD(SSodyssey.scenario.scenario_type)] scenario.
" if(SSodyssey.scenario.scenario_type == SCENARIO_TYPE_CANON) diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm index bda3d45253e..cf145d744f8 100644 --- a/code/modules/mob/abstract/ghost/storyteller/storyteller.dm +++ b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm @@ -93,7 +93,7 @@ if(target.mob in messagemobs) prefix = "" if((target.mob in messagemobs) || display_remote) - to_chat(target, SPAN_STORYTELLER("[create_text_tag("STORY", target)] [span("prefix", prefix)][display_name][admin_stuff]: [span("message linkify", msg)]>")) + to_chat(target, SPAN_STORYTELLER("[create_text_tag("STORY", target)] [span("prefix", prefix)][display_name][admin_stuff]: [span("message linkify", msg)]")) /mob/abstract/ghost/storyteller/dust() return diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm b/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm index aab960d66fa..bd1c08fd674 100644 --- a/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm +++ b/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm @@ -1,4 +1,3 @@ - /singleton/scenario/cryo_outpost name = "Cryo Outpost #187-D" desc = "An illegal cloning outpost on a desert oasis planet, that has just been noticed by megacorporations to be stealing proprietary tech. \