wega-team/ss14-wega
1
0
Fork 0
mirror of https://github.com/wega-team/ss14-wega.git synced 2026-02-14 19:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

buildfixes

Browse Source
This commit is contained in:
Zekins3366
2026-01-31 15:24:36 +03:00
parent 4b6f7d13f9
commit 38be9a956c
26 changed files with 88 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/_Wega/Android/AndroidSystem.cs
View File

@@ -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()

2
Content.Server/Fluids/EntitySystems/SpraySystem.cs
View File

@@ -74,7 +74,7 @@ public sealed class SpraySystem : SharedSpraySystem
// Corvax-Wega-Surgery-start
if (args.Target != null && HasComp<ItemComponent>(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<SterileComponent>(args.Target.Value);

10
Content.Server/_Wega/BloodCult/BloodCultSystem.Runes.cs
View File

@@ -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<BloodCultObjectComponent>(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<MindContainerComponent>(target, out var mindContainer) && mindContainer.Mind != null)
_mind.TransferTo(mindContainer.Mind.Value, harvester);
_body.GibBody(target);
_gibbing.Gib(target);
}
}

5
Content.Server/_Wega/Dice/DiceOfFateSystem.cs
View File

@@ -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;
}

4
Content.Server/_Wega/GameTicking/Rules/VampireRuleSystem.cs
View File

@@ -132,8 +132,8 @@ namespace Content.Server.GameTicking.Rules
private void SetVampireComponents(EntityUid vampire, VampireComponent _)
{
if (TryComp<TemperatureComponent>(vampire, out var temperatureComponent))
temperatureComponent.ColdDamageThreshold = Atmospherics.TCMB;
if (TryComp<TemperatureDamageComponent>(vampire, out var temperature))
temperature.ColdDamageThreshold = Atmospherics.TCMB;
EnsureComp<UnholyComponent>(vampire);
EnsureComp<VampireComponent>(vampire);

4
Content.Server/_Wega/Genetics/Systems/Intermediate/ColdResistanceGenSystem.cs
View File

@@ -17,7 +17,7 @@ public sealed class ColdResistanceGenSystem : EntitySystem
private void OnInit(Entity<ColdResistanceGenComponent> ent, ref ComponentInit args)
{
if (TryComp<TemperatureComponent>(ent, out var temperature))
if (TryComp<TemperatureDamageComponent>(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<ColdResistanceGenComponent> ent, ref ComponentShutdown args)
{
if (TryComp<TemperatureComponent>(ent, out var temperature))
if (TryComp<TemperatureDamageComponent>(ent, out var temperature))
temperature.ColdDamageThreshold = ent.Comp.OldColdResistance;
if (HasComp<BarotraumaComponent>(ent) && HasComp<PressureImmunityComponent>(ent))

4
Content.Server/_Wega/Genetics/Systems/Minor/HeatResistanceGenSystem.cs
View File

@@ -22,7 +22,7 @@ public sealed class HeatResistanceGenSystem : EntitySystem
ent.Comp.RemFlammable = true;
}
if (TryComp<TemperatureComponent>(ent, out var temperature))
if (TryComp<TemperatureDamageComponent>(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<FlammableComponent>(ent);
if (TryComp<TemperatureComponent>(ent, out var temperature))
if (TryComp<TemperatureDamageComponent>(ent, out var temperature))
{
temperature.HeatDamageThreshold = temperature.HeatDamageThreshold / ent.Comp.ResistanceRatio;
}

13
Content.Server/_Wega/Implants/BatteryDrainerImplantSystem.cs
View File

@@ -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<PredictedBatteryComponent>(entity))
if (HasComp<BatteryComponent>(entity))
{
battery = entity;
break;
@@ -92,7 +90,7 @@ public sealed class BatteryDrainerImplantSystem : EntitySystem
{
if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery))
{
if (HasComp<PredictedBatteryComponent>(uid))
if (HasComp<BatteryComponent>(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<PredictedBatteryComponent>(sourceUid) || !TryComp<PredictedBatteryComponent>(targetUid, out var targetBattery))
if (!HasComp<BatteryComponent>(sourceUid) || !TryComp<BatteryComponent>(targetUid, out var targetBattery))
return;
float transfer = Math.Clamp(targetBattery.MaxCharge - _battery.GetCharge(targetUid.Value), 0f, _battery.GetCharge(sourceUid.Value));

12
Content.Shared/_Wega/Barks/BarkPrototype.cs
View File

@@ -5,27 +5,27 @@ namespace Content.Shared.Speech.Synthesis;
/// <summary>
/// Прототип для доступных барков.
/// </summary>
[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!;
/// <summary>
/// Название голоса.
/// </summary>
[DataField("name")]
public string Name { get; } = string.Empty;
public string Name { get; private set; } = string.Empty;
/// <summary>
/// Набор звуков, используемых для речи.
/// </summary>
[DataField("soundFiles", required: true)]
public List<string> SoundFiles { get; } = new();
public List<string> SoundFiles { get; private set; } = new();
/// <summary>
/// Доступен ли на старте раунда.
/// </summary>
[DataField("roundStart")]
public bool RoundStart { get; } = true;
public bool RoundStart { get; private set; } = true;
}

2
Content.Shared/_Wega/Genetics/StructuralEnzymesPrototype.cs
View File

@@ -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;

6
Content.Shared/_Wega/Pain/PainProfilePrototype.cs
View File

@@ -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<string, PainLevel> PainTypes = new();

12
Content.Shared/_Wega/Surgery/Prototypes/SurgeryGraphPrototype.cs
View File

@@ -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<ProtoId<SurgeryNodePrototype>> StartNodeIds { get; } = new();
public List<ProtoId<SurgeryNodePrototype>> StartNodeIds { get; private set; } = new();
public IEnumerable<SurgeryNodePrototype> 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<ProtoId<SurgeryTransitionPrototype>> TransitionIds { get; set; } = new();
}
[Prototype("surgeryTransition"), DataDefinition]
[Prototype, DataDefinition]
public sealed partial class SurgeryTransitionPrototype : IPrototype
{
[IdDataField]

6
Content.Shared/_Wega/Xenobiology/CellModifierPrototype.cs
View File

@@ -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<CellModifier> Modifiers = [];
public List<CellModifier> Modifiers { get; private set; } = [];
}

4
Content.Shared/_Wega/Xenobiology/CellPrototype.cs
View File

@@ -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;

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -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

3
Resources/Prototypes/_Wega/Body/Parts/animal.yml
View File

@@ -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
- Trash # i dont want you making monkeys beheaded

5
Resources/Prototypes/_Wega/Entities/Clothing/Back/specific.yml
View File

@@ -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

2
Resources/Prototypes/_Wega/Entities/Objects/Devices/secapartment.yml
View File

@@ -42,7 +42,7 @@
parent: [ SecApartmentTabletUnpowered, PowerCellSlotHighItem ]
suffix: Powered
components:
- type: PredictedBatteryVisuals
- type: BatteryVisuals
- type: PowerCellDraw
drawRate: 1.2
- type: ToggleCellDraw

4
Resources/Prototypes/_Wega/Entities/Objects/Power/powercells.yml
View File

@@ -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

2
Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml
View File

@@ -44,7 +44,7 @@
parent: [ PlantAnalyzerUnpowered, PowerCellSlotSmallItem ]
suffix: Powered
components:
- type: PredictedBatteryVisuals
- type: BatteryVisuals
- type: PowerCellDraw
drawRate: 1.2
- type: ToggleCellDraw

28
Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/hypospray.yml
View File

@@ -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

20
Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml
View File

@@ -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 ]

2
Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml
View File

@@ -40,7 +40,7 @@
parent: [ HandheldSlimeAnalyzerUnpowered, PowerCellSlotSmallItem]
suffix: Powered
components:
- type: PredictedBatteryVisuals
- type: BatteryVisuals
- type: PowerCellDraw
drawRate: 1.2
- type: ToggleCellDraw

4
Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -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

8
Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml
View File

@@ -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
energy: 1

6
Resources/Textures/Markers/jobs.rsi/meta.json
View File

@@ -208,17 +208,11 @@
{
"name": "zookeeper"
},
{
"name": "bartender"
},
{
"name": "blueshield"
},
{
"name": "postman"
},
{
"name": "geneticist"
}
]
}