From 186c150353751d82221e9b64569716100d20e2f3 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:51:59 +0200 Subject: [PATCH 1/4] initial, non-working --- .../Weapons/Guns/Battery/battery_guns.yml | 45 ++++++++++++++++++ .../Guns/Battery/personal.rsi/base.png | Bin 0 -> 464 bytes .../Guns/Battery/personal.rsi/disable.png | Bin 0 -> 114 bytes .../Guns/Battery/personal.rsi/icon.png | Bin 0 -> 464 bytes .../Guns/Battery/personal.rsi/inhand-left.png | Bin 0 -> 270 bytes .../Battery/personal.rsi/inhand-right.png | Bin 0 -> 264 bytes .../Guns/Battery/personal.rsi/kill.png | Bin 0 -> 112 bytes .../Battery/personal.rsi/mag-unshaded-0.png | Bin 0 -> 153 bytes 8 files changed, 45 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/kill.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-0.png 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 ec0a0a148b..0db0c34395 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -588,6 +588,51 @@ - type: StealTarget stealGroup: WeaponAntiqueLaser +- type: entity + name: Personal Tiny Self Defense Gun + parent: BaseWeaponBatterySmall + id: WeaponPTSDLaser + description: "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Nanotrasen. It has two settings: disable and kill." + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/ptsd.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-1 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/ptsd.rsi + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: HitscanBatteryAmmoProvider + proto: RedMediumLaser + fireCost: 100 + - type: BatteryWeaponFireModes + fireModes: + - proto: RedMediumLaser #6 + fireCost: 100 + - proto: BulletDisabler #12 + fireCost: 50 + - type: Battery + maxCharge: 600 + startingCharge: 600 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 10 # slow as heck, its only to defend and run away mostly + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 500 + - type: entity name: advanced laser pistol parent: BaseWeaponBatterySmall diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..13be0d9acc1e61a3f7505b0ee3ad00e61a67ce1c GIT binary patch literal 464 zcmV;>0WbcEP)Px$ib+I4R9J=Wld(#}P!xv0h(hU=P_Q9FE-l)C;2_dP5CkXbA`U)=t1sXK34%+X zB2)*VP=(ewHIz_HYNxoEOKp=j6$=XamXn*Dlm8?426A$8a&rC)Qp!k58U19oQmLfQ zX^TQ9*Hz2H^Zmr$AP8_>SCdjkaTP)^8jVy>uh*N&OBIk(Mz(F!Xfyz5Hk;_W&c@X> z+h-@dUR*F74gt`09mjDf?e62hJgI7$CYEIZ&}y|3B~k^-<#M!FtMT0J0#K_~0oXE4 z0363ry|!)B>2%mUzvTV?R#hPcz>5`I?{icf@mp!2p1M zzyB?BEsFp^u~<~$Ng+ZA#^bRHoD`0k4u_0eU>F7fVHhR~Xqu)148w?~Yg+h^1w7Bo zv~^jS`=V8c!xCp;Rje;+2*Yrt0-4T0eEr*>KPM;WPw)xwv8*Ecfb4Mq00000WbcEP)Px$ib+I4R9J=Wld(#}P!xv0h(hU=P_Q9FE-l)C;2_dP5CkXbA`U)=t1sXK34%+X zB2)*VP=(ewHIz_HYNxoEOKp=j6$=XamXn*Dlm8?426A$8a&rC)Qp!k58U19oQmLfQ zX^TQ9*Hz2H^Zmr$AP8_>SCdjkaTP)^8jVy>uh*N&OBIk(Mz(F!Xfyz5Hk;_W&c@X> z+h-@dUR*F74gt`09mjDf?e62hJgI7$CYEIZ&}y|3B~k^-<#M!FtMT0J0#K_~0oXE4 z0363ry|!)B>2%mUzvTV?R#hPcz>5`I?{icf@mp!2p1M zzyB?BEsFp^u~<~$Ng+ZA#^bRHoD`0k4u_0eU>F7fVHhR~Xqu)148w?~Yg+h^1w7Bo zv~^jS`=V8c!xCp;Rje;+2*Yrt0-4T0eEr*>KPM;WPw)xwv8*Ecfb4Mq0000 zPv3Dkbnp3!bFX_8qFs($i<-NNuid8TZS1)hcb!9X*Iw;BF-Lmks?Lte_wCG8?{jZ8 z*~`4WyExbQt^1~ygr!p+PJghn{r#L`_p0w1x2FWzopr0H+IcNdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..194eeb4a31ad55191cb6cac34a7d64d9f65bfb8e GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!DaPU;cPEB*=VV?2Ifp!5978JR zyuG@S_mF`=Yht(OygQbY*guNhdvxt{NMU6Nql$xxjN*rS-!6~J^!<}32>~_1!N21{ zUGHrVZ~uKo*7fO}d3z0v6&f#a~ z#{K6!Ufyy|Id=GfVVnG4bAiYUL0$cZPSYQ3>+X1ef92M=ZEsgR%`eXP_l(Qtjc!`e z(_enE`unw8ir)20w?5nZ{lezG#*e4(hB)E?-?{$4RQDz8GQWTXJYD@<);T3K0RS=b BYpehO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/kill.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/kill.png new file mode 100644 index 0000000000000000000000000000000000000000..6b850eb3b6f2d84c9cd88fe4a8f17d70c4e0eea1 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}TAnVBArY-_ z&u!#oFyLU`;Nw#}zxpMA>;$dfOzI3DCfm)tdSFQzGXsOZ-l;>(OJ$Y5_5*b>c)I$z JtaD0e0ss^-AeaCE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..cd66b71c5fefdd811046ac95047b68bb0573c8b5 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a)Lcw978f1 z-(EK4YH;9TIS>-|&+CHxiP|%Vt{?N-@L|gY=7(vsL>hT@RG1hT8p>}=%rty*H?RN1 z>zu@S({!>kr~N+}>9ba$>eCl3+dJ$)CGyq`tX!f$^|TaxfyOgi_@% literal 0 HcmV?d00001 From 6f61ce040d1f6a4b99c51324b736fbadc5c6d3cb Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:19:00 +0200 Subject: [PATCH 2/4] working version --- .../Weapons/Guns/Battery/battery_guns.yml | 18 +++---- ...disable.png => disable-mag-unshaded-1.png} | Bin .../personal.rsi/disable-mag-unshaded-2.png | Bin 0 -> 114 bytes .../{kill.png => mag-unshaded-1.png} | Bin .../Battery/personal.rsi/mag-unshaded-2.png | Bin 0 -> 112 bytes .../Guns/Battery/personal.rsi/meta.json | 46 ++++++++++++++++++ 6 files changed, 55 insertions(+), 9 deletions(-) rename Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/{disable.png => disable-mag-unshaded-1.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png rename Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/{kill.png => mag-unshaded-1.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json 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 0db0c34395..287a6c5ec9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -595,24 +595,24 @@ description: "The PTSD gun has a built-in flashlight and the ability to recharge itself in two minutes. PTSD is standard issue for leadership within Nanotrasen. It has two settings: disable and kill." components: - type: Sprite - sprite: Objects/Weapons/Guns/Battery/ptsd.rsi + sprite: Objects/Weapons/Guns/Battery/personal.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-1 - map: ["enum.GunVisualLayers.MagUnshaded"] + - state: mag-unshaded-2 + map: ["enum.GunVisualLayers.MagUnshaded"] #TODO: figure out a way to use `disable-mag-unshaded-#` to replace red colouring when using BulletDisabler shader: unshaded - type: Clothing - sprite: Objects/Weapons/Guns/Battery/ptsd.rsi + sprite: Objects/Weapons/Guns/Battery/personal.rsi - type: Gun soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - - type: HitscanBatteryAmmoProvider - proto: RedMediumLaser + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyGunLaser fireCost: 100 - type: BatteryWeaponFireModes fireModes: - - proto: RedMediumLaser #6 + - proto: BulletEnergyGunLaser #6 fireCost: 100 - proto: BulletDisabler #12 fireCost: 50 @@ -624,7 +624,7 @@ autoRechargeRate: 10 # slow as heck, its only to defend and run away mostly - type: MagazineVisuals magState: mag - steps: 5 + steps: 3 zeroVisible: true - type: Appearance - type: Tag diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable.png rename to Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..9705e9593a2f3eb864a465653b9eb415ae76c51f GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}I-V|$ArY-_ zj~enaCj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/kill.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/kill.png rename to Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..005523461ff256e4bfc002c438ea433ed9c989a9 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}TAnVBArY-_ zk8b2;P~c(S;N!FB{NB{JtWzDnJz`;~D=J%Mzi!hieufV%+!?{_o|^MYG=aJpJYD@< J);T3K0RT5>ApZaW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json new file mode 100644 index 0000000000..e25300a5ba --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ported from BeeStation13 \u0027https://github.com/BeeStation/BeeStation-Hornet\u0027", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "disable-mag-unshaded-1" + }, + { + "name": "disable-mag-unshaded-2" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + } + ] +} \ No newline at end of file From 00496d5b36cbf9de84a207097bd06df2f040e28e Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:21:34 +0200 Subject: [PATCH 3/4] adds `WeaponPTSDLaser` to all head lockers --- .../Prototypes/Catalog/Fills/Lockers/heads.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 752591da37..15bcc5a4ed 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -22,6 +22,7 @@ - id: QuartermasterIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerCaptainFilledHardsuit @@ -51,6 +52,7 @@ - id: MedalCase - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerCaptainFilled @@ -80,6 +82,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerCaptainFilledNoLaser @@ -108,6 +111,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerHeadOfPersonnelFilled @@ -139,6 +143,7 @@ - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP. - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerChiefEngineerFilledHardsuit @@ -167,6 +172,7 @@ - id: CEIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerChiefEngineerFilled @@ -191,6 +197,7 @@ - id: RCDAmmo - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -219,6 +226,7 @@ - id: CMOIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerChiefMedicalOfficerFilled @@ -243,6 +251,7 @@ - id: CMOIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerResearchDirectorFilledHardsuit @@ -266,6 +275,7 @@ - id: EncryptionKeyBinary - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerResearchDirectorFilled @@ -288,6 +298,7 @@ - id: EncryptionKeyBinary - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerHeadOfSecurityFilledHardsuit @@ -319,6 +330,7 @@ - id: HoSIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerHeadOfSecurityFilled @@ -348,6 +360,7 @@ - id: HoSIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponPTSDLaser - type: entity id: LockerFreezerVaultFilled From bfce35eee645fa42f760c0949d0ad70969f2a535 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Tue, 13 Aug 2024 21:57:35 +0200 Subject: [PATCH 4/4] updates type, audio and adds genericVisualizer --- .../Weapons/Guns/Battery/battery_guns.yml | 18 +++++++++++++++++- .../personal.rsi/disable-mag-unshaded-1.png | Bin 114 -> 0 bytes .../personal.rsi/disable-mag-unshaded-2.png | Bin 114 -> 0 bytes .../Battery/personal.rsi/mag-unshaded-1.png | Bin 112 -> 114 bytes .../Battery/personal.rsi/mag-unshaded-2.png | Bin 112 -> 114 bytes .../Guns/Battery/personal.rsi/meta.json | 12 ++++++------ .../Battery/personal.rsi/mode-disabler.png | Bin 0 -> 112 bytes .../Guns/Battery/personal.rsi/mode-lethal.png | Bin 0 -> 109 bytes 8 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-disabler.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-lethal.png 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 287a6c5ec9..251b8c2754 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -599,6 +599,9 @@ layers: - state: base map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + map: [ "Firemode" ] + shader: unshaded - state: mag-unshaded-2 map: ["enum.GunVisualLayers.MagUnshaded"] #TODO: figure out a way to use `disable-mag-unshaded-#` to replace red colouring when using BulletDisabler shader: unshaded @@ -607,15 +610,21 @@ - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - type: ProjectileBatteryAmmoProvider proto: BulletEnergyGunLaser fireCost: 100 - - type: BatteryWeaponFireModes + - type: EnergyGun fireModes: - proto: BulletEnergyGunLaser #6 fireCost: 100 + name: lethal + state: lethal - proto: BulletDisabler #12 fireCost: 50 + name: disable + state: disabler - type: Battery maxCharge: 600 startingCharge: 600 @@ -627,6 +636,13 @@ steps: 3 zeroVisible: true - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-stun } # Unused (HARDCODED BULLSHIT) - type: Tag tags: - Sidearm diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-1.png deleted file mode 100644 index 7af87e11e0f501da8e13884ec176e5d341584d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}I-V|$ArY-_ z&pGlkDDbdssB~fD`kD0R!-n%hm$WiO8UCcqoqh3uUm7z5gDn38Yc{jj&%Vb3^)Yz5 L`njxgN@xNAU-}{Q diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/disable-mag-unshaded-2.png deleted file mode 100644 index 9705e9593a2f3eb864a465653b9eb415ae76c51f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}I-V|$ArY-_ zj~enaCj diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mag-unshaded-1.png index 6b850eb3b6f2d84c9cd88fe4a8f17d70c4e0eea1..7af87e11e0f501da8e13884ec176e5d341584d5b 100644 GIT binary patch delta 70 zcmXRYnqcUt}%W64Cnh+(upo0}kd5K0dYct6%cRPSE}%W64Cnh=tf=!1s>)NK0bTS?@fKnI@RIZBNm3bqOw)?>o%?8XZX;< Yoe|9LsX4DilK}`kUHx3vIVCg!0H3rOivR!s diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json index e25300a5ba..358d4e9d38 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/meta.json @@ -25,22 +25,22 @@ "name": "mag-unshaded-0", "delays": [ [ - 0.3, - 0.3 + 0.3, + 0.3 ] ] }, { - "name": "disable-mag-unshaded-1" + "name": "mag-unshaded-1" }, { - "name": "disable-mag-unshaded-2" + "name": "mag-unshaded-2" }, { - "name": "mag-unshaded-1" + "name": "mode-lethal" }, { - "name": "mag-unshaded-2" + "name": "mode-disabler" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-disabler.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-disabler.png new file mode 100644 index 0000000000000000000000000000000000000000..d07422e0e00b45e6bcfa81bdb52fcbfe8784a099 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}TAnVBArY-_ z&pGlkDDbdssB~fD`hN6=V)KSATv4nH`y*>NP2N+-z;LFJ(fkjanNW7e0iZ4hPgg&e IbxsLQ0Pl()vj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-lethal.png b/Resources/Textures/Objects/Weapons/Guns/Battery/personal.rsi/mode-lethal.png new file mode 100644 index 0000000000000000000000000000000000000000..b039ffc4c16bc53ab9ef8d189030005dc6b1cacf GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_ z&l&PEC#B{|=oa%u9VuyDNZN7(8A5T-G@y GGywppydP5l literal 0 HcmV?d00001