diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs index 891a1a0181..e0bb0de0f5 100644 --- a/Content.Client/Outline/InteractionOutlineSystem.cs +++ b/Content.Client/Outline/InteractionOutlineSystem.cs @@ -141,19 +141,25 @@ public sealed class InteractionOutlineSystem : EntitySystem var inRange = false; if (localPlayer.ControlledEntity != null && !Deleted(entityToClick)) { - inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, entityToClick.Value); - // WD START if (_combatMode.IsInCombatMode(localPlayer.ControlledEntity) && (_meleeWeapon.TryGetWeapon(localPlayer.ControlledEntity.Value, out _, out var weapon) || TryComp(localPlayer.ControlledEntity, out weapon))) { + inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, + entityToClick.Value, weapon.Range); + var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); var userPos = Transform(localPlayer.ControlledEntity.Value).MapPosition; if (mousePos.MapId != userPos.MapId || (userPos.Position - mousePos.Position).Length() > weapon.Range) inRange = false; - } // WD END + } + else + { + inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, entityToClick.Value); + } + // WD END } InteractionOutlineComponent? outline; diff --git a/Content.Client/_White/Chaplain/ArmamentsBeaconBui.cs b/Content.Client/_White/Chaplain/ArmamentsBeaconBui.cs new file mode 100644 index 0000000000..c2c78986a1 --- /dev/null +++ b/Content.Client/_White/Chaplain/ArmamentsBeaconBui.cs @@ -0,0 +1,66 @@ +using Content.Client._White.UserInterface.Radial; +using Content.Shared._White.Chaplain; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Shared.Prototypes; + +namespace Content.Client._White.Chaplain; + +[UsedImplicitly] +public sealed class ArmamentsBeaconBui : BoundUserInterface +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + private SpriteSystem _spriteSystem = default!; + + private bool _selected; + private RadialContainer? _armorSelector; + + public ArmamentsBeaconBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + + _spriteSystem = _entityManager.EntitySysManager.GetEntitySystem(); + var beacon = _entityManager.GetComponent(Owner); + + _armorSelector = new RadialContainer(); + + _armorSelector.Closed += () => + { + if (_selected) + return; + + SendMessage(new ArmorSelectedEvent(-1)); + Close(); + }; + + for (var i = 0; i < beacon.Armor.Count; i++) + { + var armorPrototype = _prototypeManager.Index(beacon.Armor[i]); + var button = _armorSelector.AddButton(armorPrototype.Name, + _spriteSystem.GetPrototypeIcon(armorPrototype).Default); + + var index = i; + button.Controller.OnPressed += _ => + { + _selected = true; + SendMessage(new ArmorSelectedEvent(index)); + _armorSelector.Close(); + Close(); + }; + } + + _armorSelector.OpenAttachedLocalPlayer(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _armorSelector?.Close(); + } +} diff --git a/Content.Client/_White/Chaplain/NullRodBui.cs b/Content.Client/_White/Chaplain/NullRodBui.cs new file mode 100644 index 0000000000..73bbd13d7f --- /dev/null +++ b/Content.Client/_White/Chaplain/NullRodBui.cs @@ -0,0 +1,65 @@ +using Content.Client._White.UserInterface.Radial; +using Content.Shared._White.Chaplain; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Shared.Prototypes; + +namespace Content.Client._White.Chaplain; + +[UsedImplicitly] +public sealed class NullRodBui : BoundUserInterface +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + private SpriteSystem _spriteSystem = default!; + + private bool _selected; + private RadialContainer? _weaponSelector; + + public NullRodBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + + _spriteSystem = _entityManager.EntitySysManager.GetEntitySystem(); + var nullRod = _entityManager.GetComponent(Owner); + + _weaponSelector = new RadialContainer(); + + _weaponSelector.Closed += () => + { + if (_selected) + return; + + SendMessage(new WeaponSelectedEvent(string.Empty)); + Close(); + }; + + foreach (var weapon in nullRod.Weapons) + { + var weaponPrototype = _prototypeManager.Index(weapon); + var button = _weaponSelector.AddButton(weaponPrototype.Name, + _spriteSystem.GetPrototypeIcon(weaponPrototype).Default); + + button.Controller.OnPressed += _ => + { + _selected = true; + SendMessage(new WeaponSelectedEvent(weapon)); + _weaponSelector.Close(); + Close(); + }; + } + + _weaponSelector.OpenAttachedLocalPlayer(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _weaponSelector?.Close(); + } +} diff --git a/Content.Server/_White/Chaplain/ArmamentsBeaconSystem.cs b/Content.Server/_White/Chaplain/ArmamentsBeaconSystem.cs new file mode 100644 index 0000000000..b36a9b35c8 --- /dev/null +++ b/Content.Server/_White/Chaplain/ArmamentsBeaconSystem.cs @@ -0,0 +1,39 @@ +using Content.Server.Hands.Systems; +using Content.Server.Popups; +using Content.Shared._White.Chaplain; +using Content.Shared.Ghost; +using Content.Shared.Inventory; + +namespace Content.Server._White.Chaplain; + +public sealed class ArmamentsBeaconSystem : EntitySystem +{ + [Dependency] private readonly InventorySystem _inventorySystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnArmorSelected); + } + + private void OnArmorSelected(Entity ent, ref ArmorSelectedEvent args) + { + var entity = args.Session.AttachedEntity; + var index = args.SelectedIndex; + + if (index < 0 || index >= ent.Comp.Armor.Count || entity == null) + return; + + _inventorySystem.TryUnequip(entity.Value, "outerClothing", true); + _inventorySystem.SpawnItemInSlot(entity.Value, "outerClothing", ent.Comp.Armor[index], silent: true); + + if (index < ent.Comp.Helmets.Count && ent.Comp.Helmets[index] != null) + { + _inventorySystem.TryUnequip(entity.Value, "head", true); + _inventorySystem.SpawnItemInSlot(entity.Value, "head", ent.Comp.Helmets[index]!.Value, silent: true); + } + + Del(ent); + } +} diff --git a/Content.Server/_White/Chaplain/NullRodSystem.cs b/Content.Server/_White/Chaplain/NullRodSystem.cs new file mode 100644 index 0000000000..a9fb99bc60 --- /dev/null +++ b/Content.Server/_White/Chaplain/NullRodSystem.cs @@ -0,0 +1,40 @@ +using Content.Server.Hands.Systems; +using Content.Server.Popups; +using Content.Shared._White.Chaplain; +using Content.Shared.Ghost; + +namespace Content.Server._White.Chaplain; + +public sealed class NullRodSystem : EntitySystem +{ + [Dependency] private readonly HandsSystem _hands = default!; + [Dependency] private readonly PopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnWeaponSelected); + } + + private void OnWeaponSelected(Entity ent, ref WeaponSelectedEvent args) + { + var entity = args.Session.AttachedEntity; + + if (args.SelectedWeapon == string.Empty || entity == null) + return; + + if (!HasComp(entity.Value) && !HasComp(entity.Value)) + { + _popup.PopupEntity($"Вам не хватает веры, чтобы использовать {Name(ent)}", entity.Value, entity.Value); + return; + } + + var weapon = Spawn(args.SelectedWeapon, Transform(entity.Value).Coordinates); + EnsureComp(weapon); + + Del(ent); + + _hands.PickupOrDrop(entity.Value, weapon, true, false, false); + } +} diff --git a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs index d543a02221..68f6882096 100644 --- a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs +++ b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs @@ -22,6 +22,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Player; using Robust.Shared.Random; using Content.Shared._White; +using Content.Shared._White.Chaplain; using Content.Shared._White.Cult.Components; using Content.Shared.Mind; using Robust.Shared.Audio.Systems; @@ -327,9 +328,10 @@ public sealed class CultRuleSystem : GameRuleSystem if (!_jobSystem.CanBeAntag(player)) continue; - // Gulag + // Gulag & chaplain if (!_mindSystem.TryGetMind(player, out _, out var mind) || - mind.OwnedEntity is not { } ownedEntity || HasComp(ownedEntity)) + mind.OwnedEntity is not { } ownedEntity || HasComp(ownedEntity) || + HasComp(ownedEntity)) continue; // Latejoin @@ -414,7 +416,7 @@ public sealed class CultRuleSystem : GameRuleSystem if (!_mindSystem.TryGetMind(cultist, out var mindId, out var mind)) { - Log.Info("Failed getting mind for picked thief."); + Log.Info("Failed getting mind for picked cultist."); return false; } diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs index 716a5cd396..43da0dfcad 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs @@ -10,6 +10,7 @@ using Content.Server.Hands.Systems; using Content.Server.Weapons.Ranged.Systems; using Content.Server._White.Cult.GameRule; using Content.Server._White.Cult.Runes.Comps; +using Content.Shared._White.Chaplain; using Content.Shared.Actions; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Cuffs.Components; @@ -423,7 +424,8 @@ public sealed partial class CultSystem : EntitySystem var isTarget = mind!.Mind!.Value == targetMind?.Mind!.Value; // Выполнение действия в зависимости от условий - if (canBeConverted && !HasComp(victim.Value) && !isTarget) + if (canBeConverted && !HasComp(victim.Value) && + !HasComp(victim.Value) && !isTarget) { result = Convert(uid, victim.Value, args.User, args.Cultists); } diff --git a/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs b/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs index 3ef8e1ad91..01e31df343 100644 --- a/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs +++ b/Content.Server/_White/Cult/Structures/RunicDoorSystem.cs @@ -1,8 +1,13 @@ using Content.Server.Doors.Systems; +using Content.Shared._White.Chaplain; using Content.Shared.Doors; using Content.Shared.Humanoid; using Content.Shared.Stunnable; using Content.Shared._White.Cult; +using Content.Shared.Doors.Components; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; using Robust.Shared.Physics.Systems; using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent; @@ -13,6 +18,7 @@ public sealed class RunicDoorSystem : EntitySystem [Dependency] private readonly DoorSystem _doorSystem = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; public override void Initialize() { @@ -20,6 +26,18 @@ public sealed class RunicDoorSystem : EntitySystem SubscribeLocalEvent(OnBeforeDoorOpened); SubscribeLocalEvent(OnBeforeDoorClosed); + SubscribeLocalEvent(OnGetAttacked); + } + + private void OnGetAttacked(Entity ent, ref AttackedEvent args) + { + if (!HasComp(args.Used) || !TryComp(ent, out var doorComp) || + doorComp.State is not DoorState.Closed) + return; + + _audio.PlayPvs(new SoundPathSpecifier("/Audio/Magic/knock.ogg"), ent); + + _doorSystem.StartOpening(ent, doorComp); } private void OnBeforeDoorOpened(EntityUid uid, RunicDoorComponent component, BeforeDoorOpenedEvent args) @@ -61,7 +79,7 @@ public sealed class RunicDoorSystem : EntitySystem _doorSystem.Deny(airlock); - if (!HasComp(user)) + if (!HasComp(user) || HasComp(user)) return false; var direction = Transform(user).MapPosition.Position - Transform(airlock).MapPosition.Position; diff --git a/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockComponent.cs b/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockComponent.cs new file mode 100644 index 0000000000..c5c63c33a6 --- /dev/null +++ b/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Server._White.Other.MeleeBlockSystem; + +[RegisterComponent] +public sealed partial class MeleeBlockComponent : Component +{ + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float BlockChance = 0.4f; +} diff --git a/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockSystem.cs b/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockSystem.cs new file mode 100644 index 0000000000..3f072fa2ef --- /dev/null +++ b/Content.Server/_White/Other/MeleeBlockSystem/MeleeBlockSystem.cs @@ -0,0 +1,37 @@ +using Content.Shared.Hands.Components; +using Content.Shared.Popups; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Random; + +namespace Content.Server._White.Other.MeleeBlockSystem; + +public sealed class MeleeBlockSystem : EntitySystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnBlockAttempt); + } + + private void OnBlockAttempt(Entity ent, ref MeleeBlockAttemptEvent args) + { + if (ent.Owner == args.Attacker || + !TryComp(ent.Comp.ActiveHandEntity, out MeleeBlockComponent? blockComponent) || + !_random.Prob(blockComponent.BlockChance)) + return; + + args.Blocked = true; + + _popupSystem.PopupEntity("заблокировал!", ent); + + _audio.PlayPvs(new SoundPathSpecifier("/Audio/Weapons/block_metal1.ogg"), ent, + AudioParams.Default.WithVariation(0.25f)); + } +} diff --git a/Content.Server/_White/Other/RandomDamageSystem/RandomDamageComponent.cs b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageComponent.cs new file mode 100644 index 0000000000..c9eb216eac --- /dev/null +++ b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Server._White.Other.RandomDamageSystem; + +[RegisterComponent] +public sealed partial class RandomDamageComponent : Component +{ + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float Max = 50f; +} diff --git a/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs new file mode 100644 index 0000000000..fc00fc8fa0 --- /dev/null +++ b/Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs @@ -0,0 +1,26 @@ +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.Other.RandomDamageSystem; + +public sealed class RandomDamageSystem : EntitySystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(HandleHit); + } + + private void HandleHit(Entity ent, ref MeleeHitEvent args) + { + var damage = _random.NextFloat() * ent.Comp.Max; + args.BonusDamage = new DamageSpecifier(_prototypeManager.Index("Slash"), damage); + } +} diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs index 55c01c1d6f..4186f15efc 100644 --- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs +++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs @@ -93,3 +93,8 @@ public record struct GetMeleeAttackRateEvent(EntityUid Weapon, float Rate, float /// [ByRefEvent] public record struct GetHeavyDamageModifierEvent(EntityUid Weapon, FixedPoint2 DamageModifier, float Multipliers, EntityUid User); + +// WD START +[ByRefEvent] +public record struct MeleeBlockAttemptEvent(EntityUid Attacker, bool Blocked = false); +// WD END diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 00d918e40c..f284671182 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -60,10 +60,14 @@ public sealed partial class MeleeWeaponComponent : Component [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public bool Attacking = false; - // WD + // WD START [ViewVariables(VVAccess.ReadWrite), DataField] public bool CanHeavyAttack = true; + [ViewVariables(VVAccess.ReadWrite), DataField] + public bool IgnoreResistances; + // WD END + /// /// If true, attacks will be repeated automatically without requiring the mouse button to be lifted. /// diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index df20732038..902c21d1b7 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -22,6 +22,7 @@ using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Weapons.Ranged.Systems; using Content.Shared._White; +using Content.Shared._White.Chaplain; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; @@ -500,6 +501,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (hitEvent.Handled) return; + // WD START + var blockEvent = new MeleeBlockAttemptEvent(user); + RaiseLocalEvent(target.Value, ref blockEvent); + if (blockEvent.Blocked) + return; + // WD END + var targets = new List(1) { target.Value @@ -519,7 +527,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(target.Value, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user); + var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, component.IgnoreResistances, origin:user); // WD EDIT if (damageResult != null && damageResult.Any()) { @@ -658,11 +666,18 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (!Blocker.CanAttack(user, entity, (weapon, component))) continue; + // WD START + var blockEvent = new MeleeBlockAttemptEvent(user); + RaiseLocalEvent(entity, ref blockEvent); + if (blockEvent.Blocked) + continue; + // WD END + var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates)); RaiseLocalEvent(entity, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin:user); + var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, component.IgnoreResistances, origin:user); // WD EDIT if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero) { diff --git a/Content.Shared/_White/Chaplain/ArmamentsBeaconComponent.cs b/Content.Shared/_White/Chaplain/ArmamentsBeaconComponent.cs new file mode 100644 index 0000000000..7b65153fb8 --- /dev/null +++ b/Content.Shared/_White/Chaplain/ArmamentsBeaconComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._White.Chaplain; + +[RegisterComponent] +public sealed partial class ArmamentsBeaconComponent : Component +{ + [DataField] + public List Armor = new(); + + [DataField] + public List Helmets = new(); +} diff --git a/Content.Shared/_White/Chaplain/ArmamentsBeaconUi.cs b/Content.Shared/_White/Chaplain/ArmamentsBeaconUi.cs new file mode 100644 index 0000000000..80c7cc7e37 --- /dev/null +++ b/Content.Shared/_White/Chaplain/ArmamentsBeaconUi.cs @@ -0,0 +1,21 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._White.Chaplain; + + +[Serializable, NetSerializable] +public enum SelectArmorUi +{ + Key +} + +[Serializable, NetSerializable] +public class ArmorSelectedEvent : BoundUserInterfaceMessage +{ + public int SelectedIndex; + + public ArmorSelectedEvent(int index) + { + SelectedIndex = index; + } +} diff --git a/Content.Shared/_White/Chaplain/HolyComponent.cs b/Content.Shared/_White/Chaplain/HolyComponent.cs new file mode 100644 index 0000000000..9870e5d529 --- /dev/null +++ b/Content.Shared/_White/Chaplain/HolyComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._White.Chaplain; + +[RegisterComponent, NetworkedComponent] +public sealed partial class HolyComponent : Component +{ +} diff --git a/Content.Shared/_White/Chaplain/HolyWeaponComponent.cs b/Content.Shared/_White/Chaplain/HolyWeaponComponent.cs new file mode 100644 index 0000000000..77bbe8bc4d --- /dev/null +++ b/Content.Shared/_White/Chaplain/HolyWeaponComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._White.Chaplain; + +[RegisterComponent, NetworkedComponent] +public sealed partial class HolyWeaponComponent : Component +{ +} diff --git a/Content.Shared/_White/Chaplain/HolyWeaponSystem.cs b/Content.Shared/_White/Chaplain/HolyWeaponSystem.cs new file mode 100644 index 0000000000..3418882f4f --- /dev/null +++ b/Content.Shared/_White/Chaplain/HolyWeaponSystem.cs @@ -0,0 +1,30 @@ +using Content.Shared.Examine; +using Content.Shared.Ghost; +using Content.Shared.Weapons.Melee.Events; + +namespace Content.Shared._White.Chaplain; + +public sealed class HolyWeaponSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnMeleeAttempt); + } + + private void OnMeleeAttempt(Entity ent, ref AttemptMeleeEvent args) + { + if (HasComp(args.User) || HasComp(args.User)) + return; + + args.Cancelled = true; + args.Message = $"Вам не хватает веры, чтобы использовать {Name(ent)}"; + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup("[color=lightblue]Данное оружие наделено священной силой.[/color]"); + } +} diff --git a/Content.Shared/_White/Chaplain/NullRodComponent.cs b/Content.Shared/_White/Chaplain/NullRodComponent.cs new file mode 100644 index 0000000000..b79a495b45 --- /dev/null +++ b/Content.Shared/_White/Chaplain/NullRodComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._White.Chaplain; + +[RegisterComponent] +public sealed partial class NullRodComponent : Component +{ + [DataField] + public List Weapons = new(); +} diff --git a/Content.Shared/_White/Chaplain/NullRodUi.cs b/Content.Shared/_White/Chaplain/NullRodUi.cs new file mode 100644 index 0000000000..9d2f3e7f96 --- /dev/null +++ b/Content.Shared/_White/Chaplain/NullRodUi.cs @@ -0,0 +1,20 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._White.Chaplain; + +[Serializable, NetSerializable] +public enum SelectWeaponUi +{ + Key +} + +[Serializable, NetSerializable] +public class WeaponSelectedEvent : BoundUserInterfaceMessage +{ + public string SelectedWeapon; + + public WeaponSelectedEvent(string weapon) + { + SelectedWeapon = weapon; + } +} diff --git a/Resources/Audio/White/Items/hit/chainhit.ogg b/Resources/Audio/White/Items/hit/chainhit.ogg new file mode 100644 index 0000000000..2a2c30dc78 Binary files /dev/null and b/Resources/Audio/White/Items/hit/chainhit.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml index 105a4f8ebb..78cfb40403 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml @@ -47,6 +47,10 @@ maxVol: 300 - type: UseDelay delay: 1 + - type: Tool + qualities: + - Sawing + speed: 0.5 - type: Construction deconstructionTarget: null graph: ChainsawGraph diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 76ee736e6b..f19fa9d4f6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -46,11 +46,11 @@ wideAnimationRotation: -135 damage: types: - Slash: 20 + Slash: 24 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item - size: Large + size: Huge sprite: Objects/Weapons/Melee/katana.rsi - type: DisarmMalus @@ -69,7 +69,7 @@ types: Slash: 30 - type: Item - size: Large + size: Huge sprite: Objects/Weapons/Melee/energykatana.rsi - type: EnergyKatana - type: DashAbility diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 61c1bb0e09..b4a6b1e441 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -3,6 +3,9 @@ name: job-name-chaplain description: job-description-chaplain playTimeTracker: JobChaplain + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 #5 hrs startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-hop @@ -13,6 +16,7 @@ - !type:AddComponentSpecial components: - type: BibleUser #Lets them heal with bibles + - type: Holy - type: startingGear id: ChaplainGear @@ -23,9 +27,12 @@ shoes: ClothingShoesColorBlack id: ChaplainPDA ears: ClothingHeadsetService + pocket1: ArmamentsBeacon underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear underweart: ClothingUnderwearTopBraWhite # White-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear + inhand: + - NullRod innerClothingSkirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml b/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml new file mode 100644 index 0000000000..3b2e96c123 --- /dev/null +++ b/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml @@ -0,0 +1,79 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHelmedTemplarArmored + name: шлем крестоносца + description: Деус Вульт! + components: + - type: Sprite + sprite: White/Clothing/Head/templar.rsi + - type: Clothing + sprite: White/Clothing/Head/templar.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.95 + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + +- type: entity + parent: ClothingHeadHelmedTemplarArmored + id: ClothingHeadHelmetClock + name: забытый шлем + description: У него непреклонный взгляд навечно забытого бога. + components: + - type: Sprite + sprite: White/Clothing/Head/clock.rsi + - type: Clothing + sprite: White/Clothing/Head/clock.rsi + +- type: entity + parent: ClothingHeadHelmedTemplarArmored + id: ClothingHeadHelmetCage + name: клетка + description: Клетка, сдерживающая желания личности, позволяющая увидеть нечестивый мир таким, какой он есть. + components: + - type: Sprite + sprite: White/Clothing/Head/cage.rsi + - type: Clothing + sprite: White/Clothing/Head/cage-equipped.rsi + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingHeadHelmedTemplarArmored + id: ClothingHeadHelmetAncientChaplain + name: древний шлем + description: Никто не может пройти! + components: + - type: Sprite + sprite: White/Clothing/Head/ancient.rsi + - type: Clothing + sprite: White/Clothing/Head/ancient.rsi + +- type: entity + parent: ClothingHeadHelmetCage + id: ClothingHeadHelmetWitchHunter + name: шляпа Охотника на Ведьм + description: Эта изношенная шляпа часто применялась в свое время. + components: + - type: Sprite + sprite: White/Clothing/Head/witchhunter.rsi + - type: Clothing + sprite: White/Clothing/Head/witchhunter.rsi + +- type: entity + parent: ClothingHeadHelmedTemplarArmored + id: ClothingHeadHelmetAdept + noSpawn: true + name: капюшон адепта + description: Еретично только тогда, когда это делают другие. + components: + - type: Sprite + sprite: White/Clothing/Head/adept.rsi + - type: Clothing + sprite: White/Clothing/Head/adept.rsi diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml new file mode 100644 index 0000000000..d3b9807a4a --- /dev/null +++ b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml @@ -0,0 +1,77 @@ +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorTemplar + name: доспехи крестоносца + description: Бог желает этого! + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/templar.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/templar.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.9 + Heat: 0.5 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + +- type: entity + parent: ClothingOuterArmorTemplar + id: ClothingOuterArmorClock + name: забытая броня + description: Звучит как шипение пара, тиканье шестерёнок и затихание. Похоже на мёртвую машину, пытающуюся жить. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/clock.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/clock.rsi + +- type: entity + parent: ClothingOuterArmorTemplar + id: ClothingOuterArmorStudent + name: студенческая мантия + description: Униформа древнего учебного заведения. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/student.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/student.rsi + +- type: entity + parent: ClothingOuterArmorTemplar + id: ClothingOuterArmorAncient + name: древний доспех + description: Защити сокровище... + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/ancient.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/ancient.rsi + +- type: entity + parent: ClothingOuterArmorTemplar + id: ClothingOuterArmorWitchHunter + name: одеяние Охотника на Ведьм + description: Это изношенное одеяние часто применялось в свое время. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/witchhunter.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/witchhunter.rsi + +- type: entity + parent: ClothingOuterArmorTemplar + id: ClothingOuterArmorAdept + name: мантия адепта + description: Идеальный наряд для сжигания неверных. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/adept.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/adept.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetAdept diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml b/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml new file mode 100644 index 0000000000..db76eb08c1 --- /dev/null +++ b/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml @@ -0,0 +1,39 @@ +- type: entity + parent: BaseItem + id: ArmamentsBeacon + name: радиомаяк вооружения + description: Содержит набор вооружения для священника. + components: + - type: Sprite + sprite: Objects/Devices/door_remote.rsi + layers: + - state: door_remotebase + - state: door_remotelightscolour + color: lightblue + - state: door_remotescreencolour + color: lightblue + - type: Item + storedRotation: -90 + - type: ActivatableUI + key: enum.SelectArmorUi.Key + inHandsOnly: true + closeOnHandDeselect: true + - type: UserInterface + interfaces: + - key: enum.SelectArmorUi.Key + type: ArmamentsBeaconBui + - type: ArmamentsBeacon + armor: + - ClothingOuterArmorTemplar + - ClothingOuterArmorClock + - ClothingOuterArmorStudent + - ClothingOuterArmorAncient + - ClothingOuterArmorWitchHunter + - ClothingOuterArmorAdept + helmets: + - ClothingHeadHelmedTemplarArmored + - ClothingHeadHelmetClock + - ClothingHeadHelmetCage + - ClothingHeadHelmetAncientChaplain + - ClothingHeadHelmetWitchHunter + - null diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml new file mode 100644 index 0000000000..9e303f1545 --- /dev/null +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -0,0 +1,449 @@ +- type: entity + name: жезл нулификации + parent: BaseItem + id: NullRod + description: Жезл из чистого обсидиана. Само его присутствие разрушает и ослабляет "магические силы". Во всяком случае так написано в путеводителе. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/nullrod.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Blunt: 18 + - type: Item + size: Normal + sprite: White/Objects/Weapons/Chaplain/nullrod.rsi + - type: Clothing + quickEquip: false + sprite: White/Objects/Weapons/Chaplain/nullrod.rsi + slots: + - belt + - type: ActivatableUI + key: enum.SelectWeaponUi.Key + inHandsOnly: true + closeOnHandDeselect: true + - type: UserInterface + interfaces: + - key: enum.SelectWeaponUi.Key + type: NullRodBui + - type: NullRod + weapons: + - GodHand + - HolyClaymore + - Chainsword + - SwordGlowing + - HolyKatana + - MultiverseBlade + - VorpalScythe + - HighFrequencyBlade + - SpellBlade + - PossessedBlade + - ChainsawHand + - HolyWhip + - HolyStaff + - UnholyPitchfork + - WarHammer + - HyperTool + - type: HolyWeapon + +- type: entity + name: божья длань + parent: BaseItem + id: GodHand + description: Эта рука сияет с потрясающей силой! + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/godhand.rsi + state: icon + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg + params: + variation: 0.250 + volume: -10 + wideAnimationRotation: 180 + damage: + types: + Heat: 24 + - type: Item + size: Normal + sprite: White/Objects/Weapons/Chaplain/godhand.rsi + - type: Unremoveable + deleteOnDrop: true + +- type: entity + name: священный клеймор + parent: Claymore + id: HolyClaymore + description: Оружие, подходящее для крестового похода! + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/claymore.rsi + - type: MeleeWeapon + damage: + types: + Slash: 33 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/claymore.rsi + slots: + - back + - belt + - type: Item + sprite: White/Objects/Weapons/Chaplain/claymore.rsi + +- type: entity + name: цепной меч + parent: HolyClaymore + id: Chainsword + description: Не позволь еретику жить. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/chainsword.rsi + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/chainsaw.ogg + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/chainsword.rsi + - type: Item + sprite: White/Objects/Weapons/Chaplain/chainsword.rsi + - type: Tool + qualities: + - Sawing + speed: 0.5 + +- type: entity + name: силовой меч + parent: HolyClaymore + id: SwordGlowing + description: Клинок светится силой веры. Или, возможно, благодаря аккумулятору. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi + - type: PointLight + radius: 4 + energy: 2 + color: lightblue + - type: Item + sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi + +- type: entity + name: лезвие ханзо + parent: Katana + id: HolyKatana + description: Способен прорезать святой клеймор. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/katana.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/katana.rsi + slots: + - back + - belt + - type: Item + sprite: White/Objects/Weapons/Chaplain/katana.rsi + +- type: entity + name: внепространственный клинок + parent: HolyKatana + id: MultiverseBlade + description: Будучи когда-то предвестником межпространственной войны, его острота сильно колеблется. Наносит от 1 до 50 урона. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/multiverse.rsi + - type: MeleeWeapon + damage: + types: + Slash: 1 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/multiverse.rsi + slots: + - back + - type: Item + sprite: White/Objects/Weapons/Chaplain/multiverse.rsi + - type: RandomDamage + +- type: entity + name: коса жнеца + parent: HolyClaymore + id: VorpalScythe + description: И жрец, и жнец, и на дуде игрец! Коса способна пробить броню противника. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/scythe.rsi + - type: MeleeWeapon + ignoreResistances: true + damage: + types: + Slash: 27 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/scythe.rsi + slots: + - back + - type: Item + sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi + +- type: entity + name: высокочастотный клинок + parent: HolyKatana + id: HighFrequencyBlade + description: Клинок, способный отражать выстрелы. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi + - type: MeleeWeapon + damage: + types: + Slash: 18 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi + slots: + - back + - type: Reflect + reflectProb: 0.4 + - type: Item + sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi + +- type: entity + name: клинок заклинаний + parent: HolyKatana + id: SpellBlade + description: Клинок, с шансом 20% наносящий критический удар. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/spellblade.rsi + - type: MeleeWeapon + wideAnimationRotation: 135 + damage: + types: + Slash: 18 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/spellblade.rsi + slots: + - back + - type: Crit + critChance: 20 + critMultiplier: 2.5 + - type: Item + sprite: White/Objects/Weapons/Chaplain/spellblade.rsi + +- type: entity + name: одержимый клинок + parent: HolyKatana + id: PossessedBlade + description: Когда на станции царит хаос, приятно иметь рядом друга. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/possessed.rsi + - type: MeleeWeapon + wideAnimationRotation: -45 + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/possessed.rsi + slots: + - back + - type: GhostRole + allowSpeech: true + name: Одержимый Клинок + description: Вы - одержимый клинок. Подчиняйтесь своему владельцу. + - type: GhostTakeoverAvailable + - type: Examiner + - type: Item + sprite: White/Objects/Weapons/Chaplain/possessed.rsi + +- type: entity + name: рука-бензопила + parent: BaseItem + id: ChainsawHand + description: Добро? Зло? Ты парень с бензопилой в руке. + components: + - type: Sharp + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/chainsaw.rsi + state: icon + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: 90 + attackRate: 4 + damage: + types: + Slash: 6 + soundHit: + path: /Audio/Weapons/chainsaw.ogg + params: + volume: -3 + - type: Item + size: Huge + sprite: White/Objects/Weapons/Chaplain/chainsaw.rsi + - type: Unremoveable + deleteOnDrop: true + - type: Tool + qualities: + - Sawing + speed: 0.5 + +- type: entity + name: священная плеть + parent: BaseItem + id: HolyWhip + description: Какая ужасная ночь на космической станции 14. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/whip.rsi + state: icon + - type: MeleeWeapon + soundHit: + path: /Audio/White/Items/hit/chainhit.ogg + range: 2.5 + damage: + types: + Blunt: 15 + - type: Item + size: Normal + sprite: White/Objects/Weapons/Chaplain/whip.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/whip.rsi + slots: + - belt + - type: DisarmMalus + +- type: entity + name: посох монаха + parent: BaseItem + id: HolyStaff + description: Длинный высокий посох из полированного дерева. Традиционно используемый в боевых искусствах древней Земли, теперь он используется для преследования клоуна. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/staff.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 135 + damage: + types: + Blunt: 10 + - type: Item + size: Huge + sprite: White/Objects/Weapons/Chaplain/staff.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/staff.rsi + slots: + - back + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + - type: UseDelay + - type: DisarmMalus + - type: MeleeBlock + +- type: entity + name: нечестивые вилы + parent: BaseItem + id: UnholyPitchfork + description: Держа это, ты выглядишь абсолютно по дьявольски. + components: + - type: EmbeddableProjectile + offset: 0.15,0.15 + - type: ThrowingAngle + angle: 225 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + vertices: + - -0.20,-0.10 + - -0.10,-0.20 + - 0.40,0.30 + - 0.30,0.40 + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: Sharp + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 15 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + range: 2 + - type: DamageOtherOnHit + damage: + types: + Piercing: 25 + - type: Item + sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi + size: Huge + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi + slots: + - back + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 10 + - type: UseDelay + - type: DisarmMalus + +- type: entity + name: реликтовый боевой молот + parent: BaseItem + id: WarHammer + description: Этот боевой молот обошелся священнику в сорок тысяч кредитов. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/hammer.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 0.75 + damage: + types: + Blunt: 24 + Structural: 80 + - type: Item + size: Huge + sprite: White/Objects/Weapons/Chaplain/hammer.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/hammer.rsi + slots: + - belt + - type: DisarmMalus + +- type: entity + name: гиперинструмент + parent: BaseItem + id: HyperTool + description: Инструмент настолько мощный, что даже вы не можете им идеально пользоваться. + components: + - type: Sprite + sprite: White/Objects/Weapons/Chaplain/hypertool.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 0.75 + canHeavyAttack: false + damage: + types: + Blunt: 0 + - type: StaminaDamageOnHit + damage: 60 + - type: Item + size: Normal + sprite: White/Objects/Weapons/Chaplain/hypertool.rsi + - type: Clothing + sprite: White/Objects/Weapons/Chaplain/hypertool.rsi + slots: + - belt + - type: DisarmMalus diff --git a/Resources/Textures/White/Clothing/Head/adept.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/adept.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..26b672c66d Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/adept.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/adept.rsi/icon.png b/Resources/Textures/White/Clothing/Head/adept.rsi/icon.png new file mode 100644 index 0000000000..a7850b1676 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/adept.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/adept.rsi/meta.json b/Resources/Textures/White/Clothing/Head/adept.rsi/meta.json new file mode 100644 index 0000000000..8336ffd0a9 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/adept.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/ancient.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/ancient.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..edab541af8 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/ancient.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/ancient.rsi/icon.png b/Resources/Textures/White/Clothing/Head/ancient.rsi/icon.png new file mode 100644 index 0000000000..6e56f75239 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/ancient.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/ancient.rsi/meta.json b/Resources/Textures/White/Clothing/Head/ancient.rsi/meta.json new file mode 100644 index 0000000000..8336ffd0a9 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/ancient.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..205118a882 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/meta.json b/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/meta.json new file mode 100644 index 0000000000..860268e8ea --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/cage-equipped.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "equipped-HELMET" + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/cage.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/cage.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..0e8edde45c Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/cage.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/cage.rsi/icon.png b/Resources/Textures/White/Clothing/Head/cage.rsi/icon.png new file mode 100644 index 0000000000..f338162a37 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/cage.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/cage.rsi/meta.json b/Resources/Textures/White/Clothing/Head/cage.rsi/meta.json new file mode 100644 index 0000000000..2cbfb6151d --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/cage.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/clock.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/clock.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..42e18e8576 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/clock.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/clock.rsi/icon.png b/Resources/Textures/White/Clothing/Head/clock.rsi/icon.png new file mode 100644 index 0000000000..3b1bd49b70 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/clock.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/clock.rsi/meta.json b/Resources/Textures/White/Clothing/Head/clock.rsi/meta.json new file mode 100644 index 0000000000..8336ffd0a9 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/clock.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/templar.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/templar.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..47f44183af Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/templar.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/templar.rsi/icon.png b/Resources/Textures/White/Clothing/Head/templar.rsi/icon.png new file mode 100644 index 0000000000..2ba7d7b8bb Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/templar.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/templar.rsi/meta.json b/Resources/Textures/White/Clothing/Head/templar.rsi/meta.json new file mode 100644 index 0000000000..8336ffd0a9 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/templar.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/Head/witchhunter.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..9a48c0f4f2 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Clothing/Head/witchhunter.rsi/icon.png b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/icon.png new file mode 100644 index 0000000000..0da9682392 Binary files /dev/null and b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/Head/witchhunter.rsi/meta.json b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/meta.json new file mode 100644 index 0000000000..8336ffd0a9 --- /dev/null +++ b/Resources/Textures/White/Clothing/Head/witchhunter.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..30e032d259 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/icon.png new file mode 100644 index 0000000000..41b682391e Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/adept.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..b1f75aab82 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/icon.png new file mode 100644 index 0000000000..d8cb533ecd Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/ancient.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..53ec541e11 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/icon.png new file mode 100644 index 0000000000..6cc3bbeb2f Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/clock.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/student.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..da2952056b Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/student.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/icon.png new file mode 100644 index 0000000000..cdd54846a9 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/student.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/student.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..9f4eac16c6 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/icon.png new file mode 100644 index 0000000000..fc6a14d5f8 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/templar.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..4d3b634680 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/icon.png new file mode 100644 index 0000000000..80c156529f Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/meta.json new file mode 100644 index 0000000000..21b28e350c --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/witchhunter.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/icon.png new file mode 100644 index 0000000000..3b21eb6ac1 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-left.png new file mode 100644 index 0000000000..6a87708f5c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-right.png new file mode 100644 index 0000000000..975e072a4d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/meta.json new file mode 100644 index 0000000000..b8a671c4de --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsaw.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.04, + 0.04 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/equipped-BELT.png new file mode 100644 index 0000000000..52dbbda351 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/icon.png new file mode 100644 index 0000000000..3169516c3c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-left.png new file mode 100644 index 0000000000..9e775b802e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-right.png new file mode 100644 index 0000000000..e1d3a69f17 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/meta.json new file mode 100644 index 0000000000..69c830cc0c --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/chainsword.rsi/meta.json @@ -0,0 +1,86 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/c9ddcd603adeab3822c2845f6be9dfb53452c119", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.01, + 0.01 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1d180cab16 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BELT.png new file mode 100644 index 0000000000..031a41ef25 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/icon.png new file mode 100644 index 0000000000..3f16d12cb8 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-left.png new file mode 100644 index 0000000000..fd527ba78f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-right.png new file mode 100644 index 0000000000..5256e7bd10 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/meta.json new file mode 100644 index 0000000000..73491af773 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/claymore.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..b103607bb2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BELT.png new file mode 100644 index 0000000000..1e5f9bc0dc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/icon.png new file mode 100644 index 0000000000..9319b4896f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-left.png new file mode 100644 index 0000000000..b167d3f01c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-right.png new file mode 100644 index 0000000000..090e7d8f4f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/meta.json new file mode 100644 index 0000000000..262c10ba90 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/forceweapon.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/c9ddcd603adeab3822c2845f6be9dfb53452c119", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.01, + 0.01 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/icon.png new file mode 100644 index 0000000000..83a54e728e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-left.png new file mode 100644 index 0000000000..19acec50cf Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-right.png new file mode 100644 index 0000000000..12410f5e0b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/meta.json new file mode 100644 index 0000000000..489466f74a --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/godhand.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/equipped-BELT.png new file mode 100644 index 0000000000..9e282bd1ad Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/icon.png new file mode 100644 index 0000000000..f8f2e7acca Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-left.png new file mode 100644 index 0000000000..02f5c2da2d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-right.png new file mode 100644 index 0000000000..157e0005b9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/meta.json new file mode 100644 index 0000000000..9e72d084ca --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/hammer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..27fdbfad82 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/icon.png new file mode 100644 index 0000000000..36b332b163 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-left.png new file mode 100644 index 0000000000..609993523e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-right.png new file mode 100644 index 0000000000..fea0fd938f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/meta.json new file mode 100644 index 0000000000..c2c48e56aa --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/hfrequency.rsi/meta.json @@ -0,0 +1,87 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/equipped-BELT.png new file mode 100644 index 0000000000..e74db2cc7f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/icon.png new file mode 100644 index 0000000000..180e48e75c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-left.png new file mode 100644 index 0000000000..5299d0bec2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-right.png new file mode 100644 index 0000000000..905f30c26f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/meta.json new file mode 100644 index 0000000000..9e72d084ca --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/hypertool.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..afe15976c9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BELT.png new file mode 100644 index 0000000000..bc51b5a6cc Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/icon.png new file mode 100644 index 0000000000..1a4426431e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-left.png new file mode 100644 index 0000000000..e98b52ce12 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-right.png new file mode 100644 index 0000000000..904bf95b64 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/meta.json new file mode 100644 index 0000000000..73491af773 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/katana.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..376f3f24fb Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/icon.png new file mode 100644 index 0000000000..8f79784481 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-left.png new file mode 100644 index 0000000000..0c6849ca70 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-right.png new file mode 100644 index 0000000000..06605e441c Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/meta.json new file mode 100644 index 0000000000..74d72f76f1 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/multiverse.rsi/meta.json @@ -0,0 +1,125 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/equipped-BELT.png new file mode 100644 index 0000000000..4d23529df6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/icon.png new file mode 100644 index 0000000000..965fa5a085 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-left.png new file mode 100644 index 0000000000..6f31eafd0f Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-right.png new file mode 100644 index 0000000000..3ff76ef4da Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/meta.json new file mode 100644 index 0000000000..9e72d084ca --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/nullrod.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..ed3280fab0 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/icon.png new file mode 100644 index 0000000000..106695c996 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-left.png new file mode 100644 index 0000000000..9e4fb05dc1 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-right.png new file mode 100644 index 0000000000..ab90e8e92b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/meta.json new file mode 100644 index 0000000000..a49a919843 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..9b92d57cda Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..8a515f739b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/pitchfork.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..d2045b43d1 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/icon.png new file mode 100644 index 0000000000..fc4d6aa4fa Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-left.png new file mode 100644 index 0000000000..e8eb58a5ca Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-right.png new file mode 100644 index 0000000000..9269370162 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/meta.json new file mode 100644 index 0000000000..02c36408f1 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/possessed.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000..29a6bb72a6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000..73167241c6 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/meta.json new file mode 100644 index 0000000000..dea39ac5bc --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe-inhands.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/icon.png new file mode 100644 index 0000000000..919fc3fd60 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/meta.json new file mode 100644 index 0000000000..040b169788 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/scythe.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..5ded62d26e Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/icon.png new file mode 100644 index 0000000000..33ca104256 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-left.png new file mode 100644 index 0000000000..42477f7d5d Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-right.png new file mode 100644 index 0000000000..b2aa4f99c9 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/meta.json new file mode 100644 index 0000000000..6c3fec79da --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/spellblade.rsi/meta.json @@ -0,0 +1,151 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ], + [ + 0.8, + 0.1, + 0.1, + 0.5, + 0.1, + 0.1, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/equipped-BACKPACK.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..323c3e22b2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/icon.png new file mode 100644 index 0000000000..a7ec4ea074 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-left.png new file mode 100644 index 0000000000..16ef73e7ce Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-right.png new file mode 100644 index 0000000000..d968c3500b Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/meta.json new file mode 100644 index 0000000000..a49a919843 --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..aa32cf54eb Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..f371e82d82 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/staff.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/equipped-BELT.png b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/equipped-BELT.png new file mode 100644 index 0000000000..9f5dad10c1 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/icon.png b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/icon.png new file mode 100644 index 0000000000..2dea690ddb Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-left.png b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-left.png new file mode 100644 index 0000000000..5d3d050aa2 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-right.png b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-right.png new file mode 100644 index 0000000000..005677d5c5 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/meta.json new file mode 100644 index 0000000000..694f288f1e --- /dev/null +++ b/Resources/Textures/White/Objects/Weapons/Chaplain/whip.rsi/meta.json @@ -0,0 +1,142 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}