diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm index b0656278318..95866d6563d 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(one_of_a_kind_loot, list( /obj/item/clothing/suit/armor/reactive/table, /obj/item/clothing/shoes/jackboots/fast, /obj/item/melee/energy/sword/bananium, - /obj/item/dice/d20/teleporting_die_of_fate, + /obj/item/dice/d20/fate/one_use, /obj/item/modular_computer/pda/clear, /obj/item/gun/energy/meteorgun/pen, /obj/item/hot_potato, diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/wizard.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/wizard.dm new file mode 100644 index 00000000000..fe6a474c723 --- /dev/null +++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/wizard.dm @@ -0,0 +1,16 @@ +/datum/round_event_control/antagonist/solo/wizard + name = "Wizard" + roundstart = TRUE + + antag_flag = ROLE_WIZARD + antag_datum = /datum/antagonist/wizard + + weight = 2 // This should be rare enough, lower this if it turns out to roll too frequently. + tags = list(TAG_CREW_ANTAG, TAG_CHAOTIC) + + base_antags = 1 + maximum_antags = 1 + min_players = 35 + + ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_WIZARDDEN) + diff --git a/modular_zubbers/code/modules/wizard_dize/wizard_dice_event.dm b/modular_zubbers/code/modules/wizard_dize/wizard_dice_event.dm index e603bdd5b1a..2340e0116bb 100644 --- a/modular_zubbers/code/modules/wizard_dize/wizard_dice_event.dm +++ b/modular_zubbers/code/modules/wizard_dize/wizard_dice_event.dm @@ -10,12 +10,12 @@ max_wizard_trigger_potency = NEVER_TRIGGERED_BY_WIZARDS min_players = 30 - max_occurrences = 1 - weight = 10 + max_occurrences = 0 // Previously 1 + weight = 0 // Previously 10 earliest_start = 60 MINUTES track = EVENT_TRACK_MODERATE - tags = list(TAG_COMMUNAL,TAG_COMBAT) + tags = list(TAG_COMMUNAL,TAG_COMBAT) /datum/round_event/wizard_dice announce_when = 5 diff --git a/tgstation.dme b/tgstation.dme index e1ccb6bce44..50e09d17487 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9643,6 +9643,7 @@ #include "modular_zubbers\code\modules\storyteller\event_defines\crewset\nuke_ops.dm" #include "modular_zubbers\code\modules\storyteller\event_defines\crewset\spies.dm" #include "modular_zubbers\code\modules\storyteller\event_defines\crewset\traitor.dm" +#include "modular_zubbers\code\modules\storyteller\event_defines\crewset\wizard.dm" #include "modular_zubbers\code\modules\storyteller\event_defines\ghostset\alien_infestation.dm" #include "modular_zubbers\code\modules\storyteller\event_defines\ghostset\changeling.dm" #include "modular_zubbers\code\modules\storyteller\event_defines\ghostset\lone_infiltrator.dm"