diff --git a/Content.Client/ADT/Weapon/WeaponDismantleOnShootSystem.cs b/Content.Client/ADT/Weapon/WeaponDismantleOnShootSystem.cs new file mode 100644 index 00000000000..907799e4072 --- /dev/null +++ b/Content.Client/ADT/Weapon/WeaponDismantleOnShootSystem.cs @@ -0,0 +1,24 @@ +using Content.Shared.ADT.Weapon.Systems; +using System.Numerics; +using Content.Shared.ADT.Weapon.Components; +using Content.Shared.Inventory; +using Content.Shared.Popups; +using Content.Shared.Tag; +using Content.Shared.Throwing; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Physics.Systems; + +//linq +using System.Linq; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Random; +using Content.Shared.Damage; +using Content.Shared.Wieldable; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Player; +using Robust.Shared.Audio; + +namespace Content.Client.ADT.Weapon.Systems; +public sealed partial class WeaponDismantleOnShootSystem : SharedWeaponDismantleOnShootSystem +{ +} diff --git a/Content.Server/ADT/Weapon/WeaponDismantleOnShootSystem.cs b/Content.Server/ADT/Weapon/WeaponDismantleOnShootSystem.cs new file mode 100644 index 00000000000..7639e3b334f --- /dev/null +++ b/Content.Server/ADT/Weapon/WeaponDismantleOnShootSystem.cs @@ -0,0 +1,104 @@ +using Content.Shared.ADT.Weapon.Systems; +using System.Numerics; +using Content.Shared.ADT.Weapon.Components; +using Content.Shared.Inventory; +using Content.Shared.Popups; +using Content.Shared.Tag; +using Content.Shared.Throwing; +using Content.Shared.Damage.Systems; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Physics.Systems; + +//linq +using System.Linq; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Random; +using Content.Shared.Damage; +using Content.Shared.Wieldable; +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Map; + +namespace Content.Server.ADT.Weapon.Systems; +public sealed partial class WeaponDismantleOnShootSystem : SharedWeaponDismantleOnShootSystem +{ + [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private readonly SharedGunSystem _gunSystem = default!; + [Dependency] private readonly ILogManager _log = default!; + [Dependency] protected readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] protected readonly DamageableSystem Damageable = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnGunShot); + } + + private void OnGunShot(Entity ent, ref AmmoShotEvent args) + { + if (DismantleCheck(ent, ref args) == false) + return; + + //apply the damage to the shooter + //get the shooters damageable component + Damageable.TryChangeDamage(args.Shooter, ent.Comp.SelfDamage, origin:args.Shooter); + + //we need the user past this point + if (!args.Shooter.HasValue) + return; + + _audio.PlayPvs(ent.Comp.DismantleSound, args.Shooter.Value); + + //get the users transform + var userPosition = Transform(args.Shooter.Value).Coordinates; + + if (!TryComp(ent, out var gunComponent)) + return; + + var toCoordinates = gunComponent.ShootCoordinates; + + if (toCoordinates == null) + return; + + //loop through all of the items + var random = IoCManager.Resolve(); + foreach (var item in ent.Comp.items) + { + for (var i = 0; i < item.Amount; i++) + { + //roll to see if we destroy the item or not + if (!random.Prob(item.SpawnProbability)) + continue; + + //get the item entity + var itemEntity = Spawn(item.PrototypeId, userPosition); + + Vector2 direction = toCoordinates.Value.Position; + //normalize it + direction = Vector2.Normalize(direction); + //multiply it by the distance + direction *= ent.Comp.DismantleDistance; + //rotate it by the angle + direction = item.LaunchAngle.RotateVec(direction); + + //roll for random angle modifier + double randomAngle = random.NextDouble(-item.AngleRandomness.Degrees, item.AngleRandomness.Degrees); + //rotate it by the random angle + direction = Angle.FromDegrees(randomAngle).RotateVec(direction); + + var throwDirection = new EntityCoordinates(args.Shooter.Value, direction); + + _throwing.TryThrow(itemEntity, throwDirection, ent.Comp.DismantleDistance, compensateFriction: true); + } + } + + //now we need to destroy the gun + //get the gun entity + _entityManager.QueueDeleteEntity(ent.Owner); + } +} diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index e8a1e5b5007..471ed37c1ed 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -172,6 +172,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? RaiseLocalEvent(gunUid, new AmmoShotEvent() { FiredProjectiles = shotProjectiles, + Shooter = user, // ADT-Tweak }); void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp) diff --git a/Content.Shared/ADT/Weapons/Components/WeaponDismantleOnShootComponent.cs b/Content.Shared/ADT/Weapons/Components/WeaponDismantleOnShootComponent.cs new file mode 100644 index 00000000000..06c4e853121 --- /dev/null +++ b/Content.Shared/ADT/Weapons/Components/WeaponDismantleOnShootComponent.cs @@ -0,0 +1,55 @@ +using Content.Shared.Damage; +using Content.Shared.Storage; +using Content.Shared.Tag; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.ADT.Weapon.Components; +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class WeaponDismantleOnShootComponent : Component +{ + [DataField, AutoNetworkedField] + public float DismantleChance = 0.0f; + + /// + /// How far to throw things when dismantling. + /// + [DataField, AutoNetworkedField] + public float DismantleDistance = 5f; + + [DataField] + public SoundCollectionSpecifier? DismantleSound = new SoundCollectionSpecifier("MetalBreak"); + + [DataField, AutoNetworkedField] + [ViewVariables(VVAccess.ReadWrite)] + public DamageSpecifier SelfDamage = new(); + + [DataField, AutoNetworkedField] + public List items = []; +} + +[DataDefinition] +[Serializable, NetSerializable] +public sealed partial class DismantleOnShootItem +{ + public DismantleOnShootItem() { } + [DataField("id")] + public EntProtoId? PrototypeId = null; + + /// + /// The probability that an item will spawn. Takes decimal form so 0.05 is 5%, 0.50 is 50% etc. + /// + [DataField("prob")] + public float SpawnProbability = 1; + + [DataField] + public int Amount = 1; + + [ViewVariables(VVAccess.ReadWrite), DataField] + public Angle LaunchAngle = Angle.FromDegrees(0); + + [ViewVariables(VVAccess.ReadWrite), DataField] + public Angle AngleRandomness = Angle.FromDegrees(5); +} diff --git a/Content.Shared/ADT/Weapons/SharedWeaponDismantleOnShootSystem.cs b/Content.Shared/ADT/Weapons/SharedWeaponDismantleOnShootSystem.cs new file mode 100644 index 00000000000..a437976f1f7 --- /dev/null +++ b/Content.Shared/ADT/Weapons/SharedWeaponDismantleOnShootSystem.cs @@ -0,0 +1,38 @@ +using Content.Shared.ADT.Weapon.Components; +using Content.Shared.Examine; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Random; + +namespace Content.Shared.ADT.Weapon.Systems; + +public abstract partial class SharedWeaponDismantleOnShootSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); +// SubscribeLocalEvent(OnExamine); + } + + public bool DismantleCheck(Entity ent, ref AmmoShotEvent args) + { + //roll to see if we explode or not + var random = IoCManager.Resolve(); + //1.0f means always true, 0.0f means always false + if (!random.Prob(ent.Comp.DismantleChance)) + return false; + + return true; + } + + //private void OnExamine(Entity ent, ref ExaminedEvent args) + //{ + // if (!args.IsInDetailsRange) + // return; + // + // if (ent.Comp.DismantleChance <= 0.0f) + // return; + // + // args.PushMarkup(Loc.GetString("examine-weapon-dismantle-on-shoot", ("chance", String.Format("{0:0.#}", ent.Comp.DismantleChance * 100)))); + //} +} diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs index c5452eda7c2..fd491fc5bd4 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs @@ -260,4 +260,8 @@ public void SetDamageModifierSetId(Entity ent, ProtoId FiredProjectiles = default!; + public EntityUid? Shooter = default!; // ADT-Tweak } diff --git a/Resources/Locale/en-US/ADT/crafting_menu/makeshift-items.ftl b/Resources/Locale/en-US/ADT/crafting_menu/makeshift-items.ftl new file mode 100644 index 00000000000..7335288b0b9 --- /dev/null +++ b/Resources/Locale/en-US/ADT/crafting_menu/makeshift-items.ftl @@ -0,0 +1,172 @@ +crafting-menu-name-FDB = forged double-barrel shotgun +crafting-menu-text-FDB = The cousin of the improvised shotgun, this one is made from better quality parts and an additional barrel! Takes time and welding supplies to make, however. + +crafting-menu-name-MP = makeshift pistol +crafting-menu-text-MP = A hastily built pistol, looks horrible and is liable to explode in your face. + +crafting-menu-name-IP = improvised pistol +crafting-menu-text-IP = The next best thing in improvised pistols, comes with an internal magazine of five rounds. + +crafting-menu-name-FP = forged pistol +crafting-menu-text-FP = A reliable, high quality firearm. Takes six-round clipazines, and needs welding supplies to make. + +crafting-menu-name-IPB = improvised pistol bullet +crafting-menu-text-IPB = Better than nothing. Low-quality propellant means it won't hit as hard as a normal bullet. + +crafting-menu-name-IPM = improvised pistol magazine +crafting-menu-text-IPM = A compact 6-round clipazine. + +crafting-menu-name-MR = makeshift revolver +crafting-menu-text-MR = Hastily built revolver that has a good chance of backfiring into your face. + +crafting-menu-name-IR = improvised revolver +crafting-menu-text-IR = An odd double-barrel revolver with no cylinder. The unique construction lowers the chance of a backfire, but does not eliminate it. + +crafting-menu-name-FR = forged revolver +crafting-menu-text-FR = The best Tider Engineering can provide. Has 4 shots and will NOT blow up in your face, but needs welding supplies to make. + +crafting-menu-name-IMB = improvised magnum bullet +crafting-menu-text-IMB = Better than nothing. Stuffed to the brim with phosphorus but still won't hit as hard. + +crafting-menu-name-IMS = improvised magnum speedloader +crafting-menu-text-IMS = A simple speedloader capable of holding 4 shots. + +crafting-menu-name-MB = modular barrel +crafting-menu-text-MB = For all your guncrafting needs! + +crafting-menu-name-MSH = makeshift shotgun +crafting-menu-text-MSH = A robust hand-cannon that'll snap your wrist right off if you're not careful + +crafting-menu-name-MS = makeshift smg +crafting-menu-text-MS = It can't hit the broad side of a barn. + +crafting-menu-name-IS = improvised smg +crafting-menu-text-IS = It CAN hit the broad side of a barn, but not a person. + +crafting-menu-name-FS = forged smg +crafting-menu-text-FS = Finally, an SMG that can hit a person! Needs to be welded together, so make sure you have welding supplies! + +crafting-menu-name-ISM = improvised smg magazine +crafting-menu-text-ISM = The fact this thing works at all is nothing short of a miracle + +crafting-menu-name-MRR = makeshift repeater rifle +crafting-menu-text-MRR = Too big to fit in your pocket, but small enough to fit in your bag. An odd weapon indeed. + +crafting-menu-name-IRR = improvised repeater rifle +crafting-menu-text-IRR = The weird in-between cousin, too big to be stored comfortably, but also not that inaccurate. + +crafting-menu-name-FRR = forged repeater rifle +crafting-menu-text-FRR = The peak of tider engineering. But does need welding supplies to finish. + +crafting-menu-name-IRB = improvised rifle bullet +crafting-menu-text-IRB = Better than nothing. Fairly full with phosphorus but still won't hit as hard. + +crafting-menu-name-IMGB = improvised magazine box +crafting-menu-text-IMGB = Organization is not the strong suit of any tider. Can hold all kinds of bullets. + +crafting-menu-name-MC = makeshift crowbar +crafting-menu-text-MC = You must be REALLY desperate.. + +crafting-menu-name-IC = improvised crowbar +crafting-menu-text-IC = Not the best, not the worst. Needs welding supplies to finish. + +crafting-menu-name-ISC = improvised screwdriver + +crafting-menu-name-IW = improvised wirecutter + +crafting-menu-name-IWR = improvised wrench + +crafting-menu-name-IM = improvised multitool +crafting-menu-text-IM = The best you're gonna get. Needs welding supplies to finish. + +crafting-menu-name-EW = emergency welder + +crafting-menu-name-IO = improvised omnitool +crafting-menu-text-IO = The fact that this abomination of tiderkind actually works is nothing short of a miracle. + +crafting-menu-name-FO = forged omnitool +crafting-menu-text-FO = The better, but more psychopathic omnitool. + +crafting-menu-name-WH = wooden hilt +crafting-menu-text-WH = Needed in the construction of basic bladed weapons. + +crafting-menu-name-PH = plasteel hilt +crafting-menu-text-PH = Needed in the construction of advanced bladed weapons. + +crafting-menu-name-SB = steel blade +crafting-menu-text-SB = Needed in the construction of basic bladed weapons. + +crafting-menu-name-PB = plasteel blade +crafting-menu-text-PB = Needed in the construction of advanced bladed weapons. + +crafting-menu-name-MSW = makeshift sword +crafting-menu-text-MSW = Big and scary, but not that dangerous. + +crafting-menu-name-ISW = improvised sword +crafting-menu-text-ISW = The budget option for aspiring maints knights. + +crafting-menu-name-FSW = forged sword +crafting-menu-text-FSW = Now THAT'S a weapon! Best paired with equally shiny armor, needs welding. + +crafting-menu-name-DSW = dawnbreaker +crafting-menu-text-DSW = Burn away the unholdy heretics with this weapon of justice! + +crafting-menu-name-TSW = tidebreaker +crafting-menu-text-TSW = Crush those who oppose you! + +crafting-menu-name-ISH = improvised shield +crafting-menu-text-ISH = Keep a solid sheet of metal between you and your enemies. Needs welding supplies to finish. + +crafting-menu-name-FSH = forged buckler shield +crafting-menu-text-FSH = Lightweight plasteel shield forged by the best tidersmiths, does a good job of keeping you alive. Needs welding supplies to finish. + +crafting-menu-name-FSHT = forged tower shield +crafting-menu-text-FSHT = Heavily armored plasteel shield, the extra plating and size making it more durable but heavier to hold. Needs welding supplies to finish. + +crafting-menu-name-PSH = paladin shield +crafting-menu-text-PSH = Sturdy yet light in your hands, perfectly weighted. Shaped into perfection for sword fights, among other Paladins. Needs welding supplies to finish. + +crafting-menu-name-PSHG = paladin greatshield +crafting-menu-text-PSHG = Become the wall you want to be. Exeedingly heavy to the point of needing a makeshift harness to simply hold. Needs welding supplies to finish. + +crafting-menu-name-MVT = makeshift vest +crafting-menu-text-MVT = Arguably nothing is better than this. Scrap metal cobbled together with LV cables to TRY and protect you. + +crafting-menu-name-IVT = improvised vest +crafting-menu-text-IVT = Actually better than nothing, but still a bit on the heavy side, good at keeping you from getting stabbed. + +crafting-menu-name-FVT = forged vest +crafting-menu-text-FVT = A high quality armor vest based upon old earth mongolian designs, it is very effective at what it does. + +crafting-menu-name-PVT = paladin suit +crafting-menu-text-PVT = The best a tidersmith can make! Don this suit of armor and deal swift justice to evildoers! Or.. do the evil yourself, I won't judge. + +crafting-menu-name-MVTH = makeshift helmet +crafting-menu-text-MVTH = Nothing is, somehow, still better than this. Provides minimal protection, MIGHT save your head from a bullet. + +crafting-menu-name-IVTH = improvised helmet +crafting-menu-text-IVTH = Better than nothing, by a slim margin. + +crafting-menu-name-FVTH = forged helmet +crafting-menu-text-FVTH = Almost the best a tidersmith can offer, it'll reliably stop a bullet and protect your head from being smashed in. + +crafting-menu-name-PVTH = paladin helmet +crafting-menu-text-PVTH = The best a tidersmith can offer, no holy crusade is fit to go on without a matching helmet! + +crafting-menu-name-ETX = emergency toolbox + +crafting-menu-name-MUL = multitool + +crafting-menu-name-WRE = wrench + +crafting-menu-name-WIR = wirecutter + +crafting-menu-name-SCR = screwdriver + +crafting-menu-name-CRO = crowbar + +crafting-menu-name-EXOXY = extended-capacity emergency oxygen tank + +crafting-menu-name-CGREN = green crayon + +crafting-menu-name-CYELO = yellow crayon diff --git a/Resources/Locale/en-US/ADT/prototypes/objectives/tag.ftl b/Resources/Locale/en-US/ADT/prototypes/objectives/tag.ftl new file mode 100644 index 00000000000..97325d7c518 --- /dev/null +++ b/Resources/Locale/en-US/ADT/prototypes/objectives/tag.ftl @@ -0,0 +1 @@ +construction-graph-tag-welder = welder diff --git a/Resources/Locale/ru-RU/ADT/Objects/Tools/makeshift-items.ftl b/Resources/Locale/ru-RU/ADT/Objects/Tools/makeshift-items.ftl new file mode 100644 index 00000000000..9c29d911bd2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Tools/makeshift-items.ftl @@ -0,0 +1,172 @@ +crafting-menu-name-FDB = кованый двуствольный дробовик +crafting-menu-text-FDB = Этот кованый двуствольный дробовик, похоже на настоящий двухствольный дробовик, изготовлено из деталей лучшего тех тунельного качества и со сдвоенным стволом! Однако для его изготовления требуется время и сварочные принадлежности. + +crafting-menu-name-MP = самодельный пистолет +crafting-menu-text-MP = Пистолет, сделанный на скорую руку, выглядит ужасно и может взорваться у вас перед носом. + +crafting-menu-name-IP = импровизированный пистолет +crafting-menu-text-IP = Следующая лучшая вещь в самодельных пистолетах - это внутренний магазин на пять патронов. + +crafting-menu-name-FP = кованый пистолет +crafting-menu-text-FP = Надежное, высококачественное огнестрельное оружие. Для создания требуются сварочные принадлежности. + +crafting-menu-name-IPB = самодельная пуля (9х19 мм) +crafting-menu-text-IPB = Лучше, чем ничего. Низкокачественный порох, даёт о себе знать, когда ваш противник остаётся на ногах после пары выстрелов. + +crafting-menu-name-IPM = импровизированный пистолетный магазин (9х19 мм) +crafting-menu-text-IPM = Компактный магазин на 6 патронов. + +crafting-menu-name-MR = самодельный револьвер +crafting-menu-text-MR = Наспех сконструированный револьвер, который с большой вероятностью даже не выстрелит прежде чем взорвётся у вас в руках. + +crafting-menu-name-IR = самодельный револьвер +crafting-menu-text-IR = Необычный двуствольный револьвер без барабана. Уникальная конструкция снижает вероятность обратного удара, но не исключает его. + +crafting-menu-name-FR = кованый револьвер +crafting-menu-text-FR = Лучшее, что может предложить компания Tider-Engineering. Рассчитан на 4 выстрела и он не взорвется у вас на глазах, но для изготовления нужны сварочные принадлежности. + +crafting-menu-name-IMB = самодельная пуля (.357 магнум) +crafting-menu-text-IMB = Лучше, чем ничего. Фаршированный до краев серой и фосфором, он все равно не будет таким уж вредным. + +crafting-menu-name-IMS = импровизированный спидлоудер (.357 магнум) +crafting-menu-text-IMS = Простой скорострельный пистолет, способный выдержать 4 патрона. + +crafting-menu-name-MB = модульный ствол +crafting-menu-text-MB = Все для ваших потребностей в изготовлении оружия! + +crafting-menu-name-MSH = самодельный дробовик +crafting-menu-text-MSH = Надежная ручная пушка, которая сразу же оторвет вам запястье, когда вы потеряете бдительность. + +crafting-menu-name-MS = самодельный пистолет-пулемет +crafting-menu-text-MS = Он даже выстрелить в стену не может, что уж говорить о том чтобы попасть в неё. + +crafting-menu-name-IS = импровизированный пистолет-пулемет +crafting-menu-text-IS = Он может попасть в широкую стену сарая, но явно не в человека. + +crafting-menu-name-FS = кованый пистолет-пулемет +crafting-menu-text-FS = Наконец-то, самодельный хлам, который может убить человека! Его необходимо сварить, поэтому убедитесь, что у вас есть сварочные принадлежности! + +crafting-menu-name-ISM = импровизированный ПП магазин +crafting-menu-text-ISM = Тот факт, что эта штука не разлетается при перезарядке, - не что иное, как чудо. + +crafting-menu-name-MRR = самодельная рычажная винтовка +crafting-menu-text-MRR = Слишком большой, чтобы поместиться в кармане, но достаточно маленький, чтобы поместиться в сумке. Действительно, странное оружие. + +crafting-menu-name-IRR = импровизированная рычажная винтовка +crafting-menu-text-IRR = Странный промежуточный кузен, слишком большой, чтобы его можно было удобно хранить, но в то же время не такой уж неточный. + +crafting-menu-name-FRR = кованая рычажная винтовка +crafting-menu-text-FRR = Вершина кустарной инженерной мысли. Но для завершения работы требуются сварочные принадлежности. + +crafting-menu-name-IRB = самодельная пуля (7.62х39 мм) +crafting-menu-text-IRB = Лучше, чем без патронов. + +crafting-menu-name-IMGB = импровизированная коробка для патронов +crafting-menu-text-IMGB = Организованность не является сильной стороной любого грейтрайдера. Может вмещать все виды пуль. + +crafting-menu-name-MC = самодельная монтировка +crafting-menu-text-MC = Вы, должно быть, ДЕЙСТВИТЕЛЬНО в отчаянной ситуации.. + +crafting-menu-name-IC = импровизированная монтировка +crafting-menu-text-IC = Лучше просто купите лом... Для завершения работы нужны сварочные принадлежности. + +crafting-menu-name-ISC = самодельная отвертка + +crafting-menu-name-IW = импровизированные кусачки + +crafting-menu-name-IWR = импровизированный гаечный ключ + +crafting-menu-name-IM = импровизированный мультитул +crafting-menu-text-IM = Это лучшее, что вы можете создать. Для завершения работы нужны сварочные принадлежности. + +crafting-menu-name-EW = аварийная сварка + +crafting-menu-name-IO = импровизированный омнитул +crafting-menu-text-IO = Тот факт, что эта мерзость ковача действительно работает, является ничем иным, как чудом. + +crafting-menu-name-FO = кованый омнитул +crafting-menu-text-FO = Лучший из доступных, но крайне уродский омнитул. + +crafting-menu-name-WH = рукоять из древесины +crafting-menu-text-WH = Необходим при изготовлении базового холодного оружия. + +crafting-menu-name-PH = рукоять из пластали +crafting-menu-text-PH = Необходим при изготовлении усовершенствованного холодного оружия. + +crafting-menu-name-SB = лезвие из стали +crafting-menu-text-SB = Необходим при изготовлении базового холодного оружия. + +crafting-menu-name-PB = лезвие из пластали +crafting-menu-text-PB = Необходим при изготовлении усовершенствованного холодного оружия. + +crafting-menu-name-MSW = самодельный меч +crafting-menu-text-MSW = Выглядит как оружие из фильмов ужасов, но к сожалению не очень эффективен и хрупок. + +crafting-menu-name-ISW = импровизированный меч +crafting-menu-text-ISW = Неплохой вариант для начинающих мародёров. + +crafting-menu-name-FSW = кованый меч +crafting-menu-text-FSW = Вот ЭТО меч! Хорошо сочетается с такой же блестящей броней, нуждается в сварке. + +crafting-menu-name-DSW = предвестник рассвета +crafting-menu-text-DSW = Сожгите всё вокруг, будто длань господня спустилась для судного дня. + +crafting-menu-name-TSW = киторез +crafting-menu-text-TSW = "Эта штука была слишком большой, чтобы называться мечом. Слишком большая, слишком толстая, слишком тяжелая и слишком грубая, она больше походила на огромный кусок железа." + +crafting-menu-name-ISH = импровизированный щит +crafting-menu-text-ISH = Держите между собой и врагами сплошной лист металла, прямо как старых в фильмах! Не уверен сработает ли это... Для завершения вам понадобятся сварочные принадлежности. + +crafting-menu-name-FSH = кованый баклерный щит +crafting-menu-text-FSH = Легкий защитный экран из пластали, выкованный лучшими мастерами ковачами, отлично справляется с задачей сохранения вашей жизни. Для завершения работы требуются сварочные принадлежности. + +crafting-menu-name-FSHT = кованый башенный щит +crafting-menu-text-FSHT = Сильно бронированный пластальевый щит, с дополнительной обшивкой делает его более прочным, но более тяжелым. Для завершения работы требуются сварочные принадлежности. + +crafting-menu-name-PSH = щит паладина +crafting-menu-text-PSH = Прочный, но легкий в руках, с идеальным весом. Форма идеально подходит для поединков на мечах, среди прочих паладинов. Для завершения нужны сварочные принадлежности. + +crafting-menu-name-PSHG = великий щит паладина +crafting-menu-text-PSHG = Станьте стеной, которой вы и хотите стать. Он настолько тяжелый, что для его удержания требуется самодельная обвязка. Для завершения нужны сварочные принадлежности. + +crafting-menu-name-MVT = самодельный стальной нагрудник +crafting-menu-text-MVT = Пожалуй, нет ничего хуже этого. Металлолом, скрепленный низковольтными кабелями, призван защитить ваши ошмётки. + +crafting-menu-name-IVT = импровизированная бригантина +crafting-menu-text-IVT = На самом деле это лучше, чем ничего, но все равно немного тяжеловат, но способен уберечь от ножевых ранений. + +crafting-menu-name-FVT = кованый ламеллярный доспех +crafting-menu-text-FVT = Высококачественный жилет, основанный на монгольских образцах старой брони, очень эффективен в мародёрстве. + +crafting-menu-name-PVT = миланский доспех паладина +crafting-menu-text-PVT = Это лучшее, что может создать ковач! Наденьте эти доспехи и быстро расправьтесь со злодеями! Или... творите зло сами, я не берусь судить. + +crafting-menu-name-MVTH = самодельный стальной шлем +crafting-menu-text-MVTH = У вас все равно нет ничего лучше этого. Обеспечивает минимальную защиту, может разве что смягчить выстрел. + +crafting-menu-name-IVTH = импровизированный шлем барбют +crafting-menu-text-IVTH = Этот шлем почти лучше, чем ничего. + +crafting-menu-name-FVTH = кованый шлем армэ +crafting-menu-text-FVTH = Это неплохой вариант шлема не бедствующего крестьянина, что может предложить ковач, он может замедлить пулю и защитит вашу голову от ударов. + +crafting-menu-name-PVTH = паладинский шлем штеххелм +crafting-menu-text-PVTH = Лучшее что может предложить ковач, ни один священный крестовый поход не обойдется без соответствующего шлема! + +crafting-menu-name-ETX = аварийный ящик инструментов + +crafting-menu-name-MUL = мультитул + +crafting-menu-name-WRE = гаечный ключ + +crafting-menu-name-WIR = кусачки + +crafting-menu-name-SCR = отвёртка + +crafting-menu-name-CRO = монтировка + +crafting-menu-name-EXOXY = расширенный аварийный кислородный баллон + +crafting-menu-name-CGREN = зелёный мелок + +crafting-menu-name-CYELO = жёлтый мелок diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl index ad5d82e98ef..963ee96738c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/helmets.ftl @@ -32,3 +32,15 @@ ent-ADTLegionerHemlet = шлем легионера ent-ADTClothingHeadHelmetTrueTemplar = шлем крестоносца .desc = Теперь древний шлем вполне реален для вас. + +ent-ClothingHeadHelmetMakeshift = самодельный стальной шлем + .desc = Может быть, вообще ничего не носить тоже неплохая идея. + +ent-ClothingHeadHelmetImprovised = импровизированный шлем барбют + .desc = Соединённые стальные пластины обеспечивают неплохую защиту от ударов, но все равно это едва ли лучше, чем ничего. + +ent-ClothingHeadHelmetForged = кованый шлем армэ + .desc = Высококачественный шлем армэ, изготовленный одними из лучших ковачей, наконец-то что-то стоящее, чтобы носить его на голове. + +ent-ClothingHeadHelmetPaladin = паладинский шлем штеххелм + .desc = Если кто-то не носит шлем, на войне его неминуемо ждёт смерть, исключений нет. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl index df95ddbd2b4..64f2db02aa5 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl @@ -50,3 +50,16 @@ ent-ADTClothingOuterArmorMinerReinforcedFull = пластинчатый кост ent-ADTClothingOuterArmorCrusader = защитный доспех крестоносца .desc = Время захватывать Иерусалим, брат! + +ent-ClothingOuterArmorMakeshift = самодельный стальной нагрудник + .desc = Может остановить пулю, может... + +ent-ClothingOuterArmorImprovised = импровезированная бригантина + .desc = Удобна, нестесняет движения и хорошо защищает от режущих повреждений и высокотемпературных воздействий, Может развалится от термического воздействий. + +ent-ClothingOuterArmorForged = кованый ламеллярный доспех + .desc = Броня изготовлена из высококачественного хлама ковача, а дополнительная кожаная подкладка и замена большей части пластали на сталь обеспечивают легкость брони. + +ent-ClothingOuterArmorPaladin = миланский доспех паладина + .desc = Стань паладином, которым ты хочешь быть! Замахнись своим огромным киторезом на бедного кадета службы безопасности пока он в страхе бездумно выпускает в тебя всю обойму из своего МК 58! Сражайся с МОНСТРАМИ, которые совершенно не похожи на обычных существ, но не могут даже пацарапать твою броню! Пробивайся под лазерными выстрелами и умирай! Подожди, что... + diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/makeshift-item.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/makeshift-item.ftl new file mode 100644 index 00000000000..4c57dba5dbf --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/makeshift-item.ftl @@ -0,0 +1,99 @@ +# Незаконченные вещи + +ent-UnfinishedClothingHeadHelmetImprovised = незаконченный шлем барбют + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedImprovisedShield = незаконченный импровизированный щит + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedClothingOuterArmorImprovised = незаконченная импровизированная броня бригантина + .desc = Требуется сварка, чтобы скрепить её воедино. + +ent-UnfinishedImprovisedScrewdriver = незаконченная импровизированная отвёртка + .desc = Требуется сварка, чтобы скрепить её воедино. + +ent-UnfinishedImprovisedCrowbar = незаконнченая импровизированная монтировка + .desc = Требуется сварка, чтобы скрепить её воедино. + +ent-UnfinishedImprovisedWrench = незаконченный импровизированный гаечный ключ + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedClaymoreForged = незаконченный киторез + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedSwordForged = незаконченный кованый меч + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedSniperForged = незаконченная кованная рычажная винтовка + .desc = Требуется сварка, чтобы скрепить её воедино. + +ent-UnfinishedPistolForged = незаконченный кованый пистолет + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedSubMachineGunForged = незаконченный кованый пистолет пулемёт + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedForgedShotgun = незаконченный двухствольный дробовик + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedClothingHeadHelmetForged = незаконченный кованый шлем армэ + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedClothingOuterArmorForged = незаконченный кованый ламеллярный доспех + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedForgedShieldTower = незаконченный кованый башенный щит + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedRevolverForged = незаконченный кованый револьвер + .desc = Требуется сварка, чтобы скрепить его воедино. + +ent-UnfinishedImprovisedWirecutter = незаконченные импровизированные кусачки + .desc = Требуется сварка, чтобы скрепить их. + +ent-UnfinishedImprovisedMultitool = незаконченный импровизированный мультитул + .desc = Нужна сварка и немного терпения, чтобы собрать всё это воедино. + +ent-UnfinishedImprovisedOmnitool = незаконченный импровизированный омнитул + .desc = Что ты делаешь? нужно проварить... + +ent-UnfinishedForgedOmnitool = незаконченный кованый омнитул + .desc = Вы либо сумасшедший, либо психопат. Скорее всего, и то. Нужно проварить. + +ent-ModularBarrel = модульный ствол + .desc = По факту этого уже достаточно чтобы стрелять. + +# Инструменты + +ent-OmnitoolForged = кованый омнитул + .desc = Какой-то законченный психопат решил отпилить головки у всех инструментов, которые смог найти, и соорудить из них самодельную дрель. Выглядит неплохо, учитывая её происхождение. + +ent-CrowbarMakeshift = самодельный лом + .desc = Это чудище было создано ценой одного ящика для инструментов, можно проварить чтобы сделать его по смешному лудше. + +ent-CrowbarWrenchMakeshift = самодельный лом - гаечный ключ + .desc = Всё ещё ужасен. + +ent-CrowbarWrenchScrewdriverMakeshift = самодельный лом - гаечный ключ - отвёртка + .desc = Я... Нужно остановиться.. + +ent-OmnitoolMakeshift = самодельный омнитул + .desc = Это издевательство... + +ent-MultitoolImprovised = импровизированный мультитул + .desc = Иногда искрится и бьёт током, а впрочем неплох. + +ent-ScrewdriverImprovised = импровизированная отвёртка + .desc = Как бы оно ни выглядело, главное что работает. + +ent-OmnitoolImprovised = импровизированный омнитул + .desc = Нечестивая мерзость, уступающая лишь самому великому Нагибатору. + +ent-WirecutterImprovised = импровизированные кусачки + .desc = Заточенный металл достаточно острый, чтобы разрезать толстую проволоку. + +ent-WrenchImprovised = импровизированный гаечный ключ + .desc = Сойдёт. + +ent-CrowbarImprovised = импровизированная монтировка + .desc = 5 Листов стали - это всё что мне нужно. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Box.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Box.ftl new file mode 100644 index 00000000000..e82118c7e21 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Box.ftl @@ -0,0 +1,2 @@ +ent-BaseMagazineBoxImprovised = импровизированная коробка патрон (.любые) + .desc = Это подозрительно похоже на магазинную коробку 20-го калибра с грубым рисунком пули на крышке. Не рекомендуется смешивать патроны. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl index 73395d01626..7a8db12dbed 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/cartridges.ftl @@ -17,3 +17,12 @@ ent-ShellShotgunBibis = картечь страйкбольных шариков ent-Syringecartridge = шприцевый картридж .desc = { ent-BaseCartridge.desc } .suffix = { "" } + +ent-CartridgePistolImprovised = импровизированный патрон (9х19 мм) + .desc = { ent-BaseCartridge.desc } + +ent-CartridgeMagnumImprovised = импровизированный патрон (.357 магнум) + .desc = { ent-BaseCartridge.desc } + +ent-LightRifleImprovised = импровизированный патрон (7.62х39 мм) + .desc = { ent-BaseCartridge.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.ftl index 6bdf5f3549f..2893766b4d9 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.ftl @@ -8,5 +8,7 @@ ent-ADTCartridgeMagnumLesserIncendiary = патрон (.357 магнум заж .desc = { ent-ADTCartridgeMagnumLesser.desc } ent-ADTCartridgeMagnumLesserUranium = патрон (.357 магнум урановый) .desc = { ent-ADTCartridgeMagnumLesser.desc } -ent-ADTCartridgeMagnumsilver = патрон (.357 магнум серебрянный) +ent-ADTCartridgeMagnumSilver = патрон (.357 магнум серебрянный) .desc = Не так эффективно как патроны благословленные богом, но тоже пойдут +ent-ADTCartridgeMagnumHoly = патрон (.357 магнум святой) + .desc = "Люби ближнего своего, как самого себя." diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.ftl new file mode 100644 index 00000000000..b858c39f8d2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.ftl @@ -0,0 +1,2 @@ +ent-MagazinePistolImprovised = импровизированный пистолетный магазин (9х19 мм) + .desc = { ent-BaseMagazinePistol.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/smg.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/smg.ftl new file mode 100644 index 00000000000..43bd191a824 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/smg.ftl @@ -0,0 +1,3 @@ +ent-MagazinePistolSubMachineGunImprovised = импровизированный ПП магазин (9х19 мм) + +ent-MagazinePistolSubMachineGunImprovisedFull = импровизированный ПП магазин (9х19 мм) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/magnum.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/magnum.ftl index a6ef6d834a6..3e712ee7a22 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/magnum.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/magnum.ftl @@ -12,3 +12,5 @@ ent-ADTSpeedLoaderMagnumLesserIncendiary = спидлоадер (.357 магну .desc = { ent-ADTSpeedLoaderMagnumLesser.desc } ent-ADTSpeedLoaderMagnumLesserUranium = спидлоадер (.357 магнум урановый) .desc = { ent-ADTSpeedLoaderMagnumLesser.desc } +ent-SpeedLoaderMagnumImprovised = импровизированный спидлоадер (.357 магнум) + .desc = { ent-ADTSpeedLoaderMagnumLesser.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.ftl index bbf05296c7d..7eab2400fdf 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.ftl @@ -4,5 +4,15 @@ ent-ADTWeaponPistolDesertEagle = Дезерт Игл ent-ADTBananahilator = бананагилятор .desc = Альтернативная ветвь эволюции гатфрукта. Выглядит и смешно, и полезно одновременно. + ent-ADTSeraph = СЕРАФИМ-NT-519 - .desc = Последняя модель болтера против сил зла... И разумных грибов. \ No newline at end of file + .desc = Последняя модель болтера против сил зла... И разумных грибов. + +ent-WeaponPistolMakeshiftCrafted = самодельный пистолет + .desc = Чуть больше экономии. Вероятно просто взорвётся у вас в руках. + +ent-WeaponPistolImprovised = импровизированный пистолет + .desc = Самодельный пистолет с внутренним магазином. Более надежный, но все равно способный взорватся вам в лицо. + +ent-WeaponPistolForged = кованый пистолет + .desc = Надежный магазинный пистолет, изготовленный лучшими тайдерскими кузнецами. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.ftl index 3dcf43249a3..c746ad232f4 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.ftl @@ -5,3 +5,12 @@ ent-ADTWeaponRevolverLesserUnica = Уника 6 ent-ADTWeaponRevolverRussian = русский револьвер .desc = Увесистый, красивый, отечественный револьвер с механизмом для значительного ускорения игрушечных пуль. Прекрасен для игры в русскую рулетку. .suffix = { "Револьвер" } + +ent-WeaponRevolverMakeshift = самодельный револьвер + .desc = Чуть больше шанс взрыва ценой стиля. + +ent-WeaponRevolverImprovised = импровизированный револьвер + .desc = Револьвер с двух местным барабаном. Кажется это бред... + +ent-WeaponRevolverForged = кованый револьвер + .desc = Лучшее, что может предложить компания Tider engineering - револьвер, вмещающий 4 патрона! diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/SMG/smg.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/SMG/smg.ftl new file mode 100644 index 00000000000..fa257e0e607 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/SMG/smg.ftl @@ -0,0 +1,8 @@ +ent-WeaponSubMachineGunMakeshift = самодельный пистолет-пулемёт + .desc = Скрепленн тканью и вашими мечтами, он зловеще дребезжит при каждом выстреле. + +ent-WeaponSubMachineGunImprovised = импровизированный пистолет-пулемёт + .desc = Он крепко держится на ткани, стали и вашей решимости. + +ent-WeaponSubMachineGunForged = кованый пистолет-пулемёт + .desc = Лучшее, что может быть у грейтрайдера, - это сталь и пластик, сваренные вместе для получения довольно приличного пистолета SMG, хотя самодельная возвратная пружина на нем и замедляет стрельбу. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.ftl index d2665f08330..22cf4f75c56 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.ftl @@ -5,3 +5,11 @@ ent-ADTWhiteCaneShotgun = белая трость ent-ADTWeaponShotgunImprovisedSawn = самодельный обрез .suffix = Дробовик .desc = Дерьмовенькое, да еще и обрезанное ружьё кустарного производства, использующее патроны калибра 12х70 ружейный. Патронник рассчитан только на один патрон. + +ent-WeaponShotgunMakeshift = самодельный дробовик + .desc = Небольшая ручная пушка, стреляющая патронами для дробовика калибра (12х70). Пригодится, если не выходит найти сигнальный пистолет. У неё нет заплаток, чтобы скреплять её, поэтому есть большая вероятность, что она развалится при каждом выстреле. + +# Тут нет импровизированного дробовика ибо используется оффовский + +ent-WeaponShotgunForged = кованый двухствольный дробовик + .desc = обротно сделанный двухствольный дробовик, усиленный стальными пластинами, чтобы держать его вместе. Не такой точный, как настоящий. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.ftl index 8c2cac87b8e..b1c72fa47d8 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.ftl @@ -9,3 +9,12 @@ ent-WeaponSniperHristovBibis = страйкбольный Христов ent-MusketBibis = страйкбольный Мушкет .desc = Реплика "Мушкет", сделанная для игры в страйкбол. .suffix = { ent-WeaponSniperHristovBibis.suffix } + +ent-WeaponSniperMakeshift = самодельная винтовка + .desc =Она проделает дыру в том парне, на которого ты его направишь, если конечно не оторвёт тебе запястье. + +ent-WeaponSniperImprovised = импровизированная рычажная винтовка + .desc = Может ПОЧТИ попасть в цель! + +ent-WeaponSniperForged = кованная рычажная винтовка + .desc = Лучшее, что на данный момент смогло достичь Tider engineering, - это скорострельность и надежная точность при использовании рычажной системы. Чего еще можно желать? Но ЭТО НЕ ВСЁ! оснащен патронником для (7.62х39) и (.357 магнум) калибров. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/shields/shield-makeshift.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/shields/shield-makeshift.ftl new file mode 100644 index 00000000000..25b0ad2e243 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/shields/shield-makeshift.ftl @@ -0,0 +1,14 @@ +ent-ImprovisedShield = импровизированный тарчевый щит + .desc = Сталь сварена воедино, улучшает прочность в ближнем бою. Однако не ожидайте, что она хорошо себя проявит в перестрелке. + +ent-ForgedShieldTower = кованый башенный щит + .desc = Высокий и грозный. Правда, немного тяжеловат. + +ent-ForgedShieldBuckler = кованый баклерный щит + .desc = Изготовлен из лучшей украденной пластали, которую только могли предложить инженеры. Универсальный, но из-за того, что изготовлен из цельного металла, он плохо держит термонагрев. + +ent-PaladinShieldGreat = огромный паладинский щит + .desc = Ты прижат к стене? ОТЛИЧНО, ВЕДЬ Я ТА САМАЯ СТЕНА У ТЕБЯ НА ПУТИ! (Он плохо выдерживает термонагрев.) + +ent-PaladinShield = миндалевидный щит паладина + .desc = Щит для настоящего паладина! Хорош в отражении режущих ударов и поглощении тупых ударов, но не более того. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl index b56db4df137..b0e1e2c62b6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl @@ -6,6 +6,21 @@ ent-ADTKatanacursedShard = странный осколок ent-ADTStraightRazor = опасная бритва .desc = Ею легко перерезать горло. - + ent-ADTGladius = гладиус .desc = Старый меч Римской империи, он все еще хорош для кампаний против варваров в технических помещениях. + +ent-SwordMakeshift = самодельное мачете + .desc = Какая-то прямоугольная спиленная сталь, прикрепленная к металлическому стержню, вряд ли может быть названа мечём, потому пусть будет мачете. + +ent-SwordImprovised = импровизированный меч + .desc = Не слишком острый, но с работой справляется. Это хотя бы похоже на меч! + +ent-SwordForged = полуторатонный кованый меч + .desc = Лезвие изготовленое из пластали, отлично режет плоть прилонить его к туше уже достаточно, чтобы пустить кровь. + +ent-SwordFlaming = предвестник рассвета + .desc = Страшное оружие, способное сжечь как и владельца так и врагов его. + +ent-ClaymoreForged = киторез + .desc = Абсурдно большой меч, от того он за одно дробит цели. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl index bb72ac6da08..05f66375e25 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl @@ -13,3 +13,7 @@ ent-ADTGasPipeTJunction = { ent-GasPipeBase } ent-ADTGasPipeFourway = { ent-GasPipeBase } .suffix = Четверная, ADT .desc = { ent-GasPipeBase.desc } +ent-SignalControlledValveAlt1 = сигнальный вентиль + .desc = Труба с клапаном, который можно контролировать при помощи сигналов. +ent-SignalControlledValveAlt2 = { ent-SignalControlledValveAlt1 } + .desc = { ent-SignalControlledValveAlt1.desc } diff --git a/Resources/Locale/ru-RU/ADT/recipes/tag.ftl b/Resources/Locale/ru-RU/ADT/recipes/tag.ftl index 72db5975db6..c272aba5d82 100644 --- a/Resources/Locale/ru-RU/ADT/recipes/tag.ftl +++ b/Resources/Locale/ru-RU/ADT/recipes/tag.ftl @@ -96,6 +96,9 @@ construction-graph-tag-aloe = алоэ construction-graph-door-electronics = микросхема шлюза construction-graph-intercom-electronics = плата интеркома +# Инструменты +construction-graph-tag-welder = сварочный аппарат + # Другое construction-graph-voice-trigger = голосовой триггер construction-graph-tag-toy-blaster = игрушечный бластер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/scraparmor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/scraparmor.ftl index 59ea0440cba..1a2395dcd15 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/scraparmor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/scraparmor.ftl @@ -1,8 +1,8 @@ ent-WiredApronBase = кабельный фартук .desc = Фартук с кабельной прокладкой. Выглядит незавершённым. -ent-SteelApronBase = фартук покрытый сталью - .desc = Фартук со стальной пластиной, беспорядочно прикрепленной запасными кабелями. В текущем состоянии он распадётся как только его наденут. -ent-WeldedSteelApronBase = фартук с приваренной сталью - .desc = Фартук, прикрепленный с помощью сварных стальных пластин к запасным кабелям. Броня больше не грозит развалиться, но требует дополнительных работ для надежной фиксации. +ent-SteelApronBase = фартук покрытый пласталью + .desc = Фартук с пластальевой пластиной, беспорядочно прикрепленной запасными кабелями. В текущем состоянии он распадётся как только его наденут. +ent-WeldedSteelApronBase = фартук с приваренной пласталью + .desc = Фартук, с приваренными пластальевыми пластиками закреплёнными на кабелях. Броня больше не грозит развалиться, но требует дополнительных работ для надежной фиксации. ent-ClothingOuterArmorScrap = мусорная броня - .desc = Сверкающая кольчуга тайдера. Сдайся, или ты покойник. + .desc = Сверкающая кольчуга тайдера! Покажи им кто здесь настоящий джеггернаут. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml index 4f55ae593aa..95229d63066 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml @@ -192,3 +192,81 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.8 + +# Перенос самоделок Start + +- type: entity + parent: [ClothingHeadHelmetBase, BaseMinorContraband] + id: ClothingHeadHelmetMakeshift + name: makeshift helmet + description: Cobbled together steel held together with lv cables in the vauge shape of a helmet. Barely does anything. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.97 + Slash: 0.96 + Piercing: 0.97 + Heat: 0.98 + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/makeshift.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Helmets/makeshift.rsi + - type: Construction + graph: ClothingHeadHelmetMakeshiftGraph + node: helmet + +- type: entity + parent: [ClothingHeadHelmetBase, BaseMinorContraband] + id: ClothingHeadHelmetImprovised + name: improvised helmet + description: Interlocking steel plates provides some decent protection, but is still barely better than nothing. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.93 + Piercing: 0.95 + Heat: 0.96 + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/improvised.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Helmets/improvised.rsi + +- type: entity + parent: [ClothingHeadHelmetBase, BaseMinorContraband] + id: ClothingHeadHelmetForged + name: forged helmet + description: A high-quality helmet made by some of the best Tidersmiths, it is finally worthwhile to have it on your head. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.88 + Slash: 0.92 + Piercing: 0.92 + Heat: 0.88 + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/forged.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Helmets/forged.rsi + +- type: entity + parent: [ClothingHeadHelmetBase, BaseMajorContraband] + id: ClothingHeadHelmetPaladin + name: paladin helmet + description: No true paladin can go without their helmet! + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.92 + Slash: 0.88 + Piercing: 0.88 + Heat: 0.92 + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/paladin.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Helmets/paladin.rsi +# End diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml index 9777c1512bc..2a3ed33ccdd 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -533,3 +533,102 @@ - type: ClothingSpeedModifier walkModifier: 0.75 sprintModifier: 0.75 + +# Перенос самоделок Start + +- type: entity + parent: [ClothingOuterArmorForged, BaseMinorContraband] + id: ClothingOuterArmorMakeshift + name: makeshift vest + description: Might catch a bullet. Might. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/makeshift.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/makeshift.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.85 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: Construction + graph: ClothingOuterArmorMakeshiftGraph + node: vest + +- type: entity + parent: [ClothingOuterArmorForged, BaseMinorContraband] + id: ClothingOuterArmorImprovised + name: improvised vest + description: Interlocking metal plates ensure you're decently protected against stabs, but not much else. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/improvised.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/improvised.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.60 + Piercing: 0.8 + Heat: 0.70 + - type: ExplosionResistance + damageCoefficient: 0.95 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + +- type: entity + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseMinorContraband] #BaseSecurityContraband overwrites BaseMinorContraband, annoyingly enough. + id: ClothingOuterArmorForged + name: forged vest + description: A product of high-quality tidesmithing, the additional leather padding and the swap for plasteel over steel ensures the armor is lightweight and effective. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/forged.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/forged.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.65 + Piercing: 0.65 + Heat: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.7 + +- type: entity + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseMajorContraband] + id: ClothingOuterArmorPaladin + name: paladin suit + description: Be the paladin you want to be! Swing swords in maints at the terrified security officer! Battle MONSTERS that are totally not vent creatures! Get shot by lasers and die-! Wait what? + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/paladin.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/paladin.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.50 + Piercing: 0.55 + Heat: 0.85 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.85 + +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/improviesd_parts.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/improviesd_parts.yml new file mode 100644 index 00000000000..2d9126c2d91 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/improviesd_parts.yml @@ -0,0 +1,491 @@ +- type: entity + parent: BaseItem + id: UnfinishedImprovisedCrowbar + name: crowbar parts + description: Needs welding to hold it together. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Tools/improvised_crowbar.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: CrowbarImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedCrowbarGraph + node: tool + +- type: entity + parent: BaseItem + id: UnfinishedImprovisedScrewdriver + name: screwdriver parts + description: Needs welding to hold it together. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Tools/improvised_screwdriver.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ScrewdriverImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedScrewdriverGraph + node: tool + +- type: entity + parent: BaseItem + id: UnfinishedImprovisedWirecutter + name: wirecutter parts + description: Needs welding to hold it together. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Tools/improvised_wirecutters.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WirecutterImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedWirecutterGraph + node: tool + +- type: entity + parent: BaseItem + id: UnfinishedImprovisedWrench + name: wrench parts + description: Needs welding to hold it together. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Tools/improvised_wrench.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WrenchImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedWrenchGraph + node: tool + +- type: entity + parent: BaseItem + id: UnfinishedImprovisedMultitool + name: multitool parts + description: Needs welding and some patience to put it all together. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Tools/improvised_multitool.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: MultitoolImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedMultitoolGraph + node: tool + +#- type: entity +# parent: BaseItem +# id: UnfinishedImprovisedOmnitool +# name: improvised omnitool parts +# description: What are you doing..? Needs.. to be welded. +# components: +# - type: Item +# size: Normal +# - type: Sprite +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: unfinished +# - type: ToolRefinable +# refineResult: +# - id: OmnitoolImprovised +# - type: Tag +# tags: +# - Metal +# - type: Construction +# graph: ImprovisedOmnitoolGraph +# node: tool + +#- type: entity +# parent: BaseItem +# id: UnfinishedForgedOmnitool +# name: forged omnitool parts +# description: You are either crazy, or a psychopath. Likely both, needs to be welded. +# components: +# - type: Item +# size: Normal +# - type: Sprite +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: unfinished +# - type: ToolRefinable +# refineResult: +# - id: OmnitoolForged +# - type: Tag +# tags: +# - Metal +# - type: Construction +# graph: ForgedOmnitoolGraph +# node: tool + +- type: entity + parent: BaseItem + id: HiltWood + name: wooden hilt + description: People will try to convince you otherwise, but wooden handles are not part of a high-quality sword, nor a knife. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Misc/wooden_hilt.rsi + state: icon + - type: Tag + tags: + - HiltWood + - type: Construction + graph: HiltWoodGraph + node: hilt + +- type: entity + parent: BaseItem + id: HiltPlasteel + name: plasteel hilt + description: Part of high-quality sword & knife crafting. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Misc/plasteel_hilt.rsi + state: icon + - type: Tag + tags: + - HiltPlasteel + - type: Construction + graph: HiltPlasteelGraph + node: hilt + +- type: entity + parent: BaseItem + id: BladeSteel + name: steel blade + description: Doesn't look very sharp.. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Objects/Misc/steel_blade.rsi + state: icon + - type: Tag + tags: + - BladeSteel + - type: Construction + graph: BladeSteelGraph + node: blade + +- type: entity + parent: BaseItem + id: BladePlasteel + name: plasteel blade + description: Ouch! Just touching the edge can cut you. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Objects/Misc/plasteel_blade.rsi + state: icon + - type: Tag + tags: + - BladePlasteel + - type: Construction + graph: BladePlasteelGraph + node: blade + +- type: entity + parent: BaseItem + id: UnfinishedSwordForged + name: forged sword parts + description: Simply needs a bit of welding around the edges. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_sword.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: SwordForged + - type: Tag + tags: + - Metal + - type: Construction + graph: SwordForgedGraph + node: sword + +- type: entity + parent: BaseItem + id: UnfinishedClaymoreForged + name: tidebreaker parts + description: Simply needs a bit of welding around the edges. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/tidebreaker.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClaymoreForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ClaymoreForgedGraph + node: sword + +- type: entity + parent: BaseItem + id: UnfinishedImprovisedShield + name: improvised shield parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/improvised_shield.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ImprovisedShield + - type: Tag + tags: + - Metal + - type: Construction + graph: ImprovisedShieldGraph + node: shield + +- type: entity + parent: BaseItem + id: UnfinishedForgedShieldBuckler + name: forged buckler shield parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ForgedShieldBuckler + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedShieldBucklerGraph + node: shield + +- type: entity + parent: BaseItem + id: UnfinishedForgedShieldTower + name: forged tower shield parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_tower_shield.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ForgedShieldTower + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedShieldTowerGraph + node: shield + +- type: entity + parent: BaseItem + id: UnfinishedPaladinShield + name: paladin shield parts + description: The shield of a true paladin..! In pieces. Needs some welding. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/paladin_shield.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: PaladinShield + - type: Tag + tags: + - Metal + - type: Construction + graph: PaladinShieldGraph + node: shield + +- type: entity + parent: BaseItem + id: UnfinishedPaladinShieldGreat + name: paladin greatshield parts + description: You're either crazy, or want to become a mobile emplacement. Needs a lot of welding.. + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/paladin_greatshield.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: PaladinShieldGreat + - type: Tag + tags: + - Metal + - type: Construction + graph: PaladinShieldGreatGraph + node: shield + +- type: entity + parent: BaseItem + id: UnfinishedClothingOuterArmorImprovised + name: improvised vest parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/improvised.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingOuterArmorImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingOuterArmorImprovisedGraph + node: vest + +- type: entity + parent: BaseItem + id: UnfinishedClothingOuterArmorForged + name: forged vest parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/forged.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingOuterArmorForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingOuterArmorForgedGraph + node: vest + +- type: entity + parent: BaseItem + id: UnfinishedClothingOuterArmorPaladin + name: paladin suit parts + description: A LOT of assembly required, minimal welding needed. Become the paladin you've always wanted to be! + components: + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/paladin.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingOuterArmorPaladin + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingOuterArmorPaladinGraph + node: vest + +- type: entity + parent: BaseItem + id: UnfinishedClothingHeadHelmetImprovised + name: improvised helmet parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/improvised.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingHeadHelmetImprovised + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingHeadHelmetImprovisedGraph + node: helmet + +- type: entity + parent: BaseItem + id: UnfinishedClothingHeadHelmetForged + name: forged helmet parts + description: Some assembly required, and welding too. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/forged.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingHeadHelmetForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingHeadHelmetForgedGraph + node: helmet + +- type: entity + parent: BaseItem + id: UnfinishedClothingHeadHelmetPaladin + name: paladin helmet parts + description: No Paladin LARP is good without the helmet! Needs welding. + components: + - type: Item + size: Normal + - type: Sprite + sprite: ADT/Clothing/Head/Helmets/paladin.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: ClothingHeadHelmetPaladin + - type: Tag + tags: + - Metal + - type: Construction + graph: ClothingHeadHelmetPaladinGraph + node: helmet diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/improvised_gun_parts.yml new file mode 100644 index 00000000000..eaad4741862 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/improvised_gun_parts.yml @@ -0,0 +1,127 @@ +- type: entity + parent: BaseItem + id: UnfinishedForgedShotgun + name: assembled forged shotgun + description: Just needs the welding to keep everything in place. + components: + - type: Item + size: Normal + shape: + - 0,0,4,0 + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi + state: ishotgunstep2 + - type: ToolRefinable + refineResult: + - id: WeaponShotgunForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedShotgunGraph + node: shotgun + +- type: entity + parent: BaseItem + id: UnfinishedPistolForged + name: forged pistol parts + description: Some assembly may be reqiured. Needs welding. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WeaponPistolForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedPistolGraph + node: shotgun + +- type: entity + parent: BaseItem + id: UnfinishedRevolverForged + name: forged revolver parts + description: Some assembly may be reqiured. Needs welding. + components: + - type: Item + size: Small + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WeaponRevolverForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedRevolverGraph + node: shotgun + +- type: entity + parent: BaseItem + id: UnfinishedSubMachineGunForged + name: forged SMG parts + description: Some assembly may be reqiured. Needs welding. + components: + - type: Item + size: Large + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WeaponSubMachineGunForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedSMGGraph + node: shotgun + +- type: entity + parent: BaseItem + id: UnfinishedSniperForged + name: forged sniper parts + description: Some assembly may be reqiured. Needs welding. + components: + - type: Item + size: Large + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi + state: unfinished + - type: ToolRefinable + refineResult: + - id: WeaponSniperForged + - type: Tag + tags: + - Metal + - type: Construction + graph: ForgedSniperGraph + node: shotgun + +- type: entity + parent: BaseItem + id: ModularBarrel + name: modular barrel + description: A vital component in guncrafting. + components: + - type: Item + size: Normal + shape: + - 0,0,4,0 + - type: Sprite + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + - type: Tag + tags: + - Metal + - ModularBarrel + - type: Construction + graph: ModularBarrelGraph + node: shotgun diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/shields.yml new file mode 100644 index 00000000000..b7b9813bb96 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/shields.yml @@ -0,0 +1,277 @@ +- type: entity + name: improvised shield + parent: [ PaladinShield, BaseMinorContraband ] + id: ImprovisedShield + description: Steel welded together in a interlocking pattern to hold up better to various kinds of blows. Don't expect it to do well in a gunfight, however. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/improvised_shield.rsi + state: base + - type: Item + sprite: ADT/Objects/Weapons/Melee/improvised_shield.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/improvised_shield.rsi + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.9 + Heat: 0.95 + activeBlockModifier: + coefficients: + Blunt: 0.7 + Slash: 0.6 + Piercing: 0.8 + Heat: 0.85 + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 2 + max: 10 + +- type: entity + name: paladin shield + parent: [ BaseItem, BaseMajorContraband ] # Easier to remake it than inheret it, due to wiz keeping all shields in one folder and mine doing the opposite, due to the suitslot sprites. + id: PaladinShield + description: A shield for a true paladin! Good at deflecting hits with swords and absorbing the impact from bats, but not much else. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/paladin_shield.rsi + state: base + - type: Item + sprite: ADT/Objects/Weapons/Melee/paladin_shield.rsi + size: Ginormous + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/paladin_shield.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.5 + Slash: 0.5 #Encourages long swordfights, which I really, really want to see. + Piercing: 0.8 + Heat: 0.85 + activeBlockModifier: + coefficients: + Blunt: 0.3 + Slash: 0.3 + Piercing: 0.7 + Heat: 0.75 + flatReductions: + Blunt: 1 + Slash: 1 + Piercing: 1 + Heat: 1 + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 160 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 120 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel: + min: 4 + max: 13 + SheetSteel: + min: 5 + max: 13 + +- type: entity + name: paladin greatshield + parent: [ PaladinShield, BaseMajorContraband ] + id: PaladinShieldGreat + description: You're up against the wall and I! AM! THE! FUCKING! WALL! + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/paladin_greatshield.rsi + state: base + - type: Item + sprite: ADT/Objects/Weapons/Melee/paladin_greatshield.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/paladin_greatshield.rsi + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.85 + activeBlockModifier: + coefficients: #Insanely high resist because normal shields suck when raising. This is a WALL. + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.3 + Heat: 1.5 # Achilles Heel + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.5 + - type: HeldSpeedModifier + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 250 #Combined with damage resistances, IF raised, can tank 6 lector magdumps before finally breaking. You will STAM CRIT before then. If just held, or a laser is used it'll function like a normal shield more or less. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel: + min: 6 + max: 20 + SheetSteel: + min: 4 + max: 15 + SheetGlass: + min: 2 + max: 3 + +- type: entity + name: forged buckler shield + parent: [ PaladinShield, BaseMinorContraband ] + id: ForgedShieldBuckler + description: Made from the best plasteel the tidersmiths could offer. Decent all-arounder, however being made out of solid metal makes it get hot real fast. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi + state: base + - type: Item + sprite: ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.9 + activeBlockModifier: + coefficients: + Blunt: 0.7 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 140 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel: + min: 2 + max: 6 + SheetSteel: + min: 1 + max: 4 + +- type: entity + name: forged tower shield + parent: [ ForgedShieldBuckler, BaseMinorContraband ] + id: ForgedShieldTower + description: Tall and menacing. A bit on the heavy side, however. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_tower_shield.rsi + state: base + - type: Item + sprite: ADT/Objects/Weapons/Melee/forged_tower_shield.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/forged_tower_shield.rsi + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 180 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel: + min: 2 + max: 10 + SheetSteel: + min: 4 + max: 10 + SheetGlass: + min: 1 + max: 2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml index c7394ccebf8..3817a6bd33f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml @@ -98,6 +98,7 @@ lastCharges: 100 - type: AutoRecharge rechargeDuration: 2 + - type: entity name: scalpel id: ADTSupermatterScalpel @@ -120,3 +121,520 @@ sprite: ADT/Objects/Tools/supermatter_scalpel.rsi storedRotation: 90 - type : SupermatterImmune + +# Самоделки Start + +- type: entity + name: makeshift crowbar + parent: BaseCrowbar + id: CrowbarMakeshift + description: Barely better than nothing. Could be made into something greater with a welder, though.. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/crowbar_drop.ogg + - type: Sprite + sprite: ADT/Objects/Tools/makeshift_omnitool.rsi + state: base + - type: Item + sprite: ADT/Objects/Tools/makeshift_omnitool.rsi + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 8 + - type: Tool + qualities: + - Prying + - type: ToolTileCompatible + delay: 4 + - type: Prying + speedModifier: 0.25 +# - type: ToolRefinable +# refineResult: +# - id: CrowbarWrenchMakeshift + - type: Construction + graph: MakeshiftCrowbarGraph + node: tool + - type: Tag + tags: + - Crowbar + +- type: entity + name: improvised crowbar + parent: CrowbarMakeshift + id: CrowbarImprovised + description: A few pieces of metal welded together and sharpened at the edges. Not the best tool, but it'll do. + components: + - type: Sprite + sprite: ADT/Objects/Tools/improvised_crowbar.rsi + state: icon + - type: Item + sprite: ADT/Objects/Tools/improvised_crowbar.rsi + storedSprite: + sprite: ADT/Objects/Tools/improvised_crowbar.rsi + state: storage + - type: ToolTileCompatible + delay: 2 + - type: Prying + speedModifier: 0.50 + - type: Tag + tags: + - ImprovisedCrowbar + +#- type: entity +# name: makeshift crowbar-wrench +# parent: BaseItem +# id: CrowbarWrenchMakeshift +# description: Still pretty bad. +# components: +# - type: EmitSoundOnLand +# sound: +# path: /Audio/Items/crowbar_drop.ogg +# - type: Sprite +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wrench +# - type: Item +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# - type: Prying +# - type: Tool +# qualities: +# - Prying +# - Anchoring +# speedModifier: 0.7 +# useSound: /Audio/Items/crowbar.ogg +# - type: ToolTileCompatible +# - type: MeleeWeapon +# wideAnimationRotation: -135 +# damage: +# types: +# Blunt: 9 +# - type: MultipleTool +# statusShowBehavior: true +# entries: +# - behavior: Prying +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wrench +# useSound: +# path: /Audio/Items/crowbar.ogg +# - behavior: Anchoring +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wrenchflipped +# useSound: +# path: /Audio/Items/ratchet.ogg +# - type: ToolRefinable +# refineResult: +# - id: CrowbarWrenchScrewdriverMakeshift +# - type: Tag +# tags: +# - Crowbar +# - Wrench + +#- type: entity +# name: makeshift crowbar-wrench-screwdriver +# parent: CrowbarWrenchMakeshift +# id: CrowbarWrenchScrewdriverMakeshift +# description: It's.. useful? +# components: +# - type: MeleeWeapon +# wideAnimationRotation: -135 +# damage: +# types: +# Blunt: 9 +# Slash: 1 +# - type: Sprite +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: screwdriver +# - type: Tool +# qualities: +# - Prying +# - Anchoring +# - Screwing +# speedModifier: 0.6 +# useSound: /Audio/Items/crowbar.ogg +# - type: MultipleTool +# statusShowBehavior: true +# entries: +# - behavior: Prying +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: screwdriver +# useSound: +# path: /Audio/Items/crowbar.ogg +# - behavior: Screwing +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: screwdriverflipped +# - behavior: Anchoring +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: screwdriverflipped +# useSound: +# path: /Audio/Items/ratchet.ogg +# - type: ToolRefinable +# refineResult: +# - id: OmnitoolMakeshift +# - type: Tag +# tags: +# - Crowbar +# - Wrench +# - Screwdriver + +#- type: entity +# name: makeshift omni-tool +# parent: CrowbarWrenchScrewdriverMakeshift +# id: OmnitoolMakeshift +# description: Who would've thought a red toolbox would have so many uses? +# components: +# - type: MeleeWeapon +# wideAnimationRotation: -135 +# damage: +# types: +# Blunt: 9 +# Slash: 2 +# - type: Sprite +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wirecutter +# - type: Tool +# qualities: +# - Prying +# - Anchoring +# - Screwing +# - Cutting +# speedModifier: 0.5 +# useSound: /Audio/Items/crowbar.ogg +# - type: ToolTileCompatible +# - type: MultipleTool +# statusShowBehavior: true +# entries: +# - behavior: Prying +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wirecutter +# useSound: +# path: /Audio/Items/crowbar.ogg +# - behavior: Screwing +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wirecutterflipped +# - behavior: Anchoring +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wirecutterflipped +# useSound: +# path: /Audio/Items/ratchet.ogg +# - behavior: Cutting +# sprite: +# sprite: ADT/Objects/Tools/makeshift_omnitool.rsi +# state: wirecutterside +# useSound: +# path: /Audio/Items/wirecutter.ogg +# - type: Tag +# tags: +# - Crowbar +# - Wrench +# - Screwdriver +# - Wirecutter + +- type: entity + name: improvised screwdriver + parent: BaseItem + id: ScrewdriverImprovised + description: A handful of metal with some cloth wrapped around it, and sharpened at the tip. It works. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/screwdriver_drop.ogg + - type: Sprite + sprite: ADT/Objects/Tools/improvised_screwdriver.rsi + state: screwdriver + - type: Item + sprite: ADT/Objects/Tools/improvised_screwdriver.rsi + storedRotation: -90 + - type: MeleeWeapon + wideAnimationRotation: -90 + attackRate: 1 + damage: + types: + Slash: 6 #I don't care if base screwdriver does pierce, that's fucking dumb. + soundHit: + path: "/Audio/Weapons/bladeslice.ogg" + - type: Tool + qualities: + - Screwing + useSound: + collection: Screwdriver + speedModifier: 0.80 + - type: Tag + tags: + - ImprovisedScrewdriver + +- type: entity + name: improvised wirecutter + parent: BaseItem + id: WirecutterImprovised + description: The metal's just sharp enough to cut through thick wires. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/wirecutter_drop.ogg + - type: Tag + tags: + - PlantSampleTaker + - ImprovisedWirecutter + - type: Sprite + sprite: ADT/Objects/Tools/improvised_wirecutters.rsi + state: cutters + - type: MeleeWeapon + wideAnimationRotation: -90 + damage: + types: + Slash: 2 #WHY IS WIZ SO OBSESSED WITH PIERCE + soundHit: + path: "/Audio/Items/wirecutter.ogg" + attackRate: 2 + - type: Item + sprite: ADT/Objects/Tools/improvised_wirecutters.rsi + storedRotation: -90 + - type: Tool + qualities: + - Cutting + useSound: + path: /Audio/Items/wirecutter.ogg + speedModifier: 0.80 + +- type: entity + name: improvised wrench + parent: BaseItem + id: WrenchImprovised + description: One size fits all.. Kinda. + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/wrench_drop.ogg + - type: Tag + tags: + - ImprovisedWrench + - type: Sprite + sprite: ADT/Objects/Tools/improvised_wrench.rsi + state: icon + - type: Item + sprite: ADT/Objects/Tools/improvised_wrench.rsi + storedSprite: + sprite: ADT/Objects/Tools/improvised_wrench.rsi + state: storage + - type: MeleeWeapon + wideAnimationRotation: 135 + attackRate: 1.5 + damage: + types: + Blunt: 4.5 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Anchoring + useSound: + path: /Audio/Items/ratchet.ogg + speedModifier: 0.80 + +- type: entity + name: improvised multitool + parent: BaseItem + id: MultitoolImprovised + description: A not so advanced tool to break into places. Why else would you have this? + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/multitool_drop.ogg + - type: Sprite + sprite: ADT/Objects/Tools/improvised_multitool.rsi + layers: + - state: icon + - state: green-unlit + shader: unshaded + - type: Item + sprite: ADT/Objects/Tools/improvised_multitool.rsi + - type: Clothing +# sprite: ADT/Objects/Tools/improvised_multitool.rsi + quickEquip: false + slots: + - Belt + - type: Tool + qualities: + - Pulsing + - type: NetworkConfigurator + - type: ActivatableUI + key: enum.NetworkConfiguratorUiKey.List + inHandsOnly: true + - type: UserInterface + interfaces: + enum.NetworkConfiguratorUiKey.List: + type: NetworkConfiguratorBoundUserInterface + enum.NetworkConfiguratorUiKey.Configure: + type: NetworkConfiguratorBoundUserInterface + enum.NetworkConfiguratorUiKey.Link: + type: NetworkConfiguratorBoundUserInterface + - type: Tag + tags: + - ImprovisedMultitool + - DoorElectronicsConfigurator + +#- type: entity +# name: improvised omnitool +# parent: BaseItem +# id: OmnitoolImprovised +# description: An unholy abomination only second to the great Throngler itself. +# components: +# - type: Sprite +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi # TODO: Заменить спрайты и восстановить старые +# layers: +# - state: icon +# - type: EmitSoundOnLand +# sound: +# path: /Audio/Items/crowbar_drop.ogg +# - type: Tool +# qualities: +# - Prying +# - Anchoring +# - Screwing +# - Cutting +# - Pulsing +# speedModifier: 0.7 +# useSound: /Audio/Items/crowbar.ogg +# - type: Item +# size: Normal +# - type: ToolTileCompatible +# - type: MultipleTool +# statusShowBehavior: true +# entries: +# - behavior: Screwing +# sprite: +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: icon +# useSound: +# path: /Audio/Items/drill_use.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Prying +# sprite: +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: icon +# useSound: +# path: /Audio/Items/jaws_pry.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Anchoring +# sprite: +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: icon +# useSound: +# path: /Audio/Items/ratchet.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Cutting +# sprite: +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: icon +# useSound: +# path: /Audio/Items/jaws_cut.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Pulsing +# sprite: +# sprite: ADT/Objects/Tools/improvised_omnitool.rsi +# state: icon +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - type: Tag +# tags: +# - Multitool +# - DoorElectronicsConfigurator +# - Wrench +# - PlantSampleTaker +# - Wirecutter +# - Screwdriver + +#- type: entity +# name: forged omnitool +# parent: BaseItem +# id: OmnitoolForged +# description: Some absolute psychopath decided to saw off the heads of all tools they could find and smash it together into a makeshift drill. Looks nice, considering it's origins. +# components: +# - type: EmitSoundOnLand +# sound: +# path: /Audio/Items/crowbar_drop.ogg +# - type: Sprite +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# layers: +# - state: icon +# - type: Clothing +# # sprite: ADT/Objects/Tools/forged_omnitool.rsi +# quickEquip: false +# slots: +# - Belt +# - type: ToolTileCompatible +# - type: Tool +# qualities: +# - Prying +# - Anchoring +# - Screwing +# - Cutting +# - Pulsing +# speedModifier: 0.8 +# useSound: /Audio/Items/crowbar.ogg +# - type: Item +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# size: Normal +# - type: MultipleTool +# statusShowBehavior: true +# entries: +# - behavior: Screwing +# sprite: +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: screwing +# useSound: +# path: /Audio/Items/drill_use.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Prying +# sprite: +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: prying +# useSound: +# path: /Audio/Items/jaws_pry.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Anchoring +# sprite: +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: wrenching +# useSound: +# path: /Audio/Items/ratchet.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Cutting +# sprite: +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: cutters +# useSound: +# path: /Audio/Items/jaws_cut.ogg +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - behavior: Pulsing +# sprite: +# sprite: ADT/Objects/Tools/forged_omnitool.rsi +# state: pulsing +# changeSound: +# path: /Audio/Items/change_drill.ogg +# - type: Tag +# tags: +# - Multitool +# - DoorElectronicsConfigurator +# - Wrench +# - PlantSampleTaker +# - Wirecutter +# - Screwdriver +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/improvised.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/improvised.yml new file mode 100644 index 00000000000..0c24292b6d4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/improvised.yml @@ -0,0 +1,65 @@ +- type: entity + parent: BaseItem + id: BaseMagazineBoxImprovised + name: improvised ammunition box (.any) + description: This looks suspiciously like a .20 magazine box with a crude bullet drawing ontop. Mixing ammo is not advised. + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised + - CartridgePistolUranium + - CartridgePistolIncendiary + - CartridgePistolPractice + - CartridgeMagnum + - CartridgeMagnumImprovised + - CartridgeMagnumIncendiary + - CartridgeMagnumPractice + - CartridgeMagnumAP + - ADTCartridgeMagnumLesser + - CartridgeMagnumUranium + - CartridgeLightRifle + - CartridgeLightRifleImprovised + - CartridgeLightRiflePractice + - CartridgeLightRifleIncendiary + - CartridgeLightRifleUranium + - ShellShotgun + - ShellShotgunBeanbag + - ShellShotgunSlug + - ShellShotgunFlare + - ShellShotgunIncendiary + - ShellShotgunPractice + - ShellTranquilizer + - ShellShotgunImprovised + - ShellShotgunUranium + - CartridgeRifle + - CartridgeRiflePractice + - CartridgeRifleIncendiary + - CartridgeRifleUranium + proto: null + capacity: 40 + - type: Item + size: Normal + shape: + - 0,0,2,0 + - 0,1,2,1 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: false + - type: Appearance + - type: Construction + graph: ImprovisedMagazineBoxGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 088d6ee103a..bc49d0bfdf8 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -108,3 +108,29 @@ components: - type: CartridgeAmmo proto: ADTBulletMagnumSilver + +# Самоделки + +- type: entity + id: CartridgeMagnumImprovised + name: improvised cartridge (.45 magnum) + description: A handmade revolver bullet, stuffed to the brim with phosphorus for extra 'oomph'. Still not as good as a normal magnum bullet. + parent: [BaseCartridgePistol, BaseMinorContraband] + components: + - type: CartridgeAmmo + proto: BulletMagnumImprovised + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#717171" + - type: Tag + tags: + - Cartridge + - CartridgeMagnumImprovised + - type: Construction + graph: ImprovisedMagnumBulletGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml new file mode 100644 index 00000000000..fc89f00aba3 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -0,0 +1,23 @@ +- type: entity + id: CartridgePistolImprovised + name: improvised cartridge (.35 auto) + description: A handmade pistol bullet, uses phosphorus as a propellent instead of gunpowder which makes it much less effective. + parent: [BaseCartridgePistol, BaseMinorContraband] + components: + - type: CartridgeAmmo + proto: BulletPistolImprovised + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#717171" + - type: Tag + tags: + - Cartridge + - CartridgePistolImprovised + - type: Construction + graph: ImprovisedPistolBulletGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml new file mode 100644 index 00000000000..4c7a85e90a8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -0,0 +1,23 @@ +- type: entity + id: LightRifleImprovised + name: improvised cartridge (7.62х39) + description: A handmade pistol bullet, uses phosphorus as a propellent instead of gunpowder which makes it much less effective. + parent: [BaseCartridgePistol, BaseMinorContraband] + components: + - type: CartridgeAmmo + proto: BulletLightRifleImprovised + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#717171" + - type: Tag + tags: + - Cartridge + - CartridgeLightRifleImprovised + - type: Construction + graph: ImprovisedLightRifleBulletGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml new file mode 100644 index 00000000000..f56affbcfb4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -0,0 +1,81 @@ +- type: entity + id: MagazinePistolSubMachineGunImprovised + name: Improvised SMG magazine (.35 auto) + parent: [ BaseMagazinePistolSubMachineGun, BaseMinorContraband ] + components: + - type: BallisticAmmoProvider + proto: null + capacity: 20 + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised + - type: Sprite + sprite: /Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 3 + - type: Tag + tags: + - MagazineSMGImprovised + - type: Construction + graph: ImprovisedMagazinePistolSubMachineGunGraph + node: shell + +- type: entity + id: MagazinePistolSubMachineGunImprovisedFull + name: Improvised SMG magazine (.35 auto) + parent: [ MagazinePistolSubMachineGunImprovised] + suffix: Full + components: + - type: BallisticAmmoProvider + proto: CartridgePistolImprovised + capacity: 20 + +- type: entity + id: MagazinePistolImprovised + name: "Improvised Pistol Magazine (.35)" + parent: [ BaseItem, BaseMinorContraband ] + components: + - type: Tag + tags: + - MagazinePistol + - MagazinePistolImprovised + - type: BallisticAmmoProvider + proto: null + mayTransfer: true + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised + capacity: 6 + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + right: + - state: inhand-right-mag + size: Tiny + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance + - type: Construction + graph: ImprovisedPistolMagazineGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/magnum.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/magnum.yml index 6928532d0c5..b3a2873b511 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/magnum.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/magnum.yml @@ -124,3 +124,33 @@ steps: 7 zeroVisible: false - type: Appearance + +- type: entity + id: SpeedLoaderMagnumImprovised + name: "speed loader (.357 magnum)" + parent: [BaseItem, BaseMinorContraband] + components: + - type: Tag + tags: + - SpeedLoaderMagnum + - type: SpeedLoader + - type: BallisticAmmoProvider + proto: null + whitelist: + tags: + - CartridgeMagnum + - CartridgeMagnumImprovised + capacity: 4 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Appearance + - type: Construction + graph: ImprovisedMagnumSpeedLoaderGraph + node: shell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 869bd17903b..bc7cd9fbd26 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -101,3 +101,195 @@ slots: - suitStorage - Belt + +- type: entity + name: makeshift pistol + parent: [BaseWeaponPistol, BaseMinorContraband] + id: WeaponPistolMakeshiftCrafted + description: Little more than a space eoka. Very unreliable. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi + - type: Gun + fireRate: 5 #Each bullet is manually loaded, no reason to impose a firerate limit. + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + - type: ItemSlots + slots: + gun_chamber: + name: Chamber + startingItem: null + priority: 1 + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised + - type: Construction + graph: MakeshiftPistolCraftedGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.20 + selfDamage: + types: + Blunt: 6 + Heat: 6 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + +- type: entity + name: improvised pistol + parent: [BaseItem, BaseMinorContraband] + id: WeaponPistolImprovised + description: A cobbled together pistol with an internal magazine. More reliable, but still liable to blow up in your face. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 3 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + minAngle: 1 + maxAngle: 30 + angleIncrease: 12 + angleDecay: 4 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised + capacity: 5 + proto: null + - type: Item + size: Small #Magazine location makes it bigger but should still fit in a pocket. (This basically serves to keep people from putting it in a boot/stacking them as easily) + shape: + - 0,0,1,0 + - 0,1,1,1 + - type: Tag + tags: + - Sidearm + - type: MeleeWeapon + resetOnHandSelected: false + attackRate: 1 + damage: + types: + Blunt: 7 + soundHit: + collection: GenericHit + - type: AltFireMelee + - type: AmmoCounter + - type: Appearance + - type: Construction + graph: ImprovisedPistolGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.10 + selfDamage: + types: + Blunt: 6 + Heat: 6 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: SheetSteel1 + launchAngle: 67 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 87 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 270 + prob: 0.20 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + +- type: entity + name: forged pistol + parent: [BaseWeaponPistol, BaseMinorContraband] + id: WeaponPistolForged + description: A reliable magazine-fed pistol made by the best tider blacksmiths. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi + - type: MagazineVisuals + magState: mag + steps: 3 + zeroVisible: true + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,1,1 + - type: Gun + fireRate: 4 + minAngle: 1 + maxAngle: 20 + angleIncrease: 8 + angleDecay: 9 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: null + whitelist: + tags: + - MagazinePistolImprovised + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: null + priority: 1 + whitelist: + tags: + - CartridgePistol + - CartridgePistolImprovised diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 348b0c064cf..eb9aa427344 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -481,3 +481,54 @@ - type: EmpOnCollide energyConsumption: 20 disableDuration: 2 + +- type: entity + id: BulletMagnumImprovised + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: practice + - type: Projectile + damage: + types: + Piercing: 15 + Blunt: 15 + - type: StaminaDamageOnCollide + damage: 5 + +- type: entity + id: BulletPistolImprovised + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: practice + - type: Projectile + damage: + types: + Piercing: 7 + Blunt: 7 + - type: StaminaDamageOnCollide + damage: 5 + +- type: entity + id: BulletLightRifleImprovised + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: practice + - type: Projectile + damage: + types: + Piercing: 8 + Blunt: 9 + - type: StaminaDamageOnCollide + damage: 5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 4b3ec5df439..ed425852c55 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -85,4 +85,102 @@ soundInsert: path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: StaticPrice - price: 500 \ No newline at end of file + price: 500 + +# Самоделки Start + +- type: entity + name: Makeshift Revolver + parent: [BaseWeaponRevolver, BaseMinorContraband] + id: WeaponRevolverMakeshift + description: Little more than a hand-cannon with a high chance of blowing up in your face. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeMagnum + - CartridgeMagnumImprovised + - SpeedLoaderMagnum + - SpeedLoaderMagnumImprovised + proto: null + capacity: 1 + chambers: [ null ] + ammoSlots: [ null ] + - type: Construction + graph: MakeshiftRevolverGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.30 + selfDamage: + types: + Blunt: 8 + Heat: 8 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + +- type: entity + name: Improvised Revolver + parent: WeaponRevolverMakeshift + id: WeaponRevolverImprovised + description: A revolver that has two barrels and no cylinder. Can you really call this a revolver? + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi + - type: RevolverAmmoProvider + capacity: 2 + chambers: [ null, null] + ammoSlots: [ null, null] + - type: Construction + graph: ImprovisedRevolverGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.10 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: SheetSteel1 + launchAngle: 67 + prob: 0.70 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + +- type: entity + name: Forged Revolver + parent: WeaponRevolverImprovised + id: WeaponRevolverForged + description: The best Tider engineering can offer, a revolver with the ability to hold 4 bullets! + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi + - type: RevolverAmmoProvider + capacity: 4 + chambers: [ null, null, null, null] + ammoSlots: [ null, null, null, null] + - type: WeaponDismantleOnShoot + dismantleChance: 0 + - type: Construction + graph: ForgedRevolverGraph + node: shotgun + +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 0e2bea52a4b..ce67eb9a41e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -82,3 +82,162 @@ - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/gun_sentry.ogg + +# Самоделки Start + +- type: entity + name: makeshift SMG + parent: [BaseWeaponSubMachineGun, BaseMinorContraband] + id: WeaponSubMachineGunMakeshift + description: Held together with cloth and dreams, it rattles ominously with every shot. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi + - type: Item + size: Normal + - type: Gun + fireRate: 8 + minAngle: 32 + angleIncrease: 3 + maxAngle: 64 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/smg.ogg + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: null + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineSMGImprovised + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: null + priority: 1 + whitelist: + tags: + - CartridgePistolImprovised + - type: Construction + graph: MakeshiftSMGGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.05 #Very low to account for automatic weapon fire, if entire mag is shot 5/10 SMGs will survive + selfDamage: + types: + Blunt: 10 + Heat: 12 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.30 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + - id: MagazinePistolSubMachineGunImprovised + launchAngle: 190 + prob: 1 + +- type: entity + name: improvised SMG + parent: WeaponSubMachineGunMakeshift + id: WeaponSubMachineGunImprovised + description: It's tightly held together by cloth, steel and determination. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi + - type: Item + size: Large + - type: Wieldable + unwieldOnUse: false + - type: GunWieldBonus + minAngle: -5 + maxAngle: -10 + - type: Gun + fireRate: 7 + minAngle: 16 + angleIncrease: 3 + maxAngle: 32 + - type: Appearance + - type: Construction + graph: ImprovisedSMGGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.02 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: SheetSteel1 + launchAngle: 67 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 87 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 270 + prob: 0.20 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + +- type: entity + name: forged SMG + parent: WeaponSubMachineGunImprovised + id: WeaponSubMachineGunForged + description: The best a tider could get, steel and plasteel welded together for a pretty decent SMG, though the heavy bolt on it does slow the shooting down. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi + - type: Wieldable + unwieldOnUse: false + - type: GunWieldBonus + minAngle: -10 + maxAngle: -15 + - type: Gun + fireRate: 5 + minAngle: 16 + angleIncrease: 3 + maxAngle: 32 + - type: Appearance + - type: WeaponDismantleOnShoot + dismantleChance: 0 +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 62b399b3a05..ae370a3f8eb 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -54,7 +54,7 @@ whitelist: tags: - ShellShotgun - capacity: 3 # bug-fix + capacity: 3 # bug-fix proto: ShellShotgun soundInsert: path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg @@ -64,3 +64,76 @@ ents: [] - type: StaticPrice price: 4500 + +# Самоделки Start + +- type: entity + name: forged double-barrel shotgun + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] + id: WeaponShotgunForged + description: Decently made double-barrel shotgun, reinforced with mixed steel and plasteel plates to keep it together. Not as accurate as a real gun. + components: + - type: Item + sprite: ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi + size: Normal + shape: + - 0,0,4,0 + - type: Gun + fireRate: 3 + - type: RunAndGunSpreadModifier + modifier: 0.3 + - type: MeleeWeapon + resetOnHandSelected: false + attackRate: 0.85 + damage: + types: + Blunt: 12 + soundHit: + collection: GenericHit + - type: AltFireMelee + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi + - type: GunRequiresWield + - type: BallisticAmmoProvider + whitelist: + tags: + - ShellShotgun + capacity: 2 + proto: null + +- type: entity + name: makeshift shotgun + parent: [WeaponFlareGunSecurity, BaseMinorContraband] + id: WeaponShotgunMakeshift + description: A small hand-cannon that fires .50 shotgun shells. Has no cloth to hold it together, so it has a high chance of falling apart with every shot. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi + - type: Construction + graph: MakeshiftShotgunGraph + node: shotgun + - type: WeaponDismantleOnShoot + dismantleChance: 0.50 + selfDamage: + types: + Blunt: 5 + Heat: 5 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: RifleStock + launchAngle: 180 + prob: 0.80 +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 702292d58e3..17d5c1d4679 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -88,3 +88,136 @@ type: AttachmentStripBui enum.AttachmentUI.ChooseSlotKey: type: AttachmentChooseSlotBui + +# Самоделки Start + +- type: entity + name: Makeshift Repeater Rifle + parent: [BaseWeaponSniper, BaseMinorContraband] + id: WeaponSniperMakeshift + description: It'll blow a hole in the guy you point this at, if it doesn't snap your wrist first. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi + - type: Item + size: Normal # Small, but can't fit in your pocket. + - type: Gun + fireRate: 1 + minAngle: 10 + maxAngle: 20 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeLightRifle + - CartridgeLightRifleImprovised + capacity: 2 + proto: null + - type: WeaponDismantleOnShoot + dismantleChance: 0.40 + selfDamage: + types: + Blunt: 10 + Heat: 10 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + - type: Construction + graph: MakeshiftSniperGraph + node: shotgun + +- type: entity + name: Improvised Repeater Rifle + parent: WeaponSniperMakeshift + id: WeaponSniperImprovised + description: Can ALMOST reliably hit a target! + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi + - type: Item + size: Large + - type: Wieldable + unwieldOnUse: false + - type: GunWieldBonus + minAngle: -5 + maxAngle: -10 + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: BallisticAmmoProvider + capacity: 4 + - type: WeaponDismantleOnShoot + dismantleChance: 0.20 + items: + - id: ModularBarrel + launchAngle: 0 + prob: 1 + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: SheetSteel1 + launchAngle: 67 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 87 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 270 + prob: 0.20 + - id: RifleStock + launchAngle: 180 + prob: 0.80 + - type: Construction + graph: ImprovisedSniperGraph + node: shotgun + + +- type: entity + name: Forged Repeater Rifle + parent: WeaponSniperMakeshift + id: WeaponSniperForged + description: The best a tider can achive, reliable fire-rate and accuracy with a satisfying lever-action system. What more can you ask for? Is fitted to be able to chamber both .35 / .45 + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi + - type: Item + size: Huge + - type: Wieldable + unwieldOnUse: false + - type: GunWieldBonus + minAngle: -8 + maxAngle: -15 + - type: Gun + fireRate: 1.5 #Should allow for more intuitive cycling while still being balanced, as a lever action's RoF is determined on how fast you can cycle. + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: BallisticAmmoProvider + capacity: 8 + whitelist: + tags: + - CartridgeLightRifle + - CartridgeLightRifleImprovised + - CartridgeMagnum + - CartridgeMagnumImprovised + - type: WeaponDismantleOnShoot + dismantleChance: 0 +# End diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index fe4040672b5..9a8d420a231 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -377,7 +377,7 @@ state: icon - type: MeleeWeapon wideAnimationRotation: -135 - attackRate: 1.0 + attackRate: 1.5 damage: types: Slash: 12 @@ -388,7 +388,7 @@ - type: DamageOtherOnHit damage: types: - Slash: 4 + Slash: 24 - type: ThrowingAngle angle: 225 - type: Construction @@ -408,7 +408,7 @@ attackRate: 0.7 damage: types: - Slash: 16 + Slash: 20 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Construction @@ -424,10 +424,10 @@ - type: Sprite sprite: ADT/Objects/Weapons/Melee/gladius.rsi - type: MeleeWeapon - attackRate: 0.75 + attackRate: 0.8 damage: types: - Slash: 20 + Slash: 24 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -445,7 +445,7 @@ attackRate: 0.6 damage: types: - Slash: 17 + Slash: 26 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Construction @@ -464,7 +464,7 @@ delay: 1 - type: MeleeWeapon wideAnimationRotation: -135 - attackRate: 0.6 + attackRate: 0.45 damage: types: Slash: 10 @@ -473,9 +473,279 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 15 - Structural: 15 + Blunt: 25 + Structural: 25 - type: Wieldable - type: Construction graph: ADTBBattleaxe node: ADTBoneCompBattleaxe + +# Самоделки Start +- type: entity + name: makeshift sword + parent: [ BaseSword, BaseMinorContraband ] + id: SwordMakeshift + description: Some sharp steel affixed to a metal rod, it can hardly be called a sword. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/makeshift_sword.rsi + - type: MeleeWeapon + attackRate: 1.25 + damage: + types: + Slash: 14 + Structural: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + - type: DisarmMalus + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/makeshift_sword.rsi + slots: + - suitStorage + quickEquip: false + - type: DamageOnHit + damage: + types: + Blunt: 10 + ignoreResistances: true + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/ADT/Weapons/Melee/sundowner.ogg + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 1 + max: 4 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: SwordMakeshiftGraph + node: sword + +- type: entity + name: improvised sword + parent: [ BaseSword, BaseMinorContraband ] + id: SwordImprovised + description: Not too sharp, but it does the job just fine. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/improvised_sword.rsi + - type: MeleeWeapon + attackRate: 1.25 + damage: + types: + Slash: 18 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: DamageOnHit + damage: + types: + Blunt: 10 + ignoreResistances: true + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/ADT/Weapons/Melee/sundowner.ogg + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 1 + max: 4 + - !type:SpawnEntitiesBehavior + spawn: + BladeSteel: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Item + - type: DisarmMalus + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/improvised_sword.rsi + slots: + - suitStorage + quickEquip: false + - type: Construction + graph: SwordImprovisedGraph + node: sword + +- type: entity + name: forged sword + parent: [ BaseSword, BaseMinorContraband ] + id: SwordForged + description: Made with plasteel, a single touch of the blade is enough to draw blood. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/forged_sword.rsi + - type: Reflect + reflectProb: 0.20 + spread: 90 + - type: MeleeWeapon + attackRate: 1.25 + damage: + types: + Slash: 22 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + - type: DisarmMalus + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/forged_sword.rsi + slots: + - suitStorage + quickEquip: false + - type: Tag + tags: + - SwordForged + +- type: entity + name: dawnbreaker + parent: [ BaseSword, BaseMajorContraband, Welder ] + id: SwordFlaming + description: How do you perfect upon perfection? Why, use fire of course! Be the shining light through maints and fight valiantly! + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/dawnbreaker.rsi + layers: + - state: icon + - state: welder_flame + visible: false + shader: unshaded + map: ["enum.ToggleableVisuals.Layer"] + - type: GenericVisualizer + visuals: + enum.ToggleableVisuals.Enabled: + enum.ToggleableVisuals.Layer: + True: { visible: true } + False: { visible: false } + - type: PointLight + enabled: false + radius: 3 + - type: Reflect + reflectProb: 0.25 + spread: 90 + - type: UseDelay + delay: 1.0 + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 80 + maxVol: 80 #uses less fuel than a welder, so this isnt as bad as it looks + - type: Welder + fuelConsumption: 3 + fuelLitCost: 10 + tankSafe: false + - type: ItemToggle + predictable: false + soundActivate: + collection: WelderOn + params: + variation: 0.125 + volume: -5 + soundDeactivate: + collection: WelderOff + params: + variation: 0.125 + volume: -5 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg + params: + variation: 0.250 + volume: -10 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg + params: + variation: 0.250 + volume: -12 + deactivatedSoundOnHitNoDamage: + path: /Audio/Weapons/bladeslice.ogg + activatedDamage: + types: + Heat: 22 + Slash: 10 + - type: Execution + doAfterDuration: 3.0 + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: ComponentToggler + components: + - type: IgniteOnMeleeHit + fireStacks: 3 + - type: Execution + doAfterDuration: 4.0 + - type: Item + sprite: ADT/Objects/Weapons/Melee/dawnbreaker.rsi + - type: DisarmMalus + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/dawnbreaker.rsi + quickEquip: false + slots: + - suitStorage + - type: Construction + graph: SwordFlamingGraph + node: sword + +- type: entity + name: tidebreaker + parent: [ BaseSword, BaseMajorContraband ] + id: ClaymoreForged + description: The perfect weapon for an aspiring maints knight! + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/tidebreaker.rsi + - type: UseDelay + delay: 2 + - type: MeleeWeapon + wideAnimationRotation: 180 + attackRate: 0.55 + damage: + types: + Slash: 8 + Blunt: 7 + Structural: 5 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: 0.35 + spread: 90 + - type: Wieldable + useDelayOnWield: true + - type: IncreaseDamageOnWield #they don't call it an axe for nothing + damage: + types: + Slash: 23 + Blunt: 7 + Structural: 25 + - type: Item + size: Ginormous + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/tidebreaker.rsi + quickEquip: false + slots: + - suitStorage + - type: DisarmMalus +# End diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/dawnbreaker.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/dawnbreaker.yml new file mode 100644 index 00000000000..c3d70b8fcaa --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/dawnbreaker.yml @@ -0,0 +1,32 @@ +- type: constructionGraph + id: SwordFlamingGraph + start: start + graph: + - node: start + edges: + - to: sword + steps: + - tag: SwordForged + icon: + sprite: ADT/Objects/Weapons/Melee/forged_sword.rsi + state: icon + name: crafting-menu-name-FSW + - material: Plastic + amount: 4 + doAfter: 5 + - material: Cable + amount: 2 + doAfter: 5 + - material: Glass + amount: 6 + doAfter: 5 + - material: MetalRod + amount: 2 + - tag: Welder + icon: + sprite: /Textures/Objects/Tools/welder.rsi + state: icon + name: construction-graph-tag-welder + doAfter: 10 + - node: sword + entity: SwordFlaming diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_helmet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_helmet.yml new file mode 100644 index 00000000000..0ae3ce4d235 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_helmet.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: ClothingHeadHelmetForgedGraph + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - material: Steel + amount: 5 + doAfter: 7 + - material: Plasteel + amount: 3 + doAfter: 8 + - material: Plastic + amount: 2 + - material: Cloth + amount: 4 + doAfter: 6 + - node: helmet + entity: UnfinishedClothingHeadHelmetForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_omnitool.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_omnitool.yml new file mode 100644 index 00000000000..0b4386d9ff7 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_omnitool.yml @@ -0,0 +1,54 @@ +#- type: constructionGraph +# id: ForgedOmnitoolGraph +# start: start +# graph: +# - node: start +# edges: +# - to: tool +# steps: +# - tag: Multitool +# icon: +# sprite: Objects/Tools/multitool.rsi +# state: icon +# name: crafting-menu-name-MUL +# - tag: Wrench +# icon: +# sprite: Objects/Tools/wrench.rsi +# state: icon +# name: crafting-menu-name-WRE +# - tag: Wirecutter +# icon: +# sprite: Objects/Tools/wirecutters.rsi +# state: cutters-map +# name: crafting-menu-name-WIR +# - tag: Screwdriver +# icon: +# sprite: Objects/Tools/screwdriver.rsi +# state: screwdriver-map +# name: crafting-menu-name-SCR +# - tag: Crowbar +# icon: +# sprite: Objects/Tools/crowbar.rsi +# state: storage +# name: crafting-menu-name-CRO +# - tag: PowerCellSmall +# icon: +# sprite: Objects/Power/power_cells.rsi +# state: small +# name: construction-graph-tag-power-cell-small +# - tag: GasTank +# icon: +# sprite: Objects/Tanks/emergency_extended.rsi +# state: icon +# name: crafting-menu-name-EXOXY +# - material: Cable +# amount: 3 +# doAfter: 5 +# - material: Steel +# amount: 10 +# doAfter: 20 +# - material: Plasteel +# amount: 5 +# doAfter: 30 +# - node: tool +# entity: UnfinishedForgedOmnitool diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_pistol.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_pistol.yml new file mode 100644 index 00000000000..710630ef4b6 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_pistol.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ForgedPistolGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Steel + amount: 7 + doAfter: 7 + - material: Plasteel + amount: 4 + doAfter: 13 + - node: shotgun + entity: UnfinishedPistolForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_revolver.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_revolver.yml new file mode 100644 index 00000000000..b10ecf49bc1 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_revolver.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ForgedRevolverGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Steel + amount: 9 + doAfter: 10 + - material: Plasteel + amount: 5 + doAfter: 15 + - node: shotgun + entity: UnfinishedRevolverForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_buckler.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_buckler.yml new file mode 100644 index 00000000000..e053f2fa7f5 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_buckler.yml @@ -0,0 +1,20 @@ +- type: constructionGraph + id: ForgedShieldBucklerGraph + start: start + graph: + - node: start + edges: + - to: shield + steps: + - material: Steel + amount: 5 + doAfter: 10 + - material: Plasteel + amount: 4 + doAfter: 15 + - material: Plastic + amount: 4 + - material: Cloth + amount: 5 + - node: shield + entity: UnfinishedForgedShieldBuckler diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_tower.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_tower.yml new file mode 100644 index 00000000000..b226ea29fca --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shield_tower.yml @@ -0,0 +1,24 @@ +- type: constructionGraph + id: ForgedShieldTowerGraph + start: start + graph: + - node: start + edges: + - to: shield + steps: + - material: MetalRod + amount: 10 + - material: Steel + amount: 12 + doAfter: 15 + - material: Glass + amount: 4 + - material: Plasteel + amount: 10 + doAfter: 15 + - material: Plastic + amount: 6 + - material: Cloth + amount: 8 + - node: shield + entity: UnfinishedForgedShieldTower diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shotgun.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shotgun.yml new file mode 100644 index 00000000000..faad5dc6504 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_shotgun.yml @@ -0,0 +1,39 @@ +- type: constructionGraph + id: ForgedShotgunGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - material: Steel + amount: 4 + doAfter: 5 + - material: Plasteel + amount: 2 + doAfter: 10 + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 3 + doAfter: 15 + - node: shotgun + entity: UnfinishedForgedShotgun diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_smg.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_smg.yml new file mode 100644 index 00000000000..17dfb2d4f8f --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_smg.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ForgedSMGGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Steel + amount: 17 + doAfter: 17 + - material: Plasteel + amount: 10 + doAfter: 20 + - node: shotgun + entity: UnfinishedSubMachineGunForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sniper.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sniper.yml new file mode 100644 index 00000000000..13d02ad4729 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sniper.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ForgedSniperGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Steel + amount: 25 + doAfter: 20 + - material: Plasteel + amount: 15 + doAfter: 25 + - node: shotgun + entity: UnfinishedSniperForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sword.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sword.yml new file mode 100644 index 00000000000..4096d867dfd --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_sword.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: SwordForgedGraph + start: start + graph: + - node: start + edges: + - to: sword + steps: + - tag: BladePlasteel + icon: + sprite: ADT/Objects/Misc/plasteel_blade.rsi + state: icon + name: crafting-menu-name-PB + - material: Plasteel + amount: 4 + doAfter: 15 + - material: Cloth + amount: 4 + doAfter: 5 + - tag: HiltPlasteel + icon: + sprite: ADT/Objects/Misc/plasteel_hilt.rsi + state: icon + name: crafting-menu-name-PH + - node: sword + entity: UnfinishedSwordForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_vest.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_vest.yml new file mode 100644 index 00000000000..4e4ad7896f3 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/forged_vest.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: ClothingOuterArmorForgedGraph + start: start + graph: + - node: start + edges: + - to: vest + steps: + - material: Steel + amount: 10 + doAfter: 10 + - material: Plasteel + amount: 5 + doAfter: 15 + - material: Plastic + amount: 5 + - material: Cloth + amount: 10 + doAfter: 10 + - node: vest + entity: UnfinishedClothingOuterArmorForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml index c39ca4a2ba8..c98e228a28a 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/handmade_tools.yml @@ -1,13 +1,13 @@ -- type: constructionGraph - id: ADTHandmadeCrowbarGraph - start: start - graph: - - node: start - edges: - - to: HandmadeCrowbar - steps: - - material: MetalRod - amount: 3 - doAfter: 1 - - node: HandmadeCrowbar - entity: Crowbar +#- type: constructionGraph +# id: ADTHandmadeCrowbarGraph +# start: start +# graph: +# - node: start +# edges: +# - to: HandmadeCrowbar +# steps: +# - material: MetalRod +# amount: 3 +# doAfter: 1 +# - node: HandmadeCrowbar +# entity: Crowbar diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised.yml index 9a1742a008a..35ec8b3f048 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised.yml @@ -78,13 +78,13 @@ category: construction-category-weapons objectType: Item -- type: construction - id: HandmadeCrowbar - graph: ADTHandmadeCrowbarGraph - startNode: start - targetNode: HandmadeCrowbar - category: construction-category-tools - objectType: Item +#- type: construction +# id: HandmadeCrowbar +# graph: ADTHandmadeCrowbarGraph +# startNode: start +# targetNode: HandmadeCrowbar +# category: construction-category-tools +# objectType: Item - type: construction id: ADTBoneKnife @@ -165,3 +165,526 @@ targetNode: ADTBoneCompBattleaxe category: construction-category-weapons objectType: Item + +# Самоделки Start + +- type: construction + name: crafting-menu-name-FDB + id: WeaponShotgunForged + graph: ForgedShotgunGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FDB + +- type: construction + name: crafting-menu-name-MP + id: WeaponPistolMakeshiftCrafted + graph: MakeshiftPistolCraftedGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MP + +- type: construction + name: crafting-menu-name-IP + id: WeaponPistolImprovised + graph: ImprovisedPistolGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IP + +- type: construction + name: crafting-menu-name-FP + id: WeaponPistolForged + graph: ForgedPistolGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FP + +- type: construction + name: crafting-menu-name-IPB + id: CartridgePistolImprovised + graph: ImprovisedPistolBulletGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IPB + +- type: construction + name: crafting-menu-name-IPM + id: MagazinePistolImprovised + graph: ImprovisedPistolMagazineGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IPM + +- type: construction + name: crafting-menu-name-MR + id: WeaponRevolverMakeshift + graph: MakeshiftRevolverGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MR + +- type: construction + name: crafting-menu-name-IR + id: WeaponRevolverImprovised + graph: ImprovisedRevolverGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IR + +- type: construction + name: crafting-menu-name-FR + id: WeaponRevolverForged + graph: ForgedRevolverGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FR + +- type: construction + name: crafting-menu-name-IMB + id: CartridgeMagnumImprovised + graph: ImprovisedMagnumBulletGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IMB + +- type: construction + name: crafting-menu-name-IMS + id: SpeedLoaderMagnumImprovised + graph: ImprovisedMagnumSpeedLoaderGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IMS + +- type: construction + name: crafting-menu-name-MB + id: ModularBarrel + graph: ModularBarrelGraph + startNode: start + targetNode: shotgun + category: construction-category-misc + objectType: Item + description: crafting-menu-text-MB + +- type: construction + name: crafting-menu-name-MSH + id: WeaponShotgunMakeshift + graph: MakeshiftShotgunGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MSH + +- type: construction + name: crafting-menu-name-MS + id: WeaponSMGMakeshift + graph: MakeshiftSMGGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MS + +- type: construction + name: crafting-menu-name-IS + id: WeaponSubMachineGunImprovised + graph: ImprovisedSMGGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IS + +- type: construction + name: crafting-menu-name-FS + id: WeaponSubMachineGunForged + graph: ForgedSMGGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FS + +- type: construction + name: crafting-menu-name-ISM + id: MagazinePistolSubMachineGunImprovised + graph: ImprovisedMagazinePistolSubMachineGunGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-ISM + +- type: construction + name: crafting-menu-name-MRR + id: WeaponSniperMakeshift + graph: MakeshiftSniperGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MRR + +- type: construction + name: crafting-menu-name-IRR + id: WeaponSniperImprovised + graph: ImprovisedSniperGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IRR + +- type: construction + name: crafting-menu-name-FRR + id: WeaponSniperForged + graph: ForgedSniperGraph + startNode: start + targetNode: shotgun + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FRR + +- type: construction + name: crafting-menu-name-IRB + id: CartridgeLightRifleImprovised + graph: ImprovisedLightRifleBulletGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IRB + +- type: construction + name: crafting-menu-name-IMGB + id: BaseMagazineBoxImprovised + graph: ImprovisedMagazineBoxGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-IMGB + +- type: construction + name: crafting-menu-name-MC + id: CrowbarMakeshift + graph: MakeshiftCrowbarGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-MC + +- type: construction + name: crafting-menu-name-IC + id: CrowbarImprovised + graph: ImprovisedCrowbarGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-IC + +- type: construction + name: crafting-menu-name-ISC + id: ScrewdriverImprovised + graph: ImprovisedScrewdriverGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-IC + +- type: construction + name: crafting-menu-name-IW + id: WirecutterImprovised + graph: ImprovisedWirecutterGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-IC + +- type: construction + name: crafting-menu-name-IWR + id: WrenchImprovised + graph: ImprovisedWrenchGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-IC + +- type: construction + name: crafting-menu-name-IM + id: MultitoolImprovised + graph: ImprovisedMultitoolGraph + startNode: start + targetNode: tool + category: construction-category-tools + objectType: Item + description: crafting-menu-text-IM + +#- type: construction +# name: crafting-menu-name-IO +# id: OmnitoolImprovised +# graph: ImprovisedOmnitoolGraph +# startNode: start +# targetNode: tool +# category: construction-category-tools +# objectType: Item +# description: crafting-menu-text-IO + +#- type: construction +# name: crafting-menu-name-FO +# id: OmnitoolForged +# graph: ForgedOmnitoolGraph +# startNode: start +# targetNode: tool +# category: construction-category-tools +# objectType: Item +# description: crafting-menu-text-FO + +- type: construction + name: crafting-menu-name-WH + id: HiltWood + graph: HiltWoodGraph + startNode: start + targetNode: hilt + category: construction-category-tools + objectType: Item + description: crafting-menu-text-WH + +- type: construction + name: crafting-menu-name-PH + id: HiltPlasteel + graph: HiltPlasteelGraph + startNode: start + targetNode: hilt + category: construction-category-tools + objectType: Item + description: crafting-menu-text-PH + +- type: construction + name: crafting-menu-name-SB + id: BladeSteel + graph: BladeSteelGraph + startNode: start + targetNode: blade + category: construction-category-tools + objectType: Item + description: crafting-menu-text-SB + +- type: construction + name: crafting-menu-name-PB + id: BladePlasteel + graph: BladePlasteelGraph + startNode: start + targetNode: blade + category: construction-category-tools + objectType: Item + description: crafting-menu-text-PB + +- type: construction + name: crafting-menu-name-MSW + id: SwordMakeshift + graph: SwordMakeshiftGraph + startNode: start + targetNode: sword + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-MSW + +- type: construction + name: crafting-menu-name-ISW + id: SwordImprovised + graph: SwordImprovisedGraph + startNode: start + targetNode: sword + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-ISW + +- type: construction + name: crafting-menu-name-FSW + id: SwordForged + graph: SwordForgedGraph + startNode: start + targetNode: sword + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FSW + +- type: construction + name: crafting-menu-name-DSW + id: SwordFlaming + graph: SwordFlamingGraph + startNode: start + targetNode: sword + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-DSW + +- type: construction + name: crafting-menu-name-TSW + id: ClaymoreForged + graph: ClaymoreForgedGraph + startNode: start + targetNode: sword + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-TSW + +- type: construction + name: crafting-menu-name-ISH + id: ImprovisedShield + graph: ImprovisedShieldGraph + startNode: start + targetNode: shield + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-ISH + +- type: construction + name: crafting-menu-name-FSH + id: ForgedShieldBuckler + graph: ForgedShieldBucklerGraph + startNode: start + targetNode: shield + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FSH + +- type: construction + name: crafting-menu-name-FSHT + id: ForgedShieldTower + graph: ForgedShieldTowerGraph + startNode: start + targetNode: shield + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-FSHT + +- type: construction + name: crafting-menu-name-PSH + id: PaladinShield + graph: PaladinShieldGraph + startNode: start + targetNode: shield + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-PSH + +- type: construction + name: crafting-menu-name-PSHG + id: PaladinShieldGreat + graph: PaladinShieldGreatGraph + startNode: start + targetNode: shield + category: construction-category-weapons + objectType: Item + description: crafting-menu-text-PSHG + +- type: construction + name: crafting-menu-name-MVT + id: ClothingOuterArmorMakeshift + graph: ClothingOuterArmorMakeshiftGraph + startNode: start + targetNode: vest + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-MVT + +- type: construction + name: crafting-menu-name-IVT + id: ClothingOuterArmorImprovised + graph: ClothingOuterArmorImprovisedGraph + startNode: start + targetNode: vest + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-IVT + +- type: construction + name: crafting-menu-name-FVT + id: ClothingOuterArmorForged + graph: ClothingOuterArmorForgedGraph + startNode: start + targetNode: vest + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-FVT + +- type: construction + name: crafting-menu-name-PVT + id: ClothingOuterArmorPaladin + graph: ClothingOuterArmorPaladinGraph + startNode: start + targetNode: vest + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-PVT + +- type: construction + name: crafting-menu-name-MVTH + id: ClothingHeadHelmetMakeshift + graph: ClothingHeadHelmetMakeshiftGraph + startNode: start + targetNode: helmet + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-MVTH + +- type: construction + name: crafting-menu-name-IVTH + id: ClothingHeadHelmetImprovised + graph: ClothingHeadHelmetImprovisedGraph + startNode: start + targetNode: helmet + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-IVTH + +- type: construction + name: crafting-menu-name-FVTH + id: ClothingHeadHelmetForged + graph: ClothingHeadHelmetForgedGraph + startNode: start + targetNode: helmet + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-FVTH + +- type: construction + name: crafting-menu-name-PVTH + id: ClothingHeadHelmetPaladin + graph: ClothingHeadHelmetPaladinGraph + startNode: start + targetNode: helmet + category: construction-category-clothing + objectType: Item + description: crafting-menu-text-PVTH +# End diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_crowbar.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_crowbar.yml new file mode 100644 index 00000000000..107256a6da9 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_crowbar.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ImprovisedCrowbarGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - material: Steel + amount: 5 + doAfter: 10 + - node: tool + entity: UnfinishedImprovisedCrowbar diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_helmet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_helmet.yml new file mode 100644 index 00000000000..1ce65cee4d1 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_helmet.yml @@ -0,0 +1,18 @@ +- type: constructionGraph + id: ClothingHeadHelmetImprovisedGraph + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - material: Steel + amount: 7 + doAfter: 6 + - material: Cloth + amount: 3 + doAfter: 3 + - material: Cable + amount: 4 + - node: helmet + entity: UnfinishedClothingHeadHelmetImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_light_rifle_bullet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_light_rifle_bullet.yml new file mode 100644 index 00000000000..21057c5df6c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_light_rifle_bullet.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ImprovisedLightRifleBulletGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 1 + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - node: shell + entity: LightRifleImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magazine_box.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magazine_box.yml new file mode 100644 index 00000000000..caeae30548c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magazine_box.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: ImprovisedMagazineBoxGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 5 + doAfter: 5 + - material: Cloth + amount: 3 + doAfter: 5 + - node: shell + entity: BaseMagazineBoxImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_bullet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_bullet.yml new file mode 100644 index 00000000000..39c3c18047b --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_bullet.yml @@ -0,0 +1,37 @@ +- type: constructionGraph + id: ImprovisedMagnumBulletGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 1 + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - node: shell + entity: CartridgeMagnumImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_speedloader.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_speedloader.yml new file mode 100644 index 00000000000..376cdeadaae --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_magnum_speedloader.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ImprovisedMagnumSpeedLoaderGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 6 + doAfter: 5 + - node: shell + entity: SpeedLoaderMagnumImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_multitool.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_multitool.yml new file mode 100644 index 00000000000..65dd962d8b0 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_multitool.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: ImprovisedMultitoolGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - material: Steel + amount: 6 + doAfter: 10 + - material: Plastic + amount: 2 + doAfter: 10 + - material: Glass + amount: 4 + doAfter: 10 + - tag: PowerCellSmall + icon: + sprite: Objects/Power/power_cells.rsi + state: small + name: construction-graph-tag-power-cell-small + - material: Cable + amount: 2 + doAfter: 5 + - node: tool + entity: UnfinishedImprovisedMultitool diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_omnitool.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_omnitool.yml new file mode 100644 index 00000000000..53054380517 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_omnitool.yml @@ -0,0 +1,38 @@ +#- type: constructionGraph +# id: ImprovisedOmnitoolGraph +# start: start +# graph: +# - node: start +# edges: +# - to: tool +# steps: +# - tag: ImprovisedMultitool +# icon: +# sprite: ADT/Objects/Tools/improvised_multitool.rsi +# state: icon +# name: crafting-menu-name-IM +# - tag: ImprovisedWrench +# icon: +# sprite: ADT/Objects/Tools/improvised_wrench.rsi +# state: icon +# name: crafting-menu-name-IWR +# - tag: ImprovisedWirecutter +# icon: +# sprite: ADT/Objects/Tools/improvised_wirecutters.rsi +# state: cutters +# name: crafting-menu-name-IW +# - tag: ImprovisedScrewdriver +# icon: +# sprite: ADT/Objects/Tools/improvised_screwdriver.rsi +# state: screwdriver +# name: crafting-menu-name-ISC +# - tag: ImprovisedCrowbar +# icon: +# sprite: ADT/Objects/Tools/improvised_crowbar.rsi +# state: icon +# name: crafting-menu-name-IC +# - material: Steel +# amount: 5 +# doAfter: 35 +# - node: tool +# entity: UnfinishedImprovisedOmnitool diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol.yml new file mode 100644 index 00000000000..b5c8898cae9 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ImprovisedPistolGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 5 + doAfter: 5 + - material: Steel + amount: 4 + doAfter: 5 + - node: shotgun + entity: WeaponPistolImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_bullet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_bullet.yml new file mode 100644 index 00000000000..0efa34574b4 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_bullet.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: ImprovisedPistolBulletGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 1 + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: construction-graph-tag-match-stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - node: shell + entity: CartridgePistolImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_magazine.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_magazine.yml new file mode 100644 index 00000000000..27ffcf8a91c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_pistol_magazine.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ImprovisedPistolMagazineGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 5 + doAfter: 2 + - node: shell + entity: MagazinePistolImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_revolver.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_revolver.yml new file mode 100644 index 00000000000..68366a0a4f2 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_revolver.yml @@ -0,0 +1,36 @@ +- type: constructionGraph + id: ImprovisedRevolverGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 4 + doAfter: 7 + - material: Steel + amount: 6 + doAfter: 7 + - node: shotgun + entity: WeaponRevolverImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_screwdriver.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_screwdriver.yml new file mode 100644 index 00000000000..3328748823f --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_screwdriver.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: ImprovisedScrewdriverGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - material: Steel + amount: 3 + doAfter: 10 + - material: Cloth + amount: 1 + doAfter: 5 + - node: tool + entity: UnfinishedImprovisedScrewdriver diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_shield.yml new file mode 100644 index 00000000000..d50e35fea82 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_shield.yml @@ -0,0 +1,17 @@ +- type: constructionGraph + id: ImprovisedShieldGraph + start: start + graph: + - node: start + edges: + - to: shield + steps: + - material: MetalRod + amount: 8 + - material: Steel + amount: 17 + doAfter: 15 + - material: Cloth + amount: 3 + - node: shield + entity: UnfinishedImprovisedShield diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg.yml new file mode 100644 index 00000000000..ac01fe56a91 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ImprovisedSMGGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 5 + doAfter: 5 + - material: Steel + amount: 15 + doAfter: 10 + - node: shotgun + entity: WeaponSubMachineGunImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg_magazine.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg_magazine.yml new file mode 100644 index 00000000000..ec48b3e8b0f --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_smg_magazine.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ImprovisedMagazinePistolSubMachineGunGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 8 + doAfter: 6 + - node: shell + entity: MagazinePistolSubMachineGunImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sniper.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sniper.yml new file mode 100644 index 00000000000..50d4fb902b9 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sniper.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: ImprovisedSniperGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 6 + doAfter: 7 + - material: Steel + amount: 20 + doAfter: 15 + - node: shotgun + entity: WeaponSniperImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sword.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sword.yml new file mode 100644 index 00000000000..887f5c2d1d4 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_sword.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: SwordImprovisedGraph + start: start + graph: + - node: start + edges: + - to: sword + steps: + - tag: BladeSteel + icon: + sprite: ADT/Objects/Misc/steel_blade.rsi + state: icon + name: crafting-menu-name-SB + - material: Steel + amount: 4 + doAfter: 15 + - material: Cloth + amount: 3 + doAfter: 5 + - tag: HiltWood + icon: + sprite: ADT/Objects/Misc/wooden_hilt.rsi + state: icon + name: crafting-menu-name-WH + - node: sword + entity: SwordImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_vest.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_vest.yml new file mode 100644 index 00000000000..c0d866963d1 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_vest.yml @@ -0,0 +1,18 @@ +- type: constructionGraph + id: ClothingOuterArmorImprovisedGraph + start: start + graph: + - node: start + edges: + - to: vest + steps: + - material: Steel + amount: 12 + doAfter: 10 + - material: Cloth + amount: 5 + doAfter: 5 + - material: Cable + amount: 7 + - node: vest + entity: UnfinishedClothingOuterArmorImprovised diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wirecutter.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wirecutter.yml new file mode 100644 index 00000000000..cbfa34f9993 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wirecutter.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: ImprovisedWirecutterGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - material: Steel + amount: 5 + doAfter: 10 + - material: Cloth + amount: 2 + doAfter: 5 + - node: tool + entity: UnfinishedImprovisedWirecutter diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wrench.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wrench.yml new file mode 100644 index 00000000000..f3747191721 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/improvised_wrench.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ImprovisedWrenchGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - material: Steel + amount: 3 + doAfter: 10 + - node: tool + entity: UnfinishedImprovisedWrench diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_crowbar.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_crowbar.yml new file mode 100644 index 00000000000..b452dcc5e4d --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_crowbar.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: MakeshiftCrowbarGraph + start: start + graph: + - node: start + edges: + - to: tool + steps: + - tag: Toolbox + icon: + sprite: Objects/Tools/Toolboxes/toolbox_red.rsi + state: icon + name: crafting-menu-name-ETX + doAfter: 8 + - node: tool + entity: CrowbarMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_helmet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_helmet.yml new file mode 100644 index 00000000000..823000a5a8a --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_helmet.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: ClothingHeadHelmetMakeshiftGraph + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - material: Steel + amount: 4 + doAfter: 5 + - material: Cable + amount: 3 + - node: helmet + entity: ClothingHeadHelmetMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_pistol_crafted.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_pistol_crafted.yml new file mode 100644 index 00000000000..cc872a4520e --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_pistol_crafted.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: MakeshiftPistolCraftedGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 4 + doAfter: 5 + - node: shotgun + entity: WeaponPistolMakeshiftCrafted diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_revolver.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_revolver.yml new file mode 100644 index 00000000000..0099179de9c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_revolver.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: MakeshiftRevolverGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 3 + doAfter: 7 + - node: shotgun + entity: WeaponRevolverMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_shotgun.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_shotgun.yml new file mode 100644 index 00000000000..194c9ce5877 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_shotgun.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: MakeshiftShotgunGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + doAfter: 3 + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + doAfter: 3 + - node: shotgun + entity: WeaponShotgunMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_smg.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_smg.yml new file mode 100644 index 00000000000..8365717571e --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_smg.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: MakeshiftSMGGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 5 + doAfter: 5 + - node: shotgun + entity: WeaponSubMachineGunMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sniper.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sniper.yml new file mode 100644 index 00000000000..33ca45794af --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sniper.yml @@ -0,0 +1,28 @@ +- type: constructionGraph + id: MakeshiftSniperGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - tag: ModularBarrel + icon: + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: construction-graph-tag-modular-receiver + - tag: RifleStock + icon: + sprite: Objects/Misc/rifle_stock.rsi + state: icon + name: construction-graph-tag-rifle-stock + - material: Cloth + amount: 5 + doAfter: 7 + - node: shotgun + entity: WeaponSniperMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sword.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sword.yml new file mode 100644 index 00000000000..d616838124d --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_sword.yml @@ -0,0 +1,18 @@ +- type: constructionGraph + id: SwordMakeshiftGraph + start: start + graph: + - node: start + edges: + - to: sword + steps: + - material: MetalRod + amount: 1 + - material: Steel + amount: 4 + doAfter: 10 + - material: Cloth + amount: 2 + doAfter: 5 + - node: sword + entity: SwordMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_vest.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_vest.yml new file mode 100644 index 00000000000..9bf5794228d --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/makeshift_vest.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: ClothingOuterArmorMakeshiftGraph + start: start + graph: + - node: start + edges: + - to: vest + steps: + - material: Steel + amount: 6 + doAfter: 10 + - material: Cable + amount: 5 + - node: vest + entity: ClothingOuterArmorMakeshift diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/modular_barrel.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/modular_barrel.yml new file mode 100644 index 00000000000..609371d2443 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/modular_barrel.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ModularBarrelGraph + start: start + graph: + - node: start + edges: + - to: shotgun + steps: + - material: Steel + amount: 1 + doAfter: 3 + - node: shotgun + entity: ModularBarrel diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_greatshield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_greatshield.yml new file mode 100644 index 00000000000..e6c73689e31 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_greatshield.yml @@ -0,0 +1,24 @@ +- type: constructionGraph + id: PaladinShieldGreatGraph + start: start + graph: + - node: start + edges: + - to: shield + steps: + - material: MetalRod + amount: 12 + - material: Steel + amount: 20 + doAfter: 20 + - material: Glass + amount: 4 + - material: Plasteel + amount: 30 + doAfter: 20 + - material: Plastic + amount: 10 + - material: Cloth + amount: 12 + - node: shield + entity: UnfinishedPaladinShieldGreat diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_helmet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_helmet.yml new file mode 100644 index 00000000000..7dd59b4826d --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_helmet.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: ClothingHeadHelmetPaladinGraph + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - material: Steel + amount: 7 + doAfter: 9 + - material: Plasteel + amount: 6 + doAfter: 9 + - material: Plastic + amount: 2 + - material: Cloth + amount: 6 + doAfter: 7 + - node: helmet + entity: UnfinishedClothingHeadHelmetPaladin diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_shield.yml new file mode 100644 index 00000000000..e1614b24489 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_shield.yml @@ -0,0 +1,22 @@ +- type: constructionGraph + id: PaladinShieldGraph + start: start + graph: + - node: start + edges: + - to: shield + steps: + - material: MetalRod + amount: 8 + - material: Steel + amount: 10 + doAfter: 15 + - material: Plasteel + amount: 8 + doAfter: 15 + - material: Plastic + amount: 4 + - material: Cloth + amount: 5 + - node: shield + entity: UnfinishedPaladinShield diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_suit.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_suit.yml new file mode 100644 index 00000000000..3a0bfccf35a --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/paladin_suit.yml @@ -0,0 +1,21 @@ +- type: constructionGraph + id: ClothingOuterArmorPaladinGraph + start: start + graph: + - node: start + edges: + - to: vest + steps: + - material: Steel + amount: 15 + doAfter: 15 + - material: Plasteel + amount: 10 + doAfter: 15 + - material: Plastic + amount: 4 + - material: Cloth + amount: 15 + doAfter: 15 + - node: vest + entity: UnfinishedClothingOuterArmorPaladin diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_blade.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_blade.yml new file mode 100644 index 00000000000..e0f48dc8258 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_blade.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: BladePlasteelGraph + start: start + graph: + - node: start + edges: + - to: blade + steps: + - material: Plasteel + amount: 6 + doAfter: 15 + - node: blade + entity: BladePlasteel diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_hilt.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_hilt.yml new file mode 100644 index 00000000000..69915f3ce33 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/plasteel_hilt.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: HiltPlasteelGraph + start: start + graph: + - node: start + edges: + - to: hilt + steps: + - material: Plasteel + amount: 4 + doAfter: 10 + - node: hilt + entity: HiltPlasteel diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/steel_blade.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/steel_blade.yml new file mode 100644 index 00000000000..a313143c578 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/steel_blade.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: BladeSteelGraph + start: start + graph: + - node: start + edges: + - to: blade + steps: + - material: Steel + amount: 4 + doAfter: 10 + - node: blade + entity: BladeSteel diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/tidebreaker.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/tidebreaker.yml new file mode 100644 index 00000000000..46201e9163c --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/tidebreaker.yml @@ -0,0 +1,36 @@ +- type: constructionGraph + id: ClaymoreForgedGraph + start: start + graph: + - node: start + edges: + - to: sword + steps: + - tag: BladePlasteel + icon: + sprite: ADT/Objects/Misc/plasteel_blade.rsi + state: icon + name: crafting-menu-name-PB + - tag: CrayonGreen + icon: + sprite: Objects/Fun/crayons.rsi + state: green + name: crafting-menu-name-CGREN + - tag: CrayonYellow + icon: + sprite: Objects/Fun/crayons.rsi + state: yellow + name: crafting-menu-name-CYELO + - material: Plasteel + amount: 15 + doAfter: 25 + - material: Cloth + amount: 8 + doAfter: 5 + - tag: HiltPlasteel + icon: + sprite: ADT/Objects/Misc/plasteel_hilt.rsi + state: icon + name: crafting-menu-name-PH + - node: sword + entity: UnfinishedClaymoreForged diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/wooden_hilt.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/wooden_hilt.yml new file mode 100644 index 00000000000..97ffe47f8bb --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/wooden_hilt.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: HiltWoodGraph + start: start + graph: + - node: start + edges: + - to: hilt + steps: + - material: WoodPlank + amount: 3 + doAfter: 4 + - node: hilt + entity: HiltWood diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 3b82bd90d1b..06d84f95f7e 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -742,6 +742,126 @@ - type: Tag id: ADTClosedRadio +- type: Tag + id: BladePlasteel + +- type: Tag + id: BladeSteel + +- type: Tag + id: CartridgePistolImprovised + +- type: Tag + id: CartridgeMagnumImprovised + +- type: Tag + id: CartridgeLightRifleImprovised + +- type: Tag + id: EmergencyWelder + +- type: Tag + id: Welder + +- type: Tag + id: HiltPlasteel + +- type: Tag + id: HiltWood + +- type: Tag + id: ImprovisedMultitool + +- type: Tag + id: ImprovisedWrench + +- type: Tag + id: ImprovisedWirecutter + +- type: Tag + id: ImprovisedScrewdriver + +- type: Tag + id: ImprovisedCrowbar + +- type: Tag + id: MagazinePistolImprovised + +- type: Tag + id: MagazineSMGImprovised + +- type: Tag + id: ModularBarrel + +- type: Tag + id: SwordForged + +- type: Tag + id: SpeedLoaderMagnumImprovised + +- type: Tag + id: ShellShotgunImprovised + +- type: Tag + id: CartridgePistolUranium + +- type: Tag + id: CartridgePistolIncendiary + +- type: Tag + id: CartridgePistolPractice + +- type: Tag + id: CartridgeMagnumIncendiary + +- type: Tag + id: CartridgeMagnumPractice + +- type: Tag + id: CartridgeMagnumAP + +- type: Tag + id: CartridgeMagnumUranium + +- type: Tag + id: CartridgeLightRifleUranium + +- type: Tag + id: CartridgeLightRifleIncendiary + +- type: Tag + id: CartridgeLightRiflePractice + +- type: Tag + id: ShellTranquilizer + +- type: Tag + id: ShellShotgunPractice + +- type: Tag + id: ShellShotgunIncendiary + +- type: Tag + id: ShellShotgunFlare + +- type: Tag + id: ShellShotgunSlug + +- type: Tag + id: ShellShotgunBeanbag + +- type: Tag + id: CartridgeRifleUranium + +- type: Tag + id: CartridgeRifleIncendiary + +- type: Tag + id: CartridgeRiflePractice + +- type: Tag + id: ShellShotgunUranium + - type: Tag id: ADTDrill diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml index adf42275955..12f6b8d62c9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml @@ -71,8 +71,8 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.5 #Some nukie tier physical protection... - Heat: 0.8 + Piercing: 0.4 # ADT-Tweak 0.5 -> 0.4 #Some nukie tier physical protection... + Heat: 0.6 # ADT-Tweak 0.8 -> 0.6 Radiation: 0.8 #Hey, it's a bunch of solid steel. - type: ExplosionResistance damageCoefficient: 0.80 diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index d1b2868e3e2..c91d0f87a41 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -26,38 +26,38 @@ enum.StationMapUiKey.Key: type: StationMapBoundUserInterface requireInputValidation: false - # ADT-Tweak-start + # ADT-Tweak-start - type: Destructible thresholds: - trigger: - !type:DamageTrigger + !type:DamageTrigger damage: 135 - behaviors: + behaviors: - !type:SpawnEntitiesBehavior spawn: SheetSteel1: min: 1 - max: 5 + max: 5 - !type:DoActsBehavior acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: collection: MetalSlam - - trigger: - !type:DamageTrigger + - trigger: + !type:DamageTrigger damage: 75 behaviors: - !type:SpawnEntitiesBehavior spawn: ScrapPAI: min: 1 - max: 1 + max: 1 - !type:DoActsBehavior - acts: [ "Destruction" ] + acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: collection: MetalSlam - # ADT-Tweak-end + # ADT-Tweak-end - type: Sprite sprite: Objects/Fun/pai.rsi layers: @@ -153,34 +153,34 @@ name: syndicate personal ai device description: Your Syndicate pal who's fun to be with! components: - # ADT-Tweak-start + # ADT-Tweak-start - type: Destructible thresholds: - trigger: - !type:DamageTrigger + !type:DamageTrigger damage: 135 - behaviors: + behaviors: - !type:SpawnEntitiesBehavior spawn: SheetSteel1: min: 1 - max: 5 + max: 5 - !type:DoActsBehavior acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: collection: MetalSlam - - trigger: - !type:DamageTrigger + - trigger: + !type:DamageTrigger damage: 75 behaviors: - !type:SpawnEntitiesBehavior spawn: ScrapPAI: min: 1 - max: 1 + max: 1 - !type:DoActsBehavior - acts: [ "Destruction" ] + acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: collection: MetalSlam @@ -245,20 +245,20 @@ - type: Destructible thresholds: - trigger: - !type:DamageTrigger + !type:DamageTrigger damage: 75 behaviors: - - !type:SpawnEntitiesBehavior + - !type:SpawnEntitiesBehavior spawn: FoodPotato: min: 1 - max: 1 + max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - !type:PlaySoundBehavior sound: collection: MetalSlam - # ADT-Tweak-end + # ADT-Tweak-end - type: Sprite sprite: Objects/Fun/pai.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 6dc1c0f4959..f830b247326 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -257,36 +257,43 @@ - type: entity name: makeshift shield - parent: BaseShield +# ADT-Tweak-Start + parent: [ PaladinShield, BaseMinorContraband ] id: MakeshiftShield description: A rundown looking shield, not good for much. components: - type: Sprite - state: makeshift-icon - - type: Item - heldPrefix: metal + sprite: ADT/Objects/Weapons/Melee/makeshift_shield.rsi + state: base + - type: Clothing + sprite: ADT/Objects/Weapons/Melee/shields/metal.rsi + quickEquip: false + slots: + - back + - suitStorage - type: Blocking passiveBlockModifier: coefficients: Blunt: 0.95 Slash: 0.95 -#ADT tweak start Piercing: 1.3 #0.95 -> 1.3 Heat: 0.7 #0.9 -> 0.7 -#ADT tweak end activeBlockModifier: coefficients: Blunt: 0.85 Slash: 0.85 -#ADT tweak start Piercing: 1 # 0.85 -> 1 Heat: 0.6 # 0.8 -> 0.6 -#ADT tweak end flatReductions: Blunt: 0.5 Slash: 0.5 Piercing: 0.5 Heat: 1 + - type: MeleeWeapon + damage: + types: + Blunt: 5 +# ADT-Tweak-End - type: Construction graph: MakeshiftShield node: makeshiftShield @@ -312,14 +319,6 @@ SheetSteel: min: 1 max: 2 -#ADT tweak start - - type: Clothing - sprite: ADT/Objects/Weapons/Melee/shields/metal.rsi - quickEquip: false - slots: - - back - - suitStorage -#ADT tweak end - type: entity name: web shield diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml index dc095e3f2c7..2a8e651fb38 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -37,9 +37,9 @@ slots: - Belt # ADT Tweak start - - type: Construction - graph: ADTHandmadeCrowbarGraph - node: HandmadeCrowbar + #- type: Construction + # graph: ADTHandmadeCrowbarGraph + # node: HandmadeCrowbar # ADT Tweak end - type: Item sprite: Objects/Tools/crowbar.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 22a03197ccd..3a8ea05e063 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -52,6 +52,7 @@ - type: Tag tags: - ADTToolboxRedSacrifice + - Toolbox ### End ADT Tweak - type: entity @@ -69,6 +70,7 @@ - type: Tag tags: - ADTToolboxBlueSacrifice + - Toolbox ### End ADT Tweak - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 8833047777a..55d539849e9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -105,6 +105,11 @@ price: 40 - type: IgnitionSource temperature: 700 +# ADT-Tweak-Start + - type: Tag + tags: + - Welder +# ADT-Tweak-End - type: entity name: industrial welding tool @@ -200,6 +205,11 @@ enabled: false radius: 1.0 color: orange +# ADT-Tweak-Start + - type: Tag + tags: + - EmergencyWelder +# ADT-Tweak-End - type: entity parent: [ Welder, BaseXenoborgContraband ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 810c5ac1363..86211a7eeea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -47,7 +47,7 @@ proto: CartridgeLightRifle - type: Sprite layers: - - state: base + - state: base-b map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index ccefc48b288..149668c5128 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -86,6 +86,25 @@ whitelist: tags: - ShellShotgun + - ShellShotgunLight # ADT-Tweak - type: Tag tags: - Sidearm + # ADT-Tweak-Start + - type: WeaponDismantleOnShoot + dismantleChance: 0.05 + selfDamage: + types: + Blunt: 6 + Heat: 6 + items: + - id: ModularReceiver + launchAngle: 90 + prob: 0.10 + - id: SheetSteel1 + launchAngle: 87 + prob: 0.20 + - id: SheetSteel1 + launchAngle: 270 + prob: 0.20 + # ADT-Tweak-End diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml index eb466f988e3..b503f0d0ed6 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml @@ -6,11 +6,13 @@ edges: - to: shotgun steps: - - tag: Pipe + # ADT-Tweak-Start + - tag: ModularBarrel icon: - sprite: Structures/Piping/Atmospherics/pipe.rsi - state: pipeStraight - name: construction-graph-tag-pipe + sprite: ADT/Objects/Misc/modular_barrel.rsi + state: icon + name: crafting-menu-name-MB + # ADT-Tweak-End - tag: ModularReceiver icon: sprite: Objects/Misc/modular_receiver.rsi diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml index d935b751c3b..2122bcdb184 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/scraparmor.yml @@ -20,8 +20,8 @@ edges: - to: steelapron steps: - - material: Steel - amount: 30 + - material: Plasteel # ADT-Tweak Steel -> Plasteel + amount: 20 # ADT-Tweak 30 -> 20 doAfter: 15 - node: steelapron diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..a28ce1f4bdb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..a26203b8b01 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/icon.png new file mode 100644 index 00000000000..b1ac919d343 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-left.png new file mode 100644 index 00000000000..9c6d37d5a23 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-right.png new file mode 100644 index 00000000000..b42b9fbe504 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/meta.json new file mode 100644 index 00000000000..7a8e3897f7c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/unfinished.png new file mode 100644 index 00000000000..72285ee4167 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/forged.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..0d2eeffb271 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8a478e7a970 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/icon.png new file mode 100644 index 00000000000..d8c0c2bca54 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-left.png new file mode 100644 index 00000000000..b868cef21cf Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-right.png new file mode 100644 index 00000000000..d2af41cb766 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/meta.json new file mode 100644 index 00000000000..7a8e3897f7c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/unfinished.png new file mode 100644 index 00000000000..e251af6c7e0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/improvised.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..a2c167b6168 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d71612ea185 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/icon.png new file mode 100644 index 00000000000..eabd08367a5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-left.png new file mode 100644 index 00000000000..70e5d2cb6f1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-right.png new file mode 100644 index 00000000000..f76f9fbad5d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/meta.json new file mode 100644 index 00000000000..617eb863b0a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Helmets/makeshift.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET-vox.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..db1a62218d1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..9a3592fc296 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/icon.png new file mode 100644 index 00000000000..49dba10d98c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-left.png new file mode 100644 index 00000000000..09423a30a3a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-right.png new file mode 100644 index 00000000000..97634bd217c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/meta.json new file mode 100644 index 00000000000..7a8e3897f7c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/unfinished.png new file mode 100644 index 00000000000..c5f22ef9f05 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Helmets/paladin.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..602d66e95da Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..daa2f8b7910 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/icon.png new file mode 100644 index 00000000000..593e2e7cbd4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-left.png new file mode 100644 index 00000000000..ec30c4ec167 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-right.png new file mode 100644 index 00000000000..a91f815666c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/meta.json new file mode 100644 index 00000000000..fea3e8ec827 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/unfinished.png new file mode 100644 index 00000000000..1f6e00d03b0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/forged.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..411063c7421 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..25c8df0ebaa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/icon.png new file mode 100644 index 00000000000..ecf45a7e0ee Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-left.png new file mode 100644 index 00000000000..5ed9ab17edb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-right.png new file mode 100644 index 00000000000..8f983e8be52 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/meta.json new file mode 100644 index 00000000000..fea3e8ec827 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/unfinished.png new file mode 100644 index 00000000000..9369e297ccb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/improvised.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..3b09d0fc948 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..c8da0d2ffae Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/icon.png new file mode 100644 index 00000000000..d98fe905d40 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-left.png new file mode 100644 index 00000000000..fa2c4566493 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-right.png new file mode 100644 index 00000000000..f8669306c01 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/meta.json new file mode 100644 index 00000000000..1ab44124d4c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/makeshift.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 00000000000..898a01ddb15 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7de84726395 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/icon.png new file mode 100644 index 00000000000..6f2b567034a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-left.png new file mode 100644 index 00000000000..2baf7311c62 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-right.png new file mode 100644 index 00000000000..9d4b533f0bb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/meta.json new file mode 100644 index 00000000000..fea3e8ec827 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/unfinished.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/unfinished.png new file mode 100644 index 00000000000..949bee5662d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/paladin.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/icon.png new file mode 100644 index 00000000000..d6b11192e5f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-left.png new file mode 100644 index 00000000000..7ca777a2e94 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-right.png new file mode 100644 index 00000000000..6c8c55a515c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/meta.json new file mode 100644 index 00000000000..6e1d50e46fd --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/modular_barrel.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Inhand sprites by alzore_(discord) for SS14, the rest is taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Small edit done by Killer Tamashi (Discord)", + "states":[ + { + "name":"icon" + }, + { + "name": "inhand-left", + "directions":4 + }, + { + "name":"inhand-right", + "directions":4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/icon.png new file mode 100644 index 00000000000..2515bee79f6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-left.png new file mode 100644 index 00000000000..f249018e714 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-right.png new file mode 100644 index 00000000000..c0f842534a8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/meta.json new file mode 100644 index 00000000000..af58a25a102 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/plasteel_blade.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Made by Killer Tamashi (Discord)", + "states":[ + { + "name":"icon" + }, + { + "name": "inhand-left", + "directions":4 + }, + { + "name":"inhand-right", + "directions":4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/icon.png new file mode 100644 index 00000000000..197cb2da10e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-left.png new file mode 100644 index 00000000000..a0175a46bfe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-right.png new file mode 100644 index 00000000000..0de667e7a9a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/meta.json new file mode 100644 index 00000000000..de347dd08b1 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/plasteel_hilt.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Made by Killer Tamashi (Discord)", + "states":[ + { + "name":"icon" + }, + { + "name": "inhand-left", + "directions":4 + }, + { + "name":"inhand-right", + "directions":4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/icon.png new file mode 100644 index 00000000000..88b46de235d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-left.png new file mode 100644 index 00000000000..f038fe9ec23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-right.png new file mode 100644 index 00000000000..d44c8ab9d76 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/meta.json new file mode 100644 index 00000000000..af58a25a102 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/steel_blade.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Made by Killer Tamashi (Discord)", + "states":[ + { + "name":"icon" + }, + { + "name": "inhand-left", + "directions":4 + }, + { + "name":"inhand-right", + "directions":4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/icon.png new file mode 100644 index 00000000000..79a47c14496 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-left.png new file mode 100644 index 00000000000..50949e07a86 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-right.png new file mode 100644 index 00000000000..04312cdb00e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/meta.json new file mode 100644 index 00000000000..af58a25a102 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/wooden_hilt.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version":1, + "size":{ + "x":32, + "y":32 + }, + "license":"CC-BY-SA-3.0", + "copyright":"Made by Killer Tamashi (Discord)", + "states":[ + { + "name":"icon" + }, + { + "name": "inhand-left", + "directions":4 + }, + { + "name":"inhand-right", + "directions":4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/cutters.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/cutters.png new file mode 100644 index 00000000000..a06208b81e6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/cutters.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/icon.png new file mode 100644 index 00000000000..1340bbffeae Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/meta.json new file mode 100644 index 00000000000..b8e9b0c591e --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wrenching" + }, + { + "name": "cutters" + }, + { + "name": "prying" + }, + { + "name": "icon" + }, + { + "name": "pulsing" + }, + { + "name": "screwing" + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/prying.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/prying.png new file mode 100644 index 00000000000..c9eb0e1ed3e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/prying.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/pulsing.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/pulsing.png new file mode 100644 index 00000000000..72f19cb4261 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/pulsing.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/screwing.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/screwing.png new file mode 100644 index 00000000000..eb3f38fa6ec Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/screwing.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/unfinished.png new file mode 100644 index 00000000000..a7bb26cc0d1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/wrenching.png b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/wrenching.png new file mode 100644 index 00000000000..52bc28f60b6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/forged_omnitool.rsi/wrenching.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/equipped-BELT.png new file mode 100644 index 00000000000..8b586d3f169 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/icon.png new file mode 100644 index 00000000000..90028d2b4a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-left.png new file mode 100644 index 00000000000..7639b445dac Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-right.png new file mode 100644 index 00000000000..9f4025d84ef Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/meta.json new file mode 100644 index 00000000000..a099a6a2222 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "storage" + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/storage.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/storage.png new file mode 100644 index 00000000000..b0c162ba085 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/storage.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/unfinished.png new file mode 100644 index 00000000000..160c02f0857 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_crowbar.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/green-unlit.png b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/green-unlit.png new file mode 100644 index 00000000000..e911d77a69d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/green-unlit.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/icon.png new file mode 100644 index 00000000000..b6f4c1085ff Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/meta.json new file mode 100644 index 00000000000..2ea7d197e60 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "green-unlit" + }, + { + "name": "yellow-unlit" + }, + { + "name": "red-unlit" + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/red-unlit.png b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/red-unlit.png new file mode 100644 index 00000000000..317d17e4ee9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/red-unlit.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/unfinished.png new file mode 100644 index 00000000000..59491bb61ba Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/yellow-unlit.png b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/yellow-unlit.png new file mode 100644 index 00000000000..039392be48c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_multitool.rsi/yellow-unlit.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/icon.png new file mode 100644 index 00000000000..4b4f59bfd57 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/meta.json new file mode 100644 index 00000000000..242ef7e4f9c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 2, + "license": "CC-BY-SA-3.0", + "copyright": "This unholy abomination was made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "welder_flame", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "pulsing" + }, + { + "name": "yellow-unlit" + }, + { + "name": "red-unlit" + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/pulsing.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/pulsing.png new file mode 100644 index 00000000000..e911d77a69d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/pulsing.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/red-unlit.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/red-unlit.png new file mode 100644 index 00000000000..317d17e4ee9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/red-unlit.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/unfinished.png new file mode 100644 index 00000000000..469a60a0ac6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/welder_flame.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/welder_flame.png new file mode 100644 index 00000000000..4f945e4166a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/welder_flame.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/yellow-unlit.png b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/yellow-unlit.png new file mode 100644 index 00000000000..039392be48c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_omnitool.rsi/yellow-unlit.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..42c4b8aba45 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/icon.png new file mode 100644 index 00000000000..9bcd7a4fa12 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-left.png new file mode 100644 index 00000000000..cdb795449dc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-right.png new file mode 100644 index 00000000000..903b812ca23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/meta.json new file mode 100644 index 00000000000..aa95dbaf056 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "screwdriver" + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/screwdriver.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/screwdriver.png new file mode 100644 index 00000000000..9bcd7a4fa12 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/screwdriver.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/unfinished.png new file mode 100644 index 00000000000..4d609173538 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_screwdriver.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/cutters.png b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/cutters.png new file mode 100644 index 00000000000..56e0ba82dec Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/cutters.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/equipped-BELT.png new file mode 100644 index 00000000000..bbd7ee696eb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-left.png new file mode 100644 index 00000000000..b1d622d11ae Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-right.png new file mode 100644 index 00000000000..2c1e6b8d2c9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/meta.json new file mode 100644 index 00000000000..43ce59635de --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cutters" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/unfinished.png new file mode 100644 index 00000000000..10406bd115e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wirecutters.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/equipped-BELT.png new file mode 100644 index 00000000000..034006b61b2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/icon.png new file mode 100644 index 00000000000..1d011d14619 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-left.png new file mode 100644 index 00000000000..3ae02383a4b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-right.png new file mode 100644 index 00000000000..5e35692b17b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/meta.json new file mode 100644 index 00000000000..751346653e5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "storage" + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/storage.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/storage.png new file mode 100644 index 00000000000..2bb3e190398 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/storage.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/unfinished.png new file mode 100644 index 00000000000..7a39270e3e6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/improvised_wrench.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/base.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/base.png new file mode 100644 index 00000000000..cee906cff47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/equipped-BELT.png new file mode 100644 index 00000000000..1e6d05112b3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/icon.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/icon.png new file mode 100644 index 00000000000..cee906cff47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-left.png new file mode 100644 index 00000000000..50a8316212e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-right.png new file mode 100644 index 00000000000..afe2ad4237d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/meta.json b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/meta.json new file mode 100644 index 00000000000..fbabbe88387 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "wrench" + }, + { + "name": "wrenchflipped" + }, + { + "name": "screwdriver" + }, + { + "name": "screwdriverflipped" + }, + { + "name": "wirecutter" + }, + { + "name": "wirecutterflipped" + }, + { + "name": "wirecutterside" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriver.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriver.png new file mode 100644 index 00000000000..d3b276fdf39 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriver.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriverflipped.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriverflipped.png new file mode 100644 index 00000000000..f2ac3c11b65 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/screwdriverflipped.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutter.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutter.png new file mode 100644 index 00000000000..a54171534d8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutter.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterflipped.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterflipped.png new file mode 100644 index 00000000000..3f710ad96f2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterflipped.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterside.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterside.png new file mode 100644 index 00000000000..d579649522e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wirecutterside.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrench.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrench.png new file mode 100644 index 00000000000..a9634f0a001 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrench.png differ diff --git a/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrenchflipped.png b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrenchflipped.png new file mode 100644 index 00000000000..8493ad797dd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Tools/makeshift_omnitool.rsi/wrenchflipped.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/base.png new file mode 100644 index 00000000000..9d2779eca0a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-1.png new file mode 100644 index 00000000000..b32332789e2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-2.png new file mode 100644 index 00000000000..f4613d9c5e1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-3.png new file mode 100644 index 00000000000..02cc6adf79d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/mag-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/meta.json new file mode 100644 index 00000000000..a9cb222107b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/improvised.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi , tweaked by Alekshhh, tider-ifed by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/ap.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/ap.png new file mode 100644 index 00000000000..00d1676b7d7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/ap.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png new file mode 100644 index 00000000000..ed6512dc0eb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/fmj.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/fmj.png new file mode 100644 index 00000000000..1131443615a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/fmj.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png new file mode 100644 index 00000000000..31426c7446f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png new file mode 100644 index 00000000000..e6ad3f68e7d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png new file mode 100644 index 00000000000..2516e6dbf19 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png new file mode 100644 index 00000000000..2d5f3fac9b4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json new file mode 100644 index 00000000000..e78dd219f1f --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "incendiary" + }, + { + "name": "sp" + }, + { + "name": "fmj" + }, + { + "name": "ap" + }, + { + "name": "uranium" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/sp.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/sp.png new file mode 100644 index 00000000000..c26e3e5cb3d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/sp.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png new file mode 100644 index 00000000000..839fa3a2f2f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base-spent.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base-spent.png new file mode 100644 index 00000000000..8b99d2ffdff Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base-spent.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base.png new file mode 100644 index 00000000000..c5c3ba28858 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/meta.json new file mode 100644 index 00000000000..3115f781c94 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy, then recolored to greyscale by Killer Tamashi (Discord)", + "states": [ + { + "name": "base" + }, + { + "name": "tip" + }, + { + "name": "base-spent" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/tip.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/tip.png new file mode 100644 index 00000000000..78ff6a8dc18 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi/tip.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base-spent.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base-spent.png new file mode 100644 index 00000000000..89df677f2af Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base-spent.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base.png new file mode 100644 index 00000000000..27f7045b190 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/meta.json new file mode 100644 index 00000000000..274d616769d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station", + "states": [ + { + "name": "base" + }, + { + "name": "tip" + }, + { + "name": "base-spent" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/tip.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/tip.png new file mode 100644 index 00000000000..8e2a4c6180f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi/tip.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/base.png new file mode 100644 index 00000000000..ff929b21dab Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-left-mag.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-left-mag.png new file mode 100644 index 00000000000..3979a59c755 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-left-mag.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-right-mag.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-right-mag.png new file mode 100644 index 00000000000..64921e06758 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/inhand-right-mag.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-1.png new file mode 100644 index 00000000000..6c49e110655 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-2.png new file mode 100644 index 00000000000..37605416ff0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-3.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-3.png new file mode 100644 index 00000000000..12ae554bb7f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-3.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-4.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-4.png new file mode 100644 index 00000000000..8a0d25212be Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-4.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-5.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-5.png new file mode 100644 index 00000000000..ab9fbbdc48e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/mag-5.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/meta.json new file mode 100644 index 00000000000..803973fda9b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/improvised_pistol_magazine.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord), inhands by TiniestShark (github) then recolored by Killer Tamashi.", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + + }, + { + "name": "inhand-left-mag", + "directions": 4 + }, + { + "name": "inhand-right-mag", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/base.png new file mode 100644 index 00000000000..fa6cf7764ea Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-left-mag.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-left-mag.png new file mode 100644 index 00000000000..c5780dbae47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-left-mag.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-right-mag.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-right-mag.png new file mode 100644 index 00000000000..a5a64e7b4da Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/inhand-right-mag.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-1.png new file mode 100644 index 00000000000..626c946146f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-2.png new file mode 100644 index 00000000000..626c946146f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/meta.json new file mode 100644 index 00000000000..7b276c986e8 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Magazine/SMG/improvised_smg_magazine.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, Flipped upside down and resprited a bit by Killer Tamashi (Discord), inhands by TiniestShark (github) then recolored by Killer Tamashi.", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "inhand-left-mag", + "directions": 4 + }, + { + "name": "inhand-right-mag", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/base.png new file mode 100644 index 00000000000..7a737155b7c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/icon.png new file mode 100644 index 00000000000..b5e32a062b6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/meta.json new file mode 100644 index 00000000000..e4fa6322c49 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/improvised_magnum_speed_loader.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, tip by darkrell, 4-shot version by Killer Tamashi (Discord)", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/base.png new file mode 100644 index 00000000000..88c7dd8c7d9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/mag-1.png new file mode 100644 index 00000000000..88c7dd8c7d9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/meta.json new file mode 100644 index 00000000000..9c32609c1d3 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by publiclyexecutedpig :3", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "red" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/red.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/red.png new file mode 100644 index 00000000000..88c7dd8c7d9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Ammunition/Speedloaders/Magnum/magnum_rifle_mag.rsi/red.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/base.png new file mode 100644 index 00000000000..4fd07a06db8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/bolt-open.png new file mode 100644 index 00000000000..1d592bd4255 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-BELT.png new file mode 100644 index 00000000000..c2df9b43e91 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..c2df9b43e91 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/icon.png new file mode 100644 index 00000000000..d162576c595 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-left.png new file mode 100644 index 00000000000..4734ce566ed Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-right.png new file mode 100644 index 00000000000..f921a101f47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-0.png new file mode 100644 index 00000000000..2e9baec6d44 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-1.png new file mode 100644 index 00000000000..58efedaf5ba Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-2.png new file mode 100644 index 00000000000..1d2a70fce08 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/meta.json new file mode 100644 index 00000000000..828bedbd7ad --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "unfinished" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/unfinished.png new file mode 100644 index 00000000000..282140044e2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/forged_pistol.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/base.png new file mode 100644 index 00000000000..09e11bd5af0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/bolt-open.png new file mode 100644 index 00000000000..fdbb3267218 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-BELT.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/icon.png new file mode 100644 index 00000000000..09e11bd5af0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-left.png new file mode 100644 index 00000000000..d0ddcdd5cfe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-right.png new file mode 100644 index 00000000000..6bf859cf764 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/meta.json new file mode 100644 index 00000000000..8e4b021717a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/improvised_pistol.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/base.png new file mode 100644 index 00000000000..f0b91639ba6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/bolt-open.png new file mode 100644 index 00000000000..2004f037fce Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-BELT.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/icon.png new file mode 100644 index 00000000000..f0b91639ba6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-left.png new file mode 100644 index 00000000000..d0ddcdd5cfe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-right.png new file mode 100644 index 00000000000..6bf859cf764 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/mag-0.png new file mode 100644 index 00000000000..8c54bd7e428 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/meta.json new file mode 100644 index 00000000000..db796dcc512 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Pistols/makeshift_pistol_crafted.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/bolt-open.png new file mode 100644 index 00000000000..ca5afff9695 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..8e5d299dc4a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..0fd8fd54f4e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/icon.png new file mode 100644 index 00000000000..0068b98d721 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-left.png new file mode 100644 index 00000000000..9166147d94a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-right.png new file mode 100644 index 00000000000..f5d0253df53 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/meta.json new file mode 100644 index 00000000000..75ace0c419c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "unfinished" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/unfinished.png new file mode 100644 index 00000000000..d93a699453c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/forged_revolver.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/bolt-open.png new file mode 100644 index 00000000000..03fd83a0fb1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..21ef42e0c8c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f0e74b3d765 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/icon.png new file mode 100644 index 00000000000..34fd0c965cf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-left.png new file mode 100644 index 00000000000..728e6da695d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-right.png new file mode 100644 index 00000000000..78f69d239e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/meta.json new file mode 100644 index 00000000000..8395052d91d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/improvised_revolver.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/bolt-open.png new file mode 100644 index 00000000000..3a9f72036fb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..21ef42e0c8c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f0e74b3d765 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/icon.png new file mode 100644 index 00000000000..9b4d20c659f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-left.png new file mode 100644 index 00000000000..728e6da695d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-right.png new file mode 100644 index 00000000000..78f69d239e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/meta.json new file mode 100644 index 00000000000..8395052d91d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Revolvers/makeshift_revolver.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/base.png new file mode 100644 index 00000000000..7c41e7e5cb1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/bolt-open.png new file mode 100644 index 00000000000..c0ac336d1f3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..c86a8172fc4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..c86a8172fc4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/icon.png new file mode 100644 index 00000000000..45e161260e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-left.png new file mode 100644 index 00000000000..69f41dab402 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-right.png new file mode 100644 index 00000000000..fb5955952e3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/mag-0.png new file mode 100644 index 00000000000..cff4b3adc19 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/meta.json new file mode 100644 index 00000000000..673603c220a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "unfinished" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/unfinished.png new file mode 100644 index 00000000000..0548c32e81d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..27137cdac39 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..dbbc8dca584 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/forged_smg.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/base.png new file mode 100644 index 00000000000..3a133093c58 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/bolt-open.png new file mode 100644 index 00000000000..92b650b030f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..af69a87a247 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..af69a87a247 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/icon.png new file mode 100644 index 00000000000..34bde4f5d74 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-left.png new file mode 100644 index 00000000000..16af1bd968e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-right.png new file mode 100644 index 00000000000..27fecc03350 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/mag-0.png new file mode 100644 index 00000000000..2cb74a9a94c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/meta.json new file mode 100644 index 00000000000..198aa181f52 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..7ffb43e6fd9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..ae3fd937ed8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/improvised_smg.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/base.png new file mode 100644 index 00000000000..968861252cb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/bolt-open.png new file mode 100644 index 00000000000..bca7fd17cc7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-BELT.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..58cb91eb327 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/icon.png new file mode 100644 index 00000000000..b168b7b1e65 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-left.png new file mode 100644 index 00000000000..e31e2eaf789 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-right.png new file mode 100644 index 00000000000..620272d1111 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/mag-0.png new file mode 100644 index 00000000000..443b4aa25f4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/mag-0.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/meta.json new file mode 100644 index 00000000000..db796dcc512 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/SMGs/makeshift_smg.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..165b11deba4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..165b11deba4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/icon.png new file mode 100644 index 00000000000..4097681ac7b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep1.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep1.png new file mode 100644 index 00000000000..222961433a4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep1.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep2.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep2.png new file mode 100644 index 00000000000..ac4768488f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/ishotgunstep2.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/meta.json new file mode 100644 index 00000000000..9a1ac9a3bcb --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy, sprite modfied into 'forged' by Killer Tamashi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "ishotgunstep1" + }, + { + "name": "ishotgunstep2" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-left.png new file mode 100644 index 00000000000..55f2f3beb45 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-right.png new file mode 100644 index 00000000000..c3cb37b6a79 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/meta.json new file mode 100644 index 00000000000..f150c0fa4df --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-4.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244, modifed into 'Forged' sprite by Killer Tamashi", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..be6bab1ded4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..3a1955e1f88 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/forged_shotgun_inhands_64x.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/base.png new file mode 100644 index 00000000000..562abb9c217 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/bolt-open.png new file mode 100644 index 00000000000..93589836ab4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-BELT.png new file mode 100644 index 00000000000..c2df9b43e91 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..c2df9b43e91 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-left.png new file mode 100644 index 00000000000..5ced812372b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-right.png new file mode 100644 index 00000000000..8955bef761d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/meta.json new file mode 100644 index 00000000000..3c1f2cd0e22 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Shotguns/makeshift_shotgun.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/base.png new file mode 100644 index 00000000000..9d29768874a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/bolt-open.png new file mode 100644 index 00000000000..c75c0aa17ff Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..69758203145 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..69758203145 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-left.png new file mode 100644 index 00000000000..13881d88b86 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-right.png new file mode 100644 index 00000000000..036caca06f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/meta.json new file mode 100644 index 00000000000..82c8a8c48a2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/unfinished.png new file mode 100644 index 00000000000..11609f4d5de Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..caeb69efc01 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..ef162eef049 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/forged_rifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/base.png new file mode 100644 index 00000000000..9d5c237f633 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/bolt-open.png new file mode 100644 index 00000000000..4ca65f87e2f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d94a4c45b6d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..d94a4c45b6d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-left.png new file mode 100644 index 00000000000..4ba3fa9b3af Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-right.png new file mode 100644 index 00000000000..637338cfa1f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/meta.json new file mode 100644 index 00000000000..73cd6a42c7d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "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 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..a128fd4be2d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..1f43b6d77cb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/improvised_rifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/base.png new file mode 100644 index 00000000000..e8bd4daa0b6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/bolt-open.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/bolt-open.png new file mode 100644 index 00000000000..fc982810922 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-BELT.png new file mode 100644 index 00000000000..9031a9b2d38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..9031a9b2d38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-left.png new file mode 100644 index 00000000000..220ce92abc7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-right.png new file mode 100644 index 00000000000..67484ab4fb0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/meta.json new file mode 100644 index 00000000000..fdc46debc57 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Snipers/makeshift_rifle.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a0423181b73 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/icon.png new file mode 100644 index 00000000000..7d62c229ba8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left-flame.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left-flame.png new file mode 100644 index 00000000000..f28c85fbe52 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left.png new file mode 100644 index 00000000000..828011c2970 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right-flame.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right-flame.png new file mode 100644 index 00000000000..d3bf214d7b6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right.png new file mode 100644 index 00000000000..f57e8b75f6f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/meta.json new file mode 100644 index 00000000000..d7266b1a041 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/meta.json @@ -0,0 +1,87 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "welder_flame", + "delays": [ + [ + 0.3, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-flame", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-right-flame", + "directions": 4, + "delays": [ + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ], + [ + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/welder_flame.png b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/welder_flame.png new file mode 100644 index 00000000000..f5de448fa8a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/dawnbreaker.rsi/welder_flame.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/base.png new file mode 100644 index 00000000000..4668ef99203 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5ba68e62dd7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5ba68e62dd7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-left.png new file mode 100644 index 00000000000..0afaf7a15b7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-right.png new file mode 100644 index 00000000000..e29a7b2aca3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/meta.json new file mode 100644 index 00000000000..b30c7c16202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/unfinished.png new file mode 100644 index 00000000000..47b3aec95f1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_buckler_shield.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..7a48ef8f2f3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..7a48ef8f2f3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/icon.png new file mode 100644 index 00000000000..28412e9033e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..55da203c498 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..0cc00b40d0d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/meta.json new file mode 100644 index 00000000000..89a1a2bf415 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/unfinished.png new file mode 100644 index 00000000000..e4e324ef8e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_sword.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/base.png new file mode 100644 index 00000000000..2229b470851 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..8f0be412fcd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..8f0be412fcd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-left.png new file mode 100644 index 00000000000..2be7b2a1733 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-right.png new file mode 100644 index 00000000000..fabc3f8979e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/meta.json new file mode 100644 index 00000000000..b30c7c16202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/unfinished.png new file mode 100644 index 00000000000..1e88e921ea1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/forged_tower_shield.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/base.png new file mode 100644 index 00000000000..8b6f2a519fa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..6737014bc21 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..6737014bc21 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-left.png new file mode 100644 index 00000000000..e148471d33c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-right.png new file mode 100644 index 00000000000..f4ad65f9240 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/meta.json new file mode 100644 index 00000000000..b30c7c16202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/unfinished.png new file mode 100644 index 00000000000..b0f7fd15bbc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_shield.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..3ed5d4ee4e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..3ed5d4ee4e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/icon.png new file mode 100644 index 00000000000..aea95e33167 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..7a101c95058 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..334e3593060 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/meta.json new file mode 100644 index 00000000000..c4d5d0f53d9 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/improvised_sword.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/base.png new file mode 100644 index 00000000000..3c5cdb61dcc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..44acda92dfb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..44acda92dfb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-left.png new file mode 100644 index 00000000000..8e803e30dce Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-right.png new file mode 100644 index 00000000000..a219b4749e0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/meta.json new file mode 100644 index 00000000000..ae0b33003c2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_shield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f40160092fc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f40160092fc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/icon.png new file mode 100644 index 00000000000..574cdc74b52 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..350e7f72259 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..a4b5b211120 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/meta.json new file mode 100644 index 00000000000..c4d5d0f53d9 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/makeshift_sword.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/base.png new file mode 100644 index 00000000000..cac93cc96bb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f18f7b25d57 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f18f7b25d57 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-left.png new file mode 100644 index 00000000000..da03eeb3a10 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-right.png new file mode 100644 index 00000000000..da03eeb3a10 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/meta.json new file mode 100644 index 00000000000..b30c7c16202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/unfinished.png new file mode 100644 index 00000000000..8a38ada739b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_greatshield.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/base.png new file mode 100644 index 00000000000..ace85e864f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..532117e7565 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..532117e7565 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-left.png new file mode 100644 index 00000000000..bb5fe1af837 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-right.png new file mode 100644 index 00000000000..fc112775678 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/meta.json new file mode 100644 index 00000000000..b30c7c16202 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "unfinished" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/unfinished.png new file mode 100644 index 00000000000..bebbf0181fb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/paladin_shield.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f5142e7c35f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f5142e7c35f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/icon.png new file mode 100644 index 00000000000..4472fd2f5dd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-left.png new file mode 100644 index 00000000000..3dee45e4448 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-right.png new file mode 100644 index 00000000000..d1554d62b70 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/meta.json new file mode 100644 index 00000000000..141c2323b90 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Killer Tamashi (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unfinished" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/unfinished.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/unfinished.png new file mode 100644 index 00000000000..390a03c3b32 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/unfinished.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..3dee45e4448 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..d1554d62b70 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tidebreaker.rsi/wielded-inhand-right.png differ