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 00000000000..09a3bfee4c2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/base.png differ 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 00000000000..6b65b307752 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-right.png new file mode 100644 index 00000000000..4040a1d8552 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-right.png differ 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 00000000000..cf8c781a244 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/icon.png differ 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 00000000000..43f8ac1800a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-left.png differ 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 00000000000..86a384f15b5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..4440748c189 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-0.png differ 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 00000000000..d94fbbea10f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-1.png differ 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 00000000000..dfed74fb689 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-2.png differ 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 00000000000..0f523560c40 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-3.png differ 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 00000000000..fdee91317e8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/meta.json new file mode 100644 index 00000000000..e7c3ce27759 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tg station at commit https://github.com/tgstation/tgstation/commit/bb9be1ac98073a904c1c404ec5cdd73f40143057", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mode-stun" + }, + { + "name": "mag-unshaded-0", + "delays": [[ 0.3, 0.3 ]] + }, + { + "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 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-disabler.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-disabler.png new file mode 100644 index 00000000000..0562d77bf7e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-disabler.png differ 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 00000000000..d56e68b963d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-lethal.png differ 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 00000000000..56dd59a0ab4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/mode-stun.png differ 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 00000000000..cfc216989b3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-right.png new file mode 100644 index 00000000000..49e9127b465 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-right.png differ 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 00000000000..b8c6feccd7f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/base.png differ 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 00000000000..5ac3c6c8c48 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5ac3c6c8c48 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/icon.png new file mode 100644 index 00000000000..454c17255cb Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/icon.png differ 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 00000000000..f25d9fc664f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png differ 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 00000000000..63454347e58 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..7e35409c180 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-0.png differ 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 00000000000..5381fb09e3f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..d45aa15f3c3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-2.png differ 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 00000000000..2b7da869777 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-4.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-4.png new file mode 100644 index 00000000000..6cbcf1d7000 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/mag-unshaded-4.png differ 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 00000000000..4f957f29e43 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/base.png differ 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 00000000000..2bcb74b1eb1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png new file mode 100644 index 00000000000..2e4639f7947 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/icon.png new file mode 100644 index 00000000000..5e27df954f1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png new file mode 100644 index 00000000000..9b05bceb311 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-left.png differ 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 00000000000..f9200bfef2e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png differ 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 00000000000..5cbfec6bbe5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-0.png differ 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 00000000000..9dbc0c5830d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-1.png differ 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 00000000000..ca2996e2131 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..7e008c14f13 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-3.png differ 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 00000000000..e1ccd7e7e3a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mag-unshaded-4.png differ 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 00000000000..bdd6d88cd22 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-disabler.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-lethal.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-lethal.png new file mode 100644 index 00000000000..5cbfec6bbe5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/mode-lethal.png differ 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 00000000000..6dcd0f9006b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/base.png differ 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 00000000000..09ffcf34515 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png new file mode 100644 index 00000000000..25bc79ca34a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/equipped-BELT.png new file mode 100644 index 00000000000..785f4037d7c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/equipped-BELT.png differ 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 00000000000..e0f4be90682 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png new file mode 100644 index 00000000000..6ed66005788 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-left.png differ 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 00000000000..42caf92772d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png differ 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 00000000000..719a022d490 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-1.png new file mode 100644 index 00000000000..771bc41b70e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-2.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-2.png new file mode 100644 index 00000000000..bab40cfa51a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-2.png differ 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 00000000000..bab40cfa51a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-3.png differ 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 00000000000..07358d778ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mag-unshaded-4.png differ 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 00000000000..1eaba97b878 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-disabler.png differ 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 00000000000..24abdb7a811 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-lethal.png differ 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 00000000000..d29773d4afd Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/mode-stun.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-left.png new file mode 100644 index 00000000000..cfc216989b3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-right.png new file mode 100644 index 00000000000..49e9127b465 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/mini_energygun.rsi/special-inhand-right.png differ 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 00000000000..e4427ef9640 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/base.png differ 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 00000000000..0ff6f98972f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-left.png differ 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 00000000000..895d331208f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/equipped-BELT.png new file mode 100644 index 00000000000..33d05e86d80 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/icon.png new file mode 100644 index 00000000000..818e5898a6c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-left.png new file mode 100644 index 00000000000..444862e0f8d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-left.png differ 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 00000000000..17e978be31e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-right.png differ 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 00000000000..1dbb157ffeb Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-0.png differ 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 00000000000..6a88fff0276 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-1.png differ 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 00000000000..e7856c41dc6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-3.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-3.png new file mode 100644 index 00000000000..ea838dc755b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-3.png differ 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 00000000000..ba12870d86f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/meta.json new file mode 100644 index 00000000000..a29f7f4cab9 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/meta.json @@ -0,0 +1,70 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tg station at commit https://github.com/tgstation/tgstation/commit/bb9be1ac98073a904c1c404ec5cdd73f40143057", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mode-ion" + }, + { + "name": "mag-unshaded-0", + "delays": [[ 0.3, 0.3 ]] + }, + { + "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/multiphase_energygun.rsi/mode-disabler.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-disabler.png new file mode 100644 index 00000000000..fb323e387ba Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-disabler.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-ion.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-ion.png new file mode 100644 index 00000000000..c6432e1a49d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-ion.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-lethal.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-lethal.png new file mode 100644 index 00000000000..3c4a6d7ae19 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-lethal.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-left.png new file mode 100644 index 00000000000..73d17f58e70 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-right.png new file mode 100644 index 00000000000..a6b053d617f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-right.png differ