From 5f1406aebab0d4398e5e3292e8cc8931ca4c3f41 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Sun, 13 Oct 2024 01:35:56 +0300 Subject: [PATCH] add: blood dagger --- .../Body/Systems/BloodstreamSystem.cs | 17 +++- .../Melee/BloodAbsorb/BloodAbsorbComponent.cs | 17 ++++ .../Melee/BloodAbsorb/BloodAbsorbSystem.cs | 71 +++++++++++++++ .../_White/Melee/Crit/CritSystem.cs | 17 +++- .../Other/BloodLust/BloodLustComponent.cs | 14 +++ .../_White/Other/BloodLust/BloodLustSystem.cs | 42 +++++++++ .../en-US/_white/store/uplink-catalog.ftl | 7 +- .../objects/weapons/melee/daggers.ftl | 7 +- .../ru-RU/_white/store/uplink-catalog.ftl | 7 +- .../Locale/ru-RU/store/uplink-catalog.ftl | 20 +---- .../_White/Catalog/uplink_catalog.yml | 24 ++++- .../Objects/Weapons/Melee/daggers.yml | 37 +++++++- .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../Melee/Daggers/blood_dagger.rsi/icon.png | Bin 0 -> 916 bytes .../Daggers/blood_dagger.rsi/inhand-left.png | Bin 0 -> 982 bytes .../Daggers/blood_dagger.rsi/inhand-right.png | Bin 0 -> 958 bytes .../Melee/Daggers/blood_dagger.rsi/meta.json | 84 ++++++++++++++++++ 20 files changed, 330 insertions(+), 34 deletions(-) create mode 100644 Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs create mode 100644 Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs create mode 100644 Content.Server/_White/Other/BloodLust/BloodLustComponent.cs create mode 100644 Content.Server/_White/Other/BloodLust/BloodLustSystem.cs rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/icon.png (100%) rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/inhand-left.png (100%) rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/inhand-right.png (100%) rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-left.png create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index b37ac5efeb..338f888b35 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -1,3 +1,4 @@ +using Content.Server._White.Other.BloodLust; using Content.Server.Body.Components; using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Chemistry.ReactionEffects; @@ -14,6 +15,7 @@ using Content.Shared.Drunk; using Content.Shared.FixedPoint; using Content.Shared.Mobs.Systems; +using Content.Shared.Movement.Systems; using Content.Shared.Popups; using Content.Shared.Rejuvenate; using Content.Shared.Speech.EntitySystems; @@ -39,6 +41,7 @@ public sealed class BloodstreamSystem : EntitySystem [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly ForensicsSystem _forensicsSystem = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; // WD public override void Initialize() { @@ -352,7 +355,7 @@ public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamCom /// /// Attempts to modify the blood level of this entity directly. /// - public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null) + public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null, bool createPuddle = true) // WD EDIT { if (!Resolve(uid, ref component, logMissing: false) || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution)) @@ -373,7 +376,7 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo tempSolution.AddSolution(newSol, _prototypeManager); - if (tempSolution.Volume > component.BleedPuddleThreshold) + if (tempSolution.Volume > component.BleedPuddleThreshold && createPuddle) // WD EDIT { // Pass some of the chemstream into the spilled blood. if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution)) @@ -406,6 +409,16 @@ public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamCompone component.BleedAmount += amount; component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount); + // WD EDIT START + if (HasComp(uid)) + { + if (component.BleedAmount == 0f) + RemComp(uid); + + _movementSpeedModifier.RefreshMovementSpeedModifiers(uid); + } + // WD EDIT END + if (component.BleedAmount == 0) _alertsSystem.ClearAlert(uid, AlertType.Bleed); else diff --git a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs new file mode 100644 index 0000000000..96c71e336d --- /dev/null +++ b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs @@ -0,0 +1,17 @@ +namespace Content.Server._White.Melee.BloodAbsorb; + +[RegisterComponent] +public sealed partial class BloodAbsorbComponent : Component +{ + [DataField] + public bool BloodLust; + + [DataField] + public int MinAbsorb = 1; + + [DataField] + public int MaxAbsorb = 20; + + [DataField] + public float AbsorbModifierOnHeavy = 0.7f; +} diff --git a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs new file mode 100644 index 0000000000..de274bfa84 --- /dev/null +++ b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs @@ -0,0 +1,71 @@ +using Content.Server._White.Melee.Crit; +using Content.Server._White.Other.BloodLust; +using Content.Server.Body.Components; +using Content.Server.Body.Systems; +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server._White.Melee.BloodAbsorb; + +public sealed class BloodAbsorbSystem : EntitySystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly BloodstreamSystem _bloodstream = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnCritHit); + SubscribeLocalEvent(OnMeleeHit); + } + + private void OnCritHit(EntityUid uid, BloodAbsorbComponent component, CritHitEvent args) + { + if(args.Targets.Count == 0 + || args.Targets[0] == args.User) + return; + + var absorbed = _random.Next(component.MinAbsorb, component.MaxAbsorb); + + if (args.Targets.Count != 1) // Heavy attack + absorbed = (int) MathF.Round(absorbed * 0.7f); + + foreach (var target in args.Targets) + { + if (!TryComp(target, out BloodstreamComponent? bloodstream)) + continue; + + var blood = bloodstream.BloodSolution; + + if (blood == null) + continue; + + var bloodLevel = blood.Value.Comp.Solution.Volume.Int(); + + if (!_bloodstream.TryModifyBloodLevel(target, -absorbed, bloodstream, false)) + continue; + + absorbed = Math.Min(absorbed, bloodLevel); + _bloodstream.TryModifyBloodLevel(args.User, absorbed); + _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index("Brute"), -absorbed)); + _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index("Burn"), -absorbed)); + _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index("Airloss"), -absorbed)); + } + } + + private void OnMeleeHit(EntityUid uid, BloodAbsorbComponent component, MeleeHitEvent args) + { + if (args.HitEntities.Count == 0 + || args.HitEntities[0] != args.User + || !component.BloodLust + || !TryComp(args.User, out BloodstreamComponent? bloodstream)) + return; + + EnsureComp(args.User); + _bloodstream.TryModifyBleedAmount(args.User, bloodstream.MaxBleedAmount, bloodstream); + } +} diff --git a/Content.Server/_White/Melee/Crit/CritSystem.cs b/Content.Server/_White/Melee/Crit/CritSystem.cs index 3ed0440d0f..816c625afc 100644 --- a/Content.Server/_White/Melee/Crit/CritSystem.cs +++ b/Content.Server/_White/Melee/Crit/CritSystem.cs @@ -20,7 +20,7 @@ public override void Initialize() SubscribeLocalEvent(HandleHit, before: new [] {typeof(MeleeBlockSystem)}); } - private void HandleHit(EntityUid uid, CritComponent component, MeleeHitEvent args) + private void HandleHit(EntityUid uid, CritComponent component, ref MeleeHitEvent args) { if (args.HitEntities.Count == 0 || !IsCriticalHit(component)) return; @@ -32,6 +32,8 @@ private void HandleHit(EntityUid uid, CritComponent component, MeleeHitEvent arg var message = Loc.GetString("melee-crit-damage", ("damage", damage)); _popup.PopupEntity(message, args.User, args.User, PopupType.MediumCaution); + + RaiseLocalEvent(uid, new CritHitEvent(args.User, args.HitEntities)); } private bool IsCriticalHit(CritComponent component) @@ -48,3 +50,16 @@ private bool IsCriticalHit(CritComponent component) return isCritical; } } + +public sealed class CritHitEvent(EntityUid user, IReadOnlyList target) +{ + /// + /// Entity who attacked with a critical attack + /// + public EntityUid User = user; + + /// + /// Entities who was attacked with a critical attack + /// + public IReadOnlyList Targets = target; +} diff --git a/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs b/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs new file mode 100644 index 0000000000..daf54999c2 --- /dev/null +++ b/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs @@ -0,0 +1,14 @@ +namespace Content.Server._White.Other.BloodLust; + +[RegisterComponent] +public sealed partial class BloodLustComponent : Component +{ + [DataField] + public float SprintModifier = 1.3f; + + [DataField] + public float WalkModifier = 1.3f; + + [DataField] + public float AttackRateModifier = 1.5f; +} diff --git a/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs new file mode 100644 index 0000000000..68dc2e4dab --- /dev/null +++ b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs @@ -0,0 +1,42 @@ +using Content.Server.Body.Components; +using Content.Shared.Movement.Systems; +using Content.Shared.Weapons.Melee.Events; + +namespace Content.Server._White.Other.BloodLust; + +public sealed class BloodLustSystem : EntitySystem +{ + public override void Initialize() + { + SubscribeLocalEvent(OnGetMeleeAttackRate); + SubscribeLocalEvent(OnRefreshMovementSpeedModifiers); + } + + private void OnGetMeleeAttackRate(EntityUid uid, BloodLustComponent component, GetMeleeAttackRateEvent args) + { + if (!TryComp(args.User, out BloodLustComponent? bloodLust)) + return; + + args.Multipliers *= GetBloodLustMultiplier(bloodLust.AttackRateModifier, GetBloodLustModifier(args.User)); + } + + private void OnRefreshMovementSpeedModifiers(EntityUid uid, BloodLustComponent component, RefreshMovementSpeedModifiersEvent args) + { + var modifier = GetBloodLustModifier(uid); + args.ModifySpeed(GetBloodLustMultiplier(component.WalkModifier, modifier), + GetBloodLustMultiplier(component.SprintModifier, modifier)); + } + + private float GetBloodLustModifier(EntityUid uid) + { + if (!TryComp(uid, out BloodstreamComponent? bloodstream) || bloodstream.MaxBleedAmount == 0f) + return 1f; + + return Math.Clamp(bloodstream.BleedAmount / bloodstream.MaxBleedAmount, 0f, 1f); + } + + private float GetBloodLustMultiplier(float multiplier, float modifier) + { + return float.Lerp(1f, multiplier, modifier); + } +} diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl index 38e64879eb..4cf8b0cb10 100644 --- a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl @@ -1,8 +1,8 @@ uplink-emp-flashlight-name = Emp Flashlight uplink-emp-flashlight-desc = A rechargeable device disguised as a flashlight designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot. -uplink-betrayal-knife-name = Betrayal dagger -uplink-betrayal-knife-desc = The betrayal dagger allows the user to teleport a short distance, and also causes significant damage when stabbed in the back. +uplink-betrayal-dagger-name = Betrayal dagger +uplink-betrayal-dagger-desc = The betrayal dagger allows the user to teleport a short distance, and also causes significant damage when stabbed in the back. uplink-betrayal-knife-name = Experimental syndicate teleporter uplink-betrayal-knife-desc = Syndicate teleporter, when used, moves 3-8 meters forward. In case of teleportation into a wall, uses emergency teleportation. Has 4 charge. @@ -18,3 +18,6 @@ uplink-implanter-desc = An advanced implant that allows you to quickly insert an uplink-smoke-implant-name = Smoke implant uplink-smoke-implant-desc = Releases a cloud of smoke when activated. + +uplink-blood-dagger-name = Blood dagger +uplink-blood-dagger-desc = A dagger of pain and blood. It has deadly accuracy, allowing you to deal critical damage and extract blood from opponents, treating the owner in proportion to the sucked blood. When absorbing the owner's blood, it briefly enhances his valuable profuse bleeding. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl index 00ceb91748..0a23c4c341 100644 --- a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl @@ -1,2 +1,5 @@ -ent-BetrayalKnife = предательский кинжал - .desc = Береги спину. \ No newline at end of file +ent-BetrayalDagger = предательский кинжал + .desc = Береги спину. + +ent-BloodDagger = кровавый кинжал + .desc = Кинжал из боли и крови. С него что-то капает... \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl index 0149d91986..4f310690d1 100644 --- a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl @@ -1,8 +1,8 @@ uplink-emp-flashlight-name = Электромагнитный фонарик uplink-emp-flashlight-desc = Замаскированное под фонарик устройство. При ударе выпускает ЭМИ, поражающий электрические устройства. -uplink-betrayal-knife-name = Предательский кинжал -uplink-betrayal-knife-desc = Предательский кинжал позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения при ударе в спину. +uplink-betrayal-dagger-name = Предательский кинжал +uplink-betrayal-dagger-desc = Предательский кинжал позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения при ударе в спину. uplink-experimental-syndicate-teleporter-name = Экспериментальный телепортер синдиката uplink-experimental-syndicate-teleporter-desc = Телепортер синдиката, при использовании перемещает на 3-8 метров вперед. В случае телепортации в стену, использует экстренную телепортацию. Имеет 4 заряда и автоматически заряжается. @@ -18,3 +18,6 @@ uplink-implanter-desc = Продвинутый имплантер, позвол uplink-smoke-implant-name = Имплант дыма uplink-smoke-implant-desc = Выпускает облако дыма при активации. + +uplink-blood-dagger-name = Кровавый кинжал +uplink-blood-dagger-desc = Кинжал из боли и крови. Обладает смертоносной точностью, позволяя наносить критический урон и извлекать кровь из противников, леча владельца пропорционально высосанной крови. При поглощении крови владельца кратковременно усиливает его ценной обильного кровотечения. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 3b73e5e10f..3017fe6914 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -440,22 +440,4 @@ uplink-hypodart-name = Гиподротик uplink-hypodart-desc = Неприметный на первый взгляд дротик с увеличенным резервуаром для химических веществ. Он вмещает в себя до 7 ед. реагентов и мгновенно впрыскивает их при попадании в цель. Изначально пуст. uplink-helmet-name = Шлем спецназа -uplink-helmet-desc = Чрезвычайно прочный шлем, обычно используемый военизированными формированиями. Он украшен гнусным рисунком в красную и черную полоску. - -uplink-ebow-name = Маленький энергетический арбалет -uplink-ebow-desc = Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия. - -uplink-blood-dagger-name = Кинжал жажды -uplink-blood-dagger-desc = Критическая жажда: Кинжал Жажды обладает смертоносной точностью. Его владелец имеет 50% шанс нанести критический урон, поражая врага в его самые уязвимые места. При ударе по себе кинжал наделит пользователя временным усилением скорости атаки и передвижения ценой обильного кровотечения. Кровавый абсорб: При каждом успешном критическом ударе, кинжал извлекает кровь из цели, восстанавливая здоровье владельцу пропорционально количеству высосанной крови. - -uplink-night-vision-name = ПНВ [Хамелеон] -uplink-night-vision-desc = Теперь ты видишь во тьме! - -uplink-thermal-vision-name = Оптический термальный сканер [Хамелеон] -uplink-thermal-vision-desc = Позволяет вам видеть существ через стены. - -uplink-betrayal-knife-name = Предательский нож -uplink-betrayal-knife-desc = Предательский нож позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения, пробивая броню противника, при ударе в спину. - -uplink-implanter-name = Имплантер -uplink-implanter-desc = Продвинутый имплантер, позволяющий быстро вкалывать и вытаскивать импланты. +uplink-helmet-desc = Чрезвычайно прочный шлем, обычно используемый военизированными формированиями. Он украшен гнусным рисунком в красную и черную полоску. \ No newline at end of file diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml index fd6b69be96..6e2de54e17 100644 --- a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml @@ -19,10 +19,10 @@ - UplinkUtility - type: listing - id: UplinkBetrayalKnife - name: uplink-betrayal-knife-name - description: uplink-betrayal-knife-desc - productEntity: BetrayalKnife + id: UplinkBetrayalDagger + name: uplink-betrayal-dagger-name + description: uplink-betrayal-dagger-desc + productEntity: BetrayalDagger cost: Telecrystal: 10 categories: @@ -81,3 +81,19 @@ Telecrystal: 2 categories: - UplinkImplants + +- type: listing + id: UplinkBloodDagger + name: uplink-blood-dagger-name + description: uplink-blood-dagger-desc + productEntity: BloodDagger + cost: + Telecrystal: 8 + categories: + - UplinkWeapons + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + saleLimit: 1 diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml index 86f111e2b5..ad34371b0a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml @@ -2,10 +2,10 @@ name: betrayal dagger description: Watch your back. parent: BaseKnife - id: BetrayalKnife + id: BetrayalDagger components: - type: Sprite - sprite: _White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi + sprite: _White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi state: icon - type: Item size: Small @@ -31,3 +31,36 @@ - type: BackStab - type: Blink blinkRate: 0.33 + +- type: entity + name: blood dagger + description: A dagger of pain and blood. Something is dripping from it... + parent: BaseKnife + id: BloodDagger + components: + - type: Sprite + sprite: _White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 135 + swingLeft: true + attackRate: 1.3 + damage: + types: + Slash: 10.5 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: Normal + - type: Clothing + sprite: _White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi + slots: + - back + - type: DisarmMalus + - type: Crit + critChance: 0.5 + critMultiplier: 2 + - type: BloodAbsorb + bloodLust: true + - type: MeleeBlock + delay: 12.1 diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/icon.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/icon.png similarity index 100% rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/icon.png rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/icon.png diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-left.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-left.png rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-left.png diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-right.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-right.png rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-right.png diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/meta.json b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/meta.json similarity index 100% rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/meta.json rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/meta.json diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4612949044e0f0e169e3962b1785bd16b3b2862f GIT binary patch literal 916 zcmV;F18e+=P)omx-v6;(0&e^*X##dP z|KUE6KQN>nQg}%f2wT|eIRkgOmPhlHbaz(wfbr}M-gA6(H4@T6?8%?!7s!Z{JmF%cyc29B!oN=?W71MU?JQZ__;Va8C(r@6%c)m z#Xo3Cj8|!7H2@E*)y{1RDTMDq1h>u*)KwUXf7F_wYz-FDB!Y#o2#|*uB17_zUKEwB z!9uEGt8pza#w;-u|KwF+&BfCY{I)DknZpdA%wYyl<}d>&bC>~?IV>OGdtmv1rR4+2 z@&RRO`G8|L!SVrZ53|h&q}-p^<{vc^w0r$x7 zn*5dzXu4_nfDTwbfHKGjq}rd?=I_-7EFX|-K7h***BbeN6#ShPAhSZL^8tW-7i4>W zfUE?y^8+;V0f74X0bB{#k;+7!1e_wbBrI7!VIaBi{8^2(vWzOGIbcd}`_rHhO ztM9jdtui}&z@hg^(P^R2%l1opI5RvFXs}>W;A8B-$=tzq!Sw7$cQ1J{mVeRvqZ!uT zyvTI0{{DL*hwM3jqW&Ib{_*)|<(9(-&3uyuPs{&%{%;Xu%Fpu;n&1ER_1dre_u}#Y zC*pM)yenCp|CevxKd~-<*{^Qa4Yo3N+m^4t`|_7?;QyuekM71#{(tjlyiG$)+_dla ztM~ud`tx)5`<=h;e767n^CEW3d8Mew@=%AX?<@bwuVXlTTkw4LqskeIOIJ6t<^Q+a|GVkW z%!e`cn*X1$J4Qcy7yI{c=e(f0c`SAdzU}P@ZGoOSh@91DW>*tG}|iZ4_@ z>H+=uH~h7}oI`fb-MG#BGZ@wue#-tXe%JO+({{h(_V4tC4os;;R&H?GbNatH!r5V`uKd?`V9;*e%`k%nPYOeIF^j@EZ=j=Zu0Qwx6W0Z) z=-um2+P@aMAfW@CFz{dTy|2F-b9?tOo@7wk#3y=F=ezWM$#pC<8)PIX@xc={( z^QZaN;D|UM^=C8FhdcNG$w4Dw|C68d_cHP1yW6bqe7>-K$~rdrJ%4}ydB^=Jz3ub= z;=kRt99V9zO;_3jAc>Em@E>!H%D(+h Tq0XMbjLP8Y>gTe~DWM4fS{lBY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e93b1a9810786eee6770cb189d922c5808c96a05 GIT binary patch literal 958 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5M?jcysy3fA0|Rq` zr;B4q#hkZu9P<`C2)Jf1nYd}DbV0+;gC0A3!;L5Lr<{x|oIR(J`3vu!#G@CcO%TeF zI^DLe?f*Ts*&gz<+)JgFzFOXB!lA&&)X~iFNTI<37xSDse@dXew}pU{QUZ0 z#;ncn5}s}2c=G)0{@tusjyVUM{IBMqW51E7wk_fK_U-SkY>O0c{PX9hxoE-;j@SB! zWW*M7J-lBXI(P4UZHReq#Se@x)>tt>^LaO*}tqIOin% zVfe-c_eX$+_~!kV|M(mmoKAjq*MN%?_9`$eCWkh({rmsu(`L?q*`?1oet!SFnIk~D zJ3i~*E2bm!w%vFju{+lGl>E<^e?nP19@fvvuR9@c9{udx_kI6Y{<+HXL+af@3;Xi* z@tNQ4k7h9)$-5T(fAh=l^8CN|KdavJSM}-gYxRYU$78wu zISuUgIi8GCzuu^Rnk>4&>@{CnUbn-)Uq3fTJLKB5*gp5?5;*Oz<2+yS&X+|`8~)h* zJjrDc)ACh3k*`}|w%q;Iuii|3U;E$kle`sc%NA20z9PQeeM+mOs6F-~RSUyUoB1$>8bg=d#Wzp$P!#)Qvy@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json new file mode 100644 index 0000000000..e5caaafc3d --- /dev/null +++ b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json @@ -0,0 +1,84 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ], + [ + 0.8, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file