diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index f7cfa67f331..1bff905116f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -179,8 +179,9 @@ var/global/list/all_cults = list() if(jobban_isbanned(cult_mind.current, ROLE_CULTIST)) replace_jobbaned_player(cult_mind.current, ROLE_CULTIST) update_cult_icons_added(cult_mind) - var/datum/game_mode/cult/cult_mode = ticker.mode - cult_mode.check_numbers() + if(GAMEMODE_IS_CULT) + var/datum/game_mode/cult/cult_mode = ticker.mode + cult_mode.check_numbers() return 1 diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index 87343feb74a..2fe00023c20 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -170,7 +170,7 @@ sacrifice_target = pick(possible_targets) possible_objectives |= "sacrifice" else - log_admin("Didn't find a suitable sacrifice target...what the hell? Shout at a coder.") + log_runtime(EXCEPTION("Didn't find a suitable sacrifice target...what the hell? Shout at a coder.")) if(!mass_convert) var/living_crew = 0 diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index c6dbf4dde65..763ca6c3191 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -489,10 +489,11 @@ if(ticker.mode.cult.len) dat += check_role_table("Cultists", ticker.mode.cult, 0) - dat += "
use Cult Mindspeak)" - var/datum/game_mode/cult/cult_round = ticker.mode - if(!cult_round.narsie_condition_cleared) - dat += "
complete objective (debug)" + dat += "
use Cult Mindspeak" + if(GAMEMODE_IS_CULT) + var/datum/game_mode/cult/cult_round = ticker.mode + if(!cult_round.narsie_condition_cleared) + dat += "
complete objective (debug)" if(ticker.mode.traitors.len) dat += check_role_table("Traitors", ticker.mode.traitors) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index adb2cfa3f8c..bef30d63e55 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1553,7 +1553,7 @@ for(var/datum/mind/H in ticker.mode.cult) if (H.current) - to_chat(H.current, "[ticker.mode.cultdat.entity_name] murmurs, [ticker.mode.cultdat.entity_name]") + to_chat(H.current, "[ticker.mode.cultdat.entity_name] murmurs, [input]") for(var/mob/dead/observer/O in player_list) to_chat(O, "[ticker.mode.cultdat.entity_name] murmurs, [input]")