From 08cbc290bde6927ba16fc5081ce0219332a6b8a3 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Tue, 26 Aug 2025 09:21:42 -0600 Subject: [PATCH] Disables the House storyteller (#4169) ## About The Pull Request Disables the House storyteller --- ...yteller_7_enemy.dm => storyteller_6_enemy.dm} | 0 .../storytellers/tellers/storyteller_6_house.dm | 16 ---------------- tgstation.dme | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) rename modular_zubbers/code/modules/storyteller/storytellers/tellers/{storyteller_7_enemy.dm => storyteller_6_enemy.dm} (100%) delete mode 100644 modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm diff --git a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_7_enemy.dm b/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_enemy.dm similarity index 100% rename from modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_7_enemy.dm rename to modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_enemy.dm diff --git a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm b/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm deleted file mode 100644 index 701797f907e..00000000000 --- a/modular_zubbers/code/modules/storyteller/storytellers/tellers/storyteller_6_house.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/storyteller/house - name = "The House (Unpredictable Intensity)" - desc = "The House gives permission for admins to drive the adminbus straight into the station. \ - All weights set to one at Medium - Low intensity." - welcome_text = "The House always wins." - track_data = /datum/storyteller_data/tracks/fragile - votable = TRUE - - population_min = 50 - storyteller_type = STORYTELLER_TYPE_INTENSE - -// All the weights are the same to the house -/datum/storyteller/house/calculate_weights(track) - for(var/datum/round_event_control/event as anything in SSgamemode.event_pools[track]) - if(event.weight) - event.calculated_weight = 1 diff --git a/tgstation.dme b/tgstation.dme index c2a5e552834..d882de2a0d3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9657,8 +9657,7 @@ #include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_3_default.dm" #include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_4_bomb.dm" #include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_5_gamer.dm" -#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_6_house.dm" -#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_7_enemy.dm" +#include "modular_zubbers\code\modules\storyteller\storytellers\tellers\storyteller_6_enemy.dm" #include "modular_zubbers\code\modules\surgery\healing.dm" #include "modular_zubbers\code\modules\surgery\robotic_cavity_implant.dm" #include "modular_zubbers\code\modules\surgery\surgery_step.dm"