From a62b9ea19b2ff793dac0cace3abe090447b33398 Mon Sep 17 00:00:00 2001 From: Sailor <109166122+Equivocateur@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:08:42 +0300 Subject: [PATCH] Revert "Reenable kudzu." (#20843) --- .../Botany/Systems/MutationSystem.cs | 7 +++--- Resources/Prototypes/GameRules/events.yml | 24 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs index 672139fbca..94a450ebef 100644 --- a/Content.Server/Botany/Systems/MutationSystem.cs +++ b/Content.Server/Botany/Systems/MutationSystem.cs @@ -37,7 +37,7 @@ public sealed class MutationSystem : EntitySystem } // Add up everything in the bits column and put the number here. - const int totalbits = 270; + const int totalbits = 265; // Tolerances (55) MutateFloat(ref seed.NutrientConsumption , 0.05f, 1.2f, 5, totalbits, severity); @@ -69,7 +69,8 @@ public sealed class MutationSystem : EntitySystem MutateBool(ref seed.Sentient , true , 10, totalbits, severity); MutateBool(ref seed.Ligneous , true , 10, totalbits, severity); MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity); - MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity); + // Kudzu disabled until superkudzu bug is fixed + // MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity); MutateBool(ref seed.CanScream , true , 10, totalbits, severity); seed.BioluminescentColor = RandomColor(seed.BioluminescentColor, 10, totalbits, severity); @@ -118,7 +119,7 @@ public sealed class MutationSystem : EntitySystem CrossBool(ref result.Sentient, a.Sentient); CrossBool(ref result.Ligneous, a.Ligneous); CrossBool(ref result.Bioluminescent, a.Bioluminescent); - CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu); + // CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu); CrossBool(ref result.CanScream, a.CanScream); CrossGasses(ref result.ExudeGasses, a.ExudeGasses); diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index e15d65b508..927aea0973 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -132,18 +132,18 @@ startDelay: 20 - type: GasLeakRule -- type: entity - id: KudzuGrowth - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - earliestStart: 15 - minimumPlayers: 15 - weight: 5 - startDelay: 50 - duration: 240 - - type: KudzuGrowthRule +#- type: entity +# id: KudzuGrowth +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# earliestStart: 15 +# minimumPlayers: 15 +# weight: 5 +# startDelay: 50 +# duration: 240 +# - type: KudzuGrowthRule - type: entity id: MeteorSwarm