From 5d55961042ee798bfd25a4f1759c4c8b41eed9e2 Mon Sep 17 00:00:00 2001 From: MartynDew Date: Sun, 7 Jun 2026 09:22:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D1=82=D0=B2=D0=B0=D1=80=20=D0=90?= =?UTF-8?q?=D0=BB=D1=8C=D1=84=D0=B0=200.2=20(#434)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lalala * Update VeilCultSystem.cs * Update antagonist.yml * nya * commit crime * Update magic.yml * Update magic.yml * Update magic.yml --- .../BloodCult/BloodCultSystem.Equipment.cs | 8 +- .../_Wega/BloodCult/BloodCultSystem.cs | 3 + .../VeilCult/VeilCultSystem.Enchantments.cs | 108 +++++++++++------- .../_Wega/VeilCult/VeilCultSystem.cs | 11 +- .../_Wega/BloodCult/BloodCultComponents.cs | 3 + .../SharedTeleportationEnchantSystem.cs | 5 +- .../_Wega/VeilCult/VeilCultComponents.cs | 12 +- .../_Wega/VeilCult/VeilCultEvents.cs | 6 +- .../prototypes/_wega/actions/veilcult.ftl | 8 +- .../entities/clothing/outerclothing/armor.ftl | 4 +- .../entities/objects/weapons/melee/magic.ftl | 3 + .../Entities/Mobs/Player/admin_ghost.yml | 1 + .../Prototypes/_Wega/Actions/veilcult.yml | 19 ++- .../_Wega/Entities/Clothing/Eyes/glasses.yml | 6 +- .../_Wega/Entities/Clothing/Hands/gloves.yml | 4 + .../_Wega/Entities/Clothing/Head/hoods.yml | 3 + .../Entities/Clothing/OuterClothing/armor.yml | 9 +- .../Entities/Clothing/OuterClothing/coats.yml | 7 +- .../Clothing/OuterClothing/enchanted.yml | 10 +- .../_Wega/Entities/Clothing/Shoes/boots.yml | 4 +- .../_Wega/Entities/Mobs/Player/veilcult.yml | 6 + .../Objects/Specific/VeilCult/slab.yml | 2 + .../Objects/Weapons/Melee/enchanted.yml | 23 +++- .../Entities/Objects/Weapons/Melee/magic.yml | 49 +++++--- .../_Wega/Guidebook/Antagonist/VeilCult.xml | 9 +- .../Melee/clock_hammer.rsi/dismantling.png | Bin 0 -> 451 bytes .../Melee/clock_hammer.rsi/equipped-BACK.png | Bin 0 -> 560 bytes .../Weapons/Melee/clock_hammer.rsi/meta.json | 11 +- .../Melee/clock_spear.rsi/equipped-BACK.png | Bin 0 -> 766 bytes .../clock_spear.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 766 bytes .../Weapons/Melee/clock_spear.rsi/meta.json | 8 ++ .../clockwork_sword.rsi/equipped-BACK.png | Bin 0 -> 567 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 567 bytes .../Melee/clockwork_sword.rsi/meta.json | 8 ++ 34 files changed, 256 insertions(+), 94 deletions(-) create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/dismantling.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/equipped-BACK.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/equipped-BACK.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-BACK.png create mode 100644 Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-SUITSTORAGE.png diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs index 8f16460100..d4b5f77ecf 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs @@ -29,7 +29,10 @@ public sealed partial class BloodCultSystem if (HasComp(args.EquipTarget) && ent.Comp.Cult == CultType.Veil) return; - + + if (HasComp(args.EquipTarget)) + return; + _transform.SetCoordinates(ent, Transform(args.EquipTarget).Coordinates); _transform.AttachToGridOrMap(ent); _throwing.TryThrow(ent, _random.NextVector2(), 1); @@ -48,6 +51,9 @@ public sealed partial class BloodCultSystem if (HasComp(args.User) && ent.Comp.Cult == CultType.Veil) return; + if (HasComp(args.User)) + return; + args.Cancelled = true; _transform.SetCoordinates(ent, Transform(args.User).Coordinates); diff --git a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs index 5a1de0746d..0ec73878c0 100644 --- a/Content.Server/_Wega/BloodCult/BloodCultSystem.cs +++ b/Content.Server/_Wega/BloodCult/BloodCultSystem.cs @@ -197,6 +197,9 @@ public sealed partial class BloodCultSystem : SharedBloodCultSystem if (HasComp(user) && entity.Comp.Cult == CultType.Veil) return; + if (HasComp(user)) + return; + _popup.PopupEntity(Loc.GetString("blood-cult-failed-attack"), user, user, PopupType.SmallCaution); var dropEvent = new DropHandItemsEvent(); diff --git a/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs b/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs index 76715da9d2..5b255c5067 100644 --- a/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs +++ b/Content.Server/_Wega/VeilCult/VeilCultSystem.Enchantments.cs @@ -62,19 +62,21 @@ public sealed partial class VeilCultSystem SubscribeLocalEvent(OnActivateCrusher); SubscribeLocalEvent(OnActivateConfusion); SubscribeLocalEvent(OnActivateKnockback); + SubscribeLocalEvent(OnActivateDismantling); SubscribeLocalEvent(OnActivateSwordsmen); SubscribeLocalEvent(OnActivateBloodShed); SubscribeLocalEvent(OnActivateHaste); SubscribeLocalEvent(OnActivateReflection); SubscribeLocalEvent(OnActivateCamouflage); SubscribeLocalEvent(OnActivateAbsorb); - SubscribeLocalEvent(OnActivateFlash); + SubscribeLocalEvent(OnActivateSmoke); SubscribeLocalEvent(OnActivateHardenPlates); SubscribeLocalEvent(OnActivateNorthStar); SubscribeLocalEvent(OnActivateRedFlame); // Enchants SubscribeLocalEvent(CrusherOnMeleeHit); + SubscribeLocalEvent(DismantlingOnMeleeHit); SubscribeLocalEvent(ConfusionOnMeleeHit); SubscribeLocalEvent(KnockbackOnMeleeHit); SubscribeLocalEvent(StunOnMeleeHit); @@ -91,7 +93,7 @@ public sealed partial class VeilCultSystem SubscribeLocalEvent(TimeStopOnUseInHand); SubscribeLocalEvent(HidingCloacksOnUseInHand); - SubscribeLocalEvent(SealWoundOnUse); + SubscribeLocalEvent(SealWoundOnUse); SubscribeLocalEvent(EnchantDoAfter); } @@ -116,12 +118,20 @@ public sealed partial class VeilCultSystem args.Handled = true; } + private void OnActivateDismantling(EntityUid uid, EnchantedComponent comp, DismantlingEnchantActionEvent args) + { + EnsureComp(uid); + args.Handled = true; + } + private void OnActivateKnockback(EntityUid uid, EnchantedComponent comp, KnockbackEnchantActionEvent args) { EnsureComp(uid, out var kb); EnsureComp(uid, out var throwOnHit); throwOnHit.Speed = kb.Speed; throwOnHit.Distance = kb.Distance; + if (TryComp(uid, out var stam)) + stam.Damage *= 2.5f; args.Handled = true; } @@ -209,7 +219,7 @@ public sealed partial class VeilCultSystem private void OnActivateCamouflage(EntityUid uid, EnchantedComponent comp, CamouflageEnchantActionEvent args) { EnsureComp(args.Performer, out var stealth); - stealth.LastVisibility = 0.2f; + stealth.LastVisibility = 0.15f; Dirty(args.Performer, stealth); Timer.Spawn(TimeSpan.FromSeconds(10), () => { @@ -221,24 +231,12 @@ public sealed partial class VeilCultSystem args.Handled = true; } - private void OnActivateFlash(EntityUid uid, EnchantedComponent comp, FlashEnchantActionEvent args) + private void OnActivateSmoke(EntityUid uid, EnchantedComponent comp, SmokeEnchantActionEvent args) { - var nearbyCultists = _entityLookup.GetEntitiesInRange(Transform(uid).Coordinates, 10f); - foreach (var cultist in nearbyCultists) - { - EnsureComp(cultist.Owner); - Timer.Spawn(TimeSpan.FromSeconds(1), () => RemComp(cultist.Owner)); - } - - var nearbyConstruct = _entityLookup.GetEntitiesInRange(Transform(uid).Coordinates, 10f); - foreach (var construct in nearbyConstruct) - { - EnsureComp(construct.Owner); - Timer.Spawn(TimeSpan.FromSeconds(1), () => RemComp(construct.Owner)); - } - - _flash.FlashArea(args.Performer, args.Performer, 10f, TimeSpan.FromSeconds(3)); - RemComp(uid); + var effect = _random.Prob(0.75f) ? "AdminInstantEffectSmoke3" : "AdminInstantEffectSmoke10"; + Spawn(effect, Transform(uid).Coordinates); + + RemComp(uid); RemComp(uid); args.Handled = true; @@ -253,9 +251,9 @@ public sealed partial class VeilCultSystem var oldPiercing = armor.Modifiers.Coefficients["Piercing"]; var oldSlash = armor.Modifiers.Coefficients["Slash"]; var oldBlunt = armor.Modifiers.Coefficients["Blunt"]; - armor.Modifiers.Coefficients["Blunt"] = 0.3f; - armor.Modifiers.Coefficients["Slash"] = 0.3f; - armor.Modifiers.Coefficients["Piercing"] = 0.4f; + armor.Modifiers.Coefficients["Blunt"] = 0.5f; + armor.Modifiers.Coefficients["Slash"] = 0.5f; + armor.Modifiers.Coefficients["Piercing"] = 0.35f; armor.Modifiers.Coefficients["Heat"] = 0.4f; Timer.Spawn(plate.Time, () => { @@ -278,7 +276,7 @@ public sealed partial class VeilCultSystem { var oldRate = weapon.AttackRate; weapon.AttackRate = enchant.AttackRate; - Timer.Spawn(TimeSpan.FromSeconds(6), () => + Timer.Spawn(TimeSpan.FromSeconds(7), () => { weapon.AttackRate = oldRate; RemComp(uid); @@ -293,7 +291,7 @@ public sealed partial class VeilCultSystem { EnsureComp(uid, out var enchant); EnsureComp(uid, out var flame); - flame.FireStacks = 1; + flame.FireStacks = 2; Timer.Spawn(enchant.Time, () => { RemComp(uid); @@ -314,6 +312,8 @@ public sealed partial class VeilCultSystem RemComp(uid); RemComp(uid); RemComp(uid); + if (TryComp(uid, out var stam)) + stam.Damage /= 2.5f; } } @@ -323,17 +323,29 @@ public sealed partial class VeilCultSystem { if (wield.Wielded && args.HitEntities != null) { - args.BonusDamage += new DamageSpecifier { DamageDict = { { "Blunt", 40 } } }; + args.BonusDamage += new DamageSpecifier { DamageDict = { { "Blunt", 30 } } }; foreach (var target in args.HitEntities) { var selectedInjury = _random.Pick(new[] { "OpenFracture", "ClosedFracture" }); _surgery.TryAddInternalDamage(target, selectedInjury); } + RemComp(uid); + RemComp(uid); + } + } + } + + private void DismantlingOnMeleeHit(EntityUid uid, DismantlingEnchantComponent comp, MeleeHitEvent args) + { + if (TryComp(uid, out var wield)) + { + if (wield.Wielded && args.HitEntities != null) + { + args.BonusDamage += new DamageSpecifier { DamageDict = { { "Structural", 800 } } }; + RemComp(uid); + RemComp(uid); } } - - RemComp(uid); - RemComp(uid); } private void ConfusionOnMeleeHit(EntityUid uid, ConfusionEnchantComponent comp, MeleeHitEvent args) @@ -378,15 +390,18 @@ public sealed partial class VeilCultSystem { foreach (var target in args.HitEntities) { - if (HasComp(target)) + if (comp.Knockout) + _stun.TryKnockdown(target, comp.StunTime, true, true, true); + else _stun.TryUpdateParalyzeDuration(target, comp.StunTime); if (comp.Mute) { - if (HasComp(target)) - continue; - EnsureComp(target); - Timer.Spawn(comp.MuteTime, () => RemComp(target)); + if (!HasComp(target)) + { + EnsureComp(target); + Timer.Spawn(comp.MuteTime, () => RemComp(target)); + } } if (comp.EmpBorgs && HasComp(target) || HasComp(target)) @@ -548,7 +563,7 @@ public sealed partial class VeilCultSystem foreach (var cultist in nearbyCultists) { EnsureComp(cultist); - Timer.Spawn(TimeSpan.FromSeconds(3), () => RemComp(cultist)); + Timer.Spawn(TimeSpan.FromSeconds(4), () => RemComp(cultist)); } Spawn("Chronofield", Transform(args.User).Coordinates); @@ -601,18 +616,23 @@ public sealed partial class VeilCultSystem } } - private void SealWoundOnUse(EntityUid uid, SealWoundsEnchantComponent comp, AfterInteractEvent args) + private void SealWoundOnUse(EntityUid uid, SealWoundsEnchantComponent comp, MeleeHitEvent args) { - if (args.Target != null && HasComp(args.Target.Value)) + if (args.HitEntities != null) { - var damage = new DamageSpecifier { DamageDict = { { "Blunt", -15 }, { "Slash", -15 }, { "Piercing", -20 }, { "Heat", -30 } } }; - _damage.TryChangeDamage(args.Target.Value, damage, true); + foreach (var target in args.HitEntities) + { + if (!HasComp(target)) + continue; + + var damage = new DamageSpecifier { DamageDict = { { "Blunt", -10 }, { "Slash", -10 }, { "Piercing", -15 }, { "Heat", -20 } } }; + _damage.TryChangeDamage(target, damage, true); - if (TryComp(args.Target.Value, out var bloodstream)) - _blood.TryModifyBleedAmount((args.Target.Value, bloodstream), -5f); - - RemComp(args.Used); - RemComp(args.Used); + if (TryComp(target, out var bloodstream)) + _blood.TryModifyBleedAmount((target, bloodstream), -5f); + } + RemComp(uid); + RemComp(uid); } } } diff --git a/Content.Server/_Wega/VeilCult/VeilCultSystem.cs b/Content.Server/_Wega/VeilCult/VeilCultSystem.cs index 0d951755bf..93aef0d1b7 100644 --- a/Content.Server/_Wega/VeilCult/VeilCultSystem.cs +++ b/Content.Server/_Wega/VeilCult/VeilCultSystem.cs @@ -91,11 +91,11 @@ public sealed partial class VeilCultSystem : SharedVeilCultSystem if (beaconComponent.NextTimeTick <= 0 && transform.Anchored) { beaconComponent.NextTimeTick = 5; - var nearbyCultists = _entityLookup.GetEntitiesInRange(transform.Coordinates, 11f) + var nearbyCultists = _entityLookup.GetEntitiesInRange(transform.Coordinates, 6f) .Where(cultist => !_mobState.IsDead(cultist)) .ToList(); - var nearbyConstruct = _entityLookup.GetEntitiesInRange(transform.Coordinates, 11f) + var nearbyConstruct = _entityLookup.GetEntitiesInRange(transform.Coordinates, 6f) .Where(cultist => !_mobState.IsDead(cultist)) .ToList(); @@ -179,7 +179,7 @@ public sealed partial class VeilCultSystem : SharedVeilCultSystem private void OnAnchor(EntityUid uid, VeilCultBeaconComponent component, AnchorAttemptEvent args) { - var beacons = _entityLookup.GetEntitiesInRange(Transform(uid).Coordinates, 20f); + var beacons = _entityLookup.GetEntitiesInRange(Transform(uid).Coordinates, 10f); if (beacons.Count > 1) { @@ -206,7 +206,7 @@ public sealed partial class VeilCultSystem : SharedVeilCultSystem private void OnInit(EntityUid uid, VeilCultBeaconComponent component, ComponentInit args) { var beacons = _entityLookup.GetEntitiesInRange( - Transform(uid).Coordinates, 20f); + Transform(uid).Coordinates, 10f); if (beacons.Count > 1) { @@ -261,9 +261,6 @@ public sealed partial class VeilCultSystem : SharedVeilCultSystem } else { - if (HasComp(target) || HasComp(target)) - continue; - if (!TryComp(target, out var mindContainer) || mindContainer.Mind == null) continue; diff --git a/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs b/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs index 36a04414a6..6a4990063c 100644 --- a/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs +++ b/Content.Shared/_Wega/BloodCult/BloodCultComponents.cs @@ -62,6 +62,9 @@ public sealed partial class CultEquipmentComponent : Component public CultType Cult = default!; } +[RegisterComponent] +public sealed partial class AllowCultEquipmentComponent : Component; + [RegisterComponent] public sealed partial class BloodDaggerComponent : Component { diff --git a/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs b/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs index cd5bcedc0d..5bc4054cf3 100644 --- a/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs +++ b/Content.Shared/_Wega/VeilCult/SharedTeleportationEnchantSystem.cs @@ -30,7 +30,10 @@ public abstract partial class SharedTeleportationEnchantSystem : EntitySystem private void Teleport(EntityUid user, NetEntity beacon, EntityUid used) { var doAfterEventArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(4), - new VeilCultTeleportDoAfterEvent(beacon), user, used) + new VeilCultTeleportDoAfterEvent() { Beacon = beacon }, + eventTarget: user, + used: used + ) { BreakOnMove = false, BreakOnDamage = true, diff --git a/Content.Shared/_Wega/VeilCult/VeilCultComponents.cs b/Content.Shared/_Wega/VeilCult/VeilCultComponents.cs index 163784bb6d..5094f52f9d 100644 --- a/Content.Shared/_Wega/VeilCult/VeilCultComponents.cs +++ b/Content.Shared/_Wega/VeilCult/VeilCultComponents.cs @@ -123,11 +123,14 @@ public sealed partial class AbsorbedByVeilComponent : Component; [RegisterComponent, NetworkedComponent] public sealed partial class StunEnchantComponent : Component { + [DataField] + public bool Knockout = false; + [DataField] public TimeSpan StunTime = TimeSpan.FromSeconds(5); [DataField] - public TimeSpan MuteTime = TimeSpan.FromSeconds(10); + public TimeSpan MuteTime = TimeSpan.FromSeconds(8); [DataField] public bool Mute = true; @@ -186,6 +189,9 @@ public sealed partial class ConfusionEnchantComponent : Component [RegisterComponent, NetworkedComponent] public sealed partial class CrusherEnchantComponent : Component; +[RegisterComponent, NetworkedComponent] +public sealed partial class DismantlingEnchantComponent : Component; + [RegisterComponent, NetworkedComponent] public sealed partial class KnockbackEnchantComponent : Component { @@ -236,7 +242,7 @@ public sealed partial class CamouflageEnchantComponent : Component; public sealed partial class AbsorbEnchantComponent : Component; [RegisterComponent, NetworkedComponent] -public sealed partial class FlashEnchantComponent : Component; +public sealed partial class SmokeEnchantComponent : Component; [RegisterComponent, NetworkedComponent] public sealed partial class HardenPlatesEnchantComponent : Component @@ -263,7 +269,7 @@ public sealed partial class RedFlameEnchantComponent : Component public sealed partial class TimeStopEnchantComponent : Component { [DataField] - public TimeSpan Time = TimeSpan.FromSeconds(5); + public TimeSpan Time = TimeSpan.FromSeconds(7); } [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs b/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs index d206f4895c..d1abbd8fd1 100644 --- a/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs +++ b/Content.Shared/_Wega/VeilCult/VeilCultEvents.cs @@ -38,6 +38,10 @@ public sealed partial class CrusherEnchantActionEvent : InstantActionEvent { } +public sealed partial class DismantlingEnchantActionEvent : InstantActionEvent +{ +} + public sealed partial class ConfusionEnchantActionEvent : InstantActionEvent { } @@ -70,7 +74,7 @@ public sealed partial class AbsorbEnchantActionEvent : InstantActionEvent { } -public sealed partial class FlashEnchantActionEvent : InstantActionEvent +public sealed partial class SmokeEnchantActionEvent : InstantActionEvent { } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/veilcult.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/veilcult.ftl index fd5237dceb..411b60c07e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/veilcult.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/actions/veilcult.ftl @@ -8,8 +8,8 @@ ent-ActionVeilCultActivateNorthStar = Активировать Зачарова .desc = Активирует зачарование "Северная Звезда". ent-ActionVeilCultActivateHardenPlates = Активировать Зачарование .desc = Активирует зачарование "Защитные Пластины". -ent-ActionVeilCultActivateFlash = Активировать Зачарование - .desc = Активирует зачарование "Вспышка". +ent-ActionVeilCultActivateSmoke = Активировать Зачарование + .desc = Активирует зачарование "Дымовая завеса". ent-ActionVeilCultActivateAbsorb = Активировать Зачарование .desc = Активирует зачарование "Поглощение". ent-ActionVeilCultActivateCamouflage = Активировать Зачарование @@ -25,4 +25,6 @@ ent-ActionVeilCultActivateSwordsmen = Активировать Зачарова ent-ActionVeilCultActivateKnockback = Активировать Зачарование .desc = Активирует зачарование "Отдача". ent-ActionVeilCultActivateConfusion = Активировать Зачарование - .desc = Активирует зачарование "Запутанность". \ No newline at end of file + .desc = Активирует зачарование "Запутанность". +ent-ActionVeilCultActivateDismantling = Активировать Зачарование + .desc = Активирует зачарование "Демонтаж". \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl index dc2c322362..ae04565bef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl @@ -35,6 +35,6 @@ ent-VeilCultBrassCuirassAbsorb = { ent-VeilCultBrassCuirass } ent-VeilCultBrassCuirassReflection = { ent-VeilCultBrassCuirass } .desc = { ent-VeilCultBrassCuirass.desc } .suffix = Отражение -ent-VeilCultBrassCuirassFlash = { ent-VeilCultBrassCuirass } +ent-VeilCultBrassCuirassSmoke = { ent-VeilCultBrassCuirass } .desc = { ent-VeilCultBrassCuirass.desc } - .suffix = Вспышка + .suffix = Дымовая завеса diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/magic.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/magic.ftl index d83f70085a..a135a21ef0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/magic.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/magic.ftl @@ -62,5 +62,8 @@ ent-WeaponClockHammerCrusher = { ent-WeaponClockHammer } ent-WeaponClockHammerKnockback = { ent-WeaponClockHammer } .desc = { ent-WeaponClockHammer.desc } .suffix = Отдача +ent-WeaponClockHammerDismantling = { ent-WeaponClockHammer } + .desc = { ent-WeaponClockHammer.desc } + .suffix = Демонтаж ent-VeilCultMidasTouch = касание Мидаса .desc = По легендам, превращает всё в золото. diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index f61a1fd6d6..c058f1f632 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -115,6 +115,7 @@ baseWalkSpeed: 30 # Corvax-End - type: AdminMindLinkListener # Corvax-Wega-MindChat + - type: AllowCultEquipment # Corvax-Wega-Cults - type: entity abstract: true diff --git a/Resources/Prototypes/_Wega/Actions/veilcult.yml b/Resources/Prototypes/_Wega/Actions/veilcult.yml index 3eac20a25f..9b99c10943 100644 --- a/Resources/Prototypes/_Wega/Actions/veilcult.yml +++ b/Resources/Prototypes/_Wega/Actions/veilcult.yml @@ -28,6 +28,21 @@ - type: LimitedCharges maxCharges: 1 +- type: entity + parent: BaseAction + id: ActionVeilCultActivateDismantling + name: Activate Enchant + description: Toggle enchant of this item. + components: + - type: Action + itemIconStyle: BigItem + priority: -20 + useDelay: 1 + - type: InstantAction + event: !type:DismantlingEnchantActionEvent + - type: LimitedCharges + maxCharges: 1 + - type: entity parent: BaseAction id: ActionVeilCultActivateConfusion @@ -150,7 +165,7 @@ - type: entity parent: BaseAction - id: ActionVeilCultActivateFlash + id: ActionVeilCultActivateSmoke name: Activate Enchant description: Toggle enchant of this item. components: @@ -159,7 +174,7 @@ priority: -20 useDelay: 1 - type: InstantAction - event: !type:FlashEnchantActionEvent + event: !type:SmokeEnchantActionEvent - type: LimitedCharges maxCharges: 1 diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml index f7d2206467..0474d84095 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Eyes/glasses.yml @@ -97,7 +97,7 @@ - type: IdentityBlocker coverage: EYES -# VeilCult +# VeilCults - type: entity parent: ClothingEyesBase id: ClothingEyesJudicialVisor @@ -118,6 +118,9 @@ coverage: EYES - type: NightVision tint: "#c242bb00" + brightness: 0.5 + luminanceThreshold: 0.05 + noiseAmount: 0.02 - type: ItemToggle soundActivate: /Audio/_Wega/Items/activate.ogg soundDeactivate: /Audio/_Wega/Items/deactivate.ogg @@ -130,7 +133,6 @@ enum.ToggleableVisuals.Layer: True: { state: "icon" } False: { state: "icon-off" } - - type: FlashImmunity - type: ShowHealthBars - type: EyeProtection - type: CultEquipment diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Hands/gloves.yml index fa9521fb75..c16b03e208 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Hands/gloves.yml @@ -221,6 +221,10 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.85 + - type: FireProtection + reduction: 0.95 + - type: TemperatureProtection + heatingCoefficient: 0.9 - type: Sprite sprite: _Wega/Clothing/Hands/clockwork_gauntlets.rsi state: icon diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml index b162e7a3e7..6276724729 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml @@ -200,6 +200,9 @@ categories: [ HideSpawnMenu ] name: clockwork robe's hood components: + - type: HideLayerClothing + slots: + - HeadTop - type: Sprite sprite: _Wega/Clothing/Head/Hoods/Coat/clockwork_hood.rsi - type: Clothing diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml index f8e4d21041..8ad55e6f21 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml @@ -286,6 +286,13 @@ Slash: 0.6 Piercing: 0.6 Heat: 0.55 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: FireProtection + reduction: 0.65 + - type: TemperatureProtection + heatingCoefficient: 0.6 + coolingCoefficient: 0.8 - type: GroupExamine - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetClockworkCuirass @@ -296,4 +303,4 @@ - VeilCultBrassCuirassHardenPlates - VeilCultBrassCuirassReflection - VeilCultBrassCuirassAbsorb - - VeilCultBrassCuirassFlash + - VeilCultBrassCuirassSmoke diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/coats.yml index 7ccc01be8b..8c98f884f7 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/coats.yml @@ -237,7 +237,12 @@ Piercing: 0.7 Heat: 0.7 - type: ExplosionResistance - damageCoefficient: 0.9 + damageCoefficient: 0.8 + - type: FireProtection + reduction: 0.75 + - type: TemperatureProtection + heatingCoefficient: 0.7 + coolingCoefficient: 0.7 - type: Enchantable enchants: - ClothingOuterVeilCultRobesCamouflage diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/enchanted.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/enchanted.yml index 0dd532db36..036903d640 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/enchanted.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/enchanted.yml @@ -48,8 +48,8 @@ - type: entity parent: VeilCultBrassCuirass - id: VeilCultBrassCuirassFlash - suffix: Flash + id: VeilCultBrassCuirassSmoke + suffix: Smoke components: - type: Sprite sprite: _Wega/Clothing/OuterClothing/Armor/cuirass.rsi @@ -59,13 +59,13 @@ shader: unshaded visible: true - type: Enchanted - - type: FlashEnchant + - type: SmokeEnchant - type: ActionGrant actions: - - ActionVeilCultActivateFlash + - ActionVeilCultActivateSmoke - type: ItemActionGrant actions: - - ActionVeilCultActivateFlash + - ActionVeilCultActivateSmoke activeIfWorn: true - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/boots.yml index 7c50b70a56..6c706995a3 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Shoes/boots.yml @@ -37,8 +37,8 @@ sprite: _Wega/Clothing/Shoes/Boots/clockwork_treads.rsi # equipSound: /Audio/Mecha/mechmove03.ogg FOR FUTURE SOUNDS # unequipSound: /Audio/Mecha/mechmove03.ogg FOR FUTURE SOUNDS - equipDelay: 3 - unequipDelay: 3 + equipDelay: 1.5 + unequipDelay: 1.5 - type: ClothingSlowOnDamageModifier modifier: 0.35 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml index 734d375168..a57672f3ed 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/veilcult.yml @@ -104,6 +104,12 @@ - type: MovementSpeedModifier baseWalkSpeed : 2.5 baseSprintSpeed : 5 + - type: MeleeWeapon + damage: + types: + Piercing: 5 + - type: StaminaDamageOnHit + damage: 15 - type: Damageable damageModifierSet: Metallic - type: Injurable diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/VeilCult/slab.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/VeilCult/slab.yml index 7ed7252166..8ffa3c3564 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/VeilCult/slab.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/VeilCult/slab.yml @@ -47,6 +47,8 @@ visible: true - type: Enchanted - type: StunEnchant + knockout: true + stunTime: 4 - type: entity id: VeilCultClockworkSlabTeleportation diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/enchanted.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/enchanted.yml index 81ffde3096..385d3f0352 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/enchanted.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/enchanted.yml @@ -125,6 +125,27 @@ - ActionVeilCultActivateCrusher activeIfWorn: false +- type: entity + id: WeaponClockHammerDismantling + parent: WeaponClockHammer + suffix: Dismantling + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Melee/clock_hammer.rsi + layers: + - state: icon + - state: dismantling + shader: unshaded + visible: true + - type: Enchanted + - type: ActionGrant + actions: + - ActionVeilCultActivateDismantling + - type: ItemActionGrant + actions: + - ActionVeilCultActivateDismantling + activeIfWorn: false + # GLOVES - type: entity @@ -187,4 +208,4 @@ - type: StunEnchant mute: false empBorgs: false - stunTime: 3 \ No newline at end of file + stunTime: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml index eca0f0f1ac..78536cd7c8 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/magic.yml @@ -593,6 +593,8 @@ - 0,0,0,2 - type: CultWeapon cult: Veil + - type: CultEquipment + cult: Veil - type: MeleeWeapon wideAnimationRotation: -135 # resistanceBypassPercentage: 0.1 # for future @@ -618,6 +620,11 @@ - type: Sprite sprite: _Wega/Objects/Weapons/Melee/clockwork_sword.rsi state: icon + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: Item storedRotation: -45 size: Normal @@ -629,7 +636,7 @@ attackRate: 1 damage: types: - Slash: 20 + Slash: 25 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: DisarmMalus @@ -643,15 +650,21 @@ - type: Sprite sprite: _Wega/Objects/Weapons/Melee/clock_hammer.rsi state: icon + - type: Clothing + quickEquip: false + slots: + - back - type: Item storedRotation: -45 size: Large - type: CultWeapon cult: Veil + - type: CultEquipment + cult: Veil - type: MeleeWeapon # resistanceBypassPercentage: 0.4 #for future wideAnimationRotation: -135 - attackRate: 0.7 + attackRate: 0.8 damage: types: Blunt: 10 @@ -661,27 +674,28 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 15 - Structural: 40 + Blunt: 20 + Structural: 50 - type: Reflect - reflectProb: 0.2 + reflectProb: 0.15 spread: 90 - type: DamageOtherOnHit damage: types: - Blunt: 25 + Blunt: 15 - type: StaminaDamageOnHit damage: 25 - type: StaminaDamageOnCollide - damage: 25 + damage: 15 - type: HeldSpeedModifier - walkModifier: 0.8 - sprintModifier: 0.8 + walkModifier: 0.9 + sprintModifier: 0.85 - type: Wieldable - type: Enchantable enchants: - WeaponClockHammerKnockback - WeaponClockHammerCrusher + - WeaponClockHammerDismantling - type: entity parent: BaseEnchantable @@ -713,19 +727,28 @@ - type: Clothing quickEquip: false slots: + - back + - suitStorage - belt - type: Item size: Normal shape: - - 0,0,0,3 + - 0,0,0,4 # Теперь нельзя носить в сумке. - type: Wieldable - type: CultWeapon cult: Veil + - type: CultEquipment + cult: Veil + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + offset: -0.15,0.0 + removalTime: 3 - type: MeleeWeapon + wideAnimationRotation: -135 range: 2 damage: types: - Piercing: 15 + Piercing: 10 angle: 0 animation: WeaponArcThrust soundHit: @@ -734,11 +757,11 @@ # resistanceBypassPercentage: 0.4 # for future damage: types: - Piercing: 50 + Piercing: 35 - type: IncreaseDamageOnWield damage: types: - Piercing: 10 + Piercing: 15 - type: Enchantable enchants: - WeaponRatvarianSpearElectricalTouch diff --git a/Resources/ServerInfo/_Wega/Guidebook/Antagonist/VeilCult.xml b/Resources/ServerInfo/_Wega/Guidebook/Antagonist/VeilCult.xml index 9222f74655..b5aea84696 100644 --- a/Resources/ServerInfo/_Wega/Guidebook/Antagonist/VeilCult.xml +++ b/Resources/ServerInfo/_Wega/Guidebook/Antagonist/VeilCult.xml @@ -52,7 +52,7 @@ При нажатии на дверь, стеклянную дверь или шкаф открывает их, снимая доступы, действует как ЕМАГ. Работает через удар на ЛКМ. - [bold]Излечивание:[/bold] - Позволяет лечить собратьев-Праведников, себя и конструктов Ратвара. Работает через взаймодействие. + Позволяет лечить собратьев-Праведников, себя и конструктов Ратвара. Работает через удар. - [bold]Сокрытие шестерней:[/bold] Маскирует постройки праведников, делая их невидимыми. Работает через использование в руках. Имеет 2 заряда @@ -65,6 +65,9 @@ - [bold]Крушитель:[/bold] После удара (необходимо держать молот в обеих руках) гарантированно останется перелом. Также повышает урон при ударе на 40 единиц. + + - [bold]Демонтаж:[/bold] + При ударе (необходимо держать молот в обеих руках) структурный урон молота повышается на 800 единиц, работает 1 раз. - [bold]Отдача:[/bold] После удара (необходимо держать молот в обеих руках) отбросит противника на небольшое расстояние. Работает несколько раз. @@ -90,8 +93,8 @@ - [bold]Защитные пластины:[/bold] Укрепляет пластины у Кирасы на 12 секунд, повышая её защиту по всем показателям. - - [bold]Вспышка:[/bold] - Испускает белое свечение, что ослепляет заблудших. Не действует на праведников и боргов. + - [bold]Дымовая завеса:[/bold] + При использовании создаётся дымка (75% - на 3 секунды, 25% - на 10.). - [bold]Северная Звезда:[/bold] После активации наделяет перчатки эффектом Кулака Полярной Звезды, троекратно повышая скорость атаки кулаками/когтями. Эффект длится 6 секунд. diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/dismantling.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/dismantling.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8781e201ffc74a6431b8abbfc3d11b35961220 GIT binary patch literal 451 zcmV;!0X+VRP)Px$eMv+?R9J=Wl`(FEFc^g&rK447SB8ocIL9cFx?~_#r0$>|fHUL(Q8+*qRUWcb zGP#D=E=;InLxj3T?hv^R2tpf&bm3bp3+(s&Z2ty&P6!{{QcNHLKujR{*p_W$E>0=x zm}_JfO~eE;vuNU&>(=qw2CAaP)m=dsFjU*Q0lI+U%i&VLXU zKMyGf02aq3!D_#b)`$+VA3Ff})2XjB-_a&i0!^?uW@aALrw*w8Ey#sOHY+=@#??YXP^#sCe-cVA?2!ARZU!WVZix(^D-cDa`Dqzbk}Ze0PSyt7RS7b zJtb6p&-X;`_q(9681RtJwuLb=iChln;;AbGCDck^9|!Me5v+rUbaqa?QXzU7UCV7@ tjQ-8Q!}7y0iCmu3K#49-drwbK6JG)%%}YO2$(aBE002ovPDHLkV1hh}!#Dr{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/equipped-BACK.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_hammer.rsi/equipped-BACK.png new file mode 100644 index 0000000000000000000000000000000000000000..265e314f797a54a47dd2f40e948dbb1a938767e4 GIT binary patch literal 560 zcmV-00?+-4P)Px$>PbXFRCt{2+AmMTP!Is{D+v`WS?fq@P%o3qR84(9Ks|DZF zO(6|Es~3TiPD2kDv#FUN$|6>}NPmqV`3@T0DAkj9$ESqpyIKZ^n|ya3`dX2ES;VO8 zp^SV7+gBkCJQS$8tkr9_8D_B*^BF2a64mRs8 zi1`F=uAkxQ^&L)6j^XO@&A#}%kChCoWq^_IU=p~y<8S=GzmJLqpmFIs$V}e8BlL?T zaPj=&4DRa&>Z*au+n2qHUkWRaJ!6b9#u#IaF~$y)?d9>dF|iKn4_t9}htWBPdr0RLBeTS^vl>tWm3-l?A7&q&!jG^|Ewa0RRf1iLn z6XyEzY_QL}KiZIoj>_1w=T=p9mP%FazTFjKv@vQ3RgDWjwZ_OGPx%xJg7oRCt{2n!Re{KoG}g4=k{YNYxn@e8rKF^0-Qk$^(@tl-E$1>K-AbU&ATV z3U|52l@M12gCPzW>?#h#fwWXY+}LJj_OH?G><56ufkK|e%tk+7 zFpb#=ngH`+racStEN0k#&;&TUn38!h!!jpiUd-UzkMDr#2lW-Wn?7Nhd&79NLid9z zz_idS006+v=r5`tQ~`dSf5kLcX&=)M!7>yDg!OwJxLUlR*({S#kI_LF7WdC+ev~sH z4Sit+{`0^H9dscI2#W%OIvYd*VQJ{I20L#r5($N3U&-LX=Eqw?8yo#{zFbW9E zvzX})f)Bd<5UL)EcDN9A2C(m|{2&@5&*EA{NJF3T&-LZWE*p#xL3buZ0oi36A3Xmp z4SiPETI5}HiogfV>p*$H#)zO(fP{LxbQk&gh;Q`OV1E0EZ4v+g`n?X&L3h^!(2_0c==_sm3TR06&{I9o72- z(gN_!NE=XzRa$`j_7U}FhA!sCOlfCYT7Z79qx}X526xjZ==VC(|8M;)AVoqw#!qJW zcP4C4^KJ6|b3#$9DDYF+asW*pr4BL(k{cCNEM=KCL7%j1yQ1wNWZ;JqEiuJQD zhovz!14OtCa2bHy2LR~52#txBSZ%tPpc1Qe24Ejc>jXVkQ#-*b&^tjJkE79Jb~WIW w)&OY%7WdB|3Z@BEVwD!araE9#td6Gn2iM|sd!`D-LjV8(07*qoM6N<$f;YTYZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..7eeb051059b51da452da6a603d3762deece93a0e GIT binary patch literal 766 zcmVPx%xJg7oRCt{2n!Re{KoG}g4=k{YNYxn@e8rKF^0-Qk$^(@tl-E$1>K-AbU&ATV z3U|52l@M12gCPzW>?#h#fwWXY+}LJj_OH?G><56ufkK|e%tk+7 zFpb#=ngH`+racStEN0k#&;&TUn38!h!!jpiUd-UzkMDr#2lW-Wn?7Nhd&79NLid9z zz_idS006+v=r5`tQ~`dSf5kLcX&=)M!7>yDg!OwJxLUlR*({S#kI_LF7WdC+ev~sH z4Sit+{`0^H9dscI2#W%OIvYd*VQJ{I20L#r5($N3U&-LX=Eqw?8yo#{zFbW9E zvzX})f)Bd<5UL)EcDN9A2C(m|{2&@5&*EA{NJF3T&-LZWE*p#xL3buZ0oi36A3Xmp z4SiPETI5}HiogfV>p*$H#)zO(fP{LxbQk&gh;Q`OV1E0EZ4v+g`n?X&L3h^!(2_0c==_sm3TR06&{I9o72- z(gN_!NE=XzRa$`j_7U}FhA!sCOlfCYT7Z79qx}X526xjZ==VC(|8M;)AVoqw#!qJW zcP4C4^KJ6|b3#$9DDYF+asW*pr4BL(k{cCNEM=KCL7%j1yQ1wNWZ;JqEiuJQD zhovz!14OtCa2bHy2LR~52#txBSZ%tPpc1Qe24Ejc>jXVkQ#-*b&^tjJkE79Jb~WIW w)&OY%7WdB|3Z@BEVwD!araE9#td6Gn2iM|sd!`D-LjV8(07*qoM6N<$f;YTYZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/meta.json index 2b2f848df9..a237ec9f70 100644 --- a/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Weapons/Melee/clock_spear.rsi/meta.json @@ -14,6 +14,14 @@ "name": "equipped-BELT", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-BACK", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-BACK.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-BACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5b4ee134ee873dc57eaadd505ceedffa86dc1589 GIT binary patch literal 567 zcmV-70?7S|P)Px$@kvBMRCt{2+P`bUKoke?ccr)pjYDy`!9fTeL#Hf47r~|ApnpTQxb?4aOE>?A z4zA8!I{61=EM#tnQt0wJln1963`n^N@YV zatw)A;y+6o2lfu;fW#?rpG8J8jRU@vDp<}#mgEnK`Fh`n*m5{~(uU8`{=Pp(E%x{xQXiV}h0+{F)o3G75sQcWd%C1Syrt*2PgT5s)BW8Ig;Be$xd`g@^!2Ml6=*9ysQTR00000 z00030j@5RvBi38`$F!S$Gh6yr4rtzfzJw|;<2>XhX=P(%wkVX8(s0^6=%6l{U7{?} zJe+ok=&$@|i^A^n0ZmHYOxk?kYmBZg5u44KlY4`{q;bGu)F$iYZG(%(L}M3X*AGcF zim!&LQ)Q*+ygltpSu^s|li&NGWR>lwLjV8(0000k#V?i=4+ZQ!n{WUC002ovPDHLk FV1f|j3UvSg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..5b4ee134ee873dc57eaadd505ceedffa86dc1589 GIT binary patch literal 567 zcmV-70?7S|P)Px$@kvBMRCt{2+P`bUKoke?ccr)pjYDy`!9fTeL#Hf47r~|ApnpTQxb?4aOE>?A z4zA8!I{61=EM#tnQt0wJln1963`n^N@YV zatw)A;y+6o2lfu;fW#?rpG8J8jRU@vDp<}#mgEnK`Fh`n*m5{~(uU8`{=Pp(E%x{xQXiV}h0+{F)o3G75sQcWd%C1Syrt*2PgT5s)BW8Ig;Be$xd`g@^!2Ml6=*9ysQTR00000 z00030j@5RvBi38`$F!S$Gh6yr4rtzfzJw|;<2>XhX=P(%wkVX8(s0^6=%6l{U7{?} zJe+ok=&$@|i^A^n0ZmHYOxk?kYmBZg5u44KlY4`{q;bGu)F$iYZG(%(L}M3X*AGcF zim!&LQ)Q*+ygltpSu^s|li&NGWR>lwLjV8(0000k#V?i=4+ZQ!n{WUC002ovPDHLk FV1f|j3UvSg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/meta.json index 085bc37889..a4ad080808 100644 --- a/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Weapons/Melee/clockwork_sword.rsi/meta.json @@ -14,6 +14,14 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-BACK", + "directions": 4 + }, { "name": "inhand-right", "directions": 4