From 38be9a956cbbbf747b90e7b2e0bf099c60b2fa06 Mon Sep 17 00:00:00 2001 From: Zekins3366 Date: Sat, 31 Jan 2026 15:24:36 +0300 Subject: [PATCH] buildfixes --- Content.Client/_Wega/Android/AndroidSystem.cs | 4 +-- .../Fluids/EntitySystems/SpraySystem.cs | 2 +- .../_Wega/BloodCult/BloodCultSystem.Runes.cs | 10 ++++--- Content.Server/_Wega/Dice/DiceOfFateSystem.cs | 5 ++-- .../GameTicking/Rules/VampireRuleSystem.cs | 4 +-- .../Intermediate/ColdResistanceGenSystem.cs | 4 +-- .../Systems/Minor/HeatResistanceGenSystem.cs | 4 +-- .../Implants/BatteryDrainerImplantSystem.cs | 13 +++------ Content.Shared/_Wega/Barks/BarkPrototype.cs | 12 ++++---- .../Genetics/StructuralEnzymesPrototype.cs | 2 +- .../_Wega/Pain/PainProfilePrototype.cs | 6 ++-- .../Prototypes/SurgeryGraphPrototype.cs | 12 ++++---- .../Xenobiology/CellModifierPrototype.cs | 6 ++-- .../_Wega/Xenobiology/CellPrototype.cs | 4 +-- .../Weapons/Guns/Battery/battery_guns.yml | 8 +++--- .../Prototypes/_Wega/Body/Parts/animal.yml | 3 +- .../_Wega/Entities/Clothing/Back/specific.yml | 5 ++-- .../Entities/Objects/Devices/secapartment.yml | 2 +- .../Entities/Objects/Power/powercells.yml | 4 +-- .../Specific/Hydroponics/plant_analyzer.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 28 +++++++++++-------- .../Objects/Specific/Robotics/borg_item.yml | 20 ++++++------- .../Specific/Xenobiology/slimeanalyzer.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 4 +-- .../Guns/Projectiles/plasma_cutter.yml | 8 +++--- Resources/Textures/Markers/jobs.rsi/meta.json | 6 ---- 26 files changed, 88 insertions(+), 92 deletions(-) diff --git a/Content.Client/_Wega/Android/AndroidSystem.cs b/Content.Client/_Wega/Android/AndroidSystem.cs index 192ff174c3..bc34377099 100644 --- a/Content.Client/_Wega/Android/AndroidSystem.cs +++ b/Content.Client/_Wega/Android/AndroidSystem.cs @@ -1,6 +1,6 @@ +using Content.Client.Power.EntitySystems; using Content.Shared.Alert; using Content.Shared.Android; -using Content.Shared.Power.EntitySystems; using Content.Shared.PowerCell; namespace Content.Client.Android; @@ -8,7 +8,7 @@ namespace Content.Client.Android; public sealed class AndroidSystem : SharedAndroidSystem { [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly PredictedBatterySystem _battery = default!; + [Dependency] private readonly BatterySystem _battery = default!; [Dependency] private readonly AlertsSystem _alerts = default!; public override void Initialize() diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs index dd22f65524..401cd4ab91 100644 --- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs +++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs @@ -74,7 +74,7 @@ public sealed class SpraySystem : SharedSpraySystem // Corvax-Wega-Surgery-start if (args.Target != null && HasComp(args.Target) - && _solutionContainer.TryGetSolution(entity.Owner, SprayComponent.SolutionName, out _, out var solution) + && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution) && solution.GetTotalPrototypeQuantity("Ethanol") >= FixedPoint2.New(5)) { EnsureComp(args.Target.Value); diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs index ed300add56..905b3ebc23 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs @@ -16,6 +16,7 @@ using Content.Shared.Damage; using Content.Shared.DoAfter; using Content.Shared.Examine; using Content.Shared.Ghost; +using Content.Shared.Gibbing; using Content.Shared.Humanoid; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -43,6 +44,7 @@ namespace Content.Server.Blood.Cult; public sealed partial class BloodCultSystem { [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private readonly GibbingSystem _gibbing = default!; [Dependency] private readonly IConsoleHost _consoleHost = default!; [Dependency] private readonly IMapManager _mapMan = default!; [Dependency] private readonly NavMapSystem _navMap = default!; @@ -370,7 +372,7 @@ public sealed partial class BloodCultSystem RemComp(target); } - _body.GibBody(target); + _gibbing.Gib(target); } private void ConvertToCultist(EntityUid target, EntityUid cultist, MapCoordinates coords, BloodRuneComponent runeComp) @@ -385,7 +387,7 @@ public sealed partial class BloodCultSystem SendRuneMessageToCultists(coords, 2f, runeComp.RuneType); CreateSoulStone(target); - _body.GibBody(target); + _gibbing.Gib(target); var cult = _bloodCult.GetActiveRule(); if (cult != null) cult.Offerings++; @@ -536,7 +538,7 @@ public sealed partial class BloodCultSystem return false; SendCultistMessage(cultist, runeComp.RuneType); - _body.GibBody(target); + _gibbing.Gib(target); var cult = _bloodCult.GetActiveRule(); if (cult != null) cult.Offerings++; @@ -844,7 +846,7 @@ public sealed partial class BloodCultSystem if (TryComp(target, out var mindContainer) && mindContainer.Mind != null) _mind.TransferTo(mindContainer.Mind.Value, harvester); - _body.GibBody(target); + _gibbing.Gib(target); } } diff --git a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs index 02f3fe65a1..e6b40a0e00 100644 --- a/Content.Server/_Wega/Dice/DiceOfFateSystem.cs +++ b/Content.Server/_Wega/Dice/DiceOfFateSystem.cs @@ -15,6 +15,7 @@ using Content.Shared.Database; using Content.Shared.Dice; using Content.Shared.Disease; using Content.Shared.Explosion; +using Content.Shared.Gibbing; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction.Events; @@ -39,10 +40,10 @@ public sealed class DiceOfFateSystem : EntitySystem [Dependency] private readonly SharedAccessSystem _access = default!; [Dependency] private readonly IAdminLogManager _admin = default!; [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly BodySystem _body = default!; [Dependency] private readonly DamageableSystem _damage = default!; [Dependency] private readonly SharedDiseaseSystem _disease = default!; [Dependency] private readonly ExplosionSystem _explosion = default!; + [Dependency] private readonly GibbingSystem _gibbing = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; @@ -127,7 +128,7 @@ public sealed class DiceOfFateSystem : EntitySystem private bool CompleteAnnihilation(EntityUid user) { - _body.GibBody(user, true, splatModifier: 10f); + _gibbing.Gib(user, true); return true; } diff --git a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs index 0cde823f21..9e78f0f347 100644 --- a/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs +++ b/Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs @@ -132,8 +132,8 @@ namespace Content.Server.GameTicking.Rules private void SetVampireComponents(EntityUid vampire, VampireComponent _) { - if (TryComp(vampire, out var temperatureComponent)) - temperatureComponent.ColdDamageThreshold = Atmospherics.TCMB; + if (TryComp(vampire, out var temperature)) + temperature.ColdDamageThreshold = Atmospherics.TCMB; EnsureComp(vampire); EnsureComp(vampire); diff --git a/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs index dbe66d7925..bcda752024 100644 --- a/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs @@ -17,7 +17,7 @@ public sealed class ColdResistanceGenSystem : EntitySystem private void OnInit(Entity ent, ref ComponentInit args) { - if (TryComp(ent, out var temperature)) + if (TryComp(ent, out var temperature)) { ent.Comp.OldColdResistance = temperature.ColdDamageThreshold; temperature.ColdDamageThreshold = Atmospherics.TCMB; @@ -29,7 +29,7 @@ public sealed class ColdResistanceGenSystem : EntitySystem private void OnShutdown(Entity ent, ref ComponentShutdown args) { - if (TryComp(ent, out var temperature)) + if (TryComp(ent, out var temperature)) temperature.ColdDamageThreshold = ent.Comp.OldColdResistance; if (HasComp(ent) && HasComp(ent)) diff --git a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs index c7eca99361..d834c6fcc8 100644 --- a/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs +++ b/Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs @@ -22,7 +22,7 @@ public sealed class HeatResistanceGenSystem : EntitySystem ent.Comp.RemFlammable = true; } - if (TryComp(ent, out var temperature)) + if (TryComp(ent, out var temperature)) { temperature.HeatDamageThreshold = temperature.HeatDamageThreshold * ent.Comp.ResistanceRatio; } @@ -32,7 +32,7 @@ public sealed class HeatResistanceGenSystem : EntitySystem { if (ent.Comp.RemFlammable) AddComp(ent); - if (TryComp(ent, out var temperature)) + if (TryComp(ent, out var temperature)) { temperature.HeatDamageThreshold = temperature.HeatDamageThreshold / ent.Comp.ResistanceRatio; } diff --git a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs index af9891f9c3..ea6d92a859 100644 --- a/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs +++ b/Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs @@ -4,17 +4,15 @@ using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Shared._Wega.Implants.Components; using Content.Shared.Power.Components; -using Content.Shared.Power.EntitySystems; using Content.Shared.PowerCell; using Robust.Server.Audio; -using System.Diagnostics; namespace Content.Server._Wega.Implants; public sealed class BatteryDrainerImplantSystem : EntitySystem { [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly PredictedBatterySystem _battery = default!; + [Dependency] private readonly BatterySystem _battery = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; [Dependency] private readonly ActionsSystem _actions = default!; [Dependency] private readonly AudioSystem _audio = default!; @@ -72,7 +70,7 @@ public sealed class BatteryDrainerImplantSystem : EntitySystem EntityUid? battery = null; foreach (var entity in _hands.EnumerateHeld(uid)) { - if (HasComp(entity)) + if (HasComp(entity)) { battery = entity; break; @@ -92,7 +90,7 @@ public sealed class BatteryDrainerImplantSystem : EntitySystem { if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery)) { - if (HasComp(uid)) + if (HasComp(uid)) return uid; } else @@ -109,10 +107,7 @@ public sealed class BatteryDrainerImplantSystem : EntitySystem if (sourceUid == null || targetUid == null) return; - Log.Info(_battery.GetCharge(sourceUid.Value).ToString() + "Мя"); - Log.Info(targetUid.Value.ToString() + "UwU"); - - if (!HasComp(sourceUid) || !TryComp(targetUid, out var targetBattery)) + if (!HasComp(sourceUid) || !TryComp(targetUid, out var targetBattery)) return; float transfer = Math.Clamp(targetBattery.MaxCharge - _battery.GetCharge(targetUid.Value), 0f, _battery.GetCharge(sourceUid.Value)); diff --git a/Content.Shared/_Wega/Barks/BarkPrototype.cs b/Content.Shared/_Wega/Barks/BarkPrototype.cs index e85a7a7e74..4af11d5795 100644 --- a/Content.Shared/_Wega/Barks/BarkPrototype.cs +++ b/Content.Shared/_Wega/Barks/BarkPrototype.cs @@ -5,27 +5,27 @@ namespace Content.Shared.Speech.Synthesis; /// /// Прототип для доступных барков. /// -[Prototype("bark")] -public sealed class BarkPrototype : IPrototype +[Prototype] +public sealed partial class BarkPrototype : IPrototype { [IdDataField] - public string ID { get; } = default!; + public string ID { get; private set; } = default!; /// /// Название голоса. /// [DataField("name")] - public string Name { get; } = string.Empty; + public string Name { get; private set; } = string.Empty; /// /// Набор звуков, используемых для речи. /// [DataField("soundFiles", required: true)] - public List SoundFiles { get; } = new(); + public List SoundFiles { get; private set; } = new(); /// /// Доступен ли на старте раунда. /// [DataField("roundStart")] - public bool RoundStart { get; } = true; + public bool RoundStart { get; private set; } = true; } diff --git a/Content.Shared/_Wega/Genetics/StructuralEnzymesPrototype.cs b/Content.Shared/_Wega/Genetics/StructuralEnzymesPrototype.cs index ffdb43e6c0..40c575f5f8 100644 --- a/Content.Shared/_Wega/Genetics/StructuralEnzymesPrototype.cs +++ b/Content.Shared/_Wega/Genetics/StructuralEnzymesPrototype.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization; namespace Content.Shared.Genetics; [Prototype, Access(typeof(SharedDnaModifierSystem))] -public sealed class StructuralEnzymesPrototype : IPrototype +public sealed partial class StructuralEnzymesPrototype : IPrototype { [IdDataField] public string ID { get; set; } = string.Empty; diff --git a/Content.Shared/_Wega/Pain/PainProfilePrototype.cs b/Content.Shared/_Wega/Pain/PainProfilePrototype.cs index 902e019c23..9709f50922 100644 --- a/Content.Shared/_Wega/Pain/PainProfilePrototype.cs +++ b/Content.Shared/_Wega/Pain/PainProfilePrototype.cs @@ -2,11 +2,11 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Pain; -[Prototype("painProfile")] -public sealed class PainProfilePrototype : IPrototype +[Prototype] +public sealed partial class PainProfilePrototype : IPrototype { [IdDataField] - public string ID { get; } = default!; + public string ID { get; private set; } = default!; [DataField("painTypes")] public Dictionary PainTypes = new(); diff --git a/Content.Shared/_Wega/Surgery/Prototypes/SurgeryGraphPrototype.cs b/Content.Shared/_Wega/Surgery/Prototypes/SurgeryGraphPrototype.cs index 02da34e9b4..1ba0a45b93 100644 --- a/Content.Shared/_Wega/Surgery/Prototypes/SurgeryGraphPrototype.cs +++ b/Content.Shared/_Wega/Surgery/Prototypes/SurgeryGraphPrototype.cs @@ -5,14 +5,14 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Surgery; -[Prototype("surgeryGraph")] -public sealed class SurgeryGraphPrototype : IPrototype +[Prototype] +public sealed partial class SurgeryGraphPrototype : IPrototype { [IdDataField] public string ID { get; private set; } = default!; [DataField("startNodes", required: true)] - public List> StartNodeIds { get; } = new(); + public List> StartNodeIds { get; private set; } = new(); public IEnumerable GetStartNodes() { @@ -27,7 +27,7 @@ public sealed class SurgeryGraphPrototype : IPrototype } } -[Prototype("surgeryNode"), DataDefinition] +[Prototype, DataDefinition] public sealed partial class SurgeryNodePrototype : IPrototype { [IdDataField] @@ -67,7 +67,7 @@ public sealed partial class SurgeryNodePrototype : IPrototype } } -[Prototype("surgeryPackage"), DataDefinition] +[Prototype, DataDefinition] public sealed partial class SurgeryPackagePrototype : IPrototype { [IdDataField] @@ -77,7 +77,7 @@ public sealed partial class SurgeryPackagePrototype : IPrototype public List> TransitionIds { get; set; } = new(); } -[Prototype("surgeryTransition"), DataDefinition] +[Prototype, DataDefinition] public sealed partial class SurgeryTransitionPrototype : IPrototype { [IdDataField] diff --git a/Content.Shared/_Wega/Xenobiology/CellModifierPrototype.cs b/Content.Shared/_Wega/Xenobiology/CellModifierPrototype.cs index bb7d1ce74d..e9c850d5de 100644 --- a/Content.Shared/_Wega/Xenobiology/CellModifierPrototype.cs +++ b/Content.Shared/_Wega/Xenobiology/CellModifierPrototype.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Xenobiology; [Prototype] -public sealed class CellModifierPrototype : IPrototype +public sealed partial class CellModifierPrototype : IPrototype { [IdDataField] - public string ID { get; } = string.Empty; + public string ID { get; private set; } = string.Empty; [DataField] public LocId Name; @@ -15,5 +15,5 @@ public sealed class CellModifierPrototype : IPrototype public Color Color; [DataField] - public readonly List Modifiers = []; + public List Modifiers { get; private set; } = []; } diff --git a/Content.Shared/_Wega/Xenobiology/CellPrototype.cs b/Content.Shared/_Wega/Xenobiology/CellPrototype.cs index 4b706c8559..f08756a96d 100644 --- a/Content.Shared/_Wega/Xenobiology/CellPrototype.cs +++ b/Content.Shared/_Wega/Xenobiology/CellPrototype.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Xenobiology; [Prototype] -public sealed class CellPrototype : IPrototype +public sealed partial class CellPrototype : IPrototype { [IdDataField] - public string ID { get; } = string.Empty; + public string ID { get; private set; } = string.Empty; [DataField] public LocId Name; diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index d913541783..8ce5f0ecb1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -52,7 +52,7 @@ - type: GunWieldBonus minAngle: -21 maxAngle: -32 - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 1500 # Corvax-Wega-gun-end @@ -195,7 +195,7 @@ - type: Item storedOffset: 0,-5 # Corvax-Wega-gun-start - - type: PredictedBattery + - type: Battery maxCharge: 1250 startingCharge: 1250 # Corvax-Wega-gun-end @@ -464,7 +464,7 @@ - type: GunWieldBonus minAngle: -21 maxAngle: -32 - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 1500 # Corvax-Wega-gun-end @@ -534,7 +534,7 @@ - type: GunWieldBonus minAngle: -21 maxAngle: -32 - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 1500 # Corvax-Wega-gun-end diff --git a/Resources/Prototypes/_Wega/Body/Parts/animal.yml b/Resources/Prototypes/_Wega/Body/Parts/animal.yml index 3898f9319a..4b82f8ec5f 100644 --- a/Resources/Prototypes/_Wega/Body/Parts/animal.yml +++ b/Resources/Prototypes/_Wega/Body/Parts/animal.yml @@ -9,7 +9,6 @@ - state: head - type: BodyPart partType: Head - - type: Gibbable - type: Extractable juiceSolution: reagents: @@ -19,4 +18,4 @@ Quantity: 15 - type: Tag tags: - - Trash # i dont want you making monkeys beheaded \ No newline at end of file + - Trash # i dont want you making monkeys beheaded diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Back/specific.yml index 2b91bc7031..b4299bcc93 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Back/specific.yml @@ -24,7 +24,7 @@ damageCoefficient: 0.9 - type: StaticPrice price: 100 - + - type: entity id: PouchMedical parent: PouchBase @@ -55,7 +55,6 @@ - SurgeryTool - Dropper components: - - Hypospray - Injector - Pill - HandLabeler @@ -97,7 +96,7 @@ - DoorRemote - Whistle - BalloonPopper - + - type: entity id: PouchSyndie parent: PouchBase diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Devices/secapartment.yml b/Resources/Prototypes/_Wega/Entities/Objects/Devices/secapartment.yml index 80207166a6..c465b86520 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Devices/secapartment.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Devices/secapartment.yml @@ -42,7 +42,7 @@ parent: [ SecApartmentTabletUnpowered, PowerCellSlotHighItem ] suffix: Powered components: - - type: PredictedBatteryVisuals + - type: BatteryVisuals - type: PowerCellDraw drawRate: 1.2 - type: ToggleCellDraw diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Wega/Entities/Objects/Power/powercells.yml index e3e747f85f..a8936cecc2 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Power/powercells.yml @@ -7,7 +7,7 @@ - type: Sprite sprite: _Wega/Objects/Consumable/Food/extracts.rsi state: yellow - - type: PredictedBattery + - type: Battery maxCharge: 720 startingCharge: 720 pricePerJoule: 0.15 @@ -36,7 +36,7 @@ sprite: _Wega/Objects/Power/power_cells.rsi layers: - state: superpotato - - type: PredictedBattery + - type: Battery maxCharge: 1800 startingCharge: 1800 - type: Tag diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml index 2bae79aefb..f01bcf8303 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml @@ -44,7 +44,7 @@ parent: [ PlantAnalyzerUnpowered, PowerCellSlotSmallItem ] suffix: Powered components: - - type: PredictedBatteryVisuals + - type: BatteryVisuals - type: PowerCellDraw drawRate: 1.2 - type: ToggleCellDraw diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/hypospray.yml index 1d63897172..92eecf398e 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/hypospray.yml @@ -9,6 +9,13 @@ state: hyno - type: Item sprite: /Textures/_Wega/Objects/Specific/Medical/hyno.rsi + - type: Injector + solutionName: hypospray + ignoreClosed: false + activeModeProtoId: HyposprayDynamicMode + allowedModes: + - HyposprayDynamicMode + - HyposprayInjectMode - type: SolutionContainerManager solutions: hypospray: @@ -17,9 +24,6 @@ solution: hypospray - type: ExaminableSolution solution: hypospray - - type: Hypospray - onlyAffectsMobs: false - transferAmount: 5 - type: UseDelay delay: 4.5 @@ -56,11 +60,12 @@ maxFillLevels: 1 changeColor: false emptySpriteName: stimpen_empty - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 30 - onlyAffectsMobs: false - injectOnly: true + currentTransferAmount: null + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode - type: entity name: stimpank @@ -96,11 +101,12 @@ reagents: - ReagentId: Stimulants Quantity: 30 - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 30 - onlyAffectsMobs: false - injectOnly: true + currentTransferAmount: null + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode - type: StaticPrice price: 1500 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml index 9deef9f0c5..2392daed09 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml @@ -17,7 +17,7 @@ sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi size: Large shape: - - 0,0,2,1 + - 0,0,2,1 - type: Gun fireRate: 0.5 selectedMode: SemiAuto @@ -110,13 +110,13 @@ sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi layers: - state: icon - - type: PredictedBattery + - type: Battery maxCharge: 1000 startingCharge: 1000 - type: BatteryAmmoProvider proto: BulletDisablerSmg fireCost: 62.5 - - type: PredictedBatterySelfRecharger + - type: BatterySelfRecharger autoRechargeRate: 10 autoRechargePauseTime: 40 - type: AmmoCounter @@ -153,10 +153,10 @@ - type: BatteryAmmoProvider proto: RedMediumLaser fireCost: 62.5 - - type: PredictedBattery + - type: Battery maxCharge: 1000 startingCharge: 1000 - - type: PredictedBatterySelfRecharger + - type: BatterySelfRecharger autoRechargeRate: 10 autoRechargePauseTime: 40 - type: AmmoCounter @@ -266,7 +266,7 @@ - type: entity parent: WeaponMeleeNeedle id: WeaponMeleeNeedleBorg - name: security damage stick + name: security damage stick description: A specialty weapon used in the destruction of unique syndicate morale-boosting equipment. components: - type: MeleeWeapon @@ -279,7 +279,7 @@ types: Piercing: 0 -# Common mining +# Common mining - type: entity name: pickaxe parent: BaseItem @@ -396,7 +396,7 @@ - WantedListCartridge - LogProbeCartridge -# SEC Granader +# SEC Granader - type: entity name: hand grenade gun parent: BaseStorageItem @@ -563,7 +563,7 @@ Piercing: 0.7 activeBlockModifier: coefficients: - Piercing: 1 + Piercing: 1 - type: Destructible thresholds: - trigger: @@ -590,7 +590,7 @@ min: 2 max: 2 -## Service Rare +## Service Rare - type: entity id: MicrowaveForBorg parent: [ BaseMachinePowered, SmallConstructibleMachine ] diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml index 2705b2f429..a9f00dfc3c 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml @@ -40,7 +40,7 @@ parent: [ HandheldSlimeAnalyzerUnpowered, PowerCellSlotSmallItem] suffix: Powered components: - - type: PredictedBatteryVisuals + - type: BatteryVisuals - type: PowerCellDraw drawRate: 1.2 - type: ToggleCellDraw diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 6609924110..cfb16d77dd 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -43,7 +43,7 @@ magState: disabler - type: Item heldPrefix: lethal - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 1500 - type: GenericVisualizer @@ -106,7 +106,7 @@ magState: disabler - type: Item heldPrefix: lethal - - type: PredictedBattery + - type: Battery maxCharge: 1000 startingCharge: 1000 - type: GenericVisualizer diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml index 2fc48997f1..49fac0807c 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml @@ -15,10 +15,10 @@ size: Normal shape: - 0,0,2,1 - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 1500 - - type: PredictedBatterySelfRecharger + - type: BatterySelfRecharger autoRechargeRate: 25 - type: BatteryAmmoProvider proto: BulletPlasmaCutter @@ -30,7 +30,7 @@ id: WeaponPlasmaCutterEmpty suffix: Empty components: - - type: PredictedBattery + - type: Battery maxCharge: 1500 startingCharge: 0 @@ -62,4 +62,4 @@ - type: PointLight radius: 1 color: blue - energy: 1 \ No newline at end of file + energy: 1 diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json index 323a6ee3ef..d494e8657d 100644 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -208,17 +208,11 @@ { "name": "zookeeper" }, - { - "name": "bartender" - }, { "name": "blueshield" }, { "name": "postman" - }, - { - "name": "geneticist" } ] }