From 207ce3c838bf8af630c03296fca47a6069fc2096 Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Sun, 29 Jun 2025 00:25:01 -0400 Subject: [PATCH] Fixes for e0bdfc3f5ffd98ce0a6b0e6b6a7e060700204540 part two --- code/__HELPERS/roundend.dm | 4 ++-- code/controllers/subsystem/ticker.dm | 2 ++ .../wizard/equipment/spellbook_entries/summons.dm | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index c8e9ffb88e6..eb3db03cb07 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -370,11 +370,11 @@ GLOBAL_LIST_INIT(achievements_unlocked, list()) //ignore this comment, it fixes the broken sytax parsing caused by the " above else parts += "[FOURSPACES]Nobody died this shift!" - + /* BUBBER EDIT REMOVAL BEGIN - Storyteller parts += "[FOURSPACES]Round: [SSdynamic.current_tier.name]" for(var/datum/dynamic_ruleset/rule as anything in SSdynamic.executed_rulesets - SSdynamic.unreported_rulesets) parts += "[FOURSPACES][FOURSPACES]- [rule.name] ([rule.config_tag])" - + */// BUBBER EDIT REMOVAL END - Storyteller return parts.Join("
") /client/proc/roundend_report_file() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c78398820b8..ee48a49f7d0 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -332,8 +332,10 @@ SUBSYSTEM_DEF(ticker) SSdynamic.queued_rulesets -= ruleset SSdynamic.executed_rulesets += ruleset // Queue roundstart intercept report + /* BUBBER EDIT REMOVAL BEGIN - Storyteller if(!CONFIG_GET(flag/no_intercept_report)) GLOB.communications_controller.queue_roundstart_report() + */// BUBBER EDIT REMOVAL END - Storyteller // Queue admin logout report addtimer(CALLBACK(src, PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME) // Queue suicide slot handling diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm index 869e44cabaa..26b91782b72 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm @@ -21,7 +21,7 @@ /datum/spellbook_entry/summon/guns/can_be_purchased() // Must be a high chaos round + Also must be config enabled - return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_guns) + return !CONFIG_GET(flag/no_summon_guns) // BUBBER EDIT CHANGE - Storyteller - ORIGINAL: return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_guns) /datum/spellbook_entry/summon/guns/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy = TRUE) summon_guns(user, 10) @@ -35,7 +35,7 @@ /datum/spellbook_entry/summon/magic/can_be_purchased() // Must be a high chaos round + Also must be config enabled - return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_magic) + return !CONFIG_GET(flag/no_summon_magic) // BUBBER EDIT CHANGE - Storyteller - ORIGINAL: return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_magic) /datum/spellbook_entry/summon/magic/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy = TRUE) summon_magic(user, 10) @@ -52,7 +52,7 @@ /datum/spellbook_entry/summon/events/can_be_purchased() // Must be a high chaos round + Also must be config enabled - return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_events) + return !CONFIG_GET(flag/no_summon_events) // BUBBER EDIT CHANGE - Storyteller - ORIGINAL: return SSdynamic.current_tier.tier == DYNAMIC_TIER_HIGH && !CONFIG_GET(flag/no_summon_events) /datum/spellbook_entry/summon/events/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy = TRUE) summon_events(user) @@ -126,8 +126,10 @@ return ..() /datum/spellbook_entry/summon/specific_spell/can_be_purchased() + /* BUBBER EDIT REMOVAL BEGIN - Storyteller if(SSdynamic.current_tier.tier != DYNAMIC_TIER_HIGH) return FALSE + */// BUBBER EDIT REMOVAL END - Storyteller if(GLOB.mass_teaching) return FALSE return ..()