cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for e0bdfc3f5f part two

Browse Source
This commit is contained in:
Roxy
2025-06-29 00:25:01 -04:00
parent ca6d822c60
commit 207ce3c838
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/roundend.dm
+2 -2
View File
@@ -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]<i>Nobody died this shift!</i>"
/* 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]- <b>[rule.name]</b> ([rule.config_tag])"
*/// BUBBER EDIT REMOVAL END - Storyteller
return parts.Join("<br>")
/client/proc/roundend_report_file()
code/controllers/subsystem/ticker.dm
+2
View File
@@ -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
code/modules/antagonists/wizard/equipment/spellbook_entries/summons.dm
+5 -3
View File
@@ -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 ..()