From 37bc9af42b945e676226893d4f61e7561dca4517 Mon Sep 17 00:00:00 2001 From: Bombinos Date: Sun, 25 Aug 2024 04:55:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B7=D0=B5=D1=80=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=83=D1=88=D0=BA=D0=B8=20=D1=81=20=D0=B1=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B5=D1=8F=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Йоу --- Content.Shared/CCVar/CCVars.cs | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 14 +- .../Entities/Objects/Power/powercells.yml | 117 ++++++++++ .../Weapons/Guns/Battery/battery_guns.yml | 200 ++++++++++++++++++ .../Guns/Battery/disabler.rsi/base.png | Bin 531 -> 523 bytes .../Guns/Battery/disabler_smg.rsi/base.png | Bin 559 -> 526 bytes .../disabler_smg.rsi/mag-unshaded-0.png | Bin 271 -> 235 bytes .../disabler_smg.rsi/mag-unshaded-1.png | Bin 203 -> 191 bytes .../disabler_smg.rsi/mag-unshaded-2.png | Bin 216 -> 201 bytes .../disabler_smg.rsi/mag-unshaded-3.png | Bin 210 -> 187 bytes .../disabler_smg.rsi/mag-unshaded-4.png | Bin 196 -> 175 bytes .../Battery/laser_gun.rsi/mag-unshaded-0.png | Bin 0 -> 152 bytes .../Battery/laser_gun.rsi/mag-unshaded-1.png | Bin 175 -> 161 bytes .../Battery/laser_gun.rsi/mag-unshaded-3.png | Bin 176 -> 175 bytes .../Battery/laser_gun.rsi/mag-unshaded-4.png | Bin 172 -> 176 bytes .../Battery/laser_gun.rsi/mag-unshaded-5.png | Bin 0 -> 172 bytes .../Guns/Battery/laser_gun.rsi/meta.json | 83 ++++---- .../carbine_energy_cells.rsi/battery.png | Bin 0 -> 205 bytes .../Power/carbine_energy_cells.rsi/meta.json | 20 ++ .../Power/carbine_energy_cells.rsi/o1.png | Bin 0 -> 161 bytes .../Power/carbine_energy_cells.rsi/o2.png | Bin 0 -> 178 bytes .../disabler_energy_cells.rsi/battery.png | Bin 0 -> 153 bytes .../Power/disabler_energy_cells.rsi/meta.json | 20 ++ .../Power/disabler_energy_cells.rsi/o1.png | Bin 0 -> 111 bytes .../Power/disabler_energy_cells.rsi/o2.png | Bin 0 -> 113 bytes .../disabler_smg_energy_cells.rsi/battery.png | Bin 0 -> 181 bytes .../disabler_smg_energy_cells.rsi/meta.json | 20 ++ .../disabler_smg_energy_cells.rsi/o1.png | Bin 0 -> 111 bytes .../disabler_smg_energy_cells.rsi/o2.png | Bin 0 -> 113 bytes .../Power/egun_energy_cells.rsi/battery.png | Bin 0 -> 188 bytes .../Power/egun_energy_cells.rsi/meta.json | 20 ++ .../Power/egun_energy_cells.rsi/o1.png | Bin 0 -> 141 bytes .../Power/egun_energy_cells.rsi/o2.png | Bin 0 -> 151 bytes 33 files changed, 445 insertions(+), 51 deletions(-) create mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml create mode 100644 Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-5.png create mode 100644 Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/battery.png create mode 100644 Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/meta.json create mode 100644 Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o1.png create mode 100644 Resources/Textures/_Honk/Objects/Power/carbine_energy_cells.rsi/o2.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/battery.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/meta.json create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o1.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_energy_cells.rsi/o2.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/battery.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/meta.json create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o1.png create mode 100644 Resources/Textures/_Honk/Objects/Power/disabler_smg_energy_cells.rsi/o2.png create mode 100644 Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/battery.png create mode 100644 Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/meta.json create mode 100644 Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o1.png create mode 100644 Resources/Textures/_Honk/Objects/Power/egun_energy_cells.rsi/o2.png 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 bddfe4180882967b5aecd79a31d9f5e1818efa11..2356e4578d080ed2c9c0aada76b0306efcbe4e98 100644 GIT binary patch delta 497 zcmVv1nlhlqz|53`3lL$za~P%o0- zWxkm&^Zn0oe*S%lf`WpAk504ElFdd-nslG?E_e63`r^$^On-k6T54bS0}0R{gjSaP zWowg*U%!p^GXv=Eb)~oN>3tXuwCq+rS*y8t>mEX+nR0X$5#Qb!eOSiRN1Bb6bSh;4 zlF@iZKT49U>i`ImV%sHzNC^U;-f8cN&)gO$=Rba~u(5H?&Ta=lXB7lK(^WEYeAMIg z#>0Dr1%@$DVowjmZN(N&~_g2`L}T>eS;d_U&za(QM2xCldI#WGs}lU^&? zwoCe4h?ME`ht042J3C{s-8QbaU3xOWuMR*3q57zZhmlqH1KA&hmRt3tyS55U=Az;_ zdWA^^<6&g<^{N@L?UFY3JbQ&IuhN;mF|m;MLER7J&T4K4r&6ZkI0%sv4G&M00000NkvXXu0mjfBdqqN delta 505 zcmVQb0?=vazaM-9QEPL@GLmmvHqL3HcVmyjev`~+%wiAZ4yFF~o;AG&mLUGz{vul<9#m%`dw5UR9SxRU3R>y!^H zQYaK8>`PKdw(@KDHEKRSI|mS3ZS`gLgMoSKo*XL=sXjV_$LpQ`)dw^z7nIFq`>w&( z3?TW%j;EOp}RMc zCc16MAnHvoj>7&`qB84uO3*|$n;3&2=CDzA+y4RGdUybXO6mw;&~gD>02kmJBjE7=|AOFI|jCvz8)+ zIZP(S=ob`PD5Yb`f9j72F(H_2ZO3*Dv><|~VpJo?b3vy=L#M)JaPE-LXW_cIOZ6;w z`gHo<_q+Q}(9zM+@jvnM#VhT`dS)_8QVno7%>sb)cjtOOFMs|>;BJ})%{;!j*T5)A z^_#b^O-uubp+F1;09WG)Po6#J_vw({_u1Alj)WczV#H9ORJ}3Jvgw9_z!(?|VgS1+ zO%niQS?#<7rIg;dQZ-@NN2z)(_vB_0^t@j@BFl=;UrsnX`$1!eynMa=27syB?#GB%!lxy!yqi+}}7E6lz+`fz>p_^w{+~>h4NwsTm zSDLvEtvwKieY<`8B!^WIX_|O%fHk00y&+_-raAj!v27%dgjT91j)dMO=qsW*dJPx> zH)%f0Z9}zH*@jXzvaHtnr^%5?+)VELm{6+TOMDl+J)l%=@AbBy%Rvo1R;!)oy=g0A q>n%9cmb)DN3z0+iP)A3{U-JMfF$XqOum5CXxy3&2JQ7_v47zEGXYG#zOhE{$s|4H zazw?#&}3Vi+m@PuEdXS&_a##}B=!?ltyZT-vq|Uq3nC23PY0Zpl8P12|4+XnKBuzE&dSe<(XzV<~KfLWVfkYJCpOO|zsI0948qVLQ%!>t^GFjOE3y zQ}vN(%I9bsfqxl7)i46m9AFEP@px3sGue#KwFf|cbv;M1Se2v-X>ogVCoE^J0#(eO zq`SVRN%_;W{tAFhC9glfl6CObsY=_fh#OEnWQw!s9W*doCI(WeBl}EW1>lU*^%_z1 zf^pck%gNURV9yCEIjl^~jXod%1ofAS_y~*p0ud8q4}T4d0Qlxq1)WuiwE|RtT>cSq z0}EHdO{aSSwg9M9iTG*q-J>5648E{Vgt{bTs};ZmYEY1KL%C(?1_(wB`6>nksDah& z<=z-Iv^@Yqe%GA+xS$o#%hpoXL&Gfz$5$|}lK)!3DB;#aV;AsKB`5zcnJ2&#Fm8MU Yn^QY&7!RT}%m4rY07*qoM6N<$f;O=9zyJUM 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 99d7e731933efb9de2fcbb959956c62d9336010b..05c20a2d02e5061cef10e1c544f84d0595770083 100644 GIT binary patch delta 207 zcmV;=05JcL0_y>gB!2;OQb$4nuFf3k0001`NklyPbf)+&vXC) z000O8Wdr!zqUY%oR z+S2+HYu}5xGMxYXa=rL}o*Qqz{R>{7`o?L^vl4gS8GP?^cK=ilGoHjE&67qEQb6Mw<&;$UC_+735 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 be58210ecdc03f056558d150f799731c42f3fcff..82b872e3e6db75bcd2d8811064839d18c9bcdf3c 100644 GIT binary patch delta 163 zcmV;U09^me0lxu|B!2;OQb$4nuFf3k0001aNkl520|V0@#=l!`>iHXP z;qBYh5OeMJIk)ZvhR{@}*!GL(e=Djdu;(!C`S-^BK*t6ROUBXz@Aon+R0e7T>s`d` Z7gsDfZIxHiTA)i9JYD@<);T3K0RY&GK>z>% 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 91cf2141e77e809ccf9f662d2ec8ddfcee3dc04f..efc78a8fff2cf8e77f05a249937b03c715e90193 100644 GIT binary patch delta 173 zcmV;e08; zc}Z49tB^^&faQ2Wqiy57ylUBnL7p*An-(bqMm};kzI^8V`g z159&Ci|6j+> z?f*c#kv8DdCkC4O3~wT2U|?W4bcmMLkAhJ!3P!;w7zLwX6c`Kw002?9Ca45rjrafn N002ovPDHLkV1iXCMdJVf delta 182 zcmV;n07?J50n!1GB!3BTNLh0L01m_e01m_fl`9S#0001lNklNGZx^prw85kHcJzX3_B3hFZBv={X7 delta 168 zcmZ3_c!Y6+N8>gTe~DWM4f{WL&= 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 0000000000000000000000000000000000000000..10b6bb37546389910d2ef2d1a00258f3d647a386 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}L7py-ArY-_ z&nxmBFyL_x%%3GPMfl4SCH)zucqDvX0CJ$V;Z?2=Pz zf0r>$%{Vyp@3W2@uXgTcUiS0nEJg-~hFJL>?$S>L?nmhWO=s|Q^>bP0l+XkK)d)4- literal 0 HcmV?d00001 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 e021aae704b983704a9bbbcdda5ebcc1532b7a75..885037dfbd892bb61ef6fa83ee12961d675a4a25 100644 GIT binary patch delta 93 zcmZ3_xR7yzgct`i0|SH0lCEPwim^Dz-HBn{IhmIeoy~33JzX3_EP9g@Bv_v?xT&cb w99r2hbEaTNM8rpp1SaLE9eE->Os^Oi7Mn9zo9@n>2Q+}e)78&qol`;+03+WW4FCWD delta 107 zcmZ3;xSnx>gfKq 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 fd7847d16f02ebe8537fd13452210a5931838b37..0a051aae142b103282d793a52f51c48d21ffcd6e 100644 GIT binary patch delta 95 zcmdnMxSnxBc*L^*O$k?dyf!fu`+i@*z`(#>666=m@E;78)-U@F6jJbXaSW-Llbj&& v#K9xblf(5ugvtfcP=}iuJ@fRW0vQ;XBbk(CL%q6yY8gCT{an^LB{Ts5Vqhac delta 96 zcmZ3_xPfs(cx1v=o@M`=yf!g-dS-?*Ffg!}1o;Is{0D=j^~-((g%mwq978JRBqvBb vaqtNAbCv^+1H`$=-Q-Qh^K%hOJDly~&aaK*bE6u6{1-oD!MbCv^+1H`$=-Q-Qh^K%hOJDly~&aaK*bE6 Lu6{1-oD!M<*BvI> delta 109 zcmdnMxQ20pTbfXSPlzi614G12O{X&1W&fKJuJU+oVmOeS`X4CDRubeF%4Uq_WR{MmkV2gQu&X J%Q~loCIHp+C^-NC 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 0000000000000000000000000000000000000000..efa7d9ea526ecf4dfb36c45bae2c235a3d70972e GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_BW7wkmB}vq-;{8b$7>VAf!x&pKvA}mAirRS{~%CR`QRT= zMA6g5F{ENna)QJY2aiBc4%Y)NH!iZc9tc%EF?F7vR3HNb(`hD^ef~4jfr=SCUHx3v IIVCg!02`?>djJ3c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..211cbdca8cee631b0435658cfe48f9bda3aaad4c GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?Vc`+&esNDDq&&31@yvQ9_GiT=5J zxa1e00SpTd^;zkqijn2DK&Ak~4O{{Yc7Aj27P5BgWqVr}0_oOBBm%cc(apL>s zPZqYDozGrlT;p)>B*Syo%Moe!=S+)87q?xoYX0`fNh+R!`b8bWr(gblyc1{*gQu&X J%Q~loCIIjEKJ)+p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0805093f72ba30fe64b9bd406b3c7c1ca9978940 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ii4<#ArY;~ z2@N`F?{x7D}fT#Q)C&sy^FaV(flU18yppn;8Q`**~>kJ0%5Y Q0PSV)boFyt=akR{0Jz6LDgXcg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..58adf505f20794859429c44308c43d54b4eaab95 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_ zFBoz)7znsrRK1bA^w2%03tEj8_wE>!7Ig>){fM_eoqm>qL14%4j*f+QJWlPHcKzM! zK)(#e_z1ZTnvWmfdCKsTS+_iU=V?I(hCjDimN2uo>dF3l4m6&@)78&qol`;+0FZb% A2mk;8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..339ce9eabc946a8d91cfa6c215ca7e8c25e3130a GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nw~C>ArY-_ z&lxf@DDW_E_%*$St!KfajvE`*11GRBu-)^lzWkP*fk9b5%AGaW_~^6CKurvuu6{1- HoD!M<;$|PX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d4fcc8ecb8da9cd02a58be92e0cb54560b99f18 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+MX_sArY-_ z&lxf@DDW_ExOI?=YeO3^Po7fQ2NkYK3Z`aZyf`J!6oH`ETUO8jcbA07(8A5 KT-G@yGywn@`XHtN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa240d8b651e94ed08342026e0356dacbd2cddbb GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`JOJ0ArY-_ z&u!#vFc4t9u-?KkPe@SlppHm^jkKsWt2OKKjTiKo=QwizU;VDD{yU?R(y!e<(rZrr z5=wq#=d<@!*uN(`Ka2g|m>8LUR|?TCHXpO83Pw&KsVKouuXB d;!x-0K-+@*$c)I$ztaD0e0sz5vKkxtm literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d71ee5ee9bce983d6ca76a895f96df5091f9c888 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nw~C>ArY-_ z&oS~cDDW_E_&L3WttaN_1jl(>xMndNDBJsT&X@1Z3<>MmJLj?HieFyX4%Ecp>FVdQ I&MBb@02m`7&Hw-a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2648aae41bb96a03e19437a74477b8fd3e1bc8aa GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+MX_sArY-_ z&oS~cDDW_ExOtF^YeO3^&p)FRlfxW^8D`||zp`_6ojn7?vn-b5ETa48=X?ihWAJqK Kb6Mw<&;$S+Ng(_H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c24db820ebf0f07bc488a7ec522c72f9ba3be95f GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY-_ z&+X=9HWX-ic)xwKFN?TVfO4MWMDM#|>!$MZdWqcT{jresua9K+ z^;$Tg$5FF2-%@E>`Sv4`3}@b?pWCrcEIRx2V!@C9nHlz$pXsqwKXCiayO}5NFqS{x m@&3*q#t(+w9UUIWxYr$2U-fmT)jgmK7(8A5T-G@yGywqk=t^7w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6e40128508a8711f8d859fea1a672778e20ba17b GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?w&4=ArY-_ z&urv8pdjJ$Fuh7qddX>)clM3KH!M3fRhB+^ukvBvD~mp6&q-$97ay+RX}I=qU)uIl oE05IozxYu4?7fcXq%Ye1@hdo^LzLa+fJQQSy85}Sb4q9e0R2ca3jhEB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c3e6ec45b261343dd0a4988f8185370f61efee23 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}fu1goArY;~ z2@