From 4fd33aa375dc12ed7b88abd44cd63dd3b7eec5ed Mon Sep 17 00:00:00 2001 From: pacable <77161122+pxc1984@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:58:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D0=BE=D0=B5=20=D1=8D=D0=BD=D0=B5=D1=80=D0=B3=D0=B5?= =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=BE=D1=80?= =?UTF-8?q?=D1=83=D0=B6=D0=B8=D0=B5=20(#59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added advanced energy gun (AEG) * added traitor objective targeting HoS' new gun * fixed formatting * added research tech unlocking energy weaponry * me stupid --- .../_Sunrise/Weapons/EnergyGunComponent.cs | 57 ++++ .../_Sunrise/Weapons/EnergyGunSystem.cs | 159 +++++++++++ .../Weapons/EnergyGunFireModeVisuals.cs | 17 ++ .../en-US/_sunrise/ranged/energygun.ftl | 1 + .../Locale/en-US/research/technologies.ftl | 3 + .../ss14-ru/prototypes/objectives/traitor.ftl | 2 + .../ru-RU/_sunrise/ranged/energygun.ftl | 19 ++ .../Locale/ru-RU/research/technologies.ftl | 3 + .../ss14-ru/prototypes/objectives/traitor.ftl | 2 + .../Catalog/Fills/Lockers/heads.yml | 4 +- .../Weapons/Guns/Projectiles/projectiles.yml | 41 +++ .../Entities/Structures/Machines/lathe.yml | 4 + .../Objectives/stealTargetGroups.yml | 7 + Resources/Prototypes/Objectives/traitor.yml | 13 + .../Weapons/Guns/Battery/battery_guns.yml | 261 ++++++++++++++++++ .../Weapons/Guns/Projectiles/impact.yml | 18 ++ .../_Sunrise/Recipes/Lathes/security.yml | 43 +++ .../Prototypes/_Sunrise/Research/arsenal.yml | 38 +++ .../Guidebook/Antagonist/Traitors.xml | 4 + .../Guns/Battery/energygun.rsi/base.png | Bin 0 -> 513 bytes .../energygun.rsi/disabler-inhand-left.png | Bin 0 -> 871 bytes .../energygun.rsi/disabler-inhand-right.png | Bin 0 -> 862 bytes .../Guns/Battery/energygun.rsi/icon.png | Bin 0 -> 515 bytes .../energygun.rsi/lethal-inhand-left.png | Bin 0 -> 1005 bytes .../energygun.rsi/lethal-inhand-right.png | Bin 0 -> 956 bytes .../Battery/energygun.rsi/mag-unshaded-0.png | Bin 0 -> 201 bytes .../Battery/energygun.rsi/mag-unshaded-1.png | Bin 0 -> 170 bytes .../Battery/energygun.rsi/mag-unshaded-2.png | Bin 0 -> 175 bytes .../Battery/energygun.rsi/mag-unshaded-3.png | Bin 0 -> 174 bytes .../Battery/energygun.rsi/mag-unshaded-4.png | Bin 0 -> 174 bytes .../Guns/Battery/energygun.rsi/meta.json | 66 +++++ .../Battery/energygun.rsi/mode-disabler.png | Bin 0 -> 164 bytes .../Battery/energygun.rsi/mode-lethal.png | Bin 0 -> 154 bytes .../Guns/Battery/energygun.rsi/mode-stun.png | Bin 0 -> 165 bytes .../energygun.rsi/special-inhand-left.png | Bin 0 -> 891 bytes .../energygun.rsi/special-inhand-right.png | Bin 0 -> 879 bytes .../Battery/energygun_carbine.rsi/base.png | Bin 0 -> 551 bytes .../equipped-BACKPACK.png | Bin 0 -> 1423 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1423 bytes .../Battery/energygun_carbine.rsi/icon.png | Bin 0 -> 558 bytes .../energygun_carbine.rsi/inhand-left.png | Bin 0 -> 546 bytes .../energygun_carbine.rsi/inhand-right.png | Bin 0 -> 573 bytes .../energygun_carbine.rsi/mag-unshaded-0.png | Bin 0 -> 162 bytes .../energygun_carbine.rsi/mag-unshaded-1.png | Bin 0 -> 169 bytes .../energygun_carbine.rsi/mag-unshaded-2.png | Bin 0 -> 170 bytes .../energygun_carbine.rsi/mag-unshaded-3.png | Bin 0 -> 170 bytes .../energygun_carbine.rsi/mag-unshaded-4.png | Bin 0 -> 163 bytes .../Battery/energygun_carbine.rsi/meta.json | 48 ++++ .../Battery/energygun_pistol.rsi/base.png | Bin 0 -> 315 bytes .../disabler-inhand-left.png | Bin 0 -> 555 bytes .../disabler-inhand-right.png | Bin 0 -> 475 bytes .../Battery/energygun_pistol.rsi/icon.png | Bin 0 -> 619 bytes .../lethal-inhand-left.png | Bin 0 -> 551 bytes .../lethal-inhand-right.png | Bin 0 -> 462 bytes .../energygun_pistol.rsi/mag-unshaded-0.png | Bin 0 -> 113 bytes .../energygun_pistol.rsi/mag-unshaded-1.png | Bin 0 -> 111 bytes .../energygun_pistol.rsi/mag-unshaded-2.png | Bin 0 -> 111 bytes .../energygun_pistol.rsi/mag-unshaded-3.png | Bin 0 -> 113 bytes .../energygun_pistol.rsi/mag-unshaded-4.png | Bin 0 -> 113 bytes .../Battery/energygun_pistol.rsi/meta.json | 54 ++++ .../energygun_pistol.rsi/mode-disabler.png | Bin 0 -> 113 bytes .../energygun_pistol.rsi/mode-lethal.png | Bin 0 -> 113 bytes .../Guns/Battery/mini_energygun.rsi/base.png | Bin 0 -> 231 bytes .../disabler-inhand-left.png | Bin 0 -> 567 bytes .../disabler-inhand-right.png | Bin 0 -> 479 bytes .../mini_energygun.rsi/equipped-BELT.png | Bin 0 -> 217 bytes .../Guns/Battery/mini_energygun.rsi/icon.png | Bin 0 -> 404 bytes .../mini_energygun.rsi/lethal-inhand-left.png | Bin 0 -> 557 bytes .../lethal-inhand-right.png | Bin 0 -> 485 bytes .../mini_energygun.rsi/mag-unshaded-0.png | Bin 0 -> 158 bytes .../mini_energygun.rsi/mag-unshaded-1.png | Bin 0 -> 157 bytes .../mini_energygun.rsi/mag-unshaded-2.png | Bin 0 -> 164 bytes .../mini_energygun.rsi/mag-unshaded-3.png | Bin 0 -> 164 bytes .../mini_energygun.rsi/mag-unshaded-4.png | Bin 0 -> 164 bytes .../Guns/Battery/mini_energygun.rsi/meta.json | 69 +++++ .../mini_energygun.rsi/mode-disabler.png | Bin 0 -> 120 bytes .../mini_energygun.rsi/mode-lethal.png | Bin 0 -> 120 bytes .../Battery/mini_energygun.rsi/mode-stun.png | Bin 0 -> 120 bytes .../special-inhand-left.png | Bin 0 -> 891 bytes .../special-inhand-right.png | Bin 0 -> 879 bytes .../Battery/multiphase_energygun.rsi/base.png | Bin 0 -> 1117 bytes .../disabler-inhand-left.png | Bin 0 -> 618 bytes .../disabler-inhand-right.png | Bin 0 -> 625 bytes .../equipped-BELT.png | Bin 0 -> 1667 bytes .../Battery/multiphase_energygun.rsi/icon.png | Bin 0 -> 1113 bytes .../lethal-inhand-left.png | Bin 0 -> 618 bytes .../lethal-inhand-right.png | Bin 0 -> 627 bytes .../mag-unshaded-0.png | Bin 0 -> 338 bytes .../mag-unshaded-1.png | Bin 0 -> 177 bytes .../mag-unshaded-2.png | Bin 0 -> 181 bytes .../mag-unshaded-3.png | Bin 0 -> 181 bytes .../mag-unshaded-4.png | Bin 0 -> 176 bytes .../multiphase_energygun.rsi/meta.json | 70 +++++ .../mode-disabler.png | Bin 0 -> 236 bytes .../multiphase_energygun.rsi/mode-ion.png | Bin 0 -> 226 bytes .../multiphase_energygun.rsi/mode-lethal.png | Bin 0 -> 220 bytes .../special-inhand-left.png | Bin 0 -> 616 bytes .../special-inhand-right.png | Bin 0 -> 627 bytes 98 files changed, 1001 insertions(+), 2 deletions(-) create mode 100644 Content.Server/_Sunrise/Weapons/EnergyGunComponent.cs create mode 100644 Content.Server/_Sunrise/Weapons/EnergyGunSystem.cs create mode 100644 Content.Shared/_Sunrise/Weapons/EnergyGunFireModeVisuals.cs create mode 100644 Resources/Locale/en-US/_sunrise/ranged/energygun.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/ranged/energygun.ftl create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml create mode 100644 Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml create mode 100644 Resources/Prototypes/_Sunrise/Research/arsenal.yml create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-disabler.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-lethal.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-stun.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-disabler.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-lethal.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-disabler.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-lethal.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-stun.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/base.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-disabler.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-ion.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-lethal.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-right.png diff --git a/Content.Server/_Sunrise/Weapons/EnergyGunComponent.cs b/Content.Server/_Sunrise/Weapons/EnergyGunComponent.cs new file mode 100644 index 00000000000..7eb768232bf --- /dev/null +++ b/Content.Server/_Sunrise/Weapons/EnergyGunComponent.cs @@ -0,0 +1,57 @@ +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Content.Server.Weapons.Ranged.Systems; + +namespace Content.Server.Weapons.Ranged.Components; + +/// +/// Allows for energy gun to switch between three modes. This also changes the sprite accordingly. +/// +/// This is BatteryWeaponFireModesSystem with additional changes to allow for different sprites. +[RegisterComponent] +[Access(typeof(EnergyGunSystem))] +[AutoGenerateComponentState] +public sealed partial class EnergyGunComponent : Component +{ + /// + /// A list of the different firing modes the energy gun can switch between + /// + [DataField("fireModes", required: true)] + [AutoNetworkedField] + public List FireModes = new(); + + /// + /// The currently selected firing mode + /// + [DataField("currentFireMode")] + [AutoNetworkedField] + public EnergyWeaponFireMode? CurrentFireMode = default!; +} + +[DataDefinition] +public sealed partial class EnergyWeaponFireMode +{ + /// + /// The projectile prototype associated with this firing mode + /// + [DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Prototype = default!; + + /// + /// The battery cost to fire the projectile associated with this firing mode + /// + [DataField("fireCost")] + public float FireCost = 100; + + /// + /// The name of the selected firemode + /// + [DataField("name")] + public string Name = string.Empty; + + /// + /// What RsiState we use for that firemode if it needs to change. + /// + [DataField("state")] + public string State = string.Empty; +} diff --git a/Content.Server/_Sunrise/Weapons/EnergyGunSystem.cs b/Content.Server/_Sunrise/Weapons/EnergyGunSystem.cs new file mode 100644 index 00000000000..4ddaf8fd358 --- /dev/null +++ b/Content.Server/_Sunrise/Weapons/EnergyGunSystem.cs @@ -0,0 +1,159 @@ +using Content.Server.Popups; +using Content.Server.Weapons.Ranged.Components; +using Content.Shared.Database; +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Verbs; +using Content.Shared.Item; +using Content.Shared._Sunrise.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Prototypes; +using System.Linq; +using System; + +namespace Content.Server.Weapons.Ranged.Systems; +public sealed class EnergyGunSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInteractHandEvent); + SubscribeLocalEvent>(OnGetVerb); + SubscribeLocalEvent(OnExamined); + } + + private void OnExamined(EntityUid uid, EnergyGunComponent component, ExaminedEvent args) + { + if (component.FireModes == null || component.FireModes.Count < 2) + return; + + if (component.CurrentFireMode == null) + { + SetFireMode(uid, component, component.FireModes.First()); + } + + if (component.CurrentFireMode?.Prototype == null) + return; + + if (!_prototypeManager.TryIndex(component.CurrentFireMode.Prototype, out var proto)) + return; + + args.PushMarkup(Loc.GetString("energygun-examine-fire-mode", ("mode", Loc.GetString(component.CurrentFireMode.Name)))); + } + + private void OnGetVerb(EntityUid uid, EnergyGunComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || args.Hands == null) + return; + + if (component.FireModes == null || component.FireModes.Count < 2) + return; + + if (component.CurrentFireMode == null) + { + SetFireMode(uid, component, component.FireModes.First()); + } + + foreach (var fireMode in component.FireModes) + { + var entProto = _prototypeManager.Index(fireMode.Prototype); + + var v = new Verb + { + Priority = 1, + Category = VerbCategory.SelectType, + Text = entProto.Name, + Disabled = fireMode == component.CurrentFireMode, + Impact = LogImpact.Low, + DoContactInteraction = true, + Act = () => + { + SetFireMode(uid, component, fireMode, args.User); + } + }; + + args.Verbs.Add(v); + } + } + + private void OnInteractHandEvent(EntityUid uid, EnergyGunComponent component, ActivateInWorldEvent args) + { + if (component.FireModes == null || component.FireModes.Count < 2) + return; + + CycleFireMode(uid, component, args.User); + } + + private void CycleFireMode(EntityUid uid, EnergyGunComponent component, EntityUid user) + { + int index = (component.CurrentFireMode != null) ? + Math.Max(component.FireModes.IndexOf(component.CurrentFireMode), 0) + 1 : 1; + + EnergyWeaponFireMode? fireMode; + + if (index >= component.FireModes.Count) + { + fireMode = component.FireModes.FirstOrDefault(); + } + + else + { + fireMode = component.FireModes[index]; + } + + SetFireMode(uid, component, fireMode, user); + } + + private void SetFireMode(EntityUid uid, EnergyGunComponent component, EnergyWeaponFireMode? fireMode, EntityUid? user = null) + { + if (fireMode?.Prototype == null) + return; + + component.CurrentFireMode = fireMode; + + if (TryComp(uid, out ProjectileBatteryAmmoProviderComponent? projectileBatteryAmmoProvider)) + { + if (!_prototypeManager.TryIndex(fireMode.Prototype, out var prototype)) + return; + + projectileBatteryAmmoProvider.Prototype = fireMode.Prototype; + projectileBatteryAmmoProvider.FireCost = fireMode.FireCost; + + if (user != null) + { + _popupSystem.PopupEntity(Loc.GetString("gun-set-fire-mode", ("mode", Loc.GetString(component.CurrentFireMode.Name))), uid, user.Value); + } + + if (component.CurrentFireMode.State == string.Empty) + return; + + if (TryComp(uid, out var _) && TryComp(uid, out var item)) + { + _item.SetHeldPrefix(uid, component.CurrentFireMode.State, false, item); + switch (component.CurrentFireMode.State) + { + case "disabler": + UpdateAppearance(uid, EnergyGunFireModeState.Disabler); + break; + case "lethal": + UpdateAppearance(uid, EnergyGunFireModeState.Lethal); + break; + case "special": + UpdateAppearance(uid, EnergyGunFireModeState.Special); + break; + } + } + } + } + + private void UpdateAppearance(EntityUid uid, EnergyGunFireModeState state) + { + _appearance.SetData(uid, EnergyGunFireModeVisuals.State, state); + } +} diff --git a/Content.Shared/_Sunrise/Weapons/EnergyGunFireModeVisuals.cs b/Content.Shared/_Sunrise/Weapons/EnergyGunFireModeVisuals.cs new file mode 100644 index 00000000000..916a7ed4b05 --- /dev/null +++ b/Content.Shared/_Sunrise/Weapons/EnergyGunFireModeVisuals.cs @@ -0,0 +1,17 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._Sunrise.Weapons.Ranged; + +[Serializable, NetSerializable] +public enum EnergyGunFireModeVisuals : byte +{ + State +} + +[Serializable, NetSerializable] +public enum EnergyGunFireModeState : byte +{ + Disabler, + Lethal, + Special +} diff --git a/Resources/Locale/en-US/_sunrise/ranged/energygun.ftl b/Resources/Locale/en-US/_sunrise/ranged/energygun.ftl new file mode 100644 index 00000000000..6a831a46dbd --- /dev/null +++ b/Resources/Locale/en-US/_sunrise/ranged/energygun.ftl @@ -0,0 +1 @@ +energygun-examine-fire-mode = The firemode is set to {$mode} diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 70ca8d018ac..c7f9f89d833 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -35,6 +35,9 @@ research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponr research-technology-experimental-battery-ammo = Experimental Battery Ammo research-technology-basic-shuttle-armament = Shuttle basic armament research-technology-advanced-shuttle-weapon = Advanced shuttle weapons +research-technology-energy-gun = Energy weaponry +research-technology-energy-gun-advance = Advanced energy weaponry +research-technology-advance-laser = Military-grade energy weaponry research-technology-basic-robotics = Basic Robotics research-technology-basic-anomalous-research = Basic Anomalous Research diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl index 7164f38b0ee..7d203adbb87 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/objectives/traitor.ftl @@ -30,6 +30,8 @@ ent-HandTeleporterStealObjective = { ent-BaseRDStealObjective } .desc = { ent-BaseRDStealObjective.desc } ent-SecretDocumentsStealObjective = { ent-BaseTraitorStealObjective } .desc = { ent-BaseTraitorStealObjective.desc } +ent-MultiphaseEnergygunStealObjective = { ent-BaseTraitorStealObjective } + .desc = { ent-BaseTraitorStealObjective.desc } ent-MagbootsStealObjective = { ent-BaseTraitorStealObjective } .desc = { ent-BaseTraitorStealObjective.desc } ent-ClipboardStealObjective = { ent-BaseTraitorStealObjective } diff --git a/Resources/Locale/ru-RU/_sunrise/ranged/energygun.ftl b/Resources/Locale/ru-RU/_sunrise/ranged/energygun.ftl new file mode 100644 index 00000000000..4b9bb9dd433 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/ranged/energygun.ftl @@ -0,0 +1,19 @@ +energygun-examine-fire-mode = Режим огня установлен на {$mode} + +ent-WeaponEnergyGun = Энергетическая пушка + .desc = Базовая гибридная энергетическая с двумя режимами работы: обезоруживание и летал. + +ent-WeaponEnergyGunMultiphase = X-01 Мультифазный энергетический карабин + .desc = Это дорогая современная реконструкция старинного лазерного пистолета. Пистолет имеет несколько уникальных режимов стрельбы, но лишен возможности перезаряжаться со временем. + +ent-WeaponEnergyGunMini = миниатюрная энергетическая пушка + .desc = Облегченная версия энергетического пистолета с меньшей емкостью. + +ent-WeaponEnergyGunPistol = Энергетический пистолет PDW-9 + .desc = Военное оружие, используемое многими ополченцами в местном секторе. + +ent-WeaponGunLaserCarbineAutomatic = Лазерный карабин ИК-60 + .desc = Лазерный полуавтоматический карабин на 20 патронов. + +energy-gun-lethal = летал +energy-gun-disable = обезоруживание diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 5fbf5a748a1..19a67c1c597 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -66,3 +66,6 @@ research-technology-honk-mech = Мех Х.О.Н.К. research-technology-advanced-spray = Продвинутые спреи research-technology-quantum-fiber-weaving = Плетение квантового волокна research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов +research-technology-energy-gun = Энергетическое вооружение +research-technology-energy-gun-advance = Продвинутое энергетическое вооружение +research-technology-advance-laser = Военное энергетическое вооружение diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/traitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/traitor.ftl index f2d3e5674f7..ae3148a68cd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/traitor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/traitor.ftl @@ -30,6 +30,8 @@ ent-HandTeleporterStealObjective = { ent-BaseRDStealObjective } .desc = { ent-BaseRDStealObjective.desc } ent-SecretDocumentsStealObjective = { ent-BaseTraitorStealObjective } .desc = { ent-BaseTraitorStealObjective.desc } +ent-MultiphaseEnergygunStealObjective = { ent-BaseTraitorStealObjective } + .desc = { ent-BaseTraitorStealObjective.desc } ent-MagbootsStealObjective = { ent-BaseTraitorStealObjective } .desc = { ent-BaseTraitorStealObjective.desc } ent-ClipboardStealObjective = { ent-BaseTraitorStealObjective } diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 7be90d5f603..2cece1cb2a9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -275,8 +275,7 @@ - id: ClothingMaskGasSwat # - id: ClothingShoeSlippersDuck: Need more space for style # prob: 0.2 - - id: DrinkVacuumFlask - prob: 0.8 + - id: WeaponEnergyGunMultiphase # Sunrise-AEG - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSecurity @@ -316,6 +315,7 @@ - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity - id: BookSecretDocuments + - id: WeaponEnergyGunMultiphase # Sunrise-AEG - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 9ba48348968..b9eab789d09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1108,3 +1108,44 @@ soundHit: collection: WeakHit soundForce: true + +# Sunrise-AEG +- type: entity + name: energy bolt + id: BulletEnergyGunLaser + parent: BaseBullet + noSpawn: true + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser_greyscale + shader: unshaded + color: red + - type: Ammo + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + mask: + - Opaque + fly-by: *flybyfixture + - type: Projectile + impactEffect: BulletImpactEffectRedDisabler + damage: + types: + Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + soundHit: + collection: WeakHit diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5c36f362d7e..54dd838a06d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -221,6 +221,10 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - WeaponEnergyGun # Sunrise - Energy Gun + - WeaponEnergyGunMini # Sunrise - Miniature Energy Gun + - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol + - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine - type: entity id: AutolatheHyperConvection diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 52117b9ce9c..4c385792a58 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -35,6 +35,13 @@ sprite: Objects/Misc/bureaucracy.rsi state: folder-sec-doc +- type: stealTargetGroup # Sunrise-AEG + id: WeaponEnergyGunMultiphase + name: x-01 multiphase energy gun + sprite: + sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + state: base + - type: stealTargetGroup id: ClothingShoesBootsMagAdv name: advanced magboots diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index ad5f56a443e..75ef23e420f 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -207,6 +207,19 @@ stealGroup: BookSecretDocuments owner: job-name-hos +- type: entity # Sunrise-AEG + parent: BaseTraitorStealObjective + id: MultiphaseEnergygunStealObjective + components: + - type: Objective + # hos has a gun ce does not, higher difficulty than most + difficulty: 3 + - type: NotJobRequirement + job: HeadOfSecurity + - type: StealCondition + stealGroup: WeaponEnergyGunMultiphase + owner: job-name-hos + ## ce - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 00000000000..ecf6d0fb4f6 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,261 @@ +- type: entity + name: energy gun + parent: BaseWeaponBattery + id: WeaponEnergyGun + description: "A basic hybrid energy gun with two settings: disable and kill." + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: energy-gun-disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: energy-gun-lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-stun } # Unused + +- type: entity + name: x-01 multiphase energy gun + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunMultiphase + description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: energy-gun-disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: energy-gun-lethal + state: lethal + # - proto: BulletEnergyGunIon + # fireCost: 250 + # name: ion + # state: special + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-ion } + - type: Tag + tags: + - HighRiskItem + - Sidearm + - type: StaticPrice + price: 750 + - type: StealTarget + stealGroup: WeaponEnergyGunMultiphase + +- type: entity + name: miniature energy gun + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunMini + description: A light version of the Energy gun with a smaller capacity. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: Battery + maxCharge: 500 + startingCharge: 500 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: energy-gun-disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: energy-gun-lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-stun } # Unused + +- type: entity + name: PDW-9 Energy Pistol + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunPistol + description: A military grade sidearm, used by many militia forces throughout the local sector. + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: Battery + maxCharge: 800 + startingCharge: 800 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: energy-gun-disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: energy-gun-lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 750 + +- type: entity + name: IK-60 laser carbine + parent: BaseWeaponBattery + id: WeaponGunLaserCarbineAutomatic + description: "A 20 round semi-automatic laser carbine." + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + selectedMode: SemiAuto + fireRate: 3 + availableModes: + - SemiAuto + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyGunLaser + fireCost: 100 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml new file mode 100644 index 00000000000..936ac9856ec --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/impact.yml @@ -0,0 +1,18 @@ +- type: entity + id: BulletImpactEffectRedDisabler + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml new file mode 100644 index 00000000000..ed0a7669a2a --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml @@ -0,0 +1,43 @@ +- type: latheRecipe + id: WeaponEnergyGun + result: WeaponEnergyGun + category: Weapons + completetime: 8 + materials: + Steel: 2000 + Glass: 800 + Plastic: 500 + +- type: latheRecipe + id: WeaponEnergyGunMini + result: WeaponEnergyGunMini + category: Weapons + completetime: 4 + materials: + Steel: 1000 + Glass: 400 + Plastic: 250 + +- type: latheRecipe + id: WeaponEnergyGunPistol + result: WeaponEnergyGunPistol + category: Weapons + completetime: 10 + materials: + Steel: 1500 + Glass: 600 + Plastic: 400 + Gold: 150 + +- type: latheRecipe + id: WeaponGunLaserCarbineAutomatic + result: WeaponGunLaserCarbineAutomatic + category: Weapons + completetime: 15 + materials: + Steel: 2000 + Glass: 1000 + Plastic: 500 + Gold: 250 + Silver: 100 + Plasma: 500 diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml new file mode 100644 index 00000000000..75924015120 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -0,0 +1,38 @@ +# Tier 2 + +- type: technology + id: EnergyGuns + name: research-technology-energy-gun # + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi + state: icon + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - WeaponEnergyGun + - WeaponEnergyGunMini + +- type: technology + id: EnergyGunsAdvanced + name: research-technology-energy-gun-advance # + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 7500 + recipeUnlocks: + - WeaponEnergyGunPistol + +- type: technology + id: Advanced Laser Manipulation + name: research-technology-advance-laser # + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 12500 + recipeUnlocks: + - WeaponGunLaserCarbineAutomatic diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 7542ca08d65..cc5cb4dda06 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -70,6 +70,10 @@ + - Украсть у Главы Службы Безопасноти [color=#a4885c]X-01 Мультифазный энергетический карабин[/color]. + + + - Украсть у Старшего Инженера [color=#a4885c]Продвинутные Магнитные Сапоги[/color]. diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..09a3bfee4c24a972ac6e5dcb6bb12aba3187c2ac GIT binary patch literal 513 zcmV+c0{;DpP)Sppct=0Getlyf_gy;bTUM4O^E^+2+U<5M%d+19 zU__MD9smq)MCSxf2Vd9qC|K+f14!>d3dRIrh7NScMV}JrrR?BxoxQ3DYZy>BKo#r3 zk5LXAVv6RZAz%;ngg1kVQl)@$uA?Kt13CaWBnLXkQv`7kdr>1oFuED7lOz#3AUd1V zR4bDym}@BAP{oBc@(xWjYmUW~hTV{1NdxCxQ8_f|yO|0;=HxG3SOJ*2Innmt!3n^k z8n{I8#b3iyy5Bis9eY*4)FlCM^T)&hFaXvD@FTzg&%!n?^mEE400000NkvXXu0mjf Dbl=)k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6b65b3077526bb168aa588dab3cf5d685910ad66 GIT binary patch literal 871 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?9 zr;B4q#hkaZ?&k?PiX7YT*tyl@fN;W**Rj4*A6H#H{^IYaFxEXwJ!{$5nlojkhF4v5 z`L~Z@LJ{ZVIl8+e1-z!8Tk-bH@uL%No_ROt{=AuUpVag(+{wd`p~uWH>oh~dGb4rt z$lP7#4Bx&5&AGLDHRt5Y_?HYpD@Eq}Jn=IM_*W_S)^GOd76nlT*8fWLkFPJAEiWtk zv-WAx%vrhWXS(|iuT~E|W~ss46gF!~dIQJ3{OEb@f1`N$oH#ZxY`Ps(;hn)cNzZ@Gs1-|Y zTO24+^FefiuBx}fkNJMfEgcJD`6WM^*>2RoF^x5R%j%TQYR*)KV*=PUjw zxHP71zG+Y^{dE_Aq9yl={&f?NJ>GbK72mus;eJhrA5L)nw?2lcaKF%|lKj3yt5O&o ziX|B?#IP}#OlM>`n~I&wFXS*sXm8i08$D5mjVvPBac#3Z(`~!Ho%jB7`RTvVNqi1A za{?ze7uxBDYF*h{C=`9-J8!_3-m1B}*CkiD=s%k%@HXdicfce58+U8F{_1aSVLo?y z>i13Zg1^}I?bU3lYgzH^Wqq)q*_27P2Y%ml`t;WN#(X;?_ME77Axlynx0Jlws<$FL zbpp#Xv)>Iy%`WS2Gpw zr;B4q#hkaZ?grg*kZ8M~dMcw^IfilWrN>L=zFc9u@{8W9Oiz7n%kM{KZ*V^vb$rQ} z17RiwjIQo{iN9;TohJ%z`V^ktb>;bLe1CU!4bLQn=6fC$6A~GX zURK&U${b&1DEaNJ>OAI(M~k1ws|i22dDFbJUTD|Bj^l{|4)%Z2ue-i}#@1RRw|)C| zkE*(vtSTQqpBMVkZ541YU|M;ihK-a`NguxdW{Np}@Zv?mIo;eXi7eMkr?iBv z-uh*sFq{3quA_^d@IBG_StJ=KacE&rpvYZoH_ingiqgx)d((n>e?R)HG=W{J_t>cx z`L_3a9d=rH_het)<}Il?foJiG`QDrlKB!+^mGwYz{u~BvK6YIZuD_kLjf<`oB#3A* zK2AFsn*Kp>+287iGq+ZW&SSwE?#HVG8;S1C?<`X_S26K{||arb}L0pv2ESe zr@FD)#-~3o<9fgyT=6lWa?b7Ys;kr1`RUdhx}`i gH}{#~>GdB&TVu!UlVKY?fEk9t)78&qol`;+0Kq|u2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cf8c781a244521bb89a2e58097f4cf3115847b25 GIT binary patch literal 515 zcmV+e0{s1nP)@i%|mFu=`M0?N6Ljsy?r0N{`u=pc^~#6fJMMucE=Gg>D}B6L7> zHl?XnMpH1=P`aUt3v1*ZnrPM>i!lwmKEsj*&bgwpZ?NlTD)^9-bGonsFm`jI?Z1N) z0HYeXL~!G;;W6Fs6mbr{Dq!l80J!~QVgXnHa|8GhU;x}jG^kr*ISBv&002ovPDHLk FV1iQ5-!}jN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..43f8ac1800a952ac4bc8877c9643e7eada0eae89 GIT binary patch literal 1005 zcmV5+Q1hm6`WAwJ%K+eZ+W@mA5czC|Fw1k**c#VemX>3T7vEx+v+S(c;Qz8PyQz~595nz$? zsogz)7hg8Fga`bi>kehisV-X$*TbimljJpr3Q6ArBK*ZR2=;&C!@>eSyDqa}QfUms9}x-p?T%M9~F=dVMr;obxOa?gA0h%5!qw63+i1 z=V{NUc4`0fye&&g4ngr88yiDmdKv=4TieF2>yD1pYT`^d$L$c}n&Vh?0#z!_;iS{P zJoU4$fOIL@0(pCCYKp%i2!0Ua{bB`vvkBX_N5U|?@m>1OYPMSVO)DR+ufs0ctXM22 zM@L7N?3K@@^d3MHX9e5luV;#Aqm%ZP%Vn{R;~)%2uKu@V+sS;njN{{Dv^#Cg&^v58 zwITJp-!J7CA##)z3Wdw?{l2{oa?}d?qJa9?_SRO~?)7@O8352+1^_gd0RYWq06=pY0MJ|p05q2Y0L^6pKyw)Y z&|J?Fz#u7l6{)dAJZS<-6B^lABHxhESl5y)S&BaH@4rdX0np$~WOx|oX?B-%=Ol&@ zuQ?7E-fwMgvi>BCNYT?gM5;cyYayfq5QC48zrfdTn-;GwbJtsyJp>%bLEUxPyYf7; zdW37r!apsjxXYH3Ga%gCPxJa4-YP@28oQn+Eegna-f&%178Vfh?1-)#ofKg1a}Fpg zkcc|%41#B&x*TVb@DLFEs`F74rG2-B_+uV|Jg*H95avpA@V!-wmQLjVVhjg?JGB}b zjRu>uZFI?bVZYbw3E0U)4qRpR0irfQOfv9&R2CNzwpt?p&u*&?_?PHCw3jt7u2f`jM>IS4_la*eC z`fCG3{$JDq1Or5YaGpMOX*;hQIFeX5p!_CyHB6}uKL`eTUv=HUv%CrqA_D-L%K(7p b(jLGcT@;{m&+tZ<00000NkvXXu0mjf@^#A_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..86a384f15b53ffc792322724985fcb2bd1c1c850 GIT binary patch literal 956 zcmV;t14I0YP)0%{dL$vW-G50u(CaJ7=zVzqUb)iarYCpx8!NzZ9PCIb z-j+7vzbSaWENliO2ti|{A3M?$sDptTaxyRya&+6Cusfi1{ja=%i)2#lHggWY)99b za7)CX0OeGxa9vjvZ5yW)e0Fse=jZ3i%&SFR|AX-Q=WhWP5q3MOSSX_H)htSDNGT%> zN$3l(DdB(u-tayi8l=(pP_Z*3uHG&n{P1i_6y zv4DbYtBq0#CnqNeyIthga=4bU<5#O zi~wkk5dh6G0-!lY05r!4faVwh&>SNGnqve&bBq9J&Z8-h-6rx&< zJlCCB7C4nk;Lxo0P`T#9x!h6OAbwR!thFh>srcjqT2M!A)=XA6uia3huyfi zIhXSMR9}M}{L<1=e2#!6ys~Y4mC~Y20A<3hT6{`)&Btk9C=_u{&ne9GQFu}v zOuAk^RcF#}W--;fXT3Gb*=KZZO$q;0t9R?uXA`@-jog#(|L@t_0#=P64iqrFW1h$a a6R=?1lBC4CcWb^UNW|0C&t;ucLK6VyvO0$V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d94fbbea10f657c4b160395ef3bd32394a85fe84 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GKAtX)Ar-gYT;0gYpuppDaZc~=_m7jp#E)>YsB-*w-X*f0 z!)4pzO=3qGfr<~rHz-z~^=;^@Yy1`WErhp0nFS~c1{DEZ1`LaA_}9-qB5VZ`@pScb JS?83{1OQi$G(i9W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..dfed74fb689460e83c06be440b7754bc1abf1e3b GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1Gfu1goAr-gYTs7okP~dS6eEjI|`^QJ;C_P#-yQAv^b1RSR zy?_-t?bACS76Mf>JkWQTb|>wf^~Fp20k2N$N&PZqaOVI?fIxvlXaggIgqfITMCyW- OAQ4YjKbLh*2~7Y*hB%!7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..0f523560c4046cb3aa3ca1825fcdb2d5ed9f2e14 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G0iG_7Ar-gYTs7okP~dUCcqm3=ez_CJvWf=nO@5U@ERkig)ODYH1?3dd`Z NfTydU%Q~loCIE&^u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..fdee91317e87a91d06b3f88e92abaecc8eeed0bd GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G0iG_7Ar-gYTs7okP~dUCcZAH z;uumf=j}N|UIs-0)<6ypD^HDu7ODY@TUnS-EU;^0HoJM+?DK5-TD})+t2|dT|C0dA0*MC81m>MP6>RUlh&v4u^K|udS?83{1OV_? BE}{Sc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-lethal.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-lethal.png new file mode 100644 index 0000000000000000000000000000000000000000..d56e68b963d295b949692bf38abbe7bdaf24392d GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCpzq z;uumf=k588yg=2g7xN$O=zDB*?vR0$wYP_X$#>~>H6^0_K!pqpEey`LzWc4Lw36M> pG?#C~b8Y|S%ym3qDIl>xrhvikDBsoDD)sgtF;7=Nmvv4FO#p;}DmnlF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-stun.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-stun.png new file mode 100644 index 0000000000000000000000000000000000000000..56dd59a0ab4faa51c019f4af54b7822a0f23774f GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>ZYP z;uumf=k2+TybJ;YZizyZS428y`pxAP@iM;A-ofhOXYxM(ooINCTdf>WIRnEErX2#u zckK|l`m$CvG0)p%L9o6 C=q^M6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..cfc216989b33fe7763894a62c9c7a22799ea4149 GIT binary patch literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?J zr;B4q#hkaZ4(16tN*w>+EOhzOlv;*n!OOD`cnazN;P`sN_w_f;H;W?z{4Xt0`^B}_ zgfV&Z?netdw_FfkFx%`K)8iWL-H`%b)6cDVduIOOoHXOzpZ|WFojB=zz4)xt3=PkW z7#8g0VaU*9W`e(m9_uP#_0wmNY0iAUo&%uM&GagUg`_I$M%rWcoOOrJ@Vk`@{+-v{5v*ThB z$F)yA5AWQ&bL89W`D?bkTU1{q#VY@g`^2(U{1@6(lH7M_RSJVcu_VKV7&Zoz>5L3#Q?YZm3pq>@+S_&M#)K%tMiG(h zkT&VA^1Gei`@Oz2pZu3OiO*rroWP0Ag?2aAU0<2~PDL!>f%JkG(P!0WuQ3kjj60*O zdh6jH{)I>6H|*Kd@|QnbvyV4!_5P`UyH1#Y*it3&Q}B`0(*LQhH$1$)F}#nKo;uz8 zMs<0-&x5NA!q$7AZmM{BC%b<6x|NPXGgiN0KE)$+_pve~Ba7pb2geeoa9(FLd?vkM zll9lLULWgsa(+4?t)MVv-uH(!RdblQ_b@W+us!6z&tQB1du@~Lo^x%h&&Uf@GRv?} zO&7DdzVMg*=d=oDy~`%|85}#rW5uU#Dn78o{DH;`?dhjeK1z1Q{yr7&vo+u0rDMh= z=?_bRHaL?Rn>d_Xg{?r>1?>do%Zh&aULgi?(0z z70%3>F;P#&m3{Yn50#DF7Pj{nIyZ0>|Cp%s+@^D8VM*P+=YI@-%~ii3qs%ZXnZ=>F zhasa+km0N$(*jF329x6)4bRq0Z8&?DW%=8;xwBW!Tdbon(c?o|^xs3L+YY72rCr#O z<5PN1h4Id|+?~OC(?4oWK6u_OIaRfQFRRuqdeX-I+s}LVIiI)sSb3al!H1=bt>3)4 z{`9+&O_+@2l#Tbk{dmz=c%wij{gLN)E`f)Zt@<)153go@lGtj)%e+P-XUW``H}}_g zb=%Ii-aD^Ae=$?VjZYKo&G)ba()fz>GvxiGAwLaXPjoi!}X&5 z{M%g|d3h6V-Evxe)#=8k)jA3-$Lu{9=wEEG*)F}{m!&q_F~vDSp67&{_um(vuvKTy zoH-939cp@Abs|kyQ<0--D!;7JkB`&+mRp)Cq-yS|SRhODwL40b#9ith`PX2K<%pEo3B4kguV*lY}2e`s?8*3g$=M2?zsx27CVclB)G zxWDkzj~Dx=yxei)$TUT_JFC5;3)kOJS}(2Hkf(EK^Y2rSOKNt9=e}HZQ;s~84 z<6|o}7~bOeyyz11v9LDJQ=6Ad|A?wv8`3?Wb@z`(+4?_+%kEv3Pw919!ocOH?R@Od zjLNO@8ZtQ=S061uswZZxD!A{%Kk+@ErR12FS|;3)_`f}4(d*xK!7GpYJGyVNarq(9 z`hC5gy4`V`GhYoo9zOnPvDnBYbn4=)k6k4>xBE_(a^;^FWZB<-O;ac8Pz=){Nz0i& zT2~*13OqO5>9=rRbM#ufA6BicdpK5Jd$jmOR9JY;stwsu%N2J0H3DjR;~TJ4OrEv% zf7r?se^b{6N4!{F5Ta|>^?#$^!9Tk2)cRcCp>)!lJUu^MU=CvNboFyt=akR{0CK^Z Ar2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c6feccd7f668546b04519cbf6b51d35bdfde91 GIT binary patch literal 551 zcmV+?0@(eDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lY~>K~z{r?Ucc4 z!axv)M^6&T&7dg(DFhUIQRu;I@$9kCcj)7kK1ClvynEdv?m zH!&f$U@zu_Wp>8hnSXYIkdl&e@nobu3Bxe9atn^*{OT@Zl}dDfI-mP@X`?1q;UaOr zGp1?6Y&MhL!4F#%&YfvA8e7YW;K>%nHTfo8J_xm=F+&)qIOwp!#fE>lpDd@3&3K4W5Z{TwUtVRjt2yA@j{^h{eGY3g!6Z@CdCuEx!+q9 zAuxV|b5~if*JOPGQN<}BKoR&I;A`Mm;-FDo-AYgJ^$ME%E}bBr=TZJFd6KB&D$C`P zW@y_sxUNfQ(DKr~4=U;-#CW<*#llOTIJ`i)T#hWRc8>!1yFgfkimvP1z(>0nL^i|F z3t&>DUawO@Toh2i;tY2z-2fEFqP!CD4{%Wwf#7Q(;qK$c^H+|NsY3YAhr9n50gNi- pT-_sy3Dxi690F2OQc^A*fE|^S9Tt@{S8o6S002ovPDHLkV1gvQ_X+?2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac3c6c8c48cf3391fee18c06d7eed1d82478ed5 GIT binary patch literal 1423 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f25d9fc664f78d26fea24eac63cd80a854573d90 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4ck3k978JN-rm}n*AyVa_P|;A<*7B3tuB@% z6qqF%`}qprUvRfZX8SkZ2rD7kSr*n76O2|)KDRD);m=N$E62o6*e+4~zdhkW+`8`t z36}015OAWSZvXswb^of(moGNFQM3NKu^h|V1ycMB7JbT6ju#T<_8s$8oBXB1=2Y44 zsea3qPe0xCCF<})gS+p)Z@QUtW?74R-=w?HqM1Q5_S)ZVv zY!7xs=&aG`dQxEFVKVnr#+RSz0tK><4dgz@Tt9nES$N$u=?Tkq;~G^wQ?}o(n={923u0fF2Gk$_@FeH9*nj0|Pkwq{d%bl{*lPLLd~D5EKHF@Jk9+#} z+*z~xN6Z%(dOZJF@h4mAan-zUE=XYd72UZjud>Z0Vz&S^L79L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..63454347e587f2b687feff0b4936764de470661e GIT binary patch literal 573 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4VOG!978JN-ricDcPK!F?ZaUqtM2toA?D2v zlSNzuP7B>jDE?q_;w`ViWR@dBCQKXGb}ev74!`^~`<-g5XvV^vJI{X4{IvYSZ`nM< z=Ny6%aCBAJ>c*-W*54)!P&SvHd%@x9UaDWc{)t>E^j>_CW7_GZFFrIM zRQP5i{J?!nZnWBD&z!b+>jhuMSo#-F+_6skXj0&{*ITQO%Ury@;ARfjCxz)%nWw`T z3xZaE)s?@yZcUhWq>h-8T>s%yGr!0i%s+qF)Vfdj-IMci{u8v-R~t<`z*yE( z|DT>|n`ingzx*TSZJG6fZGry9tUD+8+o~$T!J-zQ%*m>SC3XqohyGvRb3k?7%v}r( z(|*Q_JBr(7ujFp1Q+&p{$n{39MH=V*wTI)A0v<1sWtbs-psDZc{qqacMGJUiUJGsJ zTDg1w57R||zZdP)nQ>sp`|qh1d!{~gR-D|oX!lvI6;>1s;*b3=DjSL74G){)!Z!pt+}uV@QPi+fxfg85DSqT&Rw1mbFqh-gHK^ z(V>BPdVZ1;!-4GBv&Q?r>=%4^=F7@#MxZ9MAV%8&(W#TNmfi*O7(8A5T-G@yGywp~ Cpf552 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..5381fb09e3f074eb3e67af9972499960ded5b87b GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pq;0SV@QPi+oKBw85DV3589hd;(MgLj%!we zM%%(!lvI6;>1s;*b3=DjSL74G){)!Z!puMMyV@QPi+fxe#85DR99PkT?KPV^Lm@IYd zs3=Q;EJMt_BQ6XK>!*e#tNNYQ`M%%IZAI3cUBBPP0rfVxq%a-+ASF8E!O>GdE`z75 KpUXO@geCxAu``JP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..2b7da86977789083089fe2f67c960788fd9a596e GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!puMMyV@QPi+j9$f85DRJ4*G?}AC!}AG~j)F zO>{$sg5po({CEb2!lvI6;>1s;*b3=DjSL74G){)!Z!poOQ4V@QPi+fxe#859JL99aLtYJq%Pmd5wH zjSdP28c)xf!NTxh>!nrcH81OJFHfp@6$RAP;CqCDW3lYnAFAJ$0J#jFu6{1-oD!M< DvO6>K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json new file mode 100644 index 00000000000..1cc586fb83e --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/pull/15894/commits/199daf90ee25f4285a1a90696d152493abf6ca65", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..4f957f29e4353d0ac98540ad6bdc2f7314c1acd8 GIT binary patch literal 315 zcmV-B0mS}^P)FtcxV z0~*5r=w=!KF-9Uf5x{=h6^@$&_o}FZ?Y3_ml zCl#|#)~4L^)m}u*Sl6{x2>r^rpg_W!q-U$BKq(+-SOfYB3-BwmGIfgX&1!)8dcTu> z3=kjTB;-EegAaTGtD#-x2-Jmw+P!zs)iN`rq)EdIN#Q2m!9996|s9 N002ovPDHLkV1lG#ck%!L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2bcb74b1eb1d8220759071f377f31a5b2b241479 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4F^13978JN-rh3wXEKyvd*J_gfe>f6)dT}e z0gDJu=G(k_N6tE?{p+w)}oA?N~5>?`@0zsx8jHHM)Gx@_C(~ zc9*|s=bWtVx4orhPFcjS3@M3Kn;g08-k-a<9D1^Qwyx^yK!6witHM^>PkO*{_`=EB zInUX$x6V3~W*q#9{kz6gFQF-?^KUOXH;3Or=6F#}$&XaE3Td;}e?J6HdYbL_IGTUx zCqvKiWJ_D?>oXJNn-hXx?2YrE_b7dCt6Au+_0Pp~)pp#>Srz^DRf)Yr{EN*OGhV!B zy%hPx_ubZymm*pDr=NfRHC?Ylb%WL={#9*{gK85Z7{s3J&wta|8_dsQHq5pLSq^l>CY|idCb@SD zu1|5Uyz}AA?CQB0vyL4p%qjPqbj0qC`|iaur;5);GVb%sT|IZzs!fj3 zK<3oqn0ISCJq>(++5EdTH)QLsb-nBA%GLku)SUhNTsg;Tkb>!51|kmDnU~IgFXVW? zuI_^PA>X^Ab9aBznEt7^Te)%Gm$drZ{fBQ$%C^e)Z_lgSC*>ZPa>&4>{qVslshOW_ z=06J*e0H_cbhS~P#OHTr9h+Aml3t_|b@ MPgg&ebxsLQ0Ev>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0su)wK~z{r?UcPr z13?hSN1I406FEX8kRl-#id6~)F;C%JSXuZ|zJ`T`MF?2LMnZyzBql~MB#nCixt+`I z-iN0~MYtafv)}Wdx!t3TjEui#P5FR)KL4hgA!f5#X#IDI6i~0%RgY+~Sg00Jzu*6| z2*+_avEguN>^C~HC@nZFZqG+^su>ngtJPG`#LHZ@mbk7 zFbOW>;(<{CD(%0~L6eRiZ|QQY5$#_ZMAc(|{d3>h*dY+qeT!Ah=-Mbd(rbs!Wr>J~1G{L8t<8+3Vj;kY{^!rwNm)h%oIg zM3GnlJ$oAoj;!zuVLO}NZI`Mb@CU(xA;8Wa#AR=Tr-nD4Hn0$?fL{7I^z4BIPb1VO z5P(DB+wC^@e~Umd1mJxFE~UcGYL(f8paM7m2f-jj#2}zl=O>6%EdfOYejK=rV3pZ} z#ErI)TrS66_;CS3l#o>f2cOz(3t5GLF99JUCgYz&^bXNbTXk2l?owd#~#c>khqwbwyc$BROaip@^kTUVYhRCjze|5fb9FFzeSrtgmVv~Oo| zWori%=&TM~UAXvSM`^LTME~!S%PWOzw`t8kf80XgNbW*`^4+m_H%s??xAEV8r)W|` z-TwK98t>;{&Rq4NQoj5A&dcIQEm-7TC+>SRZ8FP)(~l+i+KnW5Qlwm$zyG?6%a8x3 z*e^rAgOBZ)ixXX6E(^UToDg^Ad+k;(AE8+qRWGw$7UR zJVL)WR7-Tq){@h*Hj5*4y27<;<$^4>&TBB>dHU#2PPXa~ff>?Uk4%5=pl3WYRkKe1 zny`UfziN5uTCIb6lNu}y%Xi0e6Y=f);)_NbP0l+XkKU}Erf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f9200bfef2edc0ed2084ca4eb13871428bd2d75f GIT binary patch literal 462 zcmV;<0WtoGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0b@x-K~#8N?b{utNtO)^k8=SxcN_o!0001h z6h+bHdEVLLsVRr@*y4>h`<`gq)}?9cch0iRe{9p~D2MX=<)#3A(oQ?ob?uj{s!ICL zVxi7JIh04aY}Ldhm#Svcst<+;O5AR2q`SMYP8y1A+P=xT`W}AO$<>H1HvMb|< zbMN-^)LtbA0000000000H~@88*81O20O#b~4>gYYVI!@v2><{907*qoM6N<$ Eg1t-8)Bpeg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..5cbfec6bbe55cf5d93ec7526fb7a10c9835204fe GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*L^CkdGB9kfHw4Ks zmIV0)GdMiEkp|?5dAc};NK8#mSfDN-(qc4a%8M-hp9~DHr3~p@9-Q((6%3xPelF{r G5}E)Gt{OrB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dbc0c5830d73d5f1754c59a6050c998c1db5d43 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN5s>`F+^f&a>4?2fd)g77g@Tj3=E1142DPMd^!)5XYh3Ob6Mw< G&;$T5X&cu7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2996e2131b1382e5fe6b22430f3ce43b6e908d GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN5s>`F+^f&a>4?2ffmClFS2x585opP7);i!vy=nMGkCiCxvXL*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN6gd3F+^f&a>4?20g(oyDIzbj^nWriIF~S_++2G76i@|&r>mdK II;Vst0Ec=V-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ccd7e7e3a6e29c0480e93d8286198ed9e3a588 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*{AXaB%EKUi_p>oj zkg+7lFPOpM*^M+HN6gd3F+^f&a>4?20g)D?DN|l#>HlP4a4ls>=knl`2dZH3boFyt I=akR{0B?#L!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/meta.json new file mode 100644 index 00000000000..f6aac319d76 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/pull/15894/commits/199daf90ee25f4285a1a90696d152493abf6ca65", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-disabler.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-disabler.png new file mode 100644 index 0000000000000000000000000000000000000000..bdd6d88cd224a0e81a2a3b4aad2bba6163945bbd GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*F!(1iG%sOq%ZmjH zGL{7S1v5B2yO9RuhL*L^CkdGB9kfHw4Ks zmIV0)GdMiEkp|?5dAc};NK8#mSfDN-(qc4a%8M-hp9~DHr3~p@9-Q((6%3xPelF{r G5}E)Gt{OrB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..6dcd0f9006b6f48265ef121ab358a457f7860b12 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*7#J8RC@45MI3y$_ zbaZq`NJtcDXb2q0F!(Uxw)u^XK$VOoL4Lsu4$p3+0XgNKE{-7@6VINDASnlwccHrYTB#c zAKI&Ormk7z>0rckan_y4MC*Vy9;UxtexDg9F4dUMBgV|xV*F=Sv0l_(J3ambymwwU cUq8n+brm=3r~6+zfKFiWboFyt=akR{0B?U%;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..09ffcf34515a4c90a3070f952710469edd4eddf0 GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4QD)E978JN-rn^0W^$BZ`*8h3KxaK)Skt4G z%`aYs?x}upjs3%$?Jo~s*}MC@@5#vvGIADdU~g5({1lm{65^9<)-!Lu&b!xV&b_lX ze)m*V2?{o?30u9=ZSlgA9l~FZms;^$?fkb*YyNp{8IMQ10s{8N`EP&2_E+}!#lRg- zGaC*j2pnwuy#1v~P{Ev^XZPO9biK%b^7p>=^_<}v!VOc88%p)2Sje2Z@_q5w+dDg= zYPLmgSu8*4cq!YlLw%PPh91?_9L{r1b4u z9Y~-rXlc;TsZ8#B1&!2K`jeo=Q%A&e5t@2m4 zTVfkF270`;*(v0&GHvM(=ZN_YA1idkr-y&~A@FyfOkKy(84|m1zdhCceOFlKz3=&n zd++3&dib)$s>4um_Nj;M4n+}_D)--iPc@pUH5G1lB>72mG1i8KJ|m_e#7d*eYFu!1LU3t?c1??d)Ms^cix_h zuDDw(yV?D~vEpSrpH;qFwd&RLb%oPX^Y+H=UY7YQSt#tl+7D@*4_!ZB`P18*tE%z* zBiGB!=SP|SQ$miJKaYDnzx$hxCB)SX3y}`F5-7T(j)T<>xNl>6mmk1qhD98t*^gv(wci^@47u(-}L|f zdjHpV_Z!M-5B0Bp>zDe=ks;)+{qX(Y-yZ)3?JRw*Tq`F3`tRHHPnLl}XL7N9iNTND Tw9TgZAa{7W`njxgN@xNAb&tIO=zwdGQ^h*uD-_BB2y7W4>&i8cNzU)nm&u1lO-^x0+HT}izXHp>LK=5aK zRCUX$`wx|CzH?TK@~iZ1S*9y@{%Odhi#g0Wf;oZ=45w-satdT0y^R(B0@C2=>gTe~ HDWM4f%I!}_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e0f4be90682b53abfdf9dd4dc76de8d0b16eea1a GIT binary patch literal 404 zcmV;F0c-w=P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0VzpDK~z{r?UOMM zf-n?@pH40&T)>2pkF6p8AnD&jzHqVru?-psfEIeVxmdEqPw7{WBd0u?2%5psK29wN2@Exzcj8eu;Hm>z&WNpeTx7 zt+|d)bjFlrnHqRzf&KB&8v%rqBvIc0R~1GpfDhY2Wm&3u6h$h+gqf)cXU!4S(y^l_ zGN2z{fT=zM5asu#fj)6CYJh7~y?2I{O#`FHZ4gbYhKc_qWg&cC% zGiPvHdztong`HHf$=De)?PA81Giz`6Jw8!vr@wyk$%XH=SyqP29sIpdfA?KI$>oz* zmWRHQT|e!goCsHIhK0<$ng(igu9qV5FwoKa8_Ub0~?<=mqeq<&kZ?8F5(*Ho!-f7E^v)`7q5XQ0R2 zJwHCpIW6n;ab-j9&G+9ITU3c0KC7-c&$wV!;P%_L(MJ2fZZ()^X(Mv#;n5_+Om@eD zZ8HC4Iry~g=lZ4E%?CQia>@n9zuWJf{-NFQwj;`pNq?%Br;<<2nvxHXKmN%1;9>J_ pwpK-k@WJe5&q1#Jb=<{{F?scaz)g>K)dQoL!PC{xWt~$(69B|c@$>)y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..42caf92772da805142f8c37618107216d6226901 GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4ON~ljv*CsZ*SS=H9H8fK2Y@X^ghfuVF!zs zZ|YN?bFMpCgxD7>T-wzuZdeJ53< z(9fs8=f!)M+uJ6obl$e~4K{zd>aHW-lbz2NG1Ok-v%XsT_E>5p+h3FD6}Aq1PaO4P zO$>Rjd48|7*fBR?>#|Ii^8NKf`%1dcUVbfmNQwQEg7~MGj}8Vfyeau(aq9O=la}kd z*qs704{l6WO;tZo5X;fnDpa|9ZcAZtdm=w;xS2m#b#EzEIms#8s$m;gLd}(9oTS zUc3r@Bf9xRaqjP}V*8nPbbLH6RR3UR_CPQLWHVw)?E# V`-R2Znt@Tn;OXk;vd$@?2>@s&)mQ)k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..719a022d4907df8ce1282f3c6d192105b1398929 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+p`-v859HLoirF*S&!lvI6;>1s;*b3=DjSL74G){)!Z!ppmDGV@QPi+jEAz3<^992c-`49~AxOaUnoV x#=u0e{BplM!=8-A&(BH~ufN5}z+fj($e!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QO1vIOhm1d*PmKnKnZXHWg;_qi;q yQ}dfE=VOb!J=-xxh@1hJ+d&PGLJ0;oHioSI+`==P3l9MeVeoYIb6Mw<&;$V9<1JSJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..bab40cfa51afd10103d390ff8a765c572d80d9ba GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QO1vIOhm1d*PmKnKnZXHWg;_qi;q yQ}dfE=VOb!J=-xxh@1hJ+d&PGLJ0;oHioSI+`==P3l9MeVeoYIb6Mw<&;$V9<1JSJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..07358d778ef66e57a1ec69b6ca3db0ad922744a3 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!prxmaV@QO1vIOhm1d*PmKnKnZXHWg;?_DMx x@#CB5jYFLFbqg*)qzt&+4r+ka3GhouFx2fASipB%MHXlXgQu&X%Q~loCIBrFE}H-V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/meta.json new file mode 100644 index 00000000000..a998b2c729e --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/meta.json @@ -0,0 +1,69 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/pull/8613/commits/980d452f1c5a2b5ca195118182758f81aab64a2d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mode-stun" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + }, + { + "name": "special-inhand-left", + "directions": 4 + }, + { + "name": "special-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-disabler.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-disabler.png new file mode 100644 index 0000000000000000000000000000000000000000..1eaba97b8787669a227e24b3e9d04b5f34788ef3 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*8>L*BqSsl7#K|W@griw zgz62kGk{WzB|(0{3=Yq3qyahNo-U3d8WWQfB(fR;8GRdWHonV~uw-E9ab-xYaM}W7 PF)(<#`njxgN@xNAH5wu8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-lethal.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-lethal.png new file mode 100644 index 0000000000000000000000000000000000000000..24abdb7a8114b545627ea448cd6f2ec1ec063a37 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*8>L*BqSsl7#REr2)LnO z(Ur9N15k>wB*-tA!Qt7BG$2RZ)5S4FV`6fGL{>u}qi@5_#&>xVmJAF%t_-OaPFsL1 O1_n=8KbLh*2~7b0MIj>q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-stun.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-stun.png new file mode 100644 index 0000000000000000000000000000000000000000..d29773d4afdf34cd34f015e9e152b2341a236745 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*8>L*ES=+EOhzOlv;*n!OOD`cnazN;P`sN_w_f;H;W?z{4Xt0`^B}_ zgfV&Z?netdw_FfkFx%`K)8iWL-H`%b)6cDVduIOOoHXOzpZ|WFojB=zz4)xt3=PkW z7#8g0VaU*9W`e(m9_uP#_0wmNY0iAUo&%uM&GagUg`_I$M%rWcoOOrJ@Vk`@{+-v{5v*ThB z$F)yA5AWQ&bL89W`D?bkTU1{q#VY@g`^2(U{1@6(lH7M_RSJVcu_VKV7&Zoz>5L3#Q?YZm3pq>@+S_&M#)K%tMiG(h zkT&VA^1Gei`@Oz2pZu3OiO*rroWP0Ag?2aAU0<2~PDL!>f%JkG(P!0WuQ3kjj60*O zdh6jH{)I>6H|*Kd@|QnbvyV4!_5P`UyH1#Y*it3&Q}B`0(*LQhH$1$)F}#nKo;uz8 zMs<0-&x5NA!q$7AZmM{BC%b<6x|NPXGgiN0KE)$+_pve~Ba7pb2geeoa9(FLd?vkM zll9lLULWgsa(+4?t)MVv-uH(!RdblQ_b@W+us!6z&tQB1du@~Lo^x%h&&Uf@GRv?} zO&7DdzVMg*=d=oDy~`%|85}#rW5uU#Dn78o{DH;`?dhjeK1z1Q{yr7&vo+u0rDMh= z=?_bRHaL?Rn>d_Xg{?r>1?>do%Zh&aULgi?(0z z70%3>F;P#&m3{Yn50#DF7Pj{nIyZ0>|Cp%s+@^D8VM*P+=YI@-%~ii3qs%ZXnZ=>F zhasa+km0N$(*jF329x6)4bRq0Z8&?DW%=8;xwBW!Tdbon(c?o|^xs3L+YY72rCr#O z<5PN1h4Id|+?~OC(?4oWK6u_OIaRfQFRRuqdeX-I+s}LVIiI)sSb3al!H1=bt>3)4 z{`9+&O_+@2l#Tbk{dmz=c%wij{gLN)E`f)Zt@<)153go@lGtj)%e+P-XUW``H}}_g zb=%Ii-aD^Ae=$?VjZYKo&G)ba()fz>GvxiGAwLaXPjoi!}X&5 z{M%g|d3h6V-Evxe)#=8k)jA3-$Lu{9=wEEG*)F}{m!&q_F~vDSp67&{_um(vuvKTy zoH-939cp@Abs|kyQ<0--D!;7JkB`&+mRp)Cq-yS|SRhODwL40b#9ith`PX2K<%pEo3B4kguV*lY}2e`s?8*3g$=M2?zsx27CVclB)G zxWDkzj~Dx=yxei)$TUT_JFC5;3)kOJS}(2Hkf(EK^Y2rSOKNt9=e}HZQ;s~84 z<6|o}7~bOeyyz11v9LDJQ=6Ad|A?wv8`3?Wb@z`(+4?_+%kEv3Pw919!ocOH?R@Od zjLNO@8ZtQ=S061uswZZxD!A{%Kk+@ErR12FS|;3)_`f}4(d*xK!7GpYJGyVNarq(9 z`hC5gy4`V`GhYoo9zOnPvDnBYbn4=)k6k4>xBE_(a^;^FWZB<-O;ac8Pz=){Nz0i& zT2~*13OqO5>9=rRbM#ufA6BicdpK5Jd$jmOR9JY;stwsu%N2J0H3DjR;~TJ4OrEv% zf7r?se^b{6N4!{F5Ta|>^?#$^!9Tk2)cRcCp>)!lJUu^MU=CvNboFyt=akR{0CK^Z Ar2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e4427ef9640ed63318b718d6d56ac059bee591b6 GIT binary patch literal 1117 zcmV-j1fu(iP)p>{Yq2E88)xI)gWNor7>%(9jV30&Nv&y9LaahGD3;Ks zWd#;GEAH&J>9i{s4{ly6!J3fprzxYO+y;2Duu+@5G9%tw8f4w0w z0J4l?xd3OwZRjPX_Tt)=Nxb#;X*iY(?;q=d;+xCmVCVDj%M_|2yb11w#l=NZn*+47 zvvU)(%#hcTrfFL$EEEb2?^CH%)7;}5HVw1~vNU<}6tmP6`%lLOz2&ayCqM_2O6BqGuv{>06?mr^-v(s0b0)6bz3-EluaTUx? ze}tLd3Cv7g+9YIUIVB!$VX$V`4PkXa97q8ErITkGD(~%23M1jw$AWTX{6`J~7{K#K zUuo%1{yz84*{N^wZeFW+p!WT0p8a|W63eZ0I?WUlEd8}iDgZbMgjE!HVmLVjuk3?= zJ8ZZ%Tvpc$Hx`gcBw!duouxs%1DX8X9x6gnRYdeKZr-{H-=|0~r%9y>nsv&7!2zl$ zvdD1PagjB%%%T!9#@{3!kJI(__1X?c0}z2hULk{MGy+vsP%eA;Y3e$u?E_8QZJ9MA z*LAVFvIU1lK0Z!)$*!%fRb-T%yC}OGu!{;Li7>?)th^=E5N31Y zz{8ZVdqN3X_W9nvUYfToVYO-IgaFoHn(@)@N4w!L<*&W^I>MiQj_*zYr=A=YMsT`( zXOw+7Jj)Dtwlyb76x!Oq(V>21iFRwF*)degWKEu^uW@eqoHpoerE?0y`x zbF-`?mZ3+&_;va>vaNC4_uOIXdp^Qp9eg^5^bll8K{MqdmP8V9KAt=Q{rx{NlQ@l7 zEQZ1UK^%E;2)1Rn9>@Q?{~2L@n4!)X8R!gv#0HFEWJt55^BhBzn$jkt@9Ag73w*l% zG50$N=e=tPFKTSkF3jH|$`<-*o7RT-LorqXMX_>kZ~)a+bDljv+$%fRT4AA5m~a^# z`#NxE>5hoATjcz4q?S@F1Uj2D1hOi(^Z*SSQb49@ZaTj__cQwM?LTC_WPiAXNHhwt zZd-7R(8D5MmQO j_t$I>z-|NhSAYQk3rpfFenXf*00000NkvXXu0mjfbkz-$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0ff6f98972f79c9f1574ee55045d3ec75a07439b GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$c zr;B4q#hkaZ_Ioiq3bfa^*UKp_*({(OHKXIkkz<#xor>!gs1Xx%y_6yUCWvFB=PrrM z5=k2Z1QzipBsyIDsV5g zVBm0Pb+FK4I26bj(;2?0a`OJQ4^_I9{v=1R=%idbTfM)(`TY<1sPDf5iiJO6dZ(o>4t=jh+IUT`IYPyN@#)BJY*{rx^0D=aoKbZN%M@EsQj zv3dGrMs@*XNqfd7>)ouMZ&f?|f6MwZr0T=nmp5b`U(N9RkvUE={6)iif~Tm5Q@-@-@KP6(%dPeXKKLOu({m}BCOB3 z&fVwPT z51Mr6t=l}|<7v^D2LJd5?r$6IcdS(0$EWplS@^pLOf|olVm9n$uHK)0{~MpmS@96C zqQzD0FHU+-GX5bvVT=BO*1)~Yo}5|-mg^s2?YqY~ExvI{Eu&t`JK2QWoJI5Ax1U)X dod}DppNw+hw(ZezZJ<=e;OXk;vd$@?2>?p60}22D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..895d331208fd994f3a3b6c26a1329ed3f079ce43 GIT binary patch literal 625 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 Yydlsse%bX(z{JDg>FVdQ&MBb@03KWY_y7O^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..17e978be31e0e6d3d45f348bfca9c2f57c2ffe73 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$) zr;B4q#hkaZZ2b=fh_u~Td(p3u!^76wozTNQSy|h@!8Lixk7%Bx39R3b_3|#yGFmPvS zuvB6=BgmN0$06}OSvX*4id6r$)CAv;q7DyppZ{Kb-MOYZey@$`wVf-Ezq+Gm>Hm$%iZy6j=gG1HA%Iw$+Sj?{5>=~XfR zjmjoxZhiHgsl2bbc$to+I`K*C9l=}Hr{S&!>)mM4SH{4%f;80v% z9H6%UuZ?_jBA?v}6U!%|5|BV(z#Tpe#ambd?ygOWmI$xpo#gseD}#H%K1QvD{#y3z z2NTviT{u(98Swu=?`AeJ&4=|sK2TmNMlCwfK>hlI(nz=UP1_pkc<<>*tq;EPp!DPG zP>xUbTUgFSHD6DRS?@GK*ZP)r!ZfKpe2=R{n_RpPtTC;SopyD#!S&#TTT*-UPQM79 q@!PlH;$D_+yM24OnxWBl&iqch`h34zhIYVI#Ng@b=d#Wzp$P!D+5SiX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..1dbb157ffeb09e493e99cf07ae42b46a73fc071b GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3l z#nZ(xq+-t78-{#M4g#zf6cs~c4!GneuCZy}+Pb&(i`=0&?keu=^9iXtTGiwly3$I` z5|dR=_Z;&2mp_fIf`|E}pN}m&&~y&*4Y7J>-j(!y)10|R<)aqUhqJFA`_2q-n_3~t z_~Yct#U|ezTtb&b?qztdI^89BV?-6B+x>k0avj$l;Rj+*_dbrc+V?QaZu8XDidqeS zQ!bqfcv=7HW6{=*k10#oEnH3;G>LG2_qX6^Sa?L{(yPa-|7sqn3*`0f<>J}R$q2L` z1RDOcWo(PiYAD;hijBoo{sl|JPX_kSjO`hcXV{zA)+}GoTjV$;*njuqJp$*t_KSub bPzP)C|9)&mwRV(bCWzgTe~DWM4fIGukv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6a88fff027672e44d530b08e02dadc58af8524c5 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G!JaOTAr-gYTruQoa1e05_){$J>DRrh%?dv z*})@d?#)$}Oe`D`Oy`;z-v4DfP}Cu@@ZHZ^|EG`2MIVT83n(}=FfalYykN6o;$bk_ WCR7)*xhn!_JcFmJpUXO@geCy@lRJ3; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..e7856c41dc6aa0dbf82e916277d6710e0492aa36 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G;hrvzAr-gYTruQo2;gD4*wY#ocYk-*=B~Ae^mUpHZnuO~ z3Pel_Nne)L$H2(c){v`u!1n&P^@$NKIt%+=->Xa$3(tDnm{r-UW|hO|6J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..ba12870d86f0fa4d76248076399f78e377d48779 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GL7py-Ar-gYT-nIUV8G!LsPDRK&HPecD+d~>nGnBVBrmdcPe!=a!Vb<>Cyj zBMA#bzcA|9Tu9n$Y3n(4&30==gU`(qly(=J@Bcly_3ttT8BvCZD;PN3Ssg627!Cz8 z3iNR`6ofFeEN0rl)qeW*vduNTE{+YHZLSAm3Xj$tF&ux>%v+<&2r_ zYKJz}I$!y7eokXldAwuT?dLx??PXrH``Z1^x@p%hzdwAKdGq$|_FEXGgy+uve^zlt z<*Ji~>+Z2$5M4BRZO+?S+y4na`W`Nl#{DvX>*UE3KWF-w?fZZ2_@!IRX6l|@r=n)@cC?WthF zDb^bwZrjMFuX_=8YB$63m1C63VY1?iBKNh|NAmnhs~77)r&s#T=M z?TZ&bUf`4w2+$A{jP1Pj{`ULaoOkb5PkkX3b@q3_9nOqC6@|H$A@AR&m)PB_s??Y* z&CC>ac3L8DfXKWB%ps@3i{g>0$hpY}gEcwP%gXhAX zxiV8uzAj(4{h$H+`{(wSPXZ-SLIQgrZDGApx?^qjkI*>gRIj~Ux0vj#WpAi{5q$dG z;l=Avj#-_0jIZQRh%VE4=)d0SLI(E&sTix^AcwpZ-niM4U$io~H)MZ!8m#>9mPBOp z^`oo96;J%XAY_oo8^^vsu2mtrY)kk73)2eOKUJblF5U-r0GVl5R~uZ6eX!rOA~x;f tYJ-oHA8e`STvl6CDZ&PcvIBGE&mA?p@I7UN1uzvcc)I$ztaD0e0szV^3eo@o literal 0 HcmV?d00001