diff --git a/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs b/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs new file mode 100644 index 00000000000..06f0e16e280 --- /dev/null +++ b/Content.Client/_Emberfall/Weapons/Ranged/Overlays/TracerOverlay.cs @@ -0,0 +1,23 @@ +using Content.Client._Emberfall.Weapons.Ranged.Systems; +using Robust.Client.Graphics; +using Robust.Shared.Enums; + +namespace Content.Client._Emberfall.Weapons.Ranged.Overlays; + +public sealed class TracerOverlay : Overlay +{ + private readonly TracerSystem _tracer; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + + public TracerOverlay(TracerSystem tracer) + { + _tracer = tracer; + IoCManager.InjectDependencies(this); + } + + protected override void Draw(in OverlayDrawArgs args) + { + _tracer.Draw(args.WorldHandle, args.MapId); + } +} diff --git a/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs b/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs new file mode 100644 index 00000000000..b050d295720 --- /dev/null +++ b/Content.Client/_Emberfall/Weapons/Ranged/Systems/TracerSystem.cs @@ -0,0 +1,87 @@ +using System.Numerics; +using Content.Client._Emberfall.Weapons.Ranged.Overlays; +using Content.Shared._Emberfall.Weapons.Ranged; +using Robust.Client.Graphics; +using Robust.Shared.Map; +using Robust.Shared.Timing; + +namespace Content.Client._Emberfall.Weapons.Ranged.Systems; + +public sealed class TracerSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + public override void Initialize() + { + base.Initialize(); + _overlay.AddOverlay(new TracerOverlay(this)); + + SubscribeLocalEvent(OnTracerStart); + } + + private void OnTracerStart(Entity ent, ref ComponentStartup args) + { + var xform = Transform(ent); + var pos = _transform.GetWorldPosition(xform); + + ent.Comp.Data = new TracerData( + new List { pos }, + _timing.CurTime + TimeSpan.FromSeconds(ent.Comp.Lifetime) + ); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var curTime = _timing.CurTime; + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var tracer, out var xform)) + { + if (curTime > tracer.Data.EndTime) + { + RemCompDeferred(uid); + continue; + } + + var currentPos = _transform.GetWorldPosition(xform); + tracer.Data.PositionHistory.Add(currentPos); + + while (tracer.Data.PositionHistory.Count > 2 && + GetTrailLength(tracer.Data.PositionHistory) > tracer.Length) + { + tracer.Data.PositionHistory.RemoveAt(0); + } + } + } + + private static float GetTrailLength(List positions) + { + var length = 0f; + for (var i = 1; i < positions.Count; i++) + { + length += Vector2.Distance(positions[i - 1], positions[i]); + } + return length; + } + + public void Draw(DrawingHandleWorld handle, MapId currentMap) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out _, out var tracer, out var xform)) + { + if (xform.MapID != currentMap) + continue; + + var positions = tracer.Data.PositionHistory; + for (var i = 1; i < positions.Count; i++) + { + handle.DrawLine(positions[i - 1], positions[i], tracer.Color); + } + } + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs new file mode 100644 index 00000000000..75ebad4e266 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Examine.cs @@ -0,0 +1,128 @@ +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + private void OnGunVerbExamine(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var examineMarkup = GetGunExamine(ent); + + var ev = new GunExamineEvent(examineMarkup); + RaiseLocalEvent(ent, ref ev); + + Examine.AddDetailedExamineVerb(args, + ent.Comp, + examineMarkup, + Loc.GetString("gun-examinable-verb-text"), + "/Textures/Interface/VerbIcons/dot.svg.192dpi.png", + Loc.GetString("gun-examinable-verb-message")); + } + + private FormattedMessage GetGunExamine(Entity ent) + { + var msg = new FormattedMessage(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine")); + + // Recoil (AngleIncrease) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-recoil", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.AngleIncreaseModified.Degrees, 2)) + )); + + // Stability (AngleDecay) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-stability", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.AngleDecayModified.Degrees, 2)) + )); + + // Max Angle + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-max-angle", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.MaxAngleModified.Degrees, 2)) + )); + + // Min Angle + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-min-angle", + ("color", FireRateExamineColor), + ("value", MathF.Round((float)ent.Comp.MinAngleModified.Degrees, 2)) + )); + + // Fire Rate (converted from RPS to RPM) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-fire-rate", + ("color", FireRateExamineColor), + ("value", MathF.Round(ent.Comp.FireRateModified, 1)) + )); + + // Muzzle Velocity (ProjectileSpeed * 10) + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("gun-examine-muzzle-velocity", + ("color", FireRateExamineColor), + ("value", MathF.Round(ent.Comp.ProjectileSpeedModified * 10f, 0)) + )); + + return msg; + } + + private bool TryGetGunCaliber(EntityUid uid, [NotNullWhen(true)] out string? caliber) + { + caliber = null; + + // Try standard gun with ItemSlots first + if (HasComp(uid) && + _slots.TryGetSlot(uid, "gun_chamber", out var chamberSlot) && + chamberSlot.Whitelist?.Tags is { Count: > 0 }) + { + caliber = GetCaliberFromTag(chamberSlot.Whitelist.Tags.First()); + return true; + } + + // Try revolver + if (TryComp(uid, out var revolver) && + revolver.Whitelist?.Tags is { Count: > 0 }) + { + caliber = GetCaliberFromTag(revolver.Whitelist.Tags.First()); + return true; + } + + return false; + } + + private static string GetCaliberFromTag(string tag) + { + return tag switch + { + "CartridgeMagnum" => ".44 Magnum", + "CartridgePistol" => "9x19mm", + "CartridgeHeavyPistol" => "10mm auto", + "CartridgeRifle" => "7.62x51mm", + "CartridgeLightRifle" => "5.56x45mm", + "CartridgeCaselessRifle" => "4.73x33mm caseless", + _ => tag, + }; + } + + private void InitializeGunExamine() + { + SubscribeLocalEvent>(OnGunVerbExamine); + } +} + +/// +/// Event raised on a gun entity to get additional examine text relating to its specifications. +/// +[ByRefEvent] +public readonly record struct GunExamineEvent(FormattedMessage Msg); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs index f3ff89a660e..cbbb91a2e2a 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs @@ -16,10 +16,19 @@ private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args using (args.PushGroup(nameof(GunComponent))) { + // Emberfall - Add caliber info + if (TryGetGunCaliber(uid, out var caliber)) + { + args.PushMarkup(Loc.GetString("gun-examine-caliber", + ("color", FireRateExamineColor), + ("caliber", caliber))); + } + // End Emberfall + args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor), ("mode", GetLocSelector(component.SelectedMode)))); - args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor), - ("fireRate", $"{component.FireRateModified:0.0}"))); + // args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor), + // ("fireRate", $"{component.FireRateModified:0.0}"))); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 62e63501ee8..a4ee7e16227 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -90,6 +90,7 @@ public override void Initialize() InitializeClothing(); InitializeContainer(); InitializeSolution(); + InitializeGunExamine(); // Emberfall // Interactions SubscribeLocalEvent>(OnAltVerb); diff --git a/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs b/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs new file mode 100644 index 00000000000..68fdebff3b3 --- /dev/null +++ b/Content.Shared/_Emberfall/Weapons/Ranged/TracerComponent.cs @@ -0,0 +1,47 @@ +using System.Numerics; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared._Emberfall.Weapons.Ranged; + +/// +/// Added to projectiles to give them tracer effects +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class TracerComponent : Component +{ + /// + /// How long the tracer effect should remain visible for after firing + /// + [DataField] + public float Lifetime = 10f; + + /// + /// The maximum length of the tracer trail + /// + [DataField] + public float Length = 2f; + + /// + /// Color of the tracer line effect + /// + [DataField] + public Color Color = Color.Red; + + [ViewVariables] + public TracerData Data = default!; +} + +[Serializable, NetSerializable, DataRecord] +public struct TracerData(List positionHistory, TimeSpan endTime) +{ + /// + /// The history of positions this tracer has moved through + /// + public List PositionHistory = positionHistory; + + /// + /// When this tracer effect should end + /// + public TimeSpan EndTime = endTime; +} diff --git a/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg b/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg new file mode 100644 index 00000000000..158765a23df Binary files /dev/null and b/Resources/Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg differ diff --git a/Resources/Audio/_Emberfall/license.txt b/Resources/Audio/_Emberfall/license.txt new file mode 100644 index 00000000000..c660ea1cc3b --- /dev/null +++ b/Resources/Audio/_Emberfall/license.txt @@ -0,0 +1 @@ +nightshade.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. diff --git a/Resources/Locale/en-US/_emberfall/research/technologies.ftl b/Resources/Locale/en-US/_emberfall/research/technologies.ftl new file mode 100644 index 00000000000..a97c87f1291 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/research/technologies.ftl @@ -0,0 +1 @@ +research-technology-tracer-ammunition = Tracer Ammunition diff --git a/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl b/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl new file mode 100644 index 00000000000..d1942ea823a --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/store/uplink-catalog.ftl @@ -0,0 +1,11 @@ +uplink-smg-atreides-name = Atreides +uplink-smg-atreides-desc = An older SMG model that refuses to die. Uses SMG magazines (9x19mm) + +uplink-pistol-pollock-name = Pollock +uplink-pistol-pollock-desc = Mass-produced mercenary sidearm. No serial numbers, no questions asked. Uses 10mm auto. + +uplink-pistol-magazine-high-capacity-name = SMG Magazine (9x19mm) +uplink-pistol-magazine-high-capacity-desc = SMG magazine with 20 catridges. Compatible with the Atreides. + +uplink-pistol-magazine-heavy-name = Pistol Magazine (10mm auto) +uplink-pistol-magazine-heavy-desc = Pistol magazine with 12 catridges. Compatible with the Pollock. diff --git a/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl new file mode 100644 index 00000000000..e113a526b62 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/weapons/gun-examine.ftl @@ -0,0 +1,10 @@ +gun-examinable-verb-text = Examine statistics +gun-examinable-verb-message = Detailed statistics +gun-examine = Gun specifications: +gun-examine-recoil = - [color={$color}]Recoil[/color]: [color=lightblue]{$value}°[/color] per shot +gun-examine-stability = - [color={$color}]Stability[/color]: [color=lightblue]{$value}°[/color] per second +gun-examine-max-angle = - [color={$color}]Maximum spread[/color]: [color=lightblue]{$value}°[/color] +gun-examine-min-angle = - [color={$color}]Minimum spread[/color]: [color=lightblue]{$value}°[/color] +gun-examine-fire-rate = - [color={$color}]Fire rate[/color]: [color=lightblue]{$value} RPS[/color] +gun-examine-muzzle-velocity = - [color={$color}]Muzzle velocity[/color]: [color=lightblue]{$value} m/s[/color] +gun-examine-caliber = It's chambered in [color={$color}]{$caliber}[/color]. diff --git a/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl b/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl new file mode 100644 index 00000000000..67adff2204f --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/weapons/guns/ammunition.ftl @@ -0,0 +1,329 @@ +## Pistol (.35 Auto / 9x19mm) + +ent-BaseMagazinePistol = pistol magazine (9x19mm) + +ent-MagazinePistol = pistol magazine (9x19mm) + +ent-MagazinePistolEmpty = pistol magazine (9x19mm any) + +ent-MagazinePistolPractice = pistol magazine (9x19mm practice) + +ent-MagazinePistolIncendiary = pistol magazine (9x19mm incendiary) + +ent-MagazinePistolUranium = pistol magazine (9x19mm uranium) + +ent-BaseMagazinePistolHighCapacity = machine pistol magazine (9x19mm) + +ent-MagazinePistolHighCapacity = machine pistol magazine (9x19mm) + +ent-MagazinePistolHighCapacityEmpty = machine pistol magazine (9x19mm any) + +ent-MagazinePistolHighCapacityPractice = machine pistol magazine (9x19mm practice) + +ent-MagazinePistolSubMachineGunTopMounted = WT550 magazine (9x19mm top-mounted) + +ent-MagazinePistolSubMachineGunTopMountedEmpty = WT550 magazine (9x19mm top-mounted any) + +ent-CartridgePistol = cartridge (9x19mm) + +ent-CartridgePistolPractice = cartridge (9x19mm practice) + +ent-CartridgePistolIncendiary = cartridge (9x19mm incendiary) + +ent-CartridgePistolUranium = cartridge (9x19mm uranium) + +ent-BaseCartridgePistol = cartridge (9x19mm) + +ent-BaseSpeedLoaderPistol = speed loader (9x19mm) + +ent-SpeedLoaderPistol = speed loader (9x19mm) + +ent-SpeedLoaderPistolPractice = speed loader (9x19mm practice) + +ent-BaseMagazineBoxPistol = ammunition box (9x19mm) + +ent-MagazineBoxPistol = ammunition box (9x19mm) + +ent-MagazineBoxPistolPractice = ammunition box (9x19mm practice) + +ent-MagazineBoxPistolIncendiary = ammunition box (9x19mm incendiary) + +ent-MagazineBoxPistolUranium = ammunition box (9x19mm uranium) + +## Rifle (.20 Rifle / 7.62x51mm) + +ent-BaseMagazineRifle = magazine (7.62x51mm) + +ent-MagazineRifle = magazine (7.62x51mm) + +ent-MagazineRifleEmpty = magazine (7.62x51mm any) + +ent-MagazineRifleIncendiary = magazine (7.62x51mm incendiary) + +ent-MagazineRiflePractice = magazine (7.62x51mm practice) + +ent-MagazineRifleUranium = magazine (7.62x51mm uranium) + +ent-BaseCartridgeRifle = cartridge (7.62x51mm) + +ent-CartridgeRifle = cartridge (7.62x51mm) + +ent-CartridgeRiflePractice = cartridge (7.62x51mm practice) + +ent-CartridgeRifleIncendiary = cartridge (7.62x51mm incendiary) + +ent-CartridgeRifleUranium = cartridge (7.62x51mm uranium) + +ent-BaseMagazineBoxRifle = ammunition box (7.62x51mm) + +ent-MagazineBoxRifleBig = ammunition box (7.62x51mm) + +ent-MagazineBoxRifle = ammunition box (7.62x51mm) + +ent-MagazineBoxRiflePractice = ammunition box (7.62x51mm practice) + +ent-MagazineBoxRifleIncendiary = ammunition box (7.62x51mm incendiary) + +ent-MagazineBoxRifleUranium = ammunition box (7.62x51mm uranium) + +## Light Rifle (.30 / 5.56x45mm) + +ent-BaseMagazineLightRifle = magazine (5.56x45mm) + +ent-MagazineLightRifleBox = L6 SAW magazine box (5.56x45mm) + +ent-BaseMagazinePistolSubMachineGun = SMG magazine (5.56x45mm) + +ent-MagazinePistolSubMachineGun = SMG magazine (5.56x45mm) + +ent-MagazinePistolSubMachineGunEmpty = SMG magazine (5.56x45mm any) + +ent-MagazinePistolSubMachineGunPractice = SMG magazine (5.56x45mm practice) + +ent-MagazinePistolSubMachineGunUranium = SMG magazine (5.56x45mm uranium) + +ent-MagazineLightRifle = magazine (5.56x45mm) + +ent-MagazineLightRifleEmpty = magazine (5.56x45mm any) + +ent-MagazineLightRiflePractice = magazine (5.56x45mm practice) + +ent-MagazineLightRifleUranium = magazine (5.56x45mm uranium) + +ent-MagazineLightRifleIncendiary = magazine (5.56x45mm incendiary) + +ent-MagazineLightRifleMaxim = pan magazine (5.56x45mm) + +ent-MagazineLightRiflePkBox = PK munitions box (5.56x45mm) + +ent-BaseCartridgeLightRifle = cartridge (5.56x45mm) + +ent-CartridgeLightRifle = cartridge (5.56x45mm) + +ent-CartridgeLightRiflePractice = cartridge (5.56x45mm practice) + +ent-CartridgeLightRifleIncendiary = cartridge (5.56x45mm incendiary) + +ent-CartridgeLightRifleUranium = cartridge (5.56x45mm uranium) + +ent-SpeedLoaderLightRifle = speed loader (5.56x45mm) + +ent-BaseMagazineBoxLightRifle = ammunition box (5.56x45mm) + +ent-MagazineBoxLightRifleBig = ammunition box (5.56x45mm) + +ent-MagazineBoxLightRifle = ammunition box (5.56x45mm) + +ent-MagazineBoxLightRiflePractice = ammunition box (5.56x45mm practice) + +ent-MagazineBoxLightRifleIncendiary = ammunition box (5.56x45mm incendiary) + +ent-MagazineBoxLightRifleUranium = ammunition box (5.56x45mm uranium) + +## Magnum (.45 / .44 Magnum) +ent-BaseMagazineMagnum = pistol magazine (.44 Magnum) + +ent-BaseMagazineMagnumSubMachineGun = Vector magazine (.44 Magnum) + +ent-MagazineMagnumEmpty = pistol magazine (.44 Magnum any) + +ent-MagazineMagnum = pistol magazine (.44 Magnum) + +ent-MagazineMagnumPractice = pistol magazine (.44 Magnum practice) + +ent-MagazineMagnumUranium = pistol magazine (.44 Magnum uranium) + +ent-MagazineMagnumAP = pistol magazine (.44 Magnum armor-piercing) + +ent-MagazineMagnumSubMachineGunEmpty = Vector magazine (.44 Magnum any) + +ent-MagazineMagnumSubMachineGun = Vector magazine (.44 Magnum) + +ent-MagazineMagnumSubMachineGunPractice = Vector magazine (.44 Magnum practice) + +ent-MagazineMagnumSubMachineGunUranium = Vector magazine (.44 Magnum uranium) + +ent-MagazineMagnumSubMachineGunPiercing = Vector magazine (.44 Magnum armor-piercing) + +ent-BaseCartridgeMagnum = cartridge (.44 Magnum) + +ent-CartridgeMagnum = cartridge (.44 Magnum) + +ent-CartridgeMagnumPractice = cartridge (.44 Magnum practice) + +ent-CartridgeMagnumIncendiary = cartridge (.44 Magnum incendiary) + +ent-CartridgeMagnumAP = cartridge (.44 Magnum armor-piercing) + +ent-CartridgeMagnumUranium = cartridge (.44 Magnum uranium) + +ent-BaseSpeedLoaderMagnum = speed loader (.44 Magnum) + +ent-SpeedLoaderMagnum = speed loader (.44 Magnum) + +ent-SpeedLoaderMagnumEmpty = speed loader (.44 Magnum) + +ent-SpeedLoaderMagnumIncendiary = speed loader (.44 Magnum incendiary) + +ent-SpeedLoaderMagnumPractice = speed loader (.44 Magnum practice) + +ent-SpeedLoaderMagnumAP = speed loader (.44 Magnum armor-piercing) + +ent-SpeedLoaderMagnumUranium = speed loader (.44 Magnum uranium) + +ent-BaseMagazineBoxMagnum = ammunition box (.44 Magnum) + +ent-MagazineBoxMagnum = ammunition box (.44 Magnum) + +ent-MagazineBoxMagnumPractice = ammunition box (.44 Magnum practice) + +ent-MagazineBoxMagnumIncendiary = ammunition box (.44 Magnum incendiary) + +ent-MagazineBoxMagnumUranium = ammunition box (.44 Magnum uranium) + +ent-MagazineBoxMagnumAP = ammunition box (.44 Magnum armor-piercing) + +## Caseless (.25 / 4.73x33mm) Related Entries + +ent-BaseMagazineCaselessRifle = magazine (4.73x33mm caseless) + +ent-BaseMagazineCaselessRifleShort = caseless rifle short magazine (4.73x33mm caseless) + +ent-BaseMagazinePistolCaselessRifle = pistol magazine (4.73x33mm caseless) + +ent-MagazineCaselessRifle10x24 = box magazine (4.73x33mm caseless) + +ent-MagazinePistolCaselessRifle = pistol magazine (4.73x33mm caseless) + +ent-MagazinePistolCaselessRiflePractice = pistol magazine (4.73x33mm caseless practice) + +ent-MagazineCaselessRifle = magazine (4.73x33mm caseless) + +ent-MagazineCaselessRiflePractice = magazine (4.73x33mm caseless practice) + +ent-MagazineCaselessRifleShort = short magazine (4.73x33mm caseless) + +ent-MagazineCaselessRifleShortPractice = short magazine (4.73x33mm caseless practice) + +ent-BaseCartridgeCaselessRifle = cartridge (4.73x33mm caseless) + +ent-CartridgeCaselessRifle = cartridge (4.73x33mm caseless) + +ent-CartridgeCaselessRiflePractice = cartridge (4.73x33mm caseless practice) + +ent-BaseMagazineBoxCaselessRifle = ammunition box (4.73x33mm caseless) + +ent-MagazineBoxCaselessRifle10x24 = ammunition box (4.73x33mm caseless) + +ent-MagazineBoxCaselessRifleBig = ammunition box (4.73x33mm caseless) + +ent-MagazineBoxCaselessRifle = ammunition box (4.73x33mm caseless) + +ent-MagazineBoxCaselessRiflePractice = ammunition box (4.73x33mm caseless practice) + +## Shotgun (.50 / 12 Gauge) +ent-BaseShellShotgun = shell (12 gauge) + +ent-ShellShotgunBeanbag = shell (12 gauge beanbag) + +ent-ShellShotgunSlug = shell (12 gauge slug) + +ent-ShellShotgunFlare = shell (12 gauge flare) + +ent-ShellShotgun = shell (12 gauge) + +ent-ShellShotgunIncendiary = shell (12 gauge incendiary) + +ent-ShellShotgunPractice = shell (12 gauge practice) + +ent-ShellTranquilizer = shell (12 gauge tranquilizer) + +ent-ShellShotgunUranium = shell (12 gauge uranium) + +ent-BaseMagazineShotgun = ammo drum (12 gauge shells) + +ent-MagazineShotgunEmpty = ammo drum (12 gauge shells any) + +ent-MagazineShotgun = ammo drum (12 gauge pellet) + +ent-MagazineShotgunBeanbag = ammo drum (12 gauge beanbags) + +ent-MagazineShotgunSlug = ammo drum (12 gauge slug) + +ent-MagazineShotgunIncendiary = ammo drum (12 gauge incendiary) + +ent-BoxBeanbag = shell box (12 gauge beanbag) + +ent-BoxLethalshot = shell box (12 gauge pellet) + +ent-BoxShotgunSlug = shell box (12 gauge slug) + +ent-BoxShotgunFlare = shell box (12 gauge flare) + +ent-BoxShotgunIncendiary = shell box (12 gauge incendiary) + +ent-BoxShotgunUranium = shell box (12 gauge uranium) + +ent-BoxShotgunPractice = shell box (12 gauge practice) + +ent-BoxShellTranquilizer = shell box (12 gauge tranquilizer) + +## Magazine boxes + +ent-BoxMagazinePistol = box of 9x19mm magazines + +ent-BoxMagazinePistolPractice = box of 9x19mm practice magazines + +ent-BoxMagazinePistolHighCapacity = box of 9x19mm machine pistol magazines + +ent-BoxMagazinePistolHighCapacityPractice = box of 9x19mm machine pistol practice magazines + +ent-BoxMagazinePistolSubMachineGun = box of 5.56x45mm SMG magazines + +ent-BoxMagazinePistolSubMachineGunPractice = box of 5.56x45mm SMG practice magazines + +ent-BoxMagazinePistolSubMachineGunTopMounted = box of 9x19mm WT550 magazines + +ent-BoxMagazineShotgun = box of 12 gauge ammo drums + +ent-BoxMagazineShotgunBeanbag = box of 12 gauge beanbag drums + +ent-BoxMagazineShotgunSlug = box of 12 gauge slug drums + +ent-BoxMagazineShotgunIncendiary = box of 12 gauge incendiary drums + +ent-BoxMagazineRifle = box of 7.62x51mm magazines + +ent-BoxMagazineRiflePractice = box of 7.62x51mm practice magazines + +ent-BoxMagazineLightRifle = box of 5.56x45mm magazines + +ent-BoxMagazineLightRiflePractice = box of 5.56x45mm practice magazines + +ent-BoxMagazineMagnumSubMachineGun = box of .44 Magnum Vector magazines + +ent-BoxMagazineMagnumSubMachineGunPractice = box of .44 Magnum Vector practice magazines + +ent-BoxMagazinePistolCaselessRifle = box of 4.73x33mm caseless pistol magazines + +ent-BoxMagazinePistolCaselessRiflePractice = box of 4.73x33mm caseless practice magazines diff --git a/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl b/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl new file mode 100644 index 00000000000..921cfab4cbe --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/weapons/guns/weapons.ftl @@ -0,0 +1,143 @@ +ent-WeaponLightMachineGunL6 = + .desc = Cybersun Industries' take on squad support. Holds enough ammunition to suppress an entire hallway or write your name in bullets on the hull. The instruction manual includes a section on 'Aggressive Negotiations' and 'Area Denial'. + +ent-WeaponLightMachineGunL6C = + .desc = A modified L6 SAW designed for cyborg use. Creates ammunition on the fly from an internal fabricator that slowly self-charges. + +ent-WeaponPistolViper = + .desc = Standard operative pistol that emphasizes practicality over flash. Reliable enough to bet your life on. + +ent-WeaponPistolEchis = + .desc = A Viper modified for cyborg use. Creates ammunition on the fly from an internal fabricator that slowly self-charges. + +ent-WeaponPistolCobra = + .desc = A rugged, robust operator handgun with inbuilt silencer. Utilizes caseless ammunition for whisper-quiet operation. + +ent-WeaponPistolMk58 = + .desc = The old workhorse of SC security. A simple design from a simpler time. Still found in station armories across the sector, much to the annoyance of newer officers who prefer modern amenities. + +ent-WeaponPistolN1984 = + .desc = The sidearm of any self respecting officer. Comes in .44 magnum, the lord's caliber. + +ent-WeaponRevolverDeckard = + .desc = An attempt at creating a hybrid between a revolver and a pistol. Hits harder than your typical 9mm while being only slightly more likely to dislocate your wrist. + +ent-WeaponRevolverInspector = + .desc = The detective's best friend, or at least their loudest one. + +ent-WeaponRevolverMateba = + .desc = A masterwork of engineering that combines power and precision. + +ent-WeaponRevolverPython = + .desc = Syndicate's answer to the Inspector. Nearly identical in performance but with more aggressive styling and a matte black finish because of course it has a matte black finish. + +ent-WeaponRevolverPirate = + .desc = An odd, old-looking revolver that somehow found its way into pirate hands. Despite its age, it packs quite a punch. + +ent-WeaponRifleAk = + .desc = An iconic weapon of war, this particular model has been rechambered to accept 5.56x45mm ammunition. + +ent-WeaponShotgunBulldog = + .desc = It's a magazine-fed combat shotgun designed for close quarters combat. + +ent-WeaponShotgunDoubleBarreled = + .desc = An immortal classic that never goes out of style. Two barrels of devastating firepower. + +ent-WeaponShotgunEnforcer = + .desc = A premium combat shotgun based on the Kammerer design, featuring improved handling. + +ent-WeaponShotgunKammerer = + .desc = When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout the system. + +ent-WeaponShotgunSawn = + .desc = A double-barrel shotgun with the barrels shortened for concealability. Loses none of its punch but all of its practicality. + +ent-WeaponShotgunSawnEmpty = + .desc = A double-barrel shotgun with the barrels shortened for concealability. Currently unloaded. + +ent-WeaponShotgunHandmade = + .desc = A crude but functional shotgun assembled from spare parts. Not pretty, but it gets the job done. + +ent-WeaponShotgunImprovised = + .desc = A simple single-shot shotgun made from scrap. Better than nothing in a pinch. + +ent-WeaponSubMachineGunAtreides = + .desc = An older SMG model that refuses to die. Based on ancient designs that predate the corporation itself. + +ent-WeaponSubMachineGunC20r = + .desc = Syndicate's pride and joy. Similar to SC's Vector but with better build quality and a more aggressive attitude. + +ent-WeaponSubMachineGunDrozd = + .desc = SC's answer to the age-old question: 'What if we made an SMG that thinks it's an assault rifle?' Chambered in 5.56mm for compatibility with standard rifle ammunition. + +ent-WeaponSubMachineGunWt550 = + .desc = Modern light SMG that proves sometimes simple is better. Lightweight, reliable, and user-friendly. + +ent-WeaponSniperMosin = + .desc = A weapon for hunting, or endless trench warfare. This bolt-action rifle has stood the test of time and still serves faithfully. + +ent-WeaponLaserSvalinn = + .desc = A practical laser pistol found in security armories across the sector. Simple, reliable, and cheap enough that accounting won't complain when you requisition a replacement. + +ent-WeaponLaserGun = + .desc = A classic design that refuses to go out of style. What it lacks in modern amenities it makes up for with proven reliability and a distinctive retro aesthetic that some officers swear improves accuracy. + +ent-WeaponMakeshiftLaser = + .desc = A jury-rigged laser pistol that's more likely to give the wielder anxiety than the target. The manual consists of a sticky note reading 'Point away from face'. + +ent-WeaponTeslaGun = + .desc = A specialized weapon that harnesses electromagnetic forces. Each shot creates an impressive light show, though most targets are too busy being electrocuted to appreciate it. + +ent-WeaponLaserCarbinePractice = + .desc = Security cadets' first introduction to energy weapons. The power output is limited to prevent training accidents, much to the relief of the medical staff. + +ent-WeaponLaserCarbine = + .desc = Standard-issue SC security laser rifle. Combines respectable stopping power with a price point that keeps the bean counters happy. Comes with a 'warranty void if exposed to plasma' sticker. + +ent-WeaponPulsePistol = + .desc = SC's premier tactical sidearm. Each shot delivers a concentrated burst of energy that will ruin anyone's day. + +ent-WeaponPulseCarbine = + .desc = High-end SC energy weapon that makes its presence known. Features select-fire capability and enough punch to make even hardened operatives think twice. + +ent-WeaponPulseRifle = + .desc = The gold standard in energy weapon technology. Each shot carries enough power to leave an impression - both on the target and in the after-action report. + +ent-WeaponLaserCannon = + .desc = When subtlety isn't an option and property damage is acceptable collateral. The power cell housing comes with built-in cooling fins, which should tell you everything you need to know. + +ent-WeaponParticleDecelerator = + .desc = A specialized containment weapon for dealing with exotic particle anomalies. The user manual heavily emphasizes keeping your distance from the target, which is always a good sign. + +ent-WeaponXrayCannon = + .desc = Cutting-edge weaponry that utilizes penetrating radiation. The 'Experimental' warning label has been crossed out and replaced with 'Mostly Stable', which is progress. + +ent-WeaponDisablerPractice = + .desc = Training variant of the standard disabler. Perfect for teaching cadets about weapon handling without risking any expensive lawsuits. + +ent-WeaponDisabler = + .desc = Standard-issue compliance device that excels at de-escalating situations. Favored by security officers who prefer their suspects conscious enough to sign confessions. + +ent-WeaponDisablerSMG = + .desc = High-rate compliance device for when one target isn't going down fast enough. Delivers enough non-lethal rounds to exhaust even the most enthusiastic resistance. + +ent-WeaponTaser = + .desc = Classic security sidearm that trades ammunition capacity for stopping power. Nothing says 'please comply' quite like 50,000 volts of persuasion. + +ent-WeaponAntiqueLaser = + .desc = A masterwork of pre-corporate craftsmanship. The self-charging mechanism is a testament to lost technology, and the chrome finish ensures you look good while using it. + +ent-WeaponAdvancedLaser = + .desc = SC's latest in personal defense technology. Features a miniaturized fusion cell that ensures you'll never run out of shots - assuming you live long enough to fire them all. + +ent-WeaponPistolCHIMP = + .desc = A marvel of anomalous weapons research that packs quite a punch for its size. The instruction manual spends more pages on physics disclaimers than actual instructions. + +ent-WeaponPistolCHIMPUpgraded = + .desc = An enhanced version of the standard CHIMP that demonstrates why some experiments should have remained theoretical. Each shot bends reality a little more than strictly necessary. + +ent-WeaponBehonkerLaser = + .desc = A grotesque but effective weapon fashioned from a behonker's eye. Every shot is accompanied by a faint honking sound that scientists swear is just psychosomatic. + +ent-WeaponEnergyShotgun = + .desc = A high-end energy shotgun. Features multiple firing modes for when you can't decide between 'stop' and 'stop existing'. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 82c80dab1f4..d9e3937191b 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -1,12 +1,12 @@ # Weapons uplink-pistol-viper-name = Viper -uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). +uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (9x19mm). uplink-revolver-python-name = Python -uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. +uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .44 Magnum. uplink-pistol-cobra-name = Cobra -uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless). +uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (4.73x33mm caseless). uplink-rifle-mosin-name = Surplus Rifle uplink-rifle-mosin-desc = A bolt action service rifle that has seen many wars. Not modern by any standard, hand loaded, and terrible recoil, but it is cheap. @@ -79,19 +79,19 @@ uplink-shrapnel-grenade-name = Shrapnel Grenade uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great damage against unarmored targets. # Ammo -uplink-pistol-magazine-name = Pistol Magazine (.35 auto) -uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper. +uplink-pistol-magazine-name = Pistol Magazine (9x19mm) +uplink-pistol-magazine-desc = Pistol magazine with 12 cartridges. Compatible with the Viper. -uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto) -uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible with C-20r. +uplink-pistol-magazine-c20r-name = SMG magazine (10mm auto) +uplink-pistol-magazine-c20r-desc = Magazine with 40 cartridges. Compatible with C-20r. -uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) +uplink-pistol-magazine-caseless-name = Pistol Magazine (4.73x33mm caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnum-name = Speedloader (.45 magnum AP) +uplink-speedloader-magnum-name = Speedloader (.44 Magnum AP) uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. -uplink-mosin-ammo-name = Ammunition box (.30 rifle) +uplink-mosin-ammo-name = Ammunition box (7.62x51mm) uplink-mosin-ammo-desc = A box of 60 cartridges for the surplus rifle. uplink-sniper-ammo-name = Ammunition box (.60 antimateriel) diff --git a/Resources/Migrations/emberfallMigration.yml b/Resources/Migrations/emberfallMigration.yml new file mode 100644 index 00000000000..9e194eb9081 --- /dev/null +++ b/Resources/Migrations/emberfallMigration.yml @@ -0,0 +1,7 @@ +# Emberfall specific migrations + +# 12-30-2024 +WeaponRifleLecter: WeaponRifleLecterEmberfall +WeaponRifleM90GrenadeLauncher: WeaponRifleM90 +WeaponSubMachineGunVector: WeaponSubMachineGunVectorEmberfall +GunSafeLecter: GunSafeLightRifleLecter diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index bc4b6411d1f..64951c79aa7 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -53,7 +53,7 @@ - type: StorageFill contents: - id: WeaponSubMachineGunC20r - - id: MagazinePistolSubMachineGun + - id: MagazineHeavyPistolSubMachineGun # Emberfall amount: 2 # - id: SMGSuppressor @@ -120,7 +120,7 @@ components: - type: StorageFill contents: - - id: MagazinePistolSubMachineGun + - id: MagazineHeavyPistolSubMachineGun # Emberfall amount: 4 - id: MagazineShotgun amount: 4 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 4e5251c27e7..54549c5ccf3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -179,6 +179,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeRifleLecter name: lecter safe + categories: [ HideSpawnMenu ] # Emberfall components: - type: StorageFill contents: @@ -191,6 +192,7 @@ parent: [GunSafeBaseSecure, BaseRestrictedContraband] id: GunSafeSubMachineGunDrozd name: drozd safe + categories: [ HideSpawnMenu ] # Emberfall components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f31d85414d4..592f61ab448 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -144,19 +144,19 @@ tags: - NukeOpsUplink -- type: listing - id: UplinkSniperBundle - name: uplink-sniper-bundle-name - description: uplink-sniper-bundle-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 6 - cost: - Telecrystal: 12 - categories: - - UplinkWeaponry +#- type: listing +# id: UplinkSniperBundle +# name: uplink-sniper-bundle-name +# description: uplink-sniper-bundle-desc +# icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } +# productEntity: BriefcaseSyndieSniperBundleFilled +# discountCategory: usualDiscounts +# discountDownTo: +# Telecrystal: 6 +# cost: +# Telecrystal: 12 +# categories: +# - UplinkWeaponry - type: listing id: UplinkC20RBundle @@ -478,8 +478,8 @@ id: UplinkMagazinePistolSubMachineGun name: uplink-pistol-magazine-c20r-name description: uplink-pistol-magazine-c20r-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon } - productEntity: MagazinePistolSubMachineGun + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi, state: red-icon } # Emberfall + productEntity: MagazineHeavyPistolSubMachineGun # Emberfall cost: Telecrystal: 2 categories: @@ -521,15 +521,15 @@ - UplinkAmmo # for the hristov -- type: listing - id: UplinkHristovAmmo - name: uplink-sniper-ammo-name - description: uplink-sniper-ammo-desc - productEntity: MagazineBoxAntiMateriel - cost: - Telecrystal: 2 - categories: - - UplinkAmmo +#- type: listing +# id: UplinkHristovAmmo +# name: uplink-sniper-ammo-name +# description: uplink-sniper-ammo-desc +# productEntity: MagazineBoxAntiMateriel +# cost: +# Telecrystal: 2 +# categories: +# - UplinkAmmo - type: listing id: UplinkAmmoBundle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 4f6f101be4c..8da7a126e58 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -121,6 +121,7 @@ name: "Vector magazine (.45 magnum any)" suffix: empty parent: BaseMagazineMagnumSubMachineGun + categories: [ HideSpawnMenu ] # Emberfall components: - type: BallisticAmmoProvider proto: null @@ -133,6 +134,7 @@ id: MagazineMagnumSubMachineGun name: "Vector magazine (.45 magnum)" parent: BaseMagazineMagnumSubMachineGun + categories: [ HideSpawnMenu ] # Emberfall components: - type: BallisticAmmoProvider proto: CartridgeMagnum @@ -147,6 +149,7 @@ id: MagazineMagnumSubMachineGunPractice name: "Vector magazine (.45 magnum practice)" parent: BaseMagazineMagnumSubMachineGun + categories: [ HideSpawnMenu ] # Emberfall components: - type: BallisticAmmoProvider proto: CartridgeMagnumPractice @@ -161,6 +164,7 @@ id: MagazineMagnumSubMachineGunUranium name: "Vector magazine (.45 magnum uranium)" parent: BaseMagazineMagnumSubMachineGun + categories: [ HideSpawnMenu ] # Emberfall components: - type: BallisticAmmoProvider proto: CartridgeMagnumUranium @@ -175,6 +179,7 @@ id: MagazineMagnumSubMachineGunPiercing name: "Vector magazine (.45 magnum armor-piercing)" parent: BaseMagazineMagnumSubMachineGun + categories: [ HideSpawnMenu ] # Emberfall components: - type: BallisticAmmoProvider proto: CartridgeMagnumAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index bd85e2691b9..008faa95b03 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -12,7 +12,7 @@ whitelist: tags: - CartridgePistol - capacity: 10 + capacity: 12 # Emberfall - type: Item size: Small - type: ContainerContainer @@ -45,7 +45,7 @@ whitelist: tags: - CartridgePistol - capacity: 16 + capacity: 20 # Emberfall - type: Item size: Small - type: ContainerContainer @@ -77,8 +77,8 @@ mayTransfer: true whitelist: tags: - - CartridgePistol - capacity: 35 + - CartridgeLightRifle # Emberfall + capacity: 40 # Emberfall - type: Item size: Small - type: ContainerContainer @@ -261,11 +261,11 @@ parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider - capacity: 30 - proto: CartridgePistol + capacity: 40 # Emberfall + proto: CartridgeLightRifle # Emberfall whitelist: tags: - - CartridgePistol + - CartridgeLightRifle # Emberfall soundInsert: path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: Sprite @@ -294,7 +294,7 @@ parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgePistolPractice + proto: CartridgeLightRiflePractice # Emberfall - type: Sprite layers: - state: practice @@ -308,7 +308,7 @@ parent: BaseMagazinePistolSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgePistolUranium + proto: CartridgeLightRifleUranium # Emberfall - type: Sprite layers: - state: uranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index c882a3b2f17..0fdbc5a3525 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -15,7 +15,7 @@ whitelist: tags: - CartridgeRifle - capacity: 25 + capacity: 20 # Emberfall - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 83392d07efa..d1293ddb628 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 26 # Emberfall - was 19 - type: entity id: BulletCaselessRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 7eac4b53d09..61e9769e380 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 34 # Emberfall - was 19 - type: entity id: BulletLightRiflePractice @@ -30,7 +30,7 @@ damage: types: Blunt: 3 - Heat: 16 + Heat: 31 # Emberfall - was 16 - type: entity id: BulletLightRifleUranium @@ -41,5 +41,5 @@ - type: Projectile damage: types: - Radiation: 9 + Radiation: 24 # Emberfall - was 9 Piercing: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index b4017fd5507..bd30661f849 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 45 # Emberfall - was 35 - type: entity id: BulletMagnumPractice @@ -30,7 +30,7 @@ damage: types: Blunt: 3 - Heat: 32 + Heat: 42 # Emberfall - was 32 - type: entity id: BulletMagnumAP @@ -53,5 +53,5 @@ - type: Projectile damage: types: - Radiation: 15 + Radiation: 25 # Emberfall - was 15 Piercing: 20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 8d146939b75..58a503be763 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 16 + Piercing: 22 # Emberfall - was 16 - type: entity id: BulletPistolPractice @@ -30,7 +30,7 @@ damage: types: Blunt: 2 - Heat: 14 + Heat: 20 # Emberfall - was 14 - type: entity id: BulletPistolUranium @@ -41,5 +41,5 @@ - type: Projectile damage: types: - Radiation: 6 + Radiation: 12 # Emberfall - was 6 Piercing: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index e3e26bf9f32..274f7f3e100 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 17 + Piercing: 42 # Emberfall - was 17 - type: entity id: BulletRiflePractice @@ -30,7 +30,7 @@ damage: types: Blunt: 2 - Heat: 15 + Heat: 40 # Emberfall - was 15 - type: entity id: BulletRifleUranium @@ -41,6 +41,6 @@ - type: Projectile damage: types: - Radiation: 7 + Radiation: 35 # Emberfall - was 7 Piercing: 8 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d8c465cf9e8..27aa963e95b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 40 # Emberfall - was 28 - type: entity id: PelletShotgunBeanbag @@ -40,7 +40,7 @@ - type: Projectile damage: types: - Piercing: 10 + Piercing: 12 # Emberfall - was 10 - type: entity id: PelletShotgunSpread diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index a415927cc56..c1a4d771f5b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -83,6 +83,9 @@ steps: 4 zeroVisible: true - type: Appearance + - type: Gun # Emberfall + projectileSpeed: 45 + angleIncrease: 3 - type: entity name: L6C ROW diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f2..848ada57741 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -26,6 +26,7 @@ - suitStorage - Belt - type: Gun + projectileSpeed: 35 # Emberfall fireRate: 6 selectedMode: SemiAuto availableModes: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7d11dffbfac..24b1537a08a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -107,7 +107,7 @@ - type: entity id: BaseBulletIncendiary name: base bullet incendiary - parent: BaseBullet + parent: [ BaseBullet, BaseBulletTracerYellow ] # Emberfall categories: [ HideSpawnMenu ] components: - type: Projectile @@ -1051,4 +1051,37 @@ - type: ProjectileSpread proto: BulletDisablerSmg count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though - spread: 9 \ No newline at end of file + spread: 9 + +# Emberfall projectiles: yes they have to be here + +# Tracers +- type: entity + abstract: true + id: BaseBulletTracer + components: + - type: Tracer + - type: PointLight + radius: 1.3 + energy: 2 + color: "#ff0000" + +- type: entity + abstract: true + parent: BaseBulletTracer + id: BaseBulletTracerYellow + components: + - type: Tracer + color: "#ffff00" + - type: PointLight + color: "#ffff00" + +- type: entity + abstract: true + parent: BaseBulletTracer + id: BaseBulletTracerGreen + components: + - type: Tracer + color: "#008000" + - type: PointLight + color: "#008000" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index e34433cb56a..3e499d83a39 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -105,6 +105,7 @@ parent: [BaseWeaponRifle, BaseSyndicateContraband] id: WeaponRifleM90GrenadeLauncher description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. + categories: [ HideSpawnMenu ] # Emberfall components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/carbine.rsi @@ -149,6 +150,7 @@ parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleLecter description: A high end military grade assault rifle. Uses .20 rifle ammo. + categories: [ HideSpawnMenu ] # Emberfall components: - type: Sprite sprite: Objects/Weapons/Guns/Rifles/lecter.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index d23e34a1ecb..4b6cc3bb11c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -46,11 +46,11 @@ whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgeLightRifle # Emberfall priority: 1 whitelist: tags: - - CartridgePistol + - CartridgeLightRifle # Emberfall - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -72,6 +72,10 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Gun + projectileSpeed: 37.5 # Emberfall + angleIncrease: 1 # Emberfall + minAngle: 4 # Emberfall + maxAngle: 22 # Emberfall fireRate: 10 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg @@ -79,6 +83,25 @@ magState: mag steps: 1 zeroVisible: true + - type: ItemSlots # Emberfall + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolHighCapacity + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolHighCapacity + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol - type: Appearance - type: entity @@ -99,9 +122,11 @@ - type: Wieldable unwieldOnUse: false - type: GunWieldBonus - minAngle: -19 - maxAngle: -16 + minAngle: -18 # Emberfall - 3 deg min + maxAngle: -18 # Emberfall - 14 deg max - type: Gun + projectileSpeed: 37.5 # Emberfall + fireRate: 8 # Emberfall minAngle: 21 maxAngle: 32 shotsPerBurst: 5 @@ -113,6 +138,25 @@ path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg - type: ChamberMagazineAmmoProvider autoEject: true + - type: ItemSlots # Emberfall + slots: + gun_magazine: + name: Magazine + startingItem: MagazineHeavyPistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineHeavyPistolSubMachineGun + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeHeavyPistol + priority: 1 + whitelist: + tags: + - CartridgeHeavyPistol - type: MagazineVisuals magState: mag steps: 6 @@ -140,6 +184,7 @@ minAngle: -19 maxAngle: -16 - type: Gun + projectileSpeed: 40 # Emberfall minAngle: 21 maxAngle: 32 fireRate: 12 @@ -165,11 +210,11 @@ whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol + startingItem: CartridgeLightRifle # Emberfall priority: 1 whitelist: tags: - - CartridgePistol + - CartridgeLightRifle # Emberfall - type: MagazineVisuals magState: mag steps: 1 @@ -181,6 +226,7 @@ parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunVector suffix: Deprecated use Drozd + categories: [ HideSpawnMenu ] # Emberfall description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. components: - type: Sprite @@ -248,10 +294,11 @@ - type: ChamberMagazineAmmoProvider boltClosed: null - type: Gun - fireRate: 5.5 - minAngle: 1 - maxAngle: 6 - angleIncrease: 1.5 + projectileSpeed: 37.5 # Emberfall + fireRate: 6.5 # Emberfall + minAngle: 2 # Emberfall + maxAngle: 8 # Emberfall + angleIncrease: 1 # Emberfall angleDecay: 6 selectedMode: FullAuto shotsPerBurst: 5 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4b8622e430c..6e8b75ebd39 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -226,6 +226,13 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + # Emberfall additions + - MagazineBoxHeavyPistol + - MagazineHeavyPistol + - MagazineHeavyPistolEmpty + - MagazineHeavyPistolSubMachineGun + - MagazineHeavyPistolSubMachineGunEmpty + # End Emberfall - type: BlueprintReceiver whitelist: tags: @@ -392,6 +399,24 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + # Emberfall additions + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineHeavyPistolSubMachineGunUranium + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineHeavyPistolSubMachineGunTracer + - MagazineHeavyPistolTracer + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolUranium + - MagazineBoxHeavyPistolIncendiary + - MagazineBoxHeavyPistolUranium + - MagazineBoxHeavyPistolTracer + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer + # End Emberfall - type: entity id: ProtolatheHyperConvection @@ -732,6 +757,16 @@ - WeaponFlareGunSecurity - WeaponLaserCarbinePractice - Zipties + # Emberfall additions + - MagazineHeavyPistolSubMachineGun + - MagazineHeavyPistolSubMachineGunEmpty + - MagazineHeavyPistolSubMachineGunPractice + - MagazineHeavyPistol + - MagazineHeavyPistolEmpty + - MagazineHeavyPistolPractice + - MagazineBoxHeavyPistol + - MagazineBoxHeavyPistolPractice + # End Emberfall dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary @@ -783,6 +818,23 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + # Emberfall additions + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolUranium + - MagazineHeavyPistolSubMachineGunUranium + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineHeavyPistolSubMachineGunTracer + - MagazineHeavyPistolTracer + - MagazineBoxHeavyPistolIncendiary + - MagazineBoxHeavyPistolUranium + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer + # End Emberfall - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 553258fdb3f..bbd4d557f34 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,6 +34,10 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + # Begin Emberfall additions + - MagazineHeavyPistolIncendiary + - MagazineHeavyPistolSubMachineGunIncendiary + - MagazineBoxHeavyPistolIncendiary - type: technology id: WeaponizedLaserManipulation @@ -81,6 +85,10 @@ - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium - BoxShotgunUranium + # Begin Emberfall additions + - MagazineHeavyPistolUranium + - MagazineHeavyPistolSubMachineGunUranium + - MagazineBoxHeavyPistolUranium - type: technology id: AdvancedRiotControl diff --git a/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml new file mode 100644 index 00000000000..44c3363429c --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Catalog/Fills/Lockers/security.yml @@ -0,0 +1,95 @@ +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeRifleVulcan + name: vulcan safe + components: + - type: StorageFill + contents: + - id: WeaponRifleVulcan + amount: 2 + - id: MagazineRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeRifleTenebra + name: tenebra safe + components: + - type: StorageFill + contents: + - id: WeaponRifleTenebra + amount: 2 + - id: MagazineRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeLightRifleLecter + name: lecter safe + components: + - type: StorageFill + contents: + - id: WeaponRifleLecterEmberfall + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeLightRifleM90 + name: m-90 safe + components: + - type: StorageFill + contents: + - id: WeaponRifleM90 + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafeSubMachineGunVector + name: vector safe + components: + - type: StorageFill + contents: + - id: WeaponSubMachineGunVectorEmberfall + amount: 2 + - id: MagazineHeavyPistolSubMachineGun + amount: 4 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafePistolM23 + name: m23 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolM23 + amount: 4 + - id: MagazinePistol + amount: 8 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafePistolM25 + name: m25 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolM25 + amount: 4 + - id: MagazineHeavyPistol + amount: 8 + +- type: entity + parent: [ GunSafeBaseSecure, BaseRestrictedContraband ] + id: GunSafePistolPollock + name: pollock safe + components: + - type: StorageFill + contents: + - id: WeaponPistolPollock + amount: 4 + - id: MagazineHeavyPistol + amount: 8 diff --git a/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000..7352f5dc796 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Catalog/uplink_catalog.yml @@ -0,0 +1,47 @@ +- type: listing + id: UplinkSubMachineGunAtreides + name: uplink-smg-atreides-name + description: uplink-smg-atreides-desc + productEntity: WeaponSubMachineGunAtreides + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 8 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkPistolPollock + name: uplink-pistol-pollock-name + description: uplink-pistol-pollock-desc + productEntity: WeaponPistolPollock + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 6 + categories: + - UplinkWeaponry + +- type: listing + id: UplinkMagazinePistolHighCapacity + name: uplink-pistol-magazine-high-capacity-name + description: uplink-pistol-magazine-high-capacity-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: red-icon } + productEntity: MagazinePistolHighCapacity + cost: + Telecrystal: 1 + categories: + - UplinkAmmo + +- type: listing + id: UplinkMagazineHeavyPistol + name: uplink-pistol-magazine-heavy-name + description: uplink-pistol-magazine-heavy-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } + productEntity: MagazineHeavyPistol + cost: + Telecrystal: 1 + categories: + - UplinkAmmo diff --git a/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml b/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml new file mode 100644 index 00000000000..8e69cfce72d --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Markers/Spawners/Random/safes.yml @@ -0,0 +1,82 @@ +- type: entity + abstract: true + parent: MarkerBase + id: BaseGunSafeSpawner + name: random safe spawner + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Storage/closet.rsi + state: shotguncase + - type: EntityTableSpawner + offset: 0 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeShotgunSpawner + suffix: Shotgun + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeShotgunEnforcer + weight: 0.65 + - id: GunSafeShotgunKammerer + weight: 0.35 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeRifleSpawner + suffix: Rifle, 7.62x51mm + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeRifleVulcan + weight: 0.7 + - id: GunSafeRifleTenebra + weight: 0.3 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeLightRifleSpawner + suffix: Rifle, 5.56x45mm + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeLightRifleLecter + - id: GunSafeLightRifleM90 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafeSMGSpawner + suffix: SMG + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafeSubMachineGunDrozd + weight: 0.65 + - id: GunSafeSubMachineGunWt550 + weight: 0.25 + - id: GunSafeSubMachineGunVector + weight: 0.1 + +- type: entity + parent: BaseGunSafeSpawner + id: GunSafePistolSpawner + suffix: Pistol + components: + - type: EntityTableSpawner + table: !type:GroupSelector + children: + - id: GunSafePistolMk58 + weight: 0.4 + - id: GunSafePistolM23 + weight: 0.3 + - id: GunSafePistolM25 + weight: 0.2 + - id: GunSafePistolPollock + weight: 0.1 diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml new file mode 100644 index 00000000000..473040b2559 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_pistol.yml @@ -0,0 +1,83 @@ +- type: entity + abstract: true + parent: BaseMagazineBoxPistol + id: BaseMagazineBoxHeavyPistol + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeHeavyPistol + proto: CartridgeHeavyPistol + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistol + name: ammunition box (10mm auto) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistol + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolPractice + name: ammunition box (10mm auto practice) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolPractice + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: practice + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolIncendiary + name: ammunition box (10mm auto incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: incendiary + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolUranium + name: ammunition box (10mm auto uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolUranium + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + - state: uranium + +- type: entity + parent: BaseMagazineBoxHeavyPistol + id: MagazineBoxHeavyPistolTracer + name: ammunition box (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml new file mode 100644 index 00000000000..9549b6fc265 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxLightRifle + id: MagazineBoxLightRifleTracer + name: ammunition box (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml new file mode 100644 index 00000000000..be22d9dba12 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxPistol + id: MagazineBoxPistolTracer + name: ammunition box (9x19mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml new file mode 100644 index 00000000000..988a02b16f2 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleTracer + name: ammunition box (7.62x51mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleTracer + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml new file mode 100644 index 00000000000..1960dc6ba47 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_pistol.yml @@ -0,0 +1,80 @@ +- type: entity + abstract: true + parent: [ BaseCartridge, BaseRestrictedContraband ] + id: BaseCartridgeHeavyPistol + name: cartridge (10mm auto) + components: + - type: Tag + tags: + - Cartridge + - CartridgeHeavyPistol + - type: CartridgeAmmo + proto: BulletHeavyPistol + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - type: Appearance + - type: SpentAmmoVisuals + +- type: entity + id: CartridgeHeavyPistol + name: cartridge (10mm auto) + parent: BaseCartridgeHeavyPistol + components: + - type: CartridgeAmmo + proto: BulletHeavyPistol + +- type: entity + id: CartridgeHeavyPistolPractice + name: cartridge (10mm auto practice) + parent: BaseCartridgeHeavyPistol + components: + - type: CartridgeAmmo + proto: BulletHeavyPistolPractice + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#dbdbdb" + +- type: entity + id: CartridgeHeavyPistolIncendiary + name: cartridge (10mm auto incendiary) + parent: BaseCartridgeHeavyPistol + components: + - type: CartridgeAmmo + proto: BulletHeavyPistolIncendiary + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#ff6e52" + +- type: entity + id: CartridgeHeavyPistolUranium + name: cartridge (10mm auto uranium) + parent: BaseCartridgeHeavyPistol + components: + - type: CartridgeAmmo + proto: BulletHeavyPistolUranium + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#65fe08" + +- type: entity + parent: BaseCartridgeHeavyPistol + id: CartridgeHeavyPistolTracer + name: cartridge (10mm auto tracer) + components: + - type: CartridgeAmmo + proto: BulletHeavyPistolTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml new file mode 100644 index 00000000000..8fa02434ef2 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -0,0 +1,21 @@ +- type: entity + parent: BaseCartridgeLightRifle + id: CartridgeLightRifleTracer + name: cartridge (5.56x45mm tracer) + components: + - type: CartridgeAmmo + proto: BulletLightRifleTracer + +- type: entity + parent: BaseMagazinePistolSubMachineGun + id: MagazinePistolSubMachineGunTracer + name: SMG magazine (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml new file mode 100644 index 00000000000..2040a8b3b1d --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -0,0 +1,7 @@ +- type: entity + parent: BaseCartridgePistol + id: CartridgePistolTracer + name: cartridge (9x19mm tracer) + components: + - type: CartridgeAmmo + proto: BulletPistolTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml new file mode 100644 index 00000000000..fee2e1cf2c4 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -0,0 +1,7 @@ +- type: entity + parent: BaseCartridgeRifle + id: CartridgeRifleTracer + name: cartridge (7.62x51mm tracer) + components: + - type: CartridgeAmmo + proto: BulletRifleTracer diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml new file mode 100644 index 00000000000..6315f8df689 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_pistol.yml @@ -0,0 +1,203 @@ +- type: entity + abstract: true + parent: [ BaseMagazinePistol, BaseRestrictedContraband ] + id: BaseMagazineHeavyPistol + name: pistol magazine (10mm auto) + components: + - type: Tag + tags: + - MagazineHeavyPistol + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeHeavyPistol + capacity: 12 + +- type: entity + abstract: true + parent: BaseMagazineHeavyPistol + id: BaseMagazineHeavyPistolSubMachineGun + components: + - type: Tag + tags: + - MagazineHeavyPistolSubMachineGun + - type: BallisticAmmoProvider + capacity: 25 + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolEmpty + name: pistol magazine (10mm auto any) + suffix: empty + components: + - type: BallisticAmmoProvider + proto: null + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistol + name: pistol magazine (10mm auto) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistol + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolPractice + name: pistol magazine (10mm auto practice) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolPractice + - type: Sprite + layers: + - state: practice + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolUranium + name: pistol magazine (10mm auto uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolUranium + - type: Sprite + layers: + - state: uranium + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolIncendiary + name: pistol magazine (10mm auto incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistol + id: MagazineHeavyPistolTracer + name: pistol magazine (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunEmpty + name: SMG magazine (10mm auto any) + suffix: empty + components: + - type: BallisticAmmoProvider + proto: null + - type: Sprite + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGun + name: SMG magazine (10mm auto) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistol + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunPractice + name: SMG magazine (10mm auto practice) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolPractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunUranium + name: SMG magazine (10mm auto uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolUranium + - type: Sprite + layers: + - state: uranium + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunIncendiary + name: SMG magazine (10mm auto incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolIncendiary + - type: Sprite + layers: + - state: incendiary + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + parent: BaseMagazineHeavyPistolSubMachineGun + id: MagazineHeavyPistolSubMachineGunTracer + name: SMG magazine (10mm auto tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeHeavyPistolTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml new file mode 100644 index 00000000000..ddccabda955 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineLightRifle + id: MagazineLightRifleTracer + name: magazine (5.56x45mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml new file mode 100644 index 00000000000..21655d7347a --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazinePistol + id: MagazinePistolTracer + name: pistol magazine (9x19mm tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml new file mode 100644 index 00000000000..0dc8e74aa80 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -0,0 +1,13 @@ +- type: entity + parent: BaseMagazineRifle + id: MagazineRifleTracer + name: magazine (7.62x51mm rifle tracer) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleTracer + - type: Sprite + layers: + - state: red + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-1 + map: [ "enum.GunVisualLayers.Mag" ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml new file mode 100644 index 00000000000..b54f24fca98 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_pistol.yml @@ -0,0 +1,51 @@ +- type: entity + parent: BaseBullet + id: BulletHeavyPistol + name: bullet (10mm auto) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 28 + +- type: entity + id: BulletHeavyPistolPractice + name: bullet (10mm auto practice) + parent: BaseBulletPractice + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 1 + +- type: entity + parent: BaseBulletIncendiary + id: BulletHeavyPistolIncendiary + name: bullet (10mm auto incendiary) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Blunt: 3 + Heat: 25 + +- type: entity + parent: BaseBulletUranium + id: BulletHeavyPistolUranium + name: bullet (10mm auto uranium) + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Radiation: 13 + Piercing: 15 + +- type: entity + parent: [ BaseBulletTracerGreen, BulletHeavyPistol ] + id: BulletHeavyPistolTracer + name: bullet (10mm auto tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml new file mode 100644 index 00000000000..d375063157c --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracer, BulletLightRifle ] + id: BulletLightRifleTracer + name: bullet (5.56x45mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml new file mode 100644 index 00000000000..7f1dcd06e77 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracerGreen, BulletPistol ] + id: BulletPistolTracer + name: bullet (9x19mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml new file mode 100644 index 00000000000..a2dea610370 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -0,0 +1,5 @@ +- type: entity + parent: [ BaseBulletTracer, BulletRifle ] + id: BulletRifleTracer + name: bullet (7.62x51mm tracer) + categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml new file mode 100644 index 00000000000..a17f938c736 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/heavy_pistols.yml @@ -0,0 +1,47 @@ +- type: entity + abstract: true + parent: BaseWeaponPistol + id: BaseWeaponHeavyPistol + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineHeavyPistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineHeavyPistol + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeHeavyPistol + priority: 1 + whitelist: + tags: + - CartridgeHeavyPistol + +- type: entity + parent: BaseWeaponHeavyPistol + id: WeaponPistolM25 + name: M25 Tactical + description: A chunky pistol chambered in 10mm Auto. Makes up for its bulk with impressive stopping power. + components: + - type: Gun + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi + +- type: entity + parent: BaseWeaponHeavyPistol + id: WeaponPistolPollock + name: Pollock + description: Mass-produced mercenary sidearm. No serial numbers, no questions asked. Favored by those who need reliability more than papers of authenticity. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/pistols.yml new file mode 100644 index 00000000000..40429dd790d --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -0,0 +1,10 @@ +- type: entity + parent: BaseWeaponPistol + id: WeaponPistolM23 + name: M23 Patrol + description: Standard-issue sidearm. Features modern improvements like proper ergonomics and better sights, though some veterans still claim the old Mk58 was better. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml new file mode 100644 index 00000000000..310b7a8e424 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -0,0 +1,232 @@ +- type: entity + parent: [ BaseWeaponRifle, BaseGunWieldable ] + id: WeaponRifleVulcan + name: SC-84 Vulcan + description: SC's attempt at a full-power battle rifle. Excellent for long-range engagements and beloved by security veterans who value stopping power over their shoulder joints. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi + - type: GunRequiresWield + - type: GunWieldBonus + minAngle: -19.5 # 1.5 deg min + maxAngle: -23.5 # 8.5 deg max + - type: Gun + projectileSpeed: 45 + fireRate: 5.5 + angleIncrease: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + parent: [ BaseWeaponRifle, BaseGunWieldable ] + id: WeaponRifleTenebra + name: Tenebra + description: A robust battle rifle, similar in performance to SC's Vulcan, but with smoother action and better ergonomics. The lack of corporate branding and serial numbers raises questions CentCom prefers not to answer. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi + - type: GunRequiresWield + - type: GunWieldBonus + minAngle: -20 # 1 deg min + maxAngle: -25 # 7 deg max + - type: Gun + projectileSpeed: 45 + fireRate: 4.5 + angleIncrease: 1.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + parent: WeaponRifleLecter + id: WeaponRifleLecterEmberfall + name: AR-19 Lecter + description: Standard-issue SC assault rifle that perfectly embodies corporate cost-cutting. The manual explicitly states 'Working as intended' in response to every known issue. + components: + - type: GunWieldBonus + minAngle: -19 # 2 deg min + maxAngle: -26 # 6 deg max + - type: Gun + projectileSpeed: 50 + fireRate: 6.5 + angleIncrease: 1 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + +- type: entity + parent: [ BaseWeaponRifle, BaseGunWieldable ] + id: WeaponRifleM90 + name: M-90 + description: An old and mass produced bullpup rifle model. More compact than the Lecter, with similar performance. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + - type: GunWieldBonus + minAngle: -18.5 # 2.5 deg min + maxAngle: -25 # 7 deg max + - type: Gun + projectileSpeed: 50 + fireRate: 6.5 + angleIncrease: 1 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + parent: [ BaseWeaponRifle, BaseGunWieldable ] + id: WeaponRifleNightshade + name: AS-9 Nightshade + description: A sleek, non-standard rifle occasionally glimpsed in the hands of SC's more discrete specialists. The lack of any visible manufacturer markings and some suspiciously advanced features suggest a story that several departments would prefer remained untold. + components: + - type: Sprite + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-0 + map: [ "enum.GunVisualLayers.Mag" ] + - type: Clothing + sprite: _Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi + - type: ChamberMagazineAmmoProvider + boltClosed: null + - type: Gun + projectileSpeed: 50 + fireRate: 6.5 + soundGunshot: + path: /Audio/_Emberfall/Weapons/Guns/Gunshots/nightshade.ogg + params: + volume: -4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml new file mode 100644 index 00000000000..713cac1e968 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -0,0 +1,37 @@ +- type: entity + parent: WeaponSubMachineGunVector + id: WeaponSubMachineGunVectorEmberfall + name: Vector + suffix: Emberfall + description: SC's licensed copy of the classic Vector design. Advanced recoil system makes it surprisingly controllable despite the powerful cartridge. + components: + - type: Gun + projectileSpeed: 40 + fireRate: 8 + angleIncrease: 1.8 + minAngle: 3 + maxAngle: 12 + selectedMode: FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + availableModes: + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineHeavyPistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineHeavyPistolSubMachineGun + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgeHeavyPistol + priority: 1 + whitelist: + tags: + - CartridgeHeavyPistol diff --git a/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml new file mode 100644 index 00000000000..f8f21518d1c --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Recipies/Lathes/security.yml @@ -0,0 +1,201 @@ +# 10mm auto magazines +- type: latheRecipe + parent: BaseEmptyAmmoRecipe + id: MagazineHeavyPistolEmpty + result: MagazineHeavyPistolEmpty + materials: + Steel: 30 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistol + result: MagazineHeavyPistol + materials: + Steel: 175 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolPractice + result: MagazineHeavyPistolPractice + materials: + Steel: 105 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolUranium + result: MagazineHeavyPistolUranium + materials: + Steel: 30 + Plastic: 80 + Uranium: 140 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolIncendiary + result: MagazineHeavyPistolIncendiary + materials: + Steel: 30 + Plastic: 145 + +# 10mm auto SMG magazines +- type: latheRecipe + parent: BaseEmptyAmmoRecipe + id: MagazineHeavyPistolSubMachineGunEmpty + result: MagazineHeavyPistolSubMachineGunEmpty + materials: + Steel: 40 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGun + result: MagazineHeavyPistolSubMachineGun + materials: + Steel: 375 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunPractice + result: MagazineHeavyPistolSubMachineGunPractice + materials: + Steel: 225 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunUranium + result: MagazineHeavyPistolSubMachineGunUranium + materials: + Steel: 40 + Plastic: 220 + Uranium: 320 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunIncendiary + result: MagazineHeavyPistolSubMachineGunIncendiary + materials: + Steel: 40 + Plastic: 335 + +# 10mm auto boxes +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistol + result: MagazineBoxHeavyPistol + materials: + Steel: 700 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolPractice + result: MagazineBoxHeavyPistolPractice + materials: + Steel: 420 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolIncendiary + result: MagazineBoxHeavyPistolIncendiary + materials: + Plastic: 700 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolUranium + result: MagazineBoxHeavyPistolUranium + materials: + Plastic: 350 + Uranium: 700 + +# Tracers: magazines + +# 9x19mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolTracer + result: MagazinePistolTracer + materials: + Steel: 125 + Plastic: 50 + +# 10mm auto +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolTracer + result: MagazineHeavyPistolTracer + materials: + Steel: 150 + Plastic: 60 + +# 10mm SMG +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineHeavyPistolSubMachineGunTracer + result: MagazineHeavyPistolSubMachineGunTracer + materials: + Steel: 315 + Plastic: 120 + +# 5.56x45mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineLightRifleTracer + result: MagazineLightRifleTracer + materials: + Steel: 485 + Plastic: 160 + +# 5.56x45mm SMG +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunTracer + result: MagazinePistolSubMachineGunTracer + materials: + Steel: 260 + Plastic: 80 + +# 7.62x51mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineRifleTracer + result: MagazineRifleTracer + materials: + Steel: 405 + Plastic: 140 + +# Tracers: boxes + +# 9x19mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxPistolTracer + result: MagazineBoxPistolTracer + materials: + Steel: 500 + Plastic: 200 + +# 10mm auto +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxHeavyPistolTracer + result: MagazineBoxHeavyPistolTracer + materials: + Steel: 600 + Plastic: 240 + +# 5.56x45mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxLightRifleTracer + result: MagazineBoxLightRifleTracer + materials: + Steel: 780 + Plastic: 320 + +# 7.62x51mm +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxRifleTracer + result: MagazineBoxRifleTracer + materials: + Steel: 650 + Plastic: 280 diff --git a/Resources/Prototypes/_Emberfall/Research/arsenal.yml b/Resources/Prototypes/_Emberfall/Research/arsenal.yml new file mode 100644 index 00000000000..7711de61605 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Research/arsenal.yml @@ -0,0 +1,17 @@ +- type: technology + id: TracerAmmunition + name: research-technology-tracer-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi + state: base + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - MagazinePistolTracer + - MagazineLightRifleTracer + - MagazinePistolSubMachineGunTracer + - MagazineRifleTracer + - MagazineBoxLightRifleTracer + - MagazineBoxPistolTracer + - MagazineBoxRifleTracer diff --git a/Resources/Prototypes/_Emberfall/tags.yml b/Resources/Prototypes/_Emberfall/tags.yml index 7217ce5e94e..ea6f6dffe56 100644 --- a/Resources/Prototypes/_Emberfall/tags.yml +++ b/Resources/Prototypes/_Emberfall/tags.yml @@ -1,2 +1,11 @@ +- type: Tag + id: CartridgeHeavyPistol + - type: Tag id: DockSpaceElevator + +- type: Tag + id: MagazineHeavyPistol + +- type: Tag + id: MagazineHeavyPistolSubMachineGun diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png new file mode 100644 index 00000000000..05ff16bb302 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index 15964feef97..64597cb2c13 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, red-icon and incendiary by MilonPL", "states": [ { "name": "base" @@ -27,6 +27,12 @@ }, { "name": "mag-1" + }, + { + "name": "incendiary" + }, + { + "name": "red-icon" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png new file mode 100644 index 00000000000..2950c4c4b5d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index a01c6d97bc8..dc65846c067 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -5,7 +5,7 @@ "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", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, red-icon by MilonPL", "states": [ { "name": "base" @@ -13,6 +13,9 @@ { "name": "practice" }, + { + "name": "red-icon" + }, { "name": "red" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png new file mode 100644 index 00000000000..811a67e560f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red-icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/base.png new file mode 100644 index 00000000000..f35f0e668aa Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png new file mode 100644 index 00000000000..5f027361443 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png new file mode 100644 index 00000000000..3ca304344a3 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..b60a4c84a97 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/icon.png new file mode 100644 index 00000000000..cc9256e1033 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png new file mode 100644 index 00000000000..a83bd7dd87b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png new file mode 100644 index 00000000000..d2f3ad70f59 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/mag-0.png new file mode 100644 index 00000000000..3d6b7c19f44 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/meta.json new file mode 100644 index 00000000000..e849a4ad01f --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/e6b7c50b3b0f5982fe90b428490ae03a3824d7d9", + "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/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/base.png new file mode 100644 index 00000000000..9c93bb852eb Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/bolt-open.png new file mode 100644 index 00000000000..85ccb805e58 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png new file mode 100644 index 00000000000..bcb512f684b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..d3d2e5798bd Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png new file mode 100644 index 00000000000..d849d2f65ea Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png new file mode 100644 index 00000000000..1072555df60 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png new file mode 100644 index 00000000000..0a182ae41ab Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png new file mode 100644 index 00000000000..4fcdb884c71 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json new file mode 100644 index 00000000000..e849a4ad01f --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/e6b7c50b3b0f5982fe90b428490ae03a3824d7d9", + "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/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png new file mode 100644 index 00000000000..81d70abe95b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png new file mode 100644 index 00000000000..e4d9a014865 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png new file mode 100644 index 00000000000..52666b6192e Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..52666b6192e Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png new file mode 100644 index 00000000000..8cfeb0987a5 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png new file mode 100644 index 00000000000..7e1df839ce9 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png new file mode 100644 index 00000000000..d0e8068dae6 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png new file mode 100644 index 00000000000..a225b095d1f Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json new file mode 100644 index 00000000000..7c893a74cff --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "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/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png new file mode 100644 index 00000000000..ad3b01ba9c0 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png new file mode 100644 index 00000000000..119a03725ee Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..3ff8834683b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..3ff8834683b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png new file mode 100644 index 00000000000..7b7baaad153 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png new file mode 100644 index 00000000000..5dfb70b2c49 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png new file mode 100644 index 00000000000..50cc43898d2 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png new file mode 100644 index 00000000000..50feca5bb6e Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json new file mode 100644 index 00000000000..940d3deae35 --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "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/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..29d04d61932 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..de791dd5359 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/base.png new file mode 100644 index 00000000000..6f6e6c28535 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png new file mode 100644 index 00000000000..23958df2463 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..7fe842d9e25 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..7fe842d9e25 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/icon.png new file mode 100644 index 00000000000..14c83c8517c Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png new file mode 100644 index 00000000000..8f1a6d24846 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-right.png new file mode 100644 index 00000000000..6f4bc99c8a3 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png new file mode 100644 index 00000000000..2b3836a5e80 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/meta.json new file mode 100644 index 00000000000..a4975e442ca --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "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/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..4b8e480e6e6 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..e9974ef24f2 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png new file mode 100644 index 00000000000..30159978c4d Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png new file mode 100644 index 00000000000..914107eb80e Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a67acadd00a Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..a67acadd00a Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png new file mode 100644 index 00000000000..0b6b42dbeb8 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png new file mode 100644 index 00000000000..6b9d8a59f4b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png new file mode 100644 index 00000000000..828a439d310 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png new file mode 100644 index 00000000000..148c42717e1 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json new file mode 100644 index 00000000000..a4975e442ca --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "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/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..684526cd7fa Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..22d8804f7a7 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png new file mode 100644 index 00000000000..a570e87127e Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/base.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png new file mode 100644 index 00000000000..c73c70dd263 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..4193e2eb0cf Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..4193e2eb0cf Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png new file mode 100644 index 00000000000..804e5604e1c Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/icon.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png new file mode 100644 index 00000000000..9a9a5276fb0 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png new file mode 100644 index 00000000000..3c21d530456 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png new file mode 100644 index 00000000000..b85fbe279a1 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/mag-0.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json new file mode 100644 index 00000000000..cd29d82fd15 --- /dev/null +++ b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from Delta-v at https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4, edited by MilonPL", + "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-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/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..d5d0304775b Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..0b5e2b7a0d2 Binary files /dev/null and b/Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi/wielded-inhand-right.png differ