diff --git a/Content.Server/Anomaly/AnomalySystem.Vessel.cs b/Content.Server/Anomaly/AnomalySystem.Vessel.cs index e1394ec448..7c7feacb87 100644 --- a/Content.Server/Anomaly/AnomalySystem.Vessel.cs +++ b/Content.Server/Anomaly/AnomalySystem.Vessel.cs @@ -1,5 +1,4 @@ using Content.Server.Anomaly.Components; -using Content.Server.Construction; using Content.Server.Power.EntitySystems; using Content.Shared.Anomaly; using Content.Shared.Anomaly.Components; @@ -20,7 +19,6 @@ public sealed partial class AnomalySystem { SubscribeLocalEvent(OnVesselShutdown); SubscribeLocalEvent(OnVesselMapInit); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnVesselInteractUsing); SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnVesselGetPointsPerSecond); @@ -67,11 +65,6 @@ public sealed partial class AnomalySystem UpdateVesselAppearance(uid, component); } - private void OnUpgradeExamine(EntityUid uid, AnomalyVesselComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("anomaly-vessel-component-upgrade-output", component.PointMultiplier); - } - private void OnVesselInteractUsing(EntityUid uid, AnomalyVesselComponent component, InteractUsingEvent args) { if (component.Anomaly != null || diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs index 9129557c22..e1eb0072b9 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasRecyclerComponent.cs @@ -1,6 +1,4 @@ using Content.Shared.Atmos; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Atmos.Piping.Binary.Components { @@ -19,28 +17,10 @@ namespace Content.Server.Atmos.Piping.Binary.Components [DataField("outlet")] public string OutletName { get; set; } = "outlet"; - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float MinTemp = 300 + Atmospherics.T0C; - [DataField("BaseMinTemp")] - public float BaseMinTemp = 300 + Atmospherics.T0C; - - [DataField("machinePartMinTemp", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartMinTemp = "Capacitor"; - - [DataField("partRatingMinTempMultiplier")] - public float PartRatingMinTempMultiplier = 0.95f; - - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float MinPressure = 30 * Atmospherics.OneAtmosphere; - - [DataField("BaseMinPressure")] - public float BaseMinPressure = 30 * Atmospherics.OneAtmosphere; - - [DataField("machinePartMinPressure", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartMinPressure = "Manipulator"; - - [DataField("partRatingMinPressureMultiplier")] - public float PartRatingMinPressureMultiplier = 0.8f; } } diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs index 6a4a16eac3..e14069b8a7 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Components; -using Content.Server.Construction; using Content.Server.NodeContainer; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.Nodes; @@ -29,8 +28,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems SubscribeLocalEvent(OnUpdate); SubscribeLocalEvent(OnDisabled); SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); } private void OnEnabled(EntityUid uid, GasRecyclerComponent comp, ref AtmosDeviceEnabledEvent args) @@ -125,20 +122,5 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems _appearance.SetData(uid, PumpVisuals.Enabled, comp.Reacting); } - - private void OnRefreshParts(EntityUid uid, GasRecyclerComponent component, RefreshPartsEvent args) - { - var ratingTemp = args.PartRatings[component.MachinePartMinTemp]; - var ratingPressure = args.PartRatings[component.MachinePartMinPressure]; - - component.MinTemp = component.BaseMinTemp * MathF.Pow(component.PartRatingMinTempMultiplier, ratingTemp - 1); - component.MinPressure = component.BaseMinPressure * MathF.Pow(component.PartRatingMinPressureMultiplier, ratingPressure - 1); - } - - private void OnUpgradeExamine(EntityUid uid, GasRecyclerComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("gas-recycler-upgrade-min-temp", component.MinTemp / component.BaseMinTemp); - args.AddPercentageUpgrade("gas-recycler-upgrade-min-pressure", component.MinPressure / component.BaseMinPressure); - } } } diff --git a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs index 7ded9beb01..ae9a5da963 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberComponent.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberComponent.cs @@ -1,6 +1,4 @@ using Content.Shared.Atmos; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Atmos.Portable { @@ -39,51 +37,13 @@ namespace Content.Server.Atmos.Portable /// /// Maximum internal pressure before it refuses to take more. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float MaxPressure = 2500; - /// - /// The base amount of maximum internal pressure - /// - [DataField("baseMaxPressure")] - public float BaseMaxPressure = 2500; - - /// - /// The machine part that modifies the maximum internal pressure - /// - [DataField("machinePartMaxPressure", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartMaxPressure = "MatterBin"; - - /// - /// How much the will affect the pressure. - /// The value will be multiplied by this amount for each increasing part tier. - /// - [DataField("partRatingMaxPressureModifier")] - public float PartRatingMaxPressureModifier = 1.5f; - /// /// The speed at which gas is scrubbed from the environment. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float TransferRate = 800; - - /// - /// The base speed at which gas is scrubbed from the environment. - /// - [DataField("baseTransferRate")] - public float BaseTransferRate = 800; - - /// - /// The machine part which modifies the speed of - /// - [DataField("machinePartTransferRate", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartTransferRate = "Manipulator"; - - /// - /// How much the will modify the rate. - /// The value will be multiplied by this amount for each increasing part tier. - /// - [DataField("partRatingTransferRateModifier")] - public float PartRatingTransferRateModifier = 1.4f; } } diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs index 922943f25f..f1be5ac515 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs @@ -12,7 +12,6 @@ using Content.Server.NodeContainer.Nodes; using Content.Server.NodeContainer.NodeGroups; using Content.Server.Audio; using Content.Server.Administration.Logs; -using Content.Server.Construction; using Content.Server.NodeContainer.EntitySystems; using Content.Shared.Database; @@ -39,8 +38,6 @@ namespace Content.Server.Atmos.Portable SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnDestroyed); SubscribeLocalEvent(OnScrubberAnalyzed); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); } private bool IsFull(PortableScrubberComponent component) @@ -170,20 +167,5 @@ namespace Content.Server.Atmos.Portable } args.GasMixtures = gasMixDict; } - - private void OnRefreshParts(EntityUid uid, PortableScrubberComponent component, RefreshPartsEvent args) - { - var pressureRating = args.PartRatings[component.MachinePartMaxPressure]; - var transferRating = args.PartRatings[component.MachinePartTransferRate]; - - component.MaxPressure = component.BaseMaxPressure * MathF.Pow(component.PartRatingMaxPressureModifier, pressureRating - 1); - component.TransferRate = component.BaseTransferRate * MathF.Pow(component.PartRatingTransferRateModifier, transferRating - 1); - } - - private void OnUpgradeExamine(EntityUid uid, PortableScrubberComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("portable-scrubber-component-upgrade-max-pressure", component.MaxPressure / component.BaseMaxPressure); - args.AddPercentageUpgrade("portable-scrubber-component-upgrade-transfer-rate", component.TransferRate / component.BaseTransferRate); - } } } diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index 9616d6ffa1..131bd4b182 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Actions; using Content.Server.Bed.Components; using Content.Server.Bed.Sleep; using Content.Server.Body.Systems; -using Content.Server.Construction; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Bed; @@ -10,7 +9,6 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Body.Components; using Content.Shared.Buckle.Components; using Content.Shared.Damage; -using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; using Content.Shared.Mobs.Systems; using Robust.Shared.Timing; @@ -33,8 +31,6 @@ namespace Content.Server.Bed SubscribeLocalEvent(OnBuckleChange); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnEmagged); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); } private void ManageUpdateList(EntityUid uid, HealOnBuckleComponent component, ref BuckleChangeEvent args) @@ -130,18 +126,5 @@ namespace Content.Server.Bed RaiseLocalEvent(buckledEntity, metabolicEvent); } } - - private void OnRefreshParts(EntityUid uid, StasisBedComponent component, RefreshPartsEvent args) - { - var metabolismRating = args.PartRatings[component.MachinePartMetabolismModifier]; - component.Multiplier = component.BaseMultiplier * metabolismRating; //linear scaling so it's not OP - if (HasComp(uid)) - component.Multiplier = 1f / component.Multiplier; - } - - private void OnUpgradeExamine(EntityUid uid, StasisBedComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("stasis-bed-component-upgrade-stasis", component.Multiplier / component.BaseMultiplier); - } } } diff --git a/Content.Server/Bed/Components/StasisBedComponent.cs b/Content.Server/Bed/Components/StasisBedComponent.cs index f658d01c9f..e2175d6e64 100644 --- a/Content.Server/Bed/Components/StasisBedComponent.cs +++ b/Content.Server/Bed/Components/StasisBedComponent.cs @@ -1,21 +1,12 @@ -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - namespace Content.Server.Bed.Components { [RegisterComponent] public sealed partial class StasisBedComponent : Component { - [DataField("baseMultiplier", required: true), ViewVariables(VVAccess.ReadWrite)] - public float BaseMultiplier = 10f; - /// /// What the metabolic update rate will be multiplied by (higher = slower metabolism) /// [ViewVariables(VVAccess.ReadWrite)] public float Multiplier = 10f; - - [DataField("machinePartMetabolismModifier", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartMetabolismModifier = "Capacitor"; } } diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index d497f027bf..ddb04f213d 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -1,7 +1,4 @@ using Content.Server.Botany.Systems; -using Content.Server.Construction; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Botany.Components; @@ -10,33 +7,14 @@ namespace Content.Server.Botany.Components; public sealed partial class SeedExtractorComponent : Component { /// - /// The minimum amount of seed packets dropped with no machine upgrades. + /// The minimum amount of seed packets dropped. /// [DataField("baseMinSeeds"), ViewVariables(VVAccess.ReadWrite)] public int BaseMinSeeds = 1; /// - /// The maximum amount of seed packets dropped with no machine upgrades. + /// The maximum amount of seed packets dropped. /// [DataField("baseMaxSeeds"), ViewVariables(VVAccess.ReadWrite)] public int BaseMaxSeeds = 3; - - /// - /// Modifier to the amount of seeds outputted, set on . - /// - [ViewVariables(VVAccess.ReadWrite)] - public float SeedAmountMultiplier; - - /// - /// Machine part whose rating modifies the amount of seed packets dropped. - /// - [DataField("machinePartYieldAmount", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartSeedAmount = "Manipulator"; - - /// - /// How much the machine part quality affects the amount of seeds outputted. - /// Going up a tier will multiply the seed output by this amount. - /// - [DataField("partRatingSeedAmountMultiplier")] - public float PartRatingSeedAmountMultiplier = 1.5f; } diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs index 4c547b96f0..f1ae6c9f11 100644 --- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs +++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs @@ -1,10 +1,8 @@ using Content.Server.Botany.Components; -using Content.Server.Construction; using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Popups; -using Robust.Shared.Player; using Robust.Shared.Random; namespace Content.Server.Botany.Systems; @@ -20,8 +18,6 @@ public sealed class SeedExtractorSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnInteractUsing); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); } private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor, InteractUsingEvent args) @@ -29,7 +25,8 @@ public sealed class SeedExtractorSystem : EntitySystem if (!this.IsPowered(uid, EntityManager)) return; - if (!TryComp(args.Used, out ProduceComponent? produce)) return; + if (!TryComp(args.Used, out ProduceComponent? produce)) + return; if (!_botanySystem.TryGetSeed(produce, out var seed) || seed.Seedless) { _popupSystem.PopupCursor(Loc.GetString("seed-extractor-component-no-seeds",("name", args.Used)), @@ -42,7 +39,7 @@ public sealed class SeedExtractorSystem : EntitySystem QueueDel(args.Used); - var amount = (int) _random.NextFloat(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1) * seedExtractor.SeedAmountMultiplier; + var amount = _random.Next(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1); var coords = Transform(uid).Coordinates; if (amount > 1) @@ -53,15 +50,4 @@ public sealed class SeedExtractorSystem : EntitySystem _botanySystem.SpawnSeedPacket(seed, coords, args.User); } } - - private void OnRefreshParts(EntityUid uid, SeedExtractorComponent seedExtractor, RefreshPartsEvent args) - { - var manipulatorQuality = args.PartRatings[seedExtractor.MachinePartSeedAmount]; - seedExtractor.SeedAmountMultiplier = MathF.Pow(seedExtractor.PartRatingSeedAmountMultiplier, manipulatorQuality - 1); - } - - private void OnUpgradeExamine(EntityUid uid, SeedExtractorComponent seedExtractor, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("seed-extractor-component-upgrade-seed-yield", seedExtractor.SeedAmountMultiplier); - } } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs index 1c25b0e79d..42aabf2578 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs @@ -1,6 +1,4 @@ using Content.Server.Cargo.Components; -using Content.Server.Construction; -using Content.Server.Paper; using Content.Server.Power.Components; using Content.Shared.Cargo; using Content.Shared.Cargo.Components; @@ -15,8 +13,6 @@ public sealed partial class CargoSystem private void InitializeTelepad() { SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnTelepadPowerChange); // Shouldn't need re-anchored event SubscribeLocalEvent(OnTelepadAnchorChange); @@ -83,17 +79,6 @@ public sealed partial class CargoSystem _linker.EnsureSinkPorts(uid, telepad.ReceiverPort); } - private void OnRefreshParts(EntityUid uid, CargoTelepadComponent component, RefreshPartsEvent args) - { - var rating = args.PartRatings[component.MachinePartTeleportDelay] - 1; - component.Delay = component.BaseDelay * MathF.Pow(component.PartRatingTeleportDelay, rating); - } - - private void OnUpgradeExamine(EntityUid uid, CargoTelepadComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("cargo-telepad-delay-upgrade", component.Delay / component.BaseDelay); - } - private void SetEnabled(EntityUid uid, CargoTelepadComponent component, ApcPowerReceiverComponent? receiver = null, TransformComponent? xform = null) { diff --git a/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs b/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs index 7195670125..c1841e022c 100644 --- a/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionHeaterComponent.cs @@ -3,27 +3,9 @@ namespace Content.Server.Chemistry.Components; [RegisterComponent] public sealed partial class SolutionHeaterComponent : Component { - /// - /// How much heat is added per second to the solution, with no upgrades. - /// - [DataField("baseHeatPerSecond")] - public float BaseHeatPerSecond = 120; - /// /// How much heat is added per second to the solution, taking upgrades into account. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float HeatPerSecond; - - /// - /// The machine part that affects the heat multiplier. - /// - [DataField("machinePartHeatMultiplier")] - public string MachinePartHeatMultiplier = "Capacitor"; - - /// - /// How much each upgrade multiplies the heat by. - /// - [DataField("partRatingHeatMultiplier")] - public float PartRatingHeatMultiplier = 1.5f; } diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs index 1ef589ab5c..6e6373e10b 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Chemistry.Components; using Content.Server.Chemistry.Containers.EntitySystems; -using Content.Server.Construction; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Chemistry; @@ -21,8 +20,6 @@ public sealed class SolutionHeaterSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnPowerChanged); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnItemPlaced); SubscribeLocalEvent(OnItemRemoved); } @@ -64,18 +61,6 @@ public sealed class SolutionHeaterSystem : EntitySystem } } - private void OnRefreshParts(Entity entity, ref RefreshPartsEvent args) - { - var heatRating = args.PartRatings[entity.Comp.MachinePartHeatMultiplier] - 1; - - entity.Comp.HeatPerSecond = entity.Comp.BaseHeatPerSecond * MathF.Pow(entity.Comp.PartRatingHeatMultiplier, heatRating); - } - - private void OnUpgradeExamine(Entity entity, ref UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("solution-heater-upgrade-heat", entity.Comp.HeatPerSecond / entity.Comp.BaseHeatPerSecond); - } - private void OnItemPlaced(Entity entity, ref ItemPlacedEvent args) { TryTurnOn(entity); diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index da8de13af2..def9950d90 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Chat.Systems; using Content.Server.Cloning.Components; -using Content.Server.Construction; using Content.Server.DeviceLinking.Systems; using Content.Server.EUI; using Content.Server.Fluids.EntitySystems; @@ -10,7 +9,6 @@ using Content.Server.Jobs; using Content.Server.Materials; using Content.Server.Popups; using Content.Server.Power.EntitySystems; -using Content.Server.Traits.Assorted; using Content.Shared.Atmos; using Content.Shared.CCVar; using Content.Shared.Chemistry.Components; @@ -71,8 +69,6 @@ namespace Content.Server.Cloning base.Initialize(); SubscribeLocalEvent(OnComponentInit); - SubscribeLocalEvent(OnPartsRefreshed); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(Reset); SubscribeLocalEvent(HandleMindAdded); SubscribeLocalEvent(OnPortDisconnected); @@ -87,21 +83,6 @@ namespace Content.Server.Cloning _signalSystem.EnsureSinkPorts(uid, CloningPodComponent.PodPort); } - private void OnPartsRefreshed(EntityUid uid, CloningPodComponent component, RefreshPartsEvent args) - { - var materialRating = args.PartRatings[component.MachinePartMaterialUse]; - var speedRating = args.PartRatings[component.MachinePartCloningSpeed]; - - component.BiomassRequirementMultiplier = MathF.Pow(component.PartRatingMaterialMultiplier, materialRating - 1); - component.CloningTime = component.BaseCloningTime * MathF.Pow(component.PartRatingSpeedMultiplier, speedRating - 1); - } - - private void OnUpgradeExamine(EntityUid uid, CloningPodComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("cloning-pod-component-upgrade-speed", component.BaseCloningTime / component.CloningTime); - args.AddPercentageUpgrade("cloning-pod-component-upgrade-biomass-requirement", component.BiomassRequirementMultiplier); - } - internal void TransferMindToClone(EntityUid mindId, MindComponent mind) { if (!ClonesWaitingForMind.TryGetValue(mind, out var entity) || @@ -190,7 +171,7 @@ namespace Content.Server.Cloning if (!TryComp(bodyToClone, out var physics)) return false; - var cloningCost = (int) Math.Round(physics.FixturesMass * clonePod.BiomassRequirementMultiplier); + var cloningCost = (int) Math.Round(physics.FixturesMass); if (_configManager.GetCVar(CCVars.BiomassEasyMode)) cloningCost = (int) Math.Round(cloningCost * EasyModeCloningCost); diff --git a/Content.Server/Construction/ConstructionSystem.Machine.cs b/Content.Server/Construction/ConstructionSystem.Machine.cs index 65b0b70476..2e670dbe40 100644 --- a/Content.Server/Construction/ConstructionSystem.Machine.cs +++ b/Content.Server/Construction/ConstructionSystem.Machine.cs @@ -5,7 +5,6 @@ using Content.Shared.Construction.Components; using Content.Shared.Construction.Prototypes; using Content.Shared.Verbs; using Robust.Shared.Containers; -using Robust.Shared.Map.Components; using Robust.Shared.Utility; namespace Content.Server.Construction; @@ -144,7 +143,7 @@ public sealed partial class ConstructionSystem var p = EntityManager.SpawnEntity(partProto.StockPartPrototype, xform.Coordinates); if (!_container.Insert(p, partContainer)) - throw new Exception($"Couldn't insert machine part of type {part} to machine with prototype {partProto.StockPartPrototype ?? "N/A"}!"); + throw new Exception($"Couldn't insert machine part of type {part} to machine with prototype {partProto.StockPartPrototype}!"); } } @@ -184,7 +183,7 @@ public sealed class RefreshPartsEvent : EntityEventArgs { public IReadOnlyList Parts = new List(); - public Dictionary PartRatings = new Dictionary(); + public Dictionary PartRatings = new(); } public sealed class UpgradeExamineEvent : EntityEventArgs diff --git a/Content.Server/Construction/PartExchangerSystem.cs b/Content.Server/Construction/PartExchangerSystem.cs index f364d1b547..ee5edcbd0a 100644 --- a/Content.Server/Construction/PartExchangerSystem.cs +++ b/Content.Server/Construction/PartExchangerSystem.cs @@ -10,7 +10,6 @@ using Content.Shared.Storage; using Robust.Shared.Containers; using Robust.Shared.Utility; using Content.Shared.Wires; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Collections; @@ -43,7 +42,7 @@ public sealed class PartExchangerSystem : EntitySystem if (args.Handled || args.Args.Target == null) return; - if (!TryComp(uid, out var storage) || storage.Container == null) + if (!TryComp(uid, out var storage)) return; //the parts are stored in here var machinePartQuery = GetEntityQuery(); diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs index 4168de43df..f946292038 100644 --- a/Content.Server/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/Gravity/GravityGeneratorComponent.cs @@ -37,9 +37,6 @@ namespace Content.Server.Gravity // 0 -> 1 [ViewVariables(VVAccess.ReadWrite)] [DataField("charge")] public float Charge { get; set; } = 1; - [DataField("machinePartMaxChargeMultiplier", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartMaxChargeMultiplier = "Capacitor"; - /// /// Is the gravity generator currently "producing" gravity? /// diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs index 0bd159f61a..b0c4bb56ff 100644 --- a/Content.Server/Gravity/GravityGeneratorSystem.cs +++ b/Content.Server/Gravity/GravityGeneratorSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Administration.Logs; using Content.Server.Audio; -using Content.Server.Construction; using Content.Server.Power.Components; using Content.Shared.Database; using Content.Shared.Gravity; @@ -27,7 +26,6 @@ namespace Content.Server.Gravity SubscribeLocalEvent(OnComponentShutdown); SubscribeLocalEvent(OnParentChanged); // Or just anchor changed? SubscribeLocalEvent(OnInteractHand); - SubscribeLocalEvent(OnRefreshParts); SubscribeLocalEvent( OnSwitchGenerator); } @@ -256,12 +254,6 @@ namespace Content.Server.Gravity } } - private void OnRefreshParts(EntityUid uid, GravityGeneratorComponent component, RefreshPartsEvent args) - { - var maxChargeMultipler = args.PartRatings[component.MachinePartMaxChargeMultiplier]; - component.MaxCharge = maxChargeMultipler * 1; - } - private void MakeBroken(Entity ent, AppearanceComponent? appearance) { _ambientSoundSystem.SetAmbience(ent, false); diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 1fb5d8d2fd..b11370c991 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Construction.Prototypes; using Content.Shared.DeviceLinking; using Content.Shared.Item; using Robust.Shared.Audio; @@ -13,10 +12,6 @@ namespace Content.Server.Kitchen.Components { [DataField("cookTimeMultiplier"), ViewVariables(VVAccess.ReadWrite)] public float CookTimeMultiplier = 1; - [DataField("machinePartCookTimeMultiplier", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartCookTimeMultiplier = "Capacitor"; - [DataField("cookTimeScalingConstant")] - public float CookTimeScalingConstant = 0.5f; [DataField("baseHeatMultiplier"), ViewVariables(VVAccess.ReadWrite)] public float BaseHeatMultiplier = 100; [DataField("objectHeatMultiplier"), ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index 2a028a8580..27834aa573 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -1,8 +1,6 @@ using Content.Shared.Kitchen; using Content.Server.Kitchen.EntitySystems; -using Content.Shared.Construction.Prototypes; using Robust.Shared.Audio; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Kitchen.Components { @@ -15,30 +13,15 @@ namespace Content.Server.Kitchen.Components [Access(typeof(ReagentGrinderSystem)), RegisterComponent] public sealed partial class ReagentGrinderComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public int StorageMaxEntities = 6; - [DataField("baseStorageMaxEntities"), ViewVariables(VVAccess.ReadWrite)] - public int BaseStorageMaxEntities = 4; - - [DataField("machinePartStorageMax", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartStorageMax = "MatterBin"; - - [DataField("storagePerPartRating")] - public int StoragePerPartRating = 4; - [DataField("workTime"), ViewVariables(VVAccess.ReadWrite)] public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds. - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float WorkTimeMultiplier = 1; - [DataField("machinePartWorkTime", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartWorkTime = "Manipulator"; - - [DataField("partRatingWorkTimeMultiplier")] - public float PartRatingWorkTimerMulitplier = 0.6f; - [DataField("clickSound"), ViewVariables(VVAccess.ReadWrite)] public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 1411f85013..efa963f2d0 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -31,7 +31,6 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.Player; using System.Linq; -using Content.Shared.Access.Components; namespace Content.Server.Kitchen.EntitySystems { @@ -67,8 +66,6 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnAnchorChanged); SubscribeLocalEvent(OnSuicide); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnSignalReceived); @@ -335,17 +332,6 @@ namespace Content.Server.Kitchen.EntitySystems _sharedContainer.EmptyContainer(component.Storage); } - private void OnRefreshParts(Entity ent, ref RefreshPartsEvent args) - { - var cookRating = args.PartRatings[ent.Comp.MachinePartCookTimeMultiplier]; - ent.Comp.CookTimeMultiplier = MathF.Pow(ent.Comp.CookTimeScalingConstant, cookRating - 1); - } - - private void OnUpgradeExamine(Entity ent, ref UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("microwave-component-upgrade-cook-time", ent.Comp.CookTimeMultiplier); - } - private void OnSignalReceived(Entity ent, ref SignalReceivedEvent args) { if (args.Port != ent.Comp.OnPort) diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index e309c3bd37..07f8849b4a 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Chemistry.Containers.EntitySystems; -using Content.Server.Construction; using Content.Server.Kitchen.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; @@ -49,8 +48,6 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent((uid, _, _) => UpdateUiState(uid)); SubscribeLocalEvent((EntityUid uid, ReagentGrinderComponent _, ref PowerChangedEvent _) => UpdateUiState(uid)); SubscribeLocalEvent(OnInteractUsing); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnContainerModified); SubscribeLocalEvent(OnContainerModified); @@ -186,24 +183,6 @@ namespace Content.Server.Kitchen.EntitySystems args.Handled = true; } - /// - /// Gotta be efficient, you know? you're saving a whole extra second here and everything. - /// - private void OnRefreshParts(Entity entity, ref RefreshPartsEvent args) - { - var ratingWorkTime = args.PartRatings[entity.Comp.MachinePartWorkTime]; - var ratingStorage = args.PartRatings[entity.Comp.MachinePartStorageMax]; - - entity.Comp.WorkTimeMultiplier = MathF.Pow(entity.Comp.PartRatingWorkTimerMulitplier, ratingWorkTime - 1); - entity.Comp.StorageMaxEntities = entity.Comp.BaseStorageMaxEntities + (int) (entity.Comp.StoragePerPartRating * (ratingStorage - 1)); - } - - private void OnUpgradeExamine(Entity entity, ref UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("reagent-grinder-component-upgrade-work-time", entity.Comp.WorkTimeMultiplier); - args.AddNumberUpgrade("reagent-grinder-component-upgrade-storage", entity.Comp.StorageMaxEntities - entity.Comp.BaseStorageMaxEntities); - } - private void UpdateUiState(EntityUid uid) { var inputContainer = _containerSystem.EnsureContainer(uid, SharedReagentGrinder.InputContainerId); diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index ff05a72ef0..c976543f7c 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Chemistry.EntitySystems; -using Content.Server.Construction; using Content.Server.Fluids.EntitySystems; using Content.Server.GameTicking; using Content.Server.Nutrition.EntitySystems; @@ -43,8 +42,6 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem base.Initialize(); SubscribeLocalEvent(OnStartup); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnInteractUsing, before: new []{typeof(WiresSystem), typeof(SolutionTransferSystem)}); @@ -56,18 +53,6 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem _solutionContainer.EnsureSolution(entity.Owner, entity.Comp.SolutionContainerId); } - private void OnUpgradeExamine(Entity entity, ref UpgradeExamineEvent args) - { - args.AddPercentageUpgrade(Loc.GetString("material-reclaimer-upgrade-process-rate"), entity.Comp.MaterialProcessRate / entity.Comp.BaseMaterialProcessRate); - } - - private void OnRefreshParts(Entity entity, ref RefreshPartsEvent args) - { - var rating = args.PartRatings[entity.Comp.MachinePartProcessRate] - 1; - entity.Comp.MaterialProcessRate = entity.Comp.BaseMaterialProcessRate * MathF.Pow(entity.Comp.PartRatingProcessRateMultiplier, rating); - Dirty(entity); - } - private void OnPowerChanged(Entity entity, ref PowerChangedEvent args) { AmbientSound.SetAmbience(entity.Owner, entity.Comp.Enabled && args.Powered); diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs index 744f579af0..25378bb3ed 100644 --- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs +++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs @@ -1,8 +1,4 @@ -using System.Threading; -using Content.Shared.Construction.Prototypes; using Content.Shared.Storage; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Medical.BiomassReclaimer { @@ -50,53 +46,14 @@ namespace Content.Server.Medical.BiomassReclaimer /// /// How many units of biomass it produces for each unit of mass. /// - [ViewVariables(VVAccess.ReadWrite)] - public float YieldPerUnitMass = default; - - /// - /// The base yield per mass unit when no components are upgraded. - /// - [DataField("baseYieldPerUnitMass")] - public float BaseYieldPerUnitMass = 0.4f; - - /// - /// Machine part whose rating modifies the yield per mass. - /// - [DataField("machinePartYieldAmount", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartYieldAmount = "MatterBin"; - - /// - /// How much the machine part quality affects the yield. - /// Going up a tier will multiply the yield by this amount. - /// - [DataField("partRatingYieldAmountMultiplier")] - public float PartRatingYieldAmountMultiplier = 1.25f; + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float YieldPerUnitMass = 0.4f; /// /// The time it takes to process a mob, per mass. /// - [ViewVariables(VVAccess.ReadWrite)] - public float ProcessingTimePerUnitMass = default; - - /// - /// The base time per mass unit that it takes to process a mob - /// when no components are upgraded. - /// - [DataField("baseProcessingTimePerUnitMass")] - public float BaseProcessingTimePerUnitMass = 0.5f; - - /// - /// The machine part that increses the processing speed. - /// - [DataField("machinePartProcessSpeed", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartProcessingSpeed = "Manipulator"; - - /// - /// How much the machine part quality affects the yield. - /// Going up a tier will multiply the speed by this amount. - /// - [DataField("partRatingSpeedMultiplier")] - public float PartRatingSpeedMultiplier = 1.35f; + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float ProcessingTimePerUnitMass = 0.5f; /// /// Will this refuse to gib a living mob? diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs index 20ac9420aa..b126c74a10 100644 --- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs +++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs @@ -1,6 +1,5 @@ using System.Numerics; using Content.Server.Body.Components; -using Content.Server.Construction; using Content.Server.Fluids.EntitySystems; using Content.Server.Materials; using Content.Server.Power.Components; @@ -24,7 +23,6 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Popups; using Content.Shared.Throwing; using Robust.Server.Player; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.Physics.Components; @@ -96,8 +94,6 @@ namespace Content.Server.Medical.BiomassReclaimer SubscribeLocalEvent(OnUnanchorAttempt); SubscribeLocalEvent(OnAfterInteractUsing); SubscribeLocalEvent(OnClimbedOn); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnSuicide); SubscribeLocalEvent(OnDoAfter); @@ -176,26 +172,6 @@ namespace Content.Server.Medical.BiomassReclaimer StartProcessing(args.Climber, reclaimer); } - private void OnRefreshParts(EntityUid uid, BiomassReclaimerComponent component, RefreshPartsEvent args) - { - var laserRating = args.PartRatings[component.MachinePartProcessingSpeed]; - var manipRating = args.PartRatings[component.MachinePartYieldAmount]; - - // Processing time slopes downwards with part rating. - component.ProcessingTimePerUnitMass = - component.BaseProcessingTimePerUnitMass / MathF.Pow(component.PartRatingSpeedMultiplier, laserRating - 1); - - // Yield slopes upwards with part rating. - component.YieldPerUnitMass = - component.BaseYieldPerUnitMass * MathF.Pow(component.PartRatingYieldAmountMultiplier, manipRating - 1); - } - - private void OnUpgradeExamine(EntityUid uid, BiomassReclaimerComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("biomass-reclaimer-component-upgrade-speed", component.BaseProcessingTimePerUnitMass / component.ProcessingTimePerUnitMass); - args.AddPercentageUpgrade("biomass-reclaimer-component-upgrade-biomass-yield", component.YieldPerUnitMass / component.BaseYieldPerUnitMass); - } - private void OnDoAfter(Entity reclaimer, ref ReclaimerDoAfterEvent args) { if (args.Handled || args.Cancelled || args.Args.Target == null || HasComp(args.Args.Target.Value)) diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs index fdfb19cbac..aef56d6c0b 100644 --- a/Content.Server/Medical/Components/MedicalScannerComponent.cs +++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs @@ -13,13 +13,7 @@ namespace Content.Server.Medical.Components public ContainerSlot BodyContainer = default!; public EntityUid? ConnectedConsole; - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float CloningFailChanceMultiplier = 1f; - - [DataField("machinePartCloningFailChance", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartCloningFailChance = "Capacitor"; - - [DataField("partRatingCloningFailChanceMultiplier")] - public float PartRatingFailMultiplier = 0.75f; } } diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs index 54de0bc3b5..91184ddc16 100644 --- a/Content.Server/Medical/MedicalScannerSystem.cs +++ b/Content.Server/Medical/MedicalScannerSystem.cs @@ -7,7 +7,6 @@ using Content.Shared.Movement.Events; using Content.Shared.Verbs; using Robust.Shared.Containers; using Content.Server.Cloning.Components; -using Content.Server.Construction; using Content.Server.DeviceLinking.Systems; using Content.Shared.DeviceLinking.Events; using Content.Server.Power.EntitySystems; @@ -45,8 +44,6 @@ namespace Content.Server.Medical SubscribeLocalEvent(OnDragDropOn); SubscribeLocalEvent(OnPortDisconnected); SubscribeLocalEvent(OnAnchorChanged); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnCanDragDropOn); } @@ -249,17 +246,5 @@ namespace Content.Server.Medical _climbSystem.ForciblySetClimbing(contained, uid); UpdateAppearance(uid, scannerComponent); } - - private void OnRefreshParts(EntityUid uid, MedicalScannerComponent component, RefreshPartsEvent args) - { - var ratingFail = args.PartRatings[component.MachinePartCloningFailChance]; - - component.CloningFailChanceMultiplier = MathF.Pow(component.PartRatingFailMultiplier, ratingFail - 1); - } - - private void OnUpgradeExamine(EntityUid uid, MedicalScannerComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("medical-scanner-upgrade-cloning", component.CloningFailChanceMultiplier); - } } } diff --git a/Content.Server/Nutrition/Components/FatExtractorComponent.cs b/Content.Server/Nutrition/Components/FatExtractorComponent.cs index 7bd9b85c79..bf81a173e4 100644 --- a/Content.Server/Nutrition/Components/FatExtractorComponent.cs +++ b/Content.Server/Nutrition/Components/FatExtractorComponent.cs @@ -1,5 +1,4 @@ using Content.Server.Nutrition.EntitySystems; -using Content.Shared.Construction.Prototypes; using Content.Shared.Nutrition.Components; using Robust.Shared.Audio; using Robust.Shared.Prototypes; @@ -26,26 +25,6 @@ public sealed partial class FatExtractorComponent : Component [DataField("nutritionPerSecond"), ViewVariables(VVAccess.ReadWrite)] public int NutritionPerSecond = 10; - /// - /// The base rate of extraction - /// - [DataField("baseNutritionPerSecond"), ViewVariables(VVAccess.ReadWrite)] - public int BaseNutritionPerSecond = 10; - - #region Machine Upgrade - /// - /// Which machine part affects the nutrition rate - /// - [DataField("machinePartNutritionRate", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartNutritionRate = "Manipulator"; - - /// - /// The increase in rate per each rating above 1. - /// - [DataField("partRatingRateMultiplier")] - public float PartRatingRateMultiplier = 10; - #endregion - /// /// An accumulator which tracks extracted nutrition to determine /// when to spawn a meat. @@ -57,7 +36,7 @@ public sealed partial class FatExtractorComponent : Component /// How high has to be to spawn meat /// [DataField("nutrientPerMeat"), ViewVariables(VVAccess.ReadWrite)] - public int NutrientPerMeat = 60; + public int NutrientPerMeat = 30; /// /// Meat spawned by the extractor. diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs index 63ca590f5d..4bd8c94ac8 100644 --- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs @@ -1,6 +1,5 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; -using Content.Server.Construction; using Content.Server.Nutrition.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; @@ -10,7 +9,6 @@ using Content.Shared.Emag.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Storage.Components; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Timing; @@ -29,8 +27,6 @@ public sealed class FatExtractorSystem : EntitySystem /// public override void Initialize() { - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnUnpaused); SubscribeLocalEvent(OnGotEmagged); SubscribeLocalEvent(OnClosed); @@ -38,17 +34,6 @@ public sealed class FatExtractorSystem : EntitySystem SubscribeLocalEvent(OnPowerChanged); } - private void OnRefreshParts(EntityUid uid, FatExtractorComponent component, RefreshPartsEvent args) - { - var rating = args.PartRatings[component.MachinePartNutritionRate] - 1; - component.NutritionPerSecond = component.BaseNutritionPerSecond + (int) (component.PartRatingRateMultiplier * rating); - } - - private void OnUpgradeExamine(EntityUid uid, FatExtractorComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("fat-extractor-component-rate", (float) component.NutritionPerSecond / component.BaseNutritionPerSecond); - } - private void OnUnpaused(EntityUid uid, FatExtractorComponent component, ref EntityUnpausedEvent args) { component.NextUpdate += args.PausedTime; diff --git a/Content.Server/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/Power/Components/UpgradeBatteryComponent.cs deleted file mode 100644 index ff91cfa755..0000000000 --- a/Content.Server/Power/Components/UpgradeBatteryComponent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components -{ - - [RegisterComponent] - public sealed partial class UpgradeBatteryComponent : Component - { - /// - /// The machine part that affects the power capacity. - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartPowerCapacity = "PowerCell"; - - /// - /// The machine part rating is raised to this power when calculating power gain - /// - [DataField("maxChargeMultiplier")] - public float MaxChargeMultiplier = 2f; - - /// - /// Power gain scaling - /// - [DataField("baseMaxCharge")] - public float BaseMaxCharge = 8000000; - } -} diff --git a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs b/Content.Server/Power/Components/UpgradePowerDrawComponent.cs deleted file mode 100644 index 02a6c57b9b..0000000000 --- a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Content.Server.Construction.Components; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components; - -/// -/// This is used for machines whose power draw -/// can be decreased through machine part upgrades. -/// -[RegisterComponent] -public sealed partial class UpgradePowerDrawComponent : Component -{ - /// - /// The base power draw of the machine. - /// Prioritizes hv/mv draw over lv draw. - /// Value is initializezd on map init from - /// - [ViewVariables(VVAccess.ReadWrite)] - public float BaseLoad; - - /// - /// The machine part that affects the power draw. - /// - [DataField("machinePartPowerDraw", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string MachinePartPowerDraw = "Capacitor"; - - /// - /// The multiplier used for scaling the power draw. - /// - [DataField("powerDrawMultiplier", required: true), ViewVariables(VVAccess.ReadWrite)] - public float PowerDrawMultiplier = 1f; - - /// - /// What type of scaling is being used? - /// - [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] - public MachineUpgradeScalingType Scaling; -} - - diff --git a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs deleted file mode 100644 index 35b43867d2..0000000000 --- a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Content.Server.Construction.Components; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components; - -[RegisterComponent] -public sealed partial class UpgradePowerSupplierComponent : Component -{ - [ViewVariables(VVAccess.ReadWrite)] - public float BaseSupplyRate; - - /// - /// The machine part that affects the power supplu. - /// - [DataField("machinePartPowerSupply", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string MachinePartPowerSupply = "Capacitor"; - - /// - /// The multiplier used for scaling the power supply. - /// - [DataField("powerSupplyMultiplier", required: true), ViewVariables(VVAccess.ReadWrite)] - public float PowerSupplyMultiplier = 1f; - - /// - /// What type of scaling is being used? - /// - [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] - public MachineUpgradeScalingType Scaling; - - /// - /// The current value that the power supply is being scaled by, - /// - [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] - public float ActualScalar = 1f; -} diff --git a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs deleted file mode 100644 index 7bd29f2de7..0000000000 --- a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Server.Construction.Components; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components -{ - - [RegisterComponent] - public sealed partial class UpgradePowerSupplyRampingComponent : Component - { - [ViewVariables(VVAccess.ReadWrite)] - public float BaseRampRate; - - /// - /// The machine part that affects the power supply ramping - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartRampRate = "Capacitor"; - - /// - /// The multiplier used for scaling the power supply ramping - /// - [DataField("supplyRampingMultiplier")] - public float SupplyRampingMultiplier = 1f; - - /// - /// What type of scaling is being used? - /// - [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] - public MachineUpgradeScalingType Scaling; - - /// - /// The current value that the power supply is being scaled by - /// - [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] - public float ActualScalar = 1f; - } -} diff --git a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs deleted file mode 100644 index 734cf9d89c..0000000000 --- a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Server.Construction; -using Content.Server.Power.Components; -using JetBrains.Annotations; - -namespace Content.Server.Power.EntitySystems -{ - [UsedImplicitly] - public sealed class UpgradeBatterySystem : EntitySystem - { - [Dependency] private readonly BatterySystem _batterySystem = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); - } - - public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args) - { - var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity]; - - if (TryComp(uid, out var batteryComp)) - { - _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp); - } - } - - private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args) - { - // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this. - if (TryComp(uid, out var batteryComp)) - { - args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge); - } - } - } -} diff --git a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs b/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs deleted file mode 100644 index 9cf28c386a..0000000000 --- a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs +++ /dev/null @@ -1,139 +0,0 @@ -using Content.Server.Construction; -using Content.Server.Construction.Components; -using Content.Server.Power.Components; - -namespace Content.Server.Power.EntitySystems; - -/// -/// This handles using upgraded machine parts -/// to modify the power supply/generation of a machine. -/// -public sealed class UpgradePowerSystem : EntitySystem -{ - /// - public override void Initialize() - { - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); - - SubscribeLocalEvent(OnSupplierMapInit); - SubscribeLocalEvent(OnSupplierRefreshParts); - SubscribeLocalEvent(OnSupplierUpgradeExamine); - - SubscribeLocalEvent(OnSupplyRampingMapInit); - SubscribeLocalEvent(OnSupplyRampingRefreshParts); - SubscribeLocalEvent(OnSupplyRampingUpgradeExamine); - } - - private void OnMapInit(EntityUid uid, UpgradePowerDrawComponent component, MapInitEvent args) - { - if (TryComp(uid, out var powa)) - component.BaseLoad = powa.DrawRate; - else if (TryComp(uid, out var powa2)) - component.BaseLoad = powa2.Load; - } - - private void OnRefreshParts(EntityUid uid, UpgradePowerDrawComponent component, RefreshPartsEvent args) - { - var load = component.BaseLoad; - var rating = args.PartRatings[component.MachinePartPowerDraw]; - switch (component.Scaling) - { - case MachineUpgradeScalingType.Linear: - load += component.PowerDrawMultiplier * (rating - 1); - break; - case MachineUpgradeScalingType.Exponential: - load *= MathF.Pow(component.PowerDrawMultiplier, rating - 1); - break; - default: - Log.Error($"invalid power scaling type for {ToPrettyString(uid)}."); - load = 0; - break; - } - if (TryComp(uid, out var powa)) - powa.Load = load; - if (TryComp(uid, out var powa2)) - powa2.DrawRate = load; - } - - private void OnUpgradeExamine(EntityUid uid, UpgradePowerDrawComponent component, UpgradeExamineEvent args) - { - // UpgradePowerDrawComponent.PowerDrawMultiplier is not the actual multiplier, so we have to do this. - var powerDrawMultiplier = CompOrNull(uid)?.Load / component.BaseLoad - ?? CompOrNull(uid)?.DrawRate / component.BaseLoad; - - if (powerDrawMultiplier is not null) - args.AddPercentageUpgrade("upgrade-power-draw", powerDrawMultiplier.Value); - } - - private void OnSupplierMapInit(EntityUid uid, UpgradePowerSupplierComponent component, MapInitEvent args) - { - if (TryComp(uid, out var supplier)) - component.BaseSupplyRate = supplier.MaxSupply; - } - - private void OnSupplierRefreshParts(EntityUid uid, UpgradePowerSupplierComponent component, RefreshPartsEvent args) - { - var supply = component.BaseSupplyRate; - var rating = args.PartRatings[component.MachinePartPowerSupply]; - switch (component.Scaling) - { - case MachineUpgradeScalingType.Linear: - supply += component.PowerSupplyMultiplier * component.BaseSupplyRate * (rating - 1); - break; - case MachineUpgradeScalingType.Exponential: - supply *= MathF.Pow(component.PowerSupplyMultiplier, rating - 1); - break; - default: - Log.Error($"invalid power scaling type for {ToPrettyString(uid)}."); - supply = component.BaseSupplyRate; - break; - } - - component.ActualScalar = supply / component.BaseSupplyRate; - - if (TryComp(uid, out var powa)) - powa.MaxSupply = supply; - } - - private void OnSupplierUpgradeExamine(EntityUid uid, UpgradePowerSupplierComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("upgrade-power-supply", component.ActualScalar); - } - - private void OnSupplyRampingMapInit(EntityUid uid, UpgradePowerSupplyRampingComponent component, MapInitEvent args) - { - if (TryComp(uid, out var battery)) - component.BaseRampRate = battery.SupplyRampRate; - } - - private void OnSupplyRampingRefreshParts(EntityUid uid, UpgradePowerSupplyRampingComponent component, RefreshPartsEvent args) - { - var rampRate = component.BaseRampRate; - var rating = args.PartRatings[component.MachinePartRampRate]; - switch (component.Scaling) - { - case MachineUpgradeScalingType.Linear: - rampRate += component.SupplyRampingMultiplier * component.BaseRampRate * (rating - 1); - break; - case MachineUpgradeScalingType.Exponential: - rampRate *= MathF.Pow(component.SupplyRampingMultiplier, rating - 1); - break; - default: - Log.Error($"invalid power supply ramping type for {ToPrettyString(uid)}."); - rampRate = component.BaseRampRate; - break; - } - - component.ActualScalar = rampRate / component.BaseRampRate; - - if (TryComp(uid, out var battery)) - battery.SupplyRampRate = rampRate; - } - - private void OnSupplyRampingUpgradeExamine(EntityUid uid, UpgradePowerSupplyRampingComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("upgrade-power-supply-ramping", component.ActualScalar); - } -} diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index fc6ac07340..a9ec2e642b 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -26,11 +26,8 @@ public sealed class GeneratorSystem : SharedGeneratorSystem [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly PuddleSystem _puddle = default!; - private EntityQuery _upgradeQuery; - public override void Initialize() { - _upgradeQuery = GetEntityQuery(); UpdatesBefore.Add(typeof(PowerNetSystem)); @@ -216,9 +213,7 @@ public sealed class GeneratorSystem : SharedGeneratorSystem supplier.Enabled = true; - var upgradeMultiplier = _upgradeQuery.CompOrNull(uid)?.ActualScalar ?? 1f; - - supplier.MaxSupply = gen.TargetPower * upgradeMultiplier; + supplier.MaxSupply = gen.TargetPower; var eff = 1 / CalcFuelEfficiency(gen.TargetPower, gen.OptimalPower, gen); var consumption = gen.OptimalBurnRate * frameTime * eff; diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs index d835099115..3bba9b5a7f 100644 --- a/Content.Server/Shuttles/Components/ThrusterComponent.cs +++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs @@ -1,10 +1,8 @@ using System.Numerics; using Content.Server.Shuttles.Systems; -using Content.Shared.Construction.Prototypes; using Content.Shared.Damage; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Shuttles.Components { @@ -27,9 +25,6 @@ namespace Content.Server.Shuttles.Components [ViewVariables(VVAccess.ReadWrite), DataField("thrust")] public float Thrust = 100f; - [DataField("baseThrust"), ViewVariables(VVAccess.ReadWrite)] - public float BaseThrust = 100f; - [DataField("thrusterType")] public ThrusterType Type = ThrusterType.Linear; @@ -60,12 +55,6 @@ namespace Content.Server.Shuttles.Components /// [ViewVariables(VVAccess.ReadWrite), DataField("nextFire", customTypeSerializer:typeof(TimeOffsetSerializer))] public TimeSpan NextFire; - - [DataField("machinePartThrust", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartThrust = "Capacitor"; - - [DataField("partRatingThrustMultiplier")] - public float PartRatingThrustMultiplier = 1.5f; } public enum ThrusterType diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs index 73e1ab0beb..1baffd4690 100644 --- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs @@ -52,9 +52,6 @@ public sealed class ThrusterSystem : EntitySystem SubscribeLocalEvent(OnThrusterExamine); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); - SubscribeLocalEvent(OnShuttleTileChange); } @@ -204,12 +201,10 @@ public sealed class ThrusterSystem : EntitySystem if (component.Type == ThrusterType.Linear) { oldShuttleComponent.LinearThrust[oldDirection] -= component.Thrust; - oldShuttleComponent.BaseLinearThrust[oldDirection] -= component.BaseThrust; DebugTools.Assert(oldShuttleComponent.LinearThrusters[oldDirection].Contains(uid)); oldShuttleComponent.LinearThrusters[oldDirection].Remove(uid); shuttleComponent.LinearThrust[direction] += component.Thrust; - shuttleComponent.BaseLinearThrust[direction] += component.BaseThrust; DebugTools.Assert(!shuttleComponent.LinearThrusters[direction].Contains(uid)); shuttleComponent.LinearThrusters[direction].Add(uid); } @@ -283,7 +278,6 @@ public sealed class ThrusterSystem : EntitySystem var direction = (int) xform.LocalRotation.GetCardinalDir() / 2; shuttleComponent.LinearThrust[direction] += component.Thrust; - shuttleComponent.BaseLinearThrust[direction] += component.BaseThrust; DebugTools.Assert(!shuttleComponent.LinearThrusters[direction].Contains(uid)); shuttleComponent.LinearThrusters[direction].Add(uid); @@ -382,7 +376,6 @@ public sealed class ThrusterSystem : EntitySystem var direction = (int) angle.Value.GetCardinalDir() / 2; shuttleComponent.LinearThrust[direction] -= component.Thrust; - shuttleComponent.BaseLinearThrust[direction] -= component.BaseThrust; DebugTools.Assert(shuttleComponent.LinearThrusters[direction].Contains(uid)); shuttleComponent.LinearThrusters[direction].Remove(uid); break; @@ -578,24 +571,6 @@ public sealed class ThrusterSystem : EntitySystem } } - private void OnRefreshParts(EntityUid uid, ThrusterComponent component, RefreshPartsEvent args) - { - if (component.IsOn) // safely disable thruster to prevent negative thrust - DisableThruster(uid, component); - - var thrustRating = args.PartRatings[component.MachinePartThrust]; - - component.Thrust = component.BaseThrust * MathF.Pow(component.PartRatingThrustMultiplier, thrustRating - 1); - - if (component.Enabled && CanEnable(uid, component)) - EnableThruster(uid, component); - } - - private void OnUpgradeExamine(EntityUid uid, ThrusterComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("thruster-comp-upgrade-thrust", component.Thrust / component.BaseThrust); - } - #endregion private int GetFlagIndex(DirectionFlag flag) diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index 652ca236e4..a9763b64d9 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -1,7 +1,6 @@ using System.Numerics; using System.Threading; using Content.Server.Administration.Logs; -using Content.Server.Construction; using Content.Server.DeviceLinking.Events; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; @@ -48,8 +47,6 @@ namespace Content.Server.Singularity.EntitySystems SubscribeLocalEvent(OnInteractHand); SubscribeLocalEvent>(OnGetVerb); SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnAnchorStateChanged); SubscribeLocalEvent(OnSignalReceived); } @@ -179,20 +176,6 @@ namespace Content.Server.Singularity.EntitySystems } } - private void OnRefreshParts(EntityUid uid, EmitterComponent component, RefreshPartsEvent args) - { - var fireRateRating = args.PartRatings[component.MachinePartFireRate]; - - component.FireInterval = component.BaseFireInterval * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1); - component.FireBurstDelayMin = component.BaseFireBurstDelayMin * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1); - component.FireBurstDelayMax = component.BaseFireBurstDelayMax * MathF.Pow(component.FireRateMultiplier, fireRateRating - 1); - } - - private void OnUpgradeExamine(EntityUid uid, EmitterComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("emitter-component-upgrade-fire-rate", (float) (component.BaseFireInterval.TotalSeconds / component.FireInterval.TotalSeconds)); - } - public void SwitchOff(EntityUid uid, EmitterComponent component) { component.IsOn = false; diff --git a/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs b/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs index a7a58778ef..ec16083c53 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Components/TraversalDistorterComponent.cs @@ -1,7 +1,4 @@ -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Xenoarchaeology.Equipment.Components; +namespace Content.Server.Xenoarchaeology.Equipment.Components; /// /// This is used for a machine that biases @@ -10,18 +7,6 @@ namespace Content.Server.Xenoarchaeology.Equipment.Components; [RegisterComponent] public sealed partial class TraversalDistorterComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] - public float BiasChance; - - [DataField("baseBiasChance")] - public float BaseBiasChance = 0.7f; - - [DataField("machinePartBiasChance", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartBiasChance = "Manipulator"; - - [DataField("partRatingBiasChance")] - public float PartRatingBiasChance = 1.1f; - [ViewVariables(VVAccess.ReadWrite)] public BiasDirection BiasDirection = BiasDirection.In; diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs index d313f9a25b..230e639af4 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs @@ -1,12 +1,9 @@ -using Content.Server.Construction; -using Content.Server.Popups; +using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Server.Xenoarchaeology.Equipment.Components; -using Content.Server.Xenoarchaeology.XenoArtifacts; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Placeable; -using Robust.Shared.Player; using Robust.Shared.Timing; namespace Content.Server.Xenoarchaeology.Equipment.Systems; @@ -23,8 +20,6 @@ public sealed class TraversalDistorterSystem : EntitySystem SubscribeLocalEvent(OnInteract); SubscribeLocalEvent(OnExamine); - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); SubscribeLocalEvent(OnItemPlaced); SubscribeLocalEvent(OnItemRemoved); @@ -73,22 +68,10 @@ public sealed class TraversalDistorterSystem : EntitySystem examine = Loc.GetString("traversal-distorter-desc-out"); break; } - + args.PushMarkup(examine); } - private void OnRefreshParts(EntityUid uid, TraversalDistorterComponent component, RefreshPartsEvent args) - { - var biasRating = args.PartRatings[component.MachinePartBiasChance]; - - component.BiasChance = component.BaseBiasChance * MathF.Pow(component.PartRatingBiasChance, biasRating - 1); - } - - private void OnUpgradeExamine(EntityUid uid, TraversalDistorterComponent component, UpgradeExamineEvent args) - { - args.AddPercentageUpgrade("traversal-distorter-upgrade-bias", component.BiasChance / component.BaseBiasChance); - } - private void OnItemPlaced(EntityUid uid, TraversalDistorterComponent component, ref ItemPlacedEvent args) { var bias = EnsureComp(args.OtherEntity); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs index a7948aa7ff..955fe827d7 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs @@ -206,7 +206,6 @@ public sealed partial class ArtifactSystem : EntitySystem if (TryComp(uid, out var bias) && TryComp(bias.Provider, out var trav) && - _random.Prob(trav.BiasChance) && this.IsPowered(bias.Provider, EntityManager)) { switch (trav.BiasDirection) diff --git a/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs b/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs index 911066207c..911ea41cca 100644 --- a/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs +++ b/Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Construction.Prototypes; using Content.Shared.DeviceLinking; using Robust.Shared.Audio; using Robust.Shared.GameStates; @@ -13,30 +12,12 @@ namespace Content.Shared.Cargo.Components; [RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))] public sealed partial class CargoTelepadComponent : Component { - /// - /// The base amount of time it takes to teleport from the telepad - /// - [DataField("baseDelay"), ViewVariables(VVAccess.ReadWrite)] - public float BaseDelay = 10f; - /// /// The actual amount of time it takes to teleport from the telepad /// [DataField("delay"), ViewVariables(VVAccess.ReadWrite)] public float Delay = 10f; - /// - /// The machine part that affects - /// - [DataField("machinePartTeleportDelay", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string MachinePartTeleportDelay = "Capacitor"; - - /// - /// A multiplier applied to for each level of - /// - [DataField("partRatingTeleportDelay"), ViewVariables(VVAccess.ReadWrite)] - public float PartRatingTeleportDelay = 0.8f; - /// /// How much time we've accumulated until next teleport. /// diff --git a/Content.Shared/Cloning/CloningPodComponent.cs b/Content.Shared/Cloning/CloningPodComponent.cs index 60d4c1e64e..88d587c145 100644 --- a/Content.Shared/Cloning/CloningPodComponent.cs +++ b/Content.Shared/Cloning/CloningPodComponent.cs @@ -1,11 +1,9 @@ -using Content.Shared.Construction.Prototypes; using Content.Shared.DeviceLinking; using Content.Shared.Materials; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Shared.Cloning; @@ -36,28 +34,10 @@ public sealed partial class CloningPodComponent : Component [DataField("requiredMaterial"), ViewVariables(VVAccess.ReadWrite)] public ProtoId RequiredMaterial = "Biomass"; - /// - /// The base amount of time it takes to clone a body - /// - [DataField("baseCloningTime")] - public float BaseCloningTime = 30f; - - /// - /// The multiplier for cloning duration - /// - [DataField("partRatingSpeedMultiplier")] - public float PartRatingSpeedMultiplier = 0.75f; - - /// - /// The machine part that affects cloning speed - /// - [DataField("machinePartCloningSpeed"), ViewVariables(VVAccess.ReadWrite)] - public ProtoId MachinePartCloningSpeed = "Manipulator"; - /// /// The current amount of time it takes to clone a body /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite)] public float CloningTime = 30f; /// @@ -82,25 +62,6 @@ public sealed partial class CloningPodComponent : Component Params = AudioParams.Default.WithVolume(4), }; - /// - /// The machine part that affects how much biomass is needed to clone a body. - /// - [DataField("partRatingMaterialMultiplier")] - public float PartRatingMaterialMultiplier = 0.85f; - - /// - /// The current multiplier on the body weight, which determines the - /// amount of biomass needed to clone. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float BiomassRequirementMultiplier = 1; - - /// - /// The machine part that decreases the amount of material needed for cloning - /// - [DataField("machinePartMaterialUse"), ViewVariables(VVAccess.ReadWrite)] - public ProtoId MachinePartMaterialUse = "MatterBin"; - [ViewVariables(VVAccess.ReadWrite)] public CloningPodStatus Status; diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs index 01db7fbade..1a19040b41 100644 --- a/Content.Shared/Construction/MachinePartSystem.cs +++ b/Content.Shared/Construction/MachinePartSystem.cs @@ -21,7 +21,6 @@ namespace Content.Shared.Construction { base.Initialize(); SubscribeLocalEvent(OnMachineBoardExamined); - SubscribeLocalEvent(OnMachinePartExamined); } private void OnMachineBoardExamined(EntityUid uid, MachineBoardComponent component, ExaminedEvent args) @@ -62,20 +61,6 @@ namespace Content.Shared.Construction } } - private void OnMachinePartExamined(EntityUid uid, MachinePartComponent component, ExaminedEvent args) - { - if (!args.IsInDetailsRange) - return; - - using (args.PushGroup(nameof(MachinePartComponent))) - { - args.PushMarkup(Loc.GetString("machine-part-component-on-examine-rating-text", - ("rating", component.Rating))); - args.PushMarkup(Loc.GetString("machine-part-component-on-examine-type-text", ("type", - Loc.GetString(_prototype.Index(component.PartType).Name)))); - } - } - public Dictionary GetMachineBoardMaterialCost(Entity entity, int coefficient = 1) { var (_, comp) = entity; diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs index 91bd59614a..6c625e2fa2 100644 --- a/Content.Shared/Materials/MaterialReclaimerComponent.cs +++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs @@ -1,8 +1,6 @@ -using Content.Shared.Construction.Prototypes; -using Content.Shared.Whitelist; +using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; @@ -44,13 +42,6 @@ public sealed partial class MaterialReclaimerComponent : Component [DataField] public bool ScaleProcessSpeed = true; - /// - /// How quickly it takes to consume X amount of materials per second. - /// For example, with a rate of 50, an entity with 100 total material takes 2 seconds to process. - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public float BaseMaterialProcessRate = 100f; - /// /// How quickly it takes to consume X amount of materials per second. /// For example, with a rate of 50, an entity with 100 total material takes 2 seconds to process. @@ -58,18 +49,6 @@ public sealed partial class MaterialReclaimerComponent : Component [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)] public float MaterialProcessRate = 100f; - /// - /// Machine part whose rating modifies - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public ProtoId MachinePartProcessRate = "Manipulator"; - - /// - /// How much the machine part quality affects the - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public float PartRatingProcessRateMultiplier = 1.5f; - /// /// The minimum amount fo time it can take to process an entity. /// this value supercedes the calculated one using diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs index 426b991a75..c2e7af717b 100644 --- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs +++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs @@ -1,5 +1,4 @@ using System.Threading; -using Content.Shared.Construction.Prototypes; using Content.Shared.DeviceLinking; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; @@ -53,12 +52,6 @@ public sealed partial class EmitterComponent : Component [DataField("fireInterval")] public TimeSpan FireInterval = TimeSpan.FromSeconds(2); - /// - /// The base amount of time between each shot during a burst. - /// - [DataField("baseFireInterval"), ViewVariables(VVAccess.ReadWrite)] - public TimeSpan BaseFireInterval = TimeSpan.FromSeconds(2); - /// /// The current minimum delay between bursts. /// @@ -71,33 +64,6 @@ public sealed partial class EmitterComponent : Component [DataField("fireBurstDelayMax")] public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10); - /// - /// The base minimum delay between shot bursts. - /// Used for machine part rating calculations. - /// - [DataField("baseFireBurstDelayMin")] - public TimeSpan BaseFireBurstDelayMin = TimeSpan.FromSeconds(4); - - /// - /// The base maximum delay between shot bursts. - /// Used for machine part rating calculations. - /// - [DataField("baseFireBurstDelayMax")] - public TimeSpan BaseFireBurstDelayMax = TimeSpan.FromSeconds(10); - - /// - /// The multiplier for the base delay between shot bursts as well as - /// the fire interval - /// - [DataField("fireRateMultiplier"), ViewVariables(VVAccess.ReadWrite)] - public float FireRateMultiplier = 0.8f; - - /// - /// The machine part that affects burst delay. - /// - [DataField("machinePartFireRate", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartFireRate = "Capacitor"; - /// /// The visual state that is set when the emitter is turned on /// diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl index df4cbfe20c..3a398d482e 100644 --- a/Resources/Locale/en-US/anomaly/anomaly.ftl +++ b/Resources/Locale/en-US/anomaly/anomaly.ftl @@ -3,7 +3,6 @@ anomaly-component-contact-damage = The anomaly sears off your skin! anomaly-vessel-component-anomaly-assigned = Anomaly assigned to vessel. anomaly-vessel-component-not-assigned = This vessel is not assigned to any anomaly. Try using a scanner on it. anomaly-vessel-component-assigned = This vessel is currently assigned to an anomaly. -anomaly-vessel-component-upgrade-output = point output anomaly-particles-delta = Delta particles anomaly-particles-epsilon = Epsilon particles diff --git a/Resources/Locale/en-US/atmos/gas-recycler-system.ftl b/Resources/Locale/en-US/atmos/gas-recycler-system.ftl index a72e137732..cc527adf5c 100644 --- a/Resources/Locale/en-US/atmos/gas-recycler-system.ftl +++ b/Resources/Locale/en-US/atmos/gas-recycler-system.ftl @@ -1,6 +1,3 @@ gas-recycler-reacting = It is [color=green]converting[/color] waste gases. gas-recycler-low-pressure = The input pressure is [color=darkred]too low[/color]. gas-recycler-low-temperature = The input temperature is [color=darkred]too low[/color]. - -gas-recycler-upgrade-min-temp = Minimum temperature -gas-recycler-upgrade-min-pressure = Minimum pressure diff --git a/Resources/Locale/en-US/atmos/portable-scrubber.ftl b/Resources/Locale/en-US/atmos/portable-scrubber.ftl index 8aadf076d9..c4071b4acc 100644 --- a/Resources/Locale/en-US/atmos/portable-scrubber.ftl +++ b/Resources/Locale/en-US/atmos/portable-scrubber.ftl @@ -1,4 +1 @@ portable-scrubber-fill-level = It's at about [color=yellow]{$percent}%[/color] of its maximum internal pressure. - -portable-scrubber-component-upgrade-max-pressure = max pressure -portable-scrubber-component-upgrade-transfer-rate = transfer rate diff --git a/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl b/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl index c586a594a9..84d5a5ed28 100644 --- a/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl +++ b/Resources/Locale/en-US/botany/components/seed-extractor-component.ftl @@ -2,5 +2,3 @@ seed-extractor-component-interact-message = You extract some seeds from the { THE($name) }. seed-extractor-component-no-seeds = { CAPITALIZE(THE($name)) } has no seeds! - -seed-extractor-component-upgrade-seed-yield = seed yield diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl index 1caa810f1b..b56f4730cc 100644 --- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl +++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl @@ -45,5 +45,3 @@ cargo-shuttle-console-station-unknown = Unknown cargo-shuttle-console-shuttle-not-found = Not found cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle cargo-no-shuttle = No cargo shuttle found! - -cargo-telepad-delay-upgrade = Teleport delay diff --git a/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl deleted file mode 100644 index cecf15550c..0000000000 --- a/Resources/Locale/en-US/chemistry/components/solution-heater-component.ftl +++ /dev/null @@ -1 +0,0 @@ -solution-heater-upgrade-heat = Heat strength diff --git a/Resources/Locale/en-US/construction/components/machine-part-component.ftl b/Resources/Locale/en-US/construction/components/machine-part-component.ftl deleted file mode 100644 index 2db3b92da9..0000000000 --- a/Resources/Locale/en-US/construction/components/machine-part-component.ftl +++ /dev/null @@ -1,2 +0,0 @@ -machine-part-component-on-examine-rating-text = [color=white]Rating:[/color] [color=cyan]{$rating}[/color] -machine-part-component-on-examine-type-text = [color=white]Type:[/color] [color=cyan]{$type}[/color] \ No newline at end of file diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl index 41d42a744e..8e8781fe40 100644 --- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl +++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl @@ -9,7 +9,6 @@ microwave-component-suicide-multi-head-others-message = {$victim} is trying to c microwave-component-suicide-others-message = {$victim} is trying to cook their head! microwave-component-suicide-multi-head-message = You cook your heads! microwave-component-suicide-message = You cook your head! -microwave-component-upgrade-cook-time = cook time microwave-component-interact-full = It's full. microwave-component-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the microwave! diff --git a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl index ffff7c4e6f..30af6e9872 100644 --- a/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl +++ b/Resources/Locale/en-US/kitchen/components/reagent-grinder-component.ftl @@ -4,9 +4,6 @@ reagent-grinder-bound-user-interface-instant-button = INSTANT reagent-grinder-bound-user-interface-cook-time-label = COOK TIME reagent-grinder-component-cannot-put-entity-message = You can't put this in the reagent grinder! -reagent-grinder-component-upgrade-work-time = Work time -reagent-grinder-component-upgrade-storage = Storage - grinder-menu-title = All-In-One Grinder 3000 grinder-menu-grind-button = Grind grinder-menu-juice-button = Juice diff --git a/Resources/Locale/en-US/machine/machine.ftl b/Resources/Locale/en-US/machine/machine.ftl index 458e783059..ce8873df6f 100644 --- a/Resources/Locale/en-US/machine/machine.ftl +++ b/Resources/Locale/en-US/machine/machine.ftl @@ -13,15 +13,10 @@ machine-part-name-manipulator = Manipulator machine-part-name-matter-bin = Matter Bin machine-part-name-power-cell = Power Cell -upgrade-power-draw = power draw -upgrade-max-charge = max charge -upgrade-power-supply = power supply -upgrade-power-supply-ramping = power ramp rate - two-way-lever-left = push left two-way-lever-right = push right two-way-lever-cant = can't push the lever that way! recycler-count-items = Recycled {$items} objects. -machine-already-in-use = {CAPITALIZE(THE($machine))} is already in use. \ No newline at end of file +machine-already-in-use = {CAPITALIZE(THE($machine))} is already in use. diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl index 689fca4dd7..de95753233 100644 --- a/Resources/Locale/en-US/materials/materials.ftl +++ b/Resources/Locale/en-US/materials/materials.ftl @@ -34,6 +34,3 @@ materials-raw-silver = raw silver materials-raw-plasma = raw plasma materials-raw-uranium = raw uranium materials-raw-bananium = raw bananium - -# Material Reclaimer -material-reclaimer-upgrade-process-rate = process rate diff --git a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl index 0c0b8faf59..443429c1ef 100644 --- a/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl +++ b/Resources/Locale/en-US/medical/components/biomass-reclaimer-component.ftl @@ -1,4 +1 @@ biomass-reclaimer-suicide-others = {CAPITALIZE(THE($victim))} threw themselves into the biomass reclaimer! - -biomass-reclaimer-component-upgrade-speed = speed -biomass-reclaimer-component-upgrade-biomass-yield = biomass yield diff --git a/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl b/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl index e92ac86a1e..b222d707a0 100644 --- a/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl +++ b/Resources/Locale/en-US/medical/components/cloning-pod-component.ftl @@ -1,5 +1,3 @@ cloning-pod-biomass = It currently has [color=red]{$number}[/color] units of biomass. -cloning-pod-component-upgrade-speed = cloning speed -cloning-pod-component-upgrade-biomass-requirement = biomass requirement cloning-pod-component-upgrade-emag-requirement = The card zaps something inside the cloning pod. diff --git a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl index da4dc7a384..c4b1942654 100644 --- a/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl +++ b/Resources/Locale/en-US/medical/components/medical-scanner-component.ftl @@ -2,5 +2,3 @@ medical-scanner-verb-enter = Enter medical-scanner-verb-noun-occupant = occupant - -medical-scanner-upgrade-cloning = Cloning fail chance diff --git a/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl b/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl deleted file mode 100644 index 2d8a18c263..0000000000 --- a/Resources/Locale/en-US/medical/components/stasis-bed-component.ftl +++ /dev/null @@ -1 +0,0 @@ -stasis-bed-component-upgrade-stasis = stasis effect diff --git a/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl b/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl index b2df0e079e..20a31cd8c4 100644 --- a/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl +++ b/Resources/Locale/en-US/nutrition/components/fat-extractor.ftl @@ -1,8 +1,6 @@ -fat-extractor-component-rate = extraction rate - fat-extractor-fact-1 = Fats are triglycerides made up of a combination of different building blocks; glycerol and fatty acids. fat-extractor-fact-2 = Adults should get a recommended 20-35% of their energy intake from fat. fat-extractor-fact-3 = Being overweight or obese puts you at an increased risk of chronic diseases, such as cardiovascular diseases, metabolic syndrome, type 2 diabetes, and some types of cancers. fat-extractor-fact-4 = Not all fats are bad. A certain amount of fat is an essential part of a healthy balanced diet. fat-extractor-fact-5 = Saturated fat should form no more than 11% of your daily calories. -fat-extractor-fact-6 = Unsaturated fat, that is monounsaturated fats, polyunsaturated fats, and omega-3 fatty acids, is found in plants and fish. \ No newline at end of file +fat-extractor-fact-6 = Unsaturated fat, that is monounsaturated fats, polyunsaturated fats, and omega-3 fatty acids, is found in plants and fish. diff --git a/Resources/Locale/en-US/shuttles/thruster.ftl b/Resources/Locale/en-US/shuttles/thruster.ftl index faed6e8dd2..94035811c7 100644 --- a/Resources/Locale/en-US/shuttles/thruster.ftl +++ b/Resources/Locale/en-US/shuttles/thruster.ftl @@ -3,5 +3,3 @@ thruster-comp-disabled = The thruster is turned [color=red]off[/color]. thruster-comp-nozzle-direction = The nozzle is facing [color=yellow]{$direction}[/color]. thruster-comp-nozzle-exposed = The nozzle [color=green]exposed[/color] to space. thruster-comp-nozzle-not-exposed = The nozzle [color=red]is not exposed[/color] to space. - -thruster-comp-upgrade-thrust = Thrust strength diff --git a/Resources/Locale/en-US/singularity/components/emitter-component.ftl b/Resources/Locale/en-US/singularity/components/emitter-component.ftl index 7c1b33d96b..c71b3d6bdf 100644 --- a/Resources/Locale/en-US/singularity/components/emitter-component.ftl +++ b/Resources/Locale/en-US/singularity/components/emitter-component.ftl @@ -11,8 +11,5 @@ comp-emitter-turned-off = The {$target} turns off. # Shows if the user attempts to activate the emitter while it's un-anchored. comp-emitter-not-anchored = The {$target} isn't anchored to the ground! -# Upgrades -emitter-component-upgrade-fire-rate = fire rate - emitter-component-current-type = The current selected type is: {$type}. -emitter-component-type-set = Type set to: {$type} \ No newline at end of file +emitter-component-type-set = Type set to: {$type} diff --git a/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl b/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl index af3039e864..5c9eac57a5 100644 --- a/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/traversal-distorter.ftl @@ -3,5 +3,3 @@ traversal-distorter-set-out = Traversal bias set to "out" traversal-distorter-desc-in = The affected artifact's traversal now favors moving inwards to the beginning. traversal-distorter-desc-out = The affected artifact's traversal now favors moving outwards towards more dangerous nodes. - -traversal-distorter-upgrade-bias = Bias effectiveness diff --git a/Resources/Maps/Test/test_teg.yml b/Resources/Maps/Test/test_teg.yml index 3af6704980..bbca702d00 100644 --- a/Resources/Maps/Test/test_teg.yml +++ b/Resources/Maps/Test/test_teg.yml @@ -2545,8 +2545,6 @@ entities: - ShutdownSubscribers: - 433 type: DeviceNetwork - missingComponents: - - UpgradeBattery - proto: SpawnPointChiefEngineer entities: - uid: 145 diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 4fe9a503ef..62a63c80c3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml @@ -9,9 +9,6 @@ sprite: Objects/Misc/stock_parts.rsi - type: Item size: Tiny - - type: GuideHelp - guides: - - MachineUpgrading - type: entity id: CapacitorStockPart diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml index 6c61c63435..199e2d8cba 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml @@ -10,9 +10,6 @@ - type: Item sprite: Objects/Specific/Research/rped.rsi size: Normal - - type: GuideHelp - guides: - - MachineUpgrading - type: PartExchanger - type: Storage grid: diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml index 79a17153ab..6c70cf9bca 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml @@ -34,9 +34,6 @@ - type: Wires boardName: wires-board-name-chemdispenser layoutId: ChemDispenser - - type: UpgradePowerDraw - powerDrawMultiplier: 0.75 - scaling: Exponential - type: GuideHelp guides: - Chemicals diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml index f846eea005..7fb8ec771d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml @@ -176,8 +176,8 @@ SetParticleEpsilon: AnomalousParticleEpsilon SetParticleZeta: AnomalousParticleZeta fireBurstSize: 1 - baseFireBurstDelayMin: 2 - baseFireBurstDelayMax: 6 + fireBurstDelayMin: 2 + fireBurstDelayMax: 6 - type: ApcPowerReceiver powerLoad: 100 - type: GuideHelp diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml index d37cc714e2..88169ecd67 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml @@ -52,10 +52,7 @@ noRot: false - type: ApcPowerReceiver powerLoad: 15000 - needsPower: true - - type: UpgradePowerDraw - powerDrawMultiplier: 0.80 - scaling: Exponential + needsPower: true - type: ItemPlacer whitelist: components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml index 815c3247ee..1b183661f5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml @@ -106,9 +106,6 @@ hard: False - type: Transform noRot: false - - type: UpgradePowerDraw - powerDrawMultiplier: 0.80 - scaling: Exponential - type: TraversalDistorter - type: ItemPlacer # don't limit the number of artifacts that can be biased diff --git a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml index 4ecd1c29e2..ec07294bfb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml @@ -35,6 +35,3 @@ - type: SeedExtractor - type: Machine board: SeedExtractorMachineCircuitboard - - type: UpgradePowerDraw - powerDrawMultiplier: 0.75 - scaling: Exponential diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index d1f84f5b6e..ce343892cc 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -163,9 +163,6 @@ materialWhiteList: [Plasma] - type: PortableGenerator startChance: 0.8 - - type: UpgradePowerSupplier - powerSupplyMultiplier: 1.25 - scaling: Exponential - type: GeneratorExhaustGas gasType: CarbonDioxide # 2 moles of gas for every sheet of plasma. @@ -223,9 +220,6 @@ storageLimit: 3000 materialWhiteList: [Uranium] - type: PortableGenerator - - type: UpgradePowerSupplier - powerSupplyMultiplier: 1.25 - scaling: Exponential - type: PowerMonitoringDevice group: Generator loadNodes: diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index 4a3b8e5d98..c2170a127a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -29,15 +29,10 @@ state: "smes-op1" shader: unshaded - type: Smes - - type: UpgradeBattery - maxChargeMultiplier: 2 - baseMaxCharge: 8000000 - - type: UpgradePowerSupplyRamping - scaling: Linear - supplyRampingMultiplier: 1 - type: Appearance - type: Battery startingCharge: 0 + maxCharge: 8000000 - type: ExaminableBattery - type: NodeContainer examinable: true diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 9d701564eb..94de12be18 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -17,13 +17,8 @@ shader: unshaded - state: full shader: unshaded - - type: UpgradeBattery - maxChargeMultiplier: 2 - baseMaxCharge: 2500000 - - type: UpgradePowerSupplyRamping - scaling: Linear - supplyRampingMultiplier: 1 - type: Battery + maxCharge: 2500000 startingCharge: 0 - type: ExaminableBattery - type: PointLight diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index eb299e3f3a..f87be42659 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -143,7 +143,6 @@ - type: Thruster thrusterType: Angular requireSpace: false - baseThrust: 2000 thrust: 2000 machinePartThrust: Manipulator - type: Sprite @@ -193,9 +192,6 @@ collection: MetalBreak - !type:ChangeConstructionNodeBehavior node: machineFrame - - type: UpgradePowerDraw - powerDrawMultiplier: 0.75 - scaling: Exponential - type: Damageable damageContainer: Inorganic damageModifierSet: Electronic @@ -220,7 +216,6 @@ - type: Thruster thrusterType: Angular requireSpace: false - baseThrust: 100 thrust: 100 - type: ApcPowerReceiver needsPower: false diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml index 4a7558423b..4382696df8 100644 --- a/Resources/Prototypes/Guidebook/science.yml +++ b/Resources/Prototypes/Guidebook/science.yml @@ -7,7 +7,6 @@ - AnomalousResearch - Xenoarchaeology - Robotics - - MachineUpgrading - type: guideEntry id: Technologies @@ -58,11 +57,6 @@ name: guide-entry-traversal-distorter text: "/ServerInfo/Guidebook/Science/TraversalDistorter.xml" -- type: guideEntry - id: MachineUpgrading - name: guide-entry-machine-upgrading - text: "/ServerInfo/Guidebook/Science/MachineUpgrading.xml" - - type: guideEntry id: Cyborgs name: guide-entry-cyborgs diff --git a/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml b/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml deleted file mode 100644 index b6658f6671..0000000000 --- a/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml +++ /dev/null @@ -1,28 +0,0 @@ - -# Machine Upgrading - -Machines help the station run smoothly, and as a scientist, you can help them run even better! - -## Parts -Stock Parts: - - - - - -Machine Parts can be used to create many machines. - -## Upgrading -To know if a machine can be upgraded, you can examine it and check for the [color=#a4885c]lightning bolt[/color] icon in the lower right corner. Clicking on it will allow you to see what kinds of upgrades the machine has. - -To check what parts a machine needs, you can examine its board. Try it here: - - - - - - - -You can also quickly build machines by using an RPED, loading it with machine parts, and then clicking on a machine. - -