From bf43f42e38daba9706fb3a7cca5431db2d74eb9e Mon Sep 17 00:00:00 2001 From: Lucy Date: Wed, 11 Dec 2024 16:43:17 -0500 Subject: [PATCH 01/25] Raising the Tower of Babel: try 3 (#4514) * Collapsing the Tower of Babel: try 2 * bleh i'm sleep deprived --- code/modules/admin/smites/curse_of_babel.dm | 2 ++ code/modules/admin/verbs/secrets.dm | 2 ++ code/modules/events/wizard/tower_of_babel.dm | 3 ++- .../living/basic/space_fauna/carp/magicarp.dm | 4 +-- .../spells/spell_types/right_and_wrong.dm | 2 +- .../spells/spell_types/pointed/smite.dm | 6 +---- tgui/packages/tgui/interfaces/Secrets.jsx | 26 ------------------- 7 files changed, 10 insertions(+), 35 deletions(-) diff --git a/code/modules/admin/smites/curse_of_babel.dm b/code/modules/admin/smites/curse_of_babel.dm index 4098cbf928c0..dacc797c4150 100644 --- a/code/modules/admin/smites/curse_of_babel.dm +++ b/code/modules/admin/smites/curse_of_babel.dm @@ -1,3 +1,4 @@ +/* monkestation removal. if you REALLY want to do this for some reason, call the proc yourself. /// Strikes the target with a lightning bolt /datum/smite/curse_of_babel name = "Curse of Babel" @@ -15,3 +16,4 @@ target.apply_status_effect(/datum/status_effect/tower_of_babel, duration) to_chat(target, span_userdanger("The gods have punished you for your sins!"), confidential = TRUE) +monkestation end */ diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index a172f3d84542..89849d2915c6 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -294,6 +294,7 @@ GLOBAL_DATUM(everyone_an_antag, /datum/everyone_is_an_antag_controller) summon_magic(holder.mob, survivor_probability) +/* monkestation removal: if you REALLY want to do this for some reason, call the proc yourself. if("towerOfBabel") if(!is_funmin) return @@ -305,6 +306,7 @@ GLOBAL_DATUM(everyone_an_antag, /datum/everyone_is_an_antag_controller) if(!is_funmin) return holder.tower_of_babel_undo() +monkestation end */ if("events") if(!is_funmin) diff --git a/code/modules/events/wizard/tower_of_babel.dm b/code/modules/events/wizard/tower_of_babel.dm index 316d7520e8e5..31742cec7ae9 100644 --- a/code/modules/events/wizard/tower_of_babel.dm +++ b/code/modules/events/wizard/tower_of_babel.dm @@ -1,3 +1,4 @@ +/* monkestation removal. if you REALLY want to do this for some reason, call the proc yourself. /datum/round_event_control/wizard/tower_of_babel name = "Tower of Babel" weight = 3 @@ -10,4 +11,4 @@ /datum/round_event/wizard/tower_of_babel/start() GLOB.tower_of_babel = new /datum/tower_of_babel() - +monkestation end */ diff --git a/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm b/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm index 65d16cfb490d..a4ea855ff410 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/magicarp.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_INIT(magicarp_spell_types, list( /obj/projectile/magic/resurrection = "vital", /obj/projectile/magic/spellblade = "vorpal", /obj/projectile/magic/teleport = "warping", - /obj/projectile/magic/babel = "babbling", + /* /obj/projectile/magic/babel = "babbling", [monkestation removal: staff of babel is admin-only now] */ )) /// A reduced list of spells for magicarp spawned in xenobiology, less disruptive @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(magicarp_spell_colours, list( /obj/projectile/magic/resurrection = COLOR_CARP_PALE_GREEN, /obj/projectile/magic/spellblade = COLOR_CARP_SILVER, /obj/projectile/magic/teleport = COLOR_CARP_GRAPE, - /obj/projectile/magic/babel = COLOR_CARP_BROWN, + /* /obj/projectile/magic/babel = COLOR_CARP_BROWN, [monkestation removal: staff of babel is admin-only now] */ )) /** diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index fa2838a27945..240d54601db1 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(summoned_magic, list( /obj/item/gun/magic/wand/fireball, /obj/item/gun/magic/staff/healing, /obj/item/gun/magic/staff/door, - /obj/item/gun/magic/staff/babel, + /* /obj/item/gun/magic/staff/babel, [monkestation removal: this is admin only now] */ /obj/item/scrying, /obj/item/warp_whistle, /obj/item/immortality_talisman, diff --git a/monkestation/code/modules/spells/spell_types/pointed/smite.dm b/monkestation/code/modules/spells/spell_types/pointed/smite.dm index 6ff0c3688d02..fd91f28e19ec 100644 --- a/monkestation/code/modules/spells/spell_types/pointed/smite.dm +++ b/monkestation/code/modules/spells/spell_types/pointed/smite.dm @@ -25,7 +25,7 @@ var/list/heavy_smites = list(/datum/smite/berforate, /datum/smite/bloodless, /datum/smite/boneless, /datum/smite/brain_damage, /datum/smite/bread, /datum/smite/bsa, \ /datum/smite/fireball, /datum/smite/gib, /datum/smite/lightning, /datum/smite/nugget, /datum/smite/puzzgrid, /datum/smite/puzzle) //list of smites that have a low effect on the target - var/list/light_smites = list(/datum/smite/bad_luck, /datum/smite/curse_of_babel, /datum/smite/fake_bwoink, /datum/smite/fat, /datum/smite/ghost_control, /datum/smite/immerse, \ + var/list/light_smites = list(/datum/smite/bad_luck, /datum/smite/fake_bwoink, /datum/smite/fat, /datum/smite/ghost_control, /datum/smite/immerse, \ /datum/smite/knot_shoes, /datum/smite/ocky_icky, /datum/smite/scarify) /datum/action/cooldown/spell/pointed/smite/is_valid_target(atom/cast_on) @@ -61,10 +61,6 @@ var/datum/smite/berforate/shoot_smite = new picked_smite shoot_smite.hatred = "A lot" do_smite(shoot_smite, cast_on) - if(/datum/smite/curse_of_babel) - var/datum/smite/curse_of_babel/babel_smite = new picked_smite - babel_smite.duration = 5 MINUTES - do_smite(babel_smite, cast_on) if(/datum/smite/puzzgrid) var/datum/smite/puzzgrid/puzz_smite = new picked_smite puzz_smite.gib_on_loss = TRUE diff --git a/tgui/packages/tgui/interfaces/Secrets.jsx b/tgui/packages/tgui/interfaces/Secrets.jsx index 146a40b427f6..5ba7b5181ada 100644 --- a/tgui/packages/tgui/interfaces/Secrets.jsx +++ b/tgui/packages/tgui/interfaces/Secrets.jsx @@ -598,32 +598,6 @@ const FunForYouTab = (props) => { - - - - -