diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index a8211480fd..9031a9fb95 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -236,7 +236,7 @@ namespace Content.Shared.CCVar /// If roles should be restricted based on time. /// public static readonly CVarDef - GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED); + GameRoleTimers = CVarDef.Create("game.role_timers", false, CVar.SERVER | CVar.REPLICATED); /// /// Override default role requirements using a diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 70284b1f49..948b09ff4c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -231,7 +231,7 @@ - type: entity name: laser rifle parent: [BaseWeaponBattery, BaseGunWieldable] - id: WeaponLaserCarbine + id: WeaponLaserCarbineOld description: Favoured by Nanotrasen Security for being cheap and easy to use. components: - type: Sprite @@ -261,7 +261,7 @@ - type: entity name: practice laser rifle - parent: WeaponLaserCarbine + parent: WeaponLaserCarbineOld id: WeaponLaserCarbinePractice description: This modified laser rifle fires nearly harmless beams in the 40-watt range, for target practice. components: @@ -478,9 +478,9 @@ - type: Appearance - type: entity - name: disabler + name: disabler old parent: BaseWeaponBatterySmall - id: WeaponDisabler + id: WeaponDisablerOld description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: - type: Tag @@ -518,9 +518,9 @@ - Security - type: entity - name: disabler SMG + name: disabler SMG old parent: BaseWeaponBattery - id: WeaponDisablerSMG + id: WeaponDisablerSMGOld description: Advanced weapon that exhausts organic targets, weakening them until they collapse. components: - type: Item @@ -557,7 +557,7 @@ - type: entity name: practice disabler - parent: WeaponDisabler + parent: WeaponDisablerOld id: WeaponDisablerPractice description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one has been undertuned for cadets making it mostly harmless. components: diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml new file mode 100644 index 0000000000..5795976a22 --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml @@ -0,0 +1,117 @@ +- type: entity + id: BasePowerCellHonk + abstract: true + parent: BaseItem + components: + - type: Item + size: Tiny + - type: Battery + pricePerJoule: 0.15 + - type: PowerCell + - type: Explosive + explosionType: Default + maxIntensity: 200 + intensitySlope: 1.5 + - type: Sprite + sprite: Objects/Power/power_cells.rsi + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Licoxide + Quantity: 5 + - type: Tag + tags: + - DroneUsable + - PowerCell + - type: Appearance + - type: PowerCellVisuals + - type: Riggable + - type: PointLight + enabled: false + color: "#7FC080" + radius: 1.05 + energy: 0.3 + - type: PointLightRealBattery + +- type: entity + parent: BasePowerCellHonk + id: EnergyCellСarbine + suffix: Full + name: Энергитическая батарея карабина + description: Много умных букав и приписка сделано в хонокниуме + components: + - type: ProjectileBatteryAmmoProvider + proto: BulletTrailLaser + fireCost: 50 + - type: Sprite + sprite: _Honk/Objects/Power/carbine_energy_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: battery + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Tag + tags: + - EnergyCellСarbine + +- type: entity + parent: BasePowerCellHonk + id: EnergyCellDisabler + suffix: Full + name: Энергитическая батарея дизейблера + description: Много умных букав и приписка сделано в хонокниуме + components: + - type: Sprite + sprite: _Honk/Objects/Power/disabler_energy_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: battery + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 100 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Tag + tags: + - EnergyCellDisabler + +- type: entity + parent: BasePowerCellHonk + id: EnergyCellDisablerSmg + suffix: Full + name: Энергитическая батарея дизейблера пулемёта + description: Много умных букав и приписка сделано в хонокниуме + components: + - type: Sprite + sprite: _Honk/Objects/Power/disabler_smg_energy_cells.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: battery + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded + - type: ProjectileBatteryAmmoProvider + proto: BulletDisablerSmg + fireCost: 33 + - type: Battery + maxCharge: 990 + startingCharge: 990 + - type: Tag + tags: + - EnergyCellDisablerSmg diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml new file mode 100644 index 0000000000..28671fbbfa --- /dev/null +++ b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -0,0 +1,200 @@ +# Colors for pointlight +# BDC07F - yellow +# 7FC080 - green +# C07F7F - red +# 7F93C0 - blue + +- type: entity + id: BaseWeaponPowerCellHonk + parent: BaseItem + abstract: true + components: + - type: Sprite + - type: Item + size: Huge + - type: AmmoCounter + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: MagazineAmmoProvider + - type: Appearance + - type: StaticPrice + price: 500 + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + +- type: entity + id: BaseWeaponPowerCellSmallHonk + parent: BaseWeaponPowerCellHonk + abstract: true + components: + - type: Item + size: Small + - type: Tag + tags: + - Sidearm + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/taser.rsi + quickEquip: false + slots: + - Belt + - suitStorage + +#- type: entity +# name: svalinn laser pistol +# parent: BaseWeaponPowerCellSmall +# id: WeaponLaserSvalinn +# description: A cheap and widely used laser pistol. +# components: +# - type: Sprite +# sprite: Objects/Weapons/Guns/Battery/svalinn.rsi +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-unshaded-4 +# map: ["enum.GunVisualLayers.MagUnshaded"] +# shader: unshaded +# - type: Item +# sprite: Objects/Weapons/Guns/Battery/svalinn.rsi +# - type: MagazineVisuals +# magState: mag +# steps: 5 +# zeroVisible: true +# - type: PointLightBattery +# - type: PointLight +# radius: 1.3 +# energy: 0.15 +# color: "#BDC07F" + + +- type: entity + name: laser rifle + id: WeaponLaserCarbine + parent: BaseWeaponPowerCellHonk + description: Favoured by Nanotrasen Security for being cheap and easy to use. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: EnergyCellСarbine + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - EnergyCellСarbine + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: true + - type: PointLightBattery + - type: PointLight + radius: 1.3 + energy: 0.15 + color: "#7FC080" + + +- type: entity + parent: BaseWeaponPowerCellSmallHonk + id: WeaponDisabler + name: disabler + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Tag + tags: + - Taser + - Sidearm + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: EnergyCellDisabler + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - EnergyCellDisabler + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GuideHelp + guides: + - Security + +- type: entity + name: disabler SMG + parent: BaseWeaponPowerCellHonk + id: WeaponDisablerSMG + description: Advanced weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Item + size: Large + - type: Tag + tags: + - Taser + - Sidearm + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + selectedMode: FullAuto + fireRate: 4 + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: EnergyCellDisablerSmg + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + whitelist: + tags: + - EnergyCellDisablerSmg + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: StaticPrice + price: 260 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png index bddfe41808..2356e4578d 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png index c50bf189db..5ea2f509cc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png index 99d7e73193..05c20a2d02 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png index be58210ecd..82b872e3e6 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png index 91cf2141e7..efc78a8fff 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png index c8fc471c45..43571e5eb5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png index 115e28885a..c54296ff50 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_smg.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..10b6bb3754 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png index e021aae704..885037dfbd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png index fd7847d16f..0a051aae14 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png index efa7d9ea52..fd7847d16f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000..efa7d9ea52 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index 2b374ec4dd..fe8dde1b89 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -7,47 +7,44 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "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": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - } - ] + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-5" + }, + { + "name": "mag-unshaded-0" + }, + { + "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/_Honk/Objects/Power/carbine_energy_cells.rsi/battery.png b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/battery.png new file mode 100644 index 0000000000..211cbdca8c Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/battery.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/meta.json b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/meta.json new file mode 100644 index 0000000000..10c02d4b69 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bombinos Power Cells Inc.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "battery" + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o1.png b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o1.png new file mode 100644 index 0000000000..ff3bba7a26 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o1.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o2.png b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o2.png new file mode 100644 index 0000000000..0805093f72 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o2.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/battery.png b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/battery.png new file mode 100644 index 0000000000..58adf505f2 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/battery.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/meta.json b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/meta.json new file mode 100644 index 0000000000..10c02d4b69 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bombinos Power Cells Inc.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "battery" + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o1.png b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o1.png new file mode 100644 index 0000000000..339ce9eabc Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o1.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o2.png b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o2.png new file mode 100644 index 0000000000..0d4fcc8ecb Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o2.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/battery.png b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/battery.png new file mode 100644 index 0000000000..fa240d8b65 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/battery.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/meta.json b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/meta.json new file mode 100644 index 0000000000..10c02d4b69 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bombinos Power Cells Inc.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "battery" + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o1.png b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o1.png new file mode 100644 index 0000000000..d71ee5ee9b Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o1.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o2.png b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o2.png new file mode 100644 index 0000000000..2648aae41b Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o2.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/battery.png b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/battery.png new file mode 100644 index 0000000000..c24db820eb Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/battery.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/meta.json b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/meta.json new file mode 100644 index 0000000000..10c02d4b69 --- /dev/null +++ b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Bombinos Power Cells Inc.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "battery" + }, + { + "name": "o1" + }, + { + "name": "o2" + } + ] +} diff --git a/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o1.png b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o1.png new file mode 100644 index 0000000000..6e40128508 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o1.png differ diff --git a/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o2.png b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o2.png new file mode 100644 index 0000000000..c3e6ec45b2 Binary files /dev/null and b/Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o2.png differ