Skip to content

Commit

Permalink
so that's why i kept missing the clues
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Atlas committed Nov 22, 2024
1 parent 1af2caf commit 7f236cc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
11 changes: 6 additions & 5 deletions code/controllers/subsystems/processing/odyssey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand All @@ -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))
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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"])
Expand Down
4 changes: 0 additions & 4 deletions code/game/gamemodes/odyssey/odyssey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@
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

if(!SSodyssey.pick_odyssey())
return FALSE

var/odyssey_message = "The scenario picked for this round is: [SPAN_BOLD(SPAN_NOTICE(SSodyssey.scenario.name))].<br>\
[SPAN_ITALIC(SSodyssey.scenario.desc)]<br>\
It is a [SPAN_BOLD(SSodyssey.scenario.scenario_type)] scenario.<br>"

if(SSodyssey.scenario.scenario_type == SCENARIO_TYPE_CANON)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/abstract/ghost/storyteller/storyteller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)]<EM>[display_name][admin_stuff]:</EM> [span("message linkify", msg)]>"))
to_chat(target, SPAN_STORYTELLER("[create_text_tag("STORY", target)] [span("prefix", prefix)]<EM>[display_name][admin_stuff]:</EM> [span("message linkify", msg)]"))

/mob/abstract/ghost/storyteller/dust()
return
Expand Down
1 change: 0 additions & 1 deletion maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm
Original file line number Diff line number Diff line change
@@ -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. \
Expand Down

0 comments on commit 7f236cc

Please sign in to comment.