From db3e7ddbb9fa0243fdab117a1fa03d9de5975950 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:22:36 -0600 Subject: [PATCH 1/5] constitution rifle, magnum disabler, railgun --- .../Weapons/Guns/Battery/battery_guns.yml | 73 ++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 43 ++++++++++ .../Objects/Weapons/Guns/Snipers/snipers.yml | 22 +++++ .../Food/lollipop.rsi/equipped-MASK.png | Bin 209 -> 213 bytes .../Battery/disabler_magnum_fbi.rsi/base.png | Bin 0 -> 531 bytes .../disabler_magnum_fbi.rsi/equipped-BELT.png | Bin 0 -> 244 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 244 bytes .../disabler_magnum_fbi.rsi/inhand-left-0.png | Bin 0 -> 352 bytes .../disabler_magnum_fbi.rsi/inhand-left-1.png | Bin 0 -> 345 bytes .../disabler_magnum_fbi.rsi/inhand-left-2.png | Bin 0 -> 322 bytes .../disabler_magnum_fbi.rsi/inhand-left-3.png | Bin 0 -> 323 bytes .../disabler_magnum_fbi.rsi/inhand-left-4.png | Bin 0 -> 344 bytes .../disabler_magnum_fbi.rsi/inhand-left.png | Bin 0 -> 601 bytes .../inhand-right-0.png | Bin 0 -> 323 bytes .../inhand-right-1.png | Bin 0 -> 357 bytes .../inhand-right-2.png | Bin 0 -> 369 bytes .../inhand-right-3.png | Bin 0 -> 344 bytes .../inhand-right-4.png | Bin 0 -> 340 bytes .../disabler_magnum_fbi.rsi/inhand-right.png | Bin 0 -> 593 bytes .../mag-unshaded-0.png | Bin 0 -> 222 bytes .../mag-unshaded-1.png | Bin 0 -> 169 bytes .../mag-unshaded-2.png | Bin 0 -> 169 bytes .../mag-unshaded-3.png | Bin 0 -> 170 bytes .../mag-unshaded-4.png | Bin 0 -> 170 bytes .../Battery/disabler_magnum_fbi.rsi/meta.json | 81 ++++++++++++++++++ .../Weapons/Guns/Battery/railgun_fbi/base.png | Bin 0 -> 685 bytes .../Battery/railgun_fbi/equipped-BACKPACK.png | Bin 0 -> 1725 bytes .../railgun_fbi/equipped-SUITSTORAGE.png | Bin 0 -> 1716 bytes .../Weapons/Guns/Battery/railgun_fbi/icon.png | Bin 0 -> 555 bytes .../Guns/Battery/railgun_fbi/inhand-left.png | Bin 0 -> 664 bytes .../Guns/Battery/railgun_fbi/inhand-right.png | Bin 0 -> 654 bytes .../Battery/railgun_fbi/mag-unshaded-1.png | Bin 0 -> 146 bytes .../Battery/railgun_fbi/mag-unshaded-2.png | Bin 0 -> 145 bytes .../Battery/railgun_fbi/mag-unshaded-3.png | Bin 0 -> 145 bytes .../Battery/railgun_fbi/mag-unshaded-4.png | Bin 0 -> 146 bytes .../Guns/Battery/railgun_fbi/meta.json | 53 ++++++++++++ .../railgun_fbi/wielded-inhand-left.png | Bin 0 -> 1026 bytes .../railgun_fbi/wielded-inhand-right.png | Bin 0 -> 1262 bytes .../Guns/Snipers/bolt_gun_hd_fbi.rsi/base.png | Bin 0 -> 741 bytes .../Snipers/bolt_gun_hd_fbi.rsi/bolt-open.png | Bin 0 -> 755 bytes .../bolt_gun_hd_fbi.rsi/equipped-BACKPACK.png | Bin 0 -> 1007 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1007 bytes .../bolt_gun_hd_fbi.rsi/inhand-left.png | Bin 0 -> 908 bytes .../bolt_gun_hd_fbi.rsi/inhand-right.png | Bin 0 -> 839 bytes .../Snipers/bolt_gun_hd_fbi.rsi/meta.json | 41 +++++++++ .../wielded-inhand-left.png | Bin 0 -> 784 bytes .../wielded-inhand-right.png | Bin 0 -> 797 bytes 47 files changed, 313 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-right.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 444da94dfa38..715f3c756508 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -773,3 +773,76 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: railgun + parent: [BaseWeaponBattery, BaseGunWieldable] + id: WeaponFakeAssRailgunFBI + description: A weapon that fires projectiles so high-speed that they're actually lasers. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/railgun_fbi.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/railgun_fbi.rsi + - type: Gun + fireRate: 0.7 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser3.ogg + - type: HitscanBatteryAmmoProvider + proto: Pulse + fireCost: 100 + - type: Battery + maxCharge: 400 + startingCharge: 400 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 5 + +- type: entity + name: disabler magnum + parent: BaseWeaponBatterySmall + id: WeaponDisablerMagnum + description: A respectable tool for any captain when security won't do their jobs. + components: + - type: Tag + tags: + - Taser + - Sidearm + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - 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: Battery + maxCharge: 600 + startingCharge: 600 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisablerMagnum + fireCost: 100 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GuideHelp + guides: + - Security diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index acf225322322..b6661302c99e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -258,6 +258,49 @@ collection: WeakHit forceSound: true +- type: entity + name : magnum disabler bolt + id: BulletDisablerMagnum + parent: BaseBullet + categories: [ HideSpawnMenu ] + 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 + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: StaminaDamageOnCollide + damage: 45 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Heat: 8 + soundHit: + collection: WeakHit + forceSound: true + - type: entity name : disabler bolt practice id: BulletDisablerPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 88c00bedbd51..c04502fbb6f3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -153,3 +153,25 @@ - type: StaticPrice price: 0 +- type: entity + name: antique rifle + parent: [BaseWeaponSniper, BaseGunWieldable] + id: WeaponSniperHdFbi + description: A weapon given to good citizens of a now defunct nation, prized for reliability in a pinch. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + fireOnDropChance: 1 + - type: BallisticAmmoProvider + capacity: 5 + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/lollipop.rsi/equipped-MASK.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/lollipop.rsi/equipped-MASK.png index 7ff20d55e354089ddae956b8d17daa0850fe4572..551e3ce981c444752b8a24f6b01a21f895870042 100644 GIT binary patch delta 118 zcmV-+0Ez$60o4JJIW~t$L_t(|0qxp33IHGs1VHouM|*&Rtq`kf=f()t6llCXLSc^BXJ_9BsS78g7f YXqRaW16FZRegFUf07*qoM6N<$g1KcaSO5S3 delta 115 zcmV-(0F3|D0nq`FIXHt!L_t(|0qxqc4ge4g1wj4(kERBRRYKCly@iG7b=1~`009C7 z2oNCfsX(08-81VgsJd6O5Zxt6F2@IQE V3XP)@@tC&PwVLv6$C9V!vkV6#y+(KlJVU$7H3TaB3}U$0^G4}F7;EyXF*^1 z2b3XMTI`#^5sz)c!(z$1yt)uH9Y_Fx)uRWnMsvY(&u^o^u@~C|AW$geRnwtbCdcJ8 zMx+9)o5Zd5G%Vi_3acx1Q4#tre^BG=Ny+jjgf zZ+Ljt;OS(bW*}&A-L f@Z}RwnPm;b$<0bkHg|VafOL7f`njxgN@xNAR!?8Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..9686a1911dcffcaf5f6c18925adc49ad367a9bcc GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP;i;2 zi(^Q|oVT|Oxehr9v_4$^L}2HEcXEm?4ZW>5Zd5G%Vi_3acx1Q4#tre^BG=Ny+jjgf zZ+Ljt;OS(bW*}&A-L f@Z}RwnPm;b$<0bkHg|VafOL7f`njxgN@xNAR!?8Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-0.png new file mode 100644 index 0000000000000000000000000000000000000000..81bb42d6cedcdbe193339c2a42e85e1265a05ef3 GIT binary patch literal 352 zcmV-m0iXVfP)$H1xQp;rrd!1_~%p)OlHTij%ehFb)_8j0462<3Q~WG^+j^ zf&k$<6D1Rz{EXbc9LPO%Kvf5l#cYYe@ywM&ru6rKRtLt;R8`uMJ(QicXtkP3CSHPE z2ebl^nkxYw;SJWCtrCAmk&1Z`r2%M@aZ^fhM|l|D;dHqQXV4eFAW8$!9!gu}TS16O zIagc+Q5t}&rbyzPV+=z}LHRd?I~wwoB&PJAI@-mkcyyc0Dk{`wm@&? yp>5k1k5R1bJCOKW+-uzf#d6sh2EaH_y8|y*RK+iGAqOh}0000-*2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-1.png new file mode 100644 index 0000000000000000000000000000000000000000..acae1eb7cb3ce410728cad514b816e3be14778d6 GIT binary patch literal 345 zcmV-f0jBfJ{6o#5FvN$#kYX zhrw2@rVt+o5Rgpe6rV^5!;9!{R+)N$!iy^?s^orp;r99+b@$x51z?ih-?otkA0&(XYT<; z59f_uv3d*le%Lzw{po&=gUy@s`^K>#kqVjJeA8)U5Tf$rnG516!W@GcV{|zoaI`d}qwst?5(dm6*2v zuxb!lzjE#;ajnR*>6ahJ<+KY2iZ%Vx3f;qOV(sM-^|*6t)Ps+?b z@nLU}1WzM>>kQU~AMHZ;0taO%DJEpXpt*joDejyO}V(hgrV8XiKoZF?8I>=C!znF z|NsA=pOeA0%rR+)QgTe~ HDWM4fwm5p! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-left-4.png new file mode 100644 index 0000000000000000000000000000000000000000..4b7eb1cd8c94734fd3308b8f411f667a9ff130d7 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|O(M zr;B4q1ZVP}^B?9XDllGlh~nE+eT8wcqJb0>jCi1U!0Gj^2@@M9Iz|S{=A6Cz+uU%? z;&6@!IVA>{RyjU;_vYjOcYE0l<{Kwf$Z9!U6$l8t!tgsJ!sFBa2^$oe8yMtoNF|6o z;9*>4#gH<4lYsK$+vVpa%imfuY`gRL9~X+aTdhAAf!1agEYFnqkfxB6g4;X9GT zoXW;*d-@obGG;ldDzX*KVw%bRY2$2BR01_mZ> zPZ!6K3dXlH_j)lqinOX9)Ke(T)iKpv6Dm^eSSx@nX z?2dY}>sIPKrtQ;HuD3jNKG45-KWEav4;R+lx$rMxk2=em^WXdTGblXEn(=*on9b9J zPY;w?%{8sxU~}zQ`DefO^;h>|^F2~{m`rJS{bosy;riKUbbR0KeYpRxYwpKY6F7GC z_5OSOH1w{`lK3lP{8zb;TGqr$+e$M0syMtlv2azA%)<)>sfB#!ZC~AZagt$&Z}`Te zclXT5F8^`t)(aD>(>Wh!G{*9_9lu>ZiIX*Io{RZ=|MfQ;_!V0}c1r#G&?{l(GDBd) zxy?tND;NIoy7i(W>;ATixA&!QzF4?;;SQLS4=AzhV`yUL%6@S7P%bd7FnGH9xvXkW>ffN&h@af^15#Sp5*xqN#wX3GedfZb)uO8GD zO;u%Wn_FG}Af(;fe&eHv%M53V7#Z!@6cZiU5*0l+Bs(ZNuQ_;R)!_n$GoQZ8+c%xP zvGqB_;oIfsC8xGZWD0R<@HuRY35=We@ZaI%38y>1@>;%nz;__c@`OXghWoYO|NsBr zZ~pMr$&Ea-<#seKIKswNHsicw*ZsZK2Rm{!PYB-NS=e>s=418$+?<{V49^4vY@Rz! zAkV_w-2Czs&)|Q%Eq62T^|U|1u_;S|(T102in5z5&{xcIObpM1w=OHVIkgcO01Te4 KelF{r5}E+1)_q3+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-1.png new file mode 100644 index 0000000000000000000000000000000000000000..fe97d1a155372feee76d9d00be10e72e95c3ad47 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|TSD zr;B4q1ZVP}^B?9XDllGlh~nE+eT8wcqJb0>g6Mg1b>pT*Rvs_@-~DZVuxLx3eu4$V zGld1t2XsYKRax8SR+m2rVGs7#>ow&)pd&8uAXz|2EJZ+U(x3Au4xCu9Xa(ak#~cZj z>q#^0c-Rl6|A^8YJub+x)PYHVz* z>C5@KyIf!5fBhcLaOd39flS}te4PBhwMFHDgj%P}{VfTHg+!4F0#g6O%iDmm4)G(frWgTe~ HDWM4f%lD2W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/inhand-right-3.png new file mode 100644 index 0000000000000000000000000000000000000000..8548bce99efbb0be8da5a5b5c9a1fc1630d420d6 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvg0|O(M zr;B4q1ZVP}^B?9XDllGlh~nE+eT8wcqJb0>g6O%iDmm4)G(frWH_MRxq zUw+``WA%f443<@b@i>}V0R5c5~#C@_HQp(boZVN8v fli+P+g6O%iDmm4)G(frW2BR01_mZ( zPZ!6K3dXmy&ifs5kT@d#xc5lH-ii>5im=5W^A_!6cfWt^gOQN$o}cO$H_JKn&#P#? zb<CvAKg?9;lqR)MSmsLR z`x*bjLb>jg@j_rGqJ zyE*yxWADSc&x+&AFIx(qV?Q*bm0`Z$?JpmG{ws9qdA2Vyq{OzPsIZdNEYeTDe3}ZwDBo=+*n!2;X zO#S~#qmw$dpM(3~$GkKZXHY9Yd__y)fno7=jk^ICIb&}boVl=ZmG#1Fjk<|voHUGM zTqj7nCU|q)V1N94(e~(^zg_c_cPCxahB@{FYlb27J_U(8vw&%Y!PC{xWt~$(69B;e B2~Yq4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..883f67d83a78690ff8dcff4905fea18caad6a391 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8Ynoy z)5S3)gZ1r=gIo;?JPi*kUrN}f^-L_4p}~lSJ-~*#*7A8*Ok`FYkNx$aVRt}Fd>Nhf*gz2O}f{Xy7%pk z_N)4@`R>~9Tlkls#d7w~f2>vS_KUtSJ!T12zelftF{?;ot=8ES=0LYGc)I$ztaD0e F0syubOv?ZO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..78b1200815fe7695c72e7d6793881a13d1153741 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>ZVO z;usRanVcZOx>(UbiU~|O>#{VJ%O#!o_h0_-&0V&^|C$Zjj&ukzw4JFJkTc+KUeqRY zz@<+urz$UYpUI)i4BG-EMWuNgFA7M&2?aG4hO-f3EU(rT)dQ_z@O1TaS?83{1OW7- BFpvNM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7ff28d236bb9148fd73a48e4406fb0b95852fb GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>ZVO z;usRanVcZOx>(UbiU~|G%P{p^*%ZG${Z##o$m!liE7J7N_{_Q(Qk?nWobv~Ph}U`U zrp1}hif0@QDSkP@mwCekiKXt&2_`IVaDq*Tg&|3dhec7U^FGiT22WQ%mvv4FO#o6d BFs%Rp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f0c16246c07da73f44888ecf036c513988ea70 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Z1E z;usRanVcZOx>(UbiU~|G%P{p^*%ZG${ZxI*X1(c80?y{76t6tDY?gL&xttScZ1E z;usRanVcZOx>(UbiU~|G%P{p^*%ZG${ZxI)X1(c80?yWyY+iY6`7G|{a=Aksja%Q9 yg&5DzvU4-<$kLP9l*wT0;`S4v9n31>XJoLo<6$`(^1u{m4}+(xpUXO@geCw_vM>Sw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json new file mode 100644 index 000000000000..7de7798fcba5 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi/meta.json @@ -0,0 +1,81 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, slightly edited by FBI to be revolver", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-0" + }, + { + "name": "inhand-left-1" + }, + { + "name": "inhand-left-2" + }, + { + "name": "inhand-left-3" + }, + { + "name": "inhand-left-4" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-0" + }, + { + "name": "inhand-right-1" + }, + { + "name": "inhand-right-2" + }, + { + "name": "inhand-right-3" + }, + { + "name": "inhand-right-4" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..59a5d0c555f9de92a21398b694a22ccf0a8c5a7e GIT binary patch literal 685 zcmV;e0#f~nP)_%_Q4&l4fJ>mb z-qM1?&iEf#+FMwd7%T0OijG7=EToZ>VEAzeG+5w%!|rog_x6an%N6bne2e)#f_pz;Wv}NGIiP}+R{ROF1N|G*@ON_^38C!qpbXw*Ig8?#`4CeDWlF20A zAD;lX?*QLV@$l74e0uWK-DaXkM~ZnJ1iyRF%8%697?a6FKv+mP97Z%6mHE|bC1dJH zB!b~^D4O=ainde0w=N#XwgoUDub>+PEQ&Il%|s^>3B(GAGUnfnvl)KfOq^@~=zd14 z)e;tT6=i^<^;-L=98mqXx&A7MbHaep5~mn%hE}iFfj|JEpL3MUWi%QM(3j0-5ex?L zhXJzyXA-f^HdRkQpxJCn<-8rd5jzap7n}Jkp!Iq!fOgGu7m&luTyLMN>FIO|?%GW=NN3+w zwA;V{uY7$6I6#Gdw|IxI+ud%CbW@yqTe-E!R=MS}wDAB5ojm!Y(a3VkM@kuF!6S!? zvkkm=Zw5NSFY}{x@gcNTdlkcLFW_LGUGX*4bzRpLZ%IT!RCodHT3<+HRT%%wP&5?(gl5i`8U!je>IMn!KBV-JWg8hR z)3Wro^boW!%l5KQ^-$!)K1L)3%Vt47gwe~QK?eG=m>a7^HO{(DrevanBWQ9vzi;lj zd*^!poO{O^N4f{@zjMCx{XgG1=YEGMETINM4TKs9HQ=s+uC6W(S6f?~<_>xMt>6*7 z(#>%tULW#gSs>cp-lqNieTv89C7$rd44`Qm{e0yb(c{geq6BvZK#KxV{QZxquCDHw zMe`=#+S9;RaEEZF8D{oeh9zqJg^uY)t zH!A_MI8k(V=`$C#Na6<)h*@}cDWO#$9vd5T?&m})kM$6KU|@hgd*P*w)pb5Wa(a52 zR#sLV`E_g{p#VD7Nu76Y(C+Ro4+FX|>Yv3x06VHy04#v~m+)On!HM~wqBoc@}#_ZsS zkT2_D`r&D)0MT9wfwA4)-AxM%3x?Z6c$Ce}O3bIPtpHH-Gu1(W zpqnW4W$DBXLN6~bQ)y`_SCyBSvj^Z~W@d)vU<3JFi1|_gQ}%lcG8M@_7FyBN9opE~ zFoNCS;Gp*Xc0FOmN@MQ@lErrnu<&%~6H}8>sV}FQK?k7>SnCUfGGEqq@x8RP^q@BO zVW9sNN3H-^h<9I7c(CZQ5_=$l=?x1P^pQn>H(Ose@e}Rh3Nq9JxlI;vrw?HfgSnt9 zF{wld7!-#Se|r6qdq5VwTp71|LKgC3{($BDj(InE&Risc&kZ7M3pEgGAk;vpflvdX z2J)x@PLxCX&*H5B9bx6>hLLqa)wWMU`3C>zmwAdkQjsAep0^bVdMf}sGT{a3 zx_ZO_M%(lG7vfo5DyVxVN=T5Poc`KA56F#{n_3KzdvSe?wLF!H0~TDz|CyHU0vlS&)r(8R%vp_^}JC27HG2^gk5qY~PKd}1HR#K;36iJU+FCYLV`C$c%uN8$p=6EWLog-}kZr?_X&N6N z=YDX(i3?wHs=ScG!`qOax6&LQ9@cQ8jq`<)VLatR&RnPZZbVqo0ozVNRKShw9uB@yyf{q0w@1IUH4Ge{Y8wUpmM)p{R z8Rc~Vgs-o!r|Rlz!eImvbye^mIgHcU1e_dMUthQFVWa zpr!yoLhut%R?fZyE;FlAg<~`73Mg``vu#cSk0-#1LKZ^}gc=An5NhCmqk;bb*Q<(w TbKvH600000NkvXXu0mjfhX)yo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd7c3bd13a0fadccf1c2f7a0f8b46846a25a1ab GIT binary patch literal 1716 zcmV;l221&gP)pLW=TXrRCodHT3<+HRT%%wP&5?(gl5i`8U!lkpA8ahA5wbAvW*O4 zT4LXp9)k8|*~Tz;Pso%!r4&AfY&qS2_5TY0m3^bk_`_(!9R z+^hu1;zZHerC)eQizI#`ftZD7ml9e9;_>lu=YCF<@>mby2L}h~ix*$cSY786Bxh!3 zXk}%^kzdCK5(=PGoz!{j8tv}x@-U!tBaZMbPo82eC+^&JgvnJ0b~L2r`}+DA{rIbI zQrneF{9aK}LAPsr@m@l|T;n?H&2b1Y;N9DdU~g}a+=K`0V@)FH6rdzNStO|lX?f}P zAdlgS0-jlTVMI{^3;}dgECT}r+Vq9*spWD9<FMb}IGh;rs)yyJ@En{) zho+{cz(de|7O>$4K?vi$@9Imo!pre#(=~9F#EEA|M+f6+Zf>TUni^iGBoYb4A7gg# zL&%r)F#Yf}RDftNg}~VE>FJ@x#YMyIAw0_F<|eJJt?_$9Lj(P@n)E#j`Bng^`I+h< zK+sJT`m%K52BDXim#MV0l&i|i%h?0)F*`fUaJdnL!7k3|Q+6gfd^&cJUpL$M4rh zKMwT2;>Z;M3-Rtt3J(@tR$})hFuh^nf!0fXXj;!m$Xau3L&mn-8|Psl=E%pb6v-!Wgz@`SvF8VEHIY9Q1=sDTGu1Dq&{ zL`dw=h;wg6rVl+Ih;&$HDXz%h!-{a!*!vvad@J*l@r|EvkjNJX-sY;(RE5K~x%7z^ zfb;Sjyow*AO5N3#!g5uI-_N*2sj8|{B2Wk*V-sZJPnE8>2gnV{&RizpC@?4f5{buR zEJ%p@EZz#x5ms()7+DuoZTlpYZ}5MATcGG86&W((c~g;~w*s&u6JC(6t49oAw7p+` zC7#8lg1TqA2niCD)8E?X0lCp~Q;Pv|FRqWVmZvgtz=G@eKl2g;%wp+dEQ|p{DaADa zh(10V)0CI2+H9P7Kx9LY6` zA7)g4ieiOTa{9H`wg2wKIRyMA!OXNY8}DBz2E<_4FW z_bib4-%dzEr2qJxQ9*F4@W>gu(8)^^GSoPjf#j&Wu3bMbg0<#7ig*bJk7S8pfArRNS%-HFcc1M92^`N*<%%El-B_ezP`Sm zs;jFBhY>{7Rl$GcFivL^aB^gQeH}k)KvOeLig|FL6a>vUa1?ERe%@SF6z>yjl{6E1 z#Wyd?9stY>RnLlFK{}0C%r~(@bU+H-Pf=5V2qr5MD-JCn>s!P{)%_uYngRd`!B0S0 zIrAR4%&bZkj?JhmpvbMxwmAtro&YBbSqwE0Y9Q1=sDTGY1OEfj<%v($xOTY!0000< KMNUMnLSTZD{T~wm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d89ebdb58e29aaae08514272adc6bd7bb108159e GIT binary patch literal 555 zcmV+`0@VG9P)CO(o z?zbZ}M~HH)fYB1K8UGo!)ZU!se-f}Fj?pe)wn=T@Len%ZO0R=ngiArkUeJNia7KLR zfdqJm@UU8?z1@2((=dIw8PubF=CM%iv=UxcwU9RK|D&KE|Qk( z)g#jzgo~AhpPW2x^X7NeqyJ2NNiH&Rtp7^|J{HNBId_HEv*ro9{gUHjpIl#Sb~!b2 z*Ty-8jg>ceXTIB8pC)zmD}%q-e3uS8x&E{FW}iKFF3s5Z%JTF5oykH9jJQ#wp^(Q~ z)fLxSgP1E>tiJi^9$(Gu!K)(L(BZCX^|Zn>QY1?Gtl-vO?WQANSX=&Vdma$vtjKy` zrU^O=>e>E@Tql?ZBTEU^A>%-en3aHdt?PAJ1uPmJRm37Nor|WMNIW9hw;hez0Il)1y aF<#@IqrPvX>@UUhIxk^1YFHEgjj_ZEobhW)itS4`G-TM^3t=a7A`8`D+R#eiJjgP$$U=+ke9|ULkEuWdckGptpwvs}f(aag!96EY8 z3o#t+cUzo2C#w4ILGhnOJJ0a7Hy=FZ{HJQ~w_88o<=&DJE3}cDZQ{FEO0JvH`A?3S z@s5`@cC#OUj4;XkQ{Qp#ZCTidq>Tp62N?|0Qw8QIbeQMA|JMF7Yip7I{u_Ir&belD z;&|te?pa+Aca$^mTwb1DzW4t7*?;TuC#h@{@VFvrQgXmT(EL$5pWKD?#)78wpiN2o zk_<(aleT0(mbA)Ii!TYhFU}!y{z`jb_>tm+3)&y8oGeha{BmcRT4k-_?6b!VdhfJO z<6pqOYe7GI>233;HFoFQ4lg{oe0}yKO^NgrrhRz=`|sxMoqu%C-eXD%On8vOg{8Y1 zwR>CjbdUTG-G9LLfIBmT#*{O!+Z;YD^g4)z4*}Q$iB}qcJEs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..1212165f71405103a909965626dae80255e8dcad GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCq3z z;usRa`S!v_UZ83ghqNLw^J4DlS6rO^9V<=l+r-DTC_6MTFfxfY?yS?^{OR&d$=`c+ jo;jBr&B7s|0G1Jd5XahTR=8gdXdHv5tDnm{r-UW|NwFs8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..0b86daafe243c8c04f5f15a9db8a084e91597051 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCq3z z;usRa`S!v>K?VgL<^$)B=;Ry|)8Q-Cma9( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/meta.json new file mode 100644 index 000000000000..19b6c3eaa767 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by FBI", + "size": { + "x": 32, + "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 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/railgun_fbi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..458adc27bae746d3adfd5f7e9b21037dafec4822 GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_tIW zo-U3d6^w6Zo%N1(6gcpFs(|N$E-toJty*$DjP@I*vdwBf{_NFJxvJOmAIw+$a?3ft z@!qBEez~9xfy|x@k2JS9Wi0IIVAHO;`7USI>wRbU?WujnxoES%x8k(2y5Ap}tQn?s zFbFCzxioMHFe*8)$f+^v=WQ1k7mqZX-5R!<)!5irY5$%*EpCeicdxa0_D_RPbs68? z%9albmtVcox_#qDLiydF(Ki`iY`OEVT(;qB%p=P_qmQdsYa8ylnNzjnlUQVadHMBA zHM@O-gM%;RZ9n*VO&-_dMq7@=loS>}fB%E3_EuJ#swVp_UpQ^n{&&BlxVCVvzgPC~ zqoKC8_8OoA`uASDv3<*yEh;6~UYD-c%U*n8$KT$A@8dt@{pPNTspkEVBGmM%h^@G| zc+-kcbLYxx{P$$GIa_-BmOVp`z=g`(GgZ&@r<_hT-M@CN?zWvfSH3#c5P6_-{oatr z0uF!wvR}AeGO;CY6>&=@tIx=!{hn}dgv&%GOJ2}|I#>D(k z@me}*{ktejYwOq6Arp<} z-;EX6##~W<@V912h?eMlz1a2HH=niZNx#%KFf&t2Y5wH5eDQ0s)R@K%p$4rblK+-> ziFUhAJO4a)`f5$7opQY!>im{!{_lFEQfqaQQAVq*t?Z;{;neKfAhzGjmM?$!hT8YUq(yVy%Xj* z1RVO&kYcoQmvq1QuBQ{)MN|_+N_M+VU*C05GGn@IJ$rr)qflo{wGGpC5iW;_;vUh6 z|9?2$+})2FS0?}SEnoC+yYu}g&f0=+J{=EU$oE*#VCrOj7e2*r%C^0%N7+hr8#~w! z>|ogXYg6)pJ4f|q9jIt|_%LzCj2Q*nUTkCDVO8_m_%Y*|U0v!E_*Y1L6x_s=Xk5B+ z_ntj#7I}Vnv4XW=gM4;PLy21T9{ui(PaHpTY>MSydeB<2tM<99g3ZCHQwwcwJcy4K zm2TKxT>R(f*3ag9IHoow>^`+jN}Ib#JZW$L-wcL;$d06+mNF`O3}?SA5!h`J*I@2c uQuXD|^)`!t!gs>Wo`@r5pfxQ27>gdSwK`vY;3Y6qGkCiCxvXFVk#q*AFs znIK(%lCS*E2KZfJ^P|khB%T>Og7B}jlKS1z(INZ#`sBY7Jo%~o&MLpNG!CLgPXG$h z@efk4Q~6Q-E_$DF_ssx@hld5e4JI#Ye=~0f-eXs9xuUr+8`-S0e0+So0(aiBzC!tK zVFUO85ZzaFaB|?jXlrY;2D-Mk2G!NoFh4&ZnQkU{@)AMVjGfupSrkRU%$BRFsw#gI zJDd|B^_(1d;E$PB>)_*uondASF4TXAnwlDDZf@4RiHQkcADMSgodZ$77vz^2xc1^% z;5d2fh8P_kb#zDgZEbCpsoQr@Z;teq?cG;qv>?oC!-!CsXj|So>m_6W0PxXX~_oJMSf*vCEz|GK)mWN&XT{t>4G z4~m7{^LEC307+P(>CL+WsC1o&kLCgAZs~b-zd${pq`c&``%2bl4-GgrY1i=!P=O%e z`!zj1?YV%lh~t+vDCP+$>MR0b0l`zMJMNc5_qQ{6vWg&>ZQwoy?{Q54LjCuoEFA;@ z?;=h)kBDW_4rCz!=r^6@9q1yv#0W3~i~u9R2rvSS03*N%FanGKBftnS0*nA7zz8q` zi~u9R2>cBMiY7*a94h>OJ0&0D@wm<*WHK3H_Jj0nl~4A`F6r5d&2RwR%ujOhE!hDq zNT{o;^Tvf8tR0}XmD&K3MJl?Tbk>ojGzj?%t0Ue?#WTr{5fG=o`7e z^2Zl0ftjDjIsx0b_2zZ0Qq=~81HHkx6TEP9k4GjRL3`UV_%^=)PtRWj z*tZ|##|&J3`5f+@I0K>~zCJ#A)|o$jJk)MreL$f4*$wQH>pAO}pE`1)Gked2}X>S>IEDpOZ1D5kTWGx$!Zt@Mt~7u1Q-EEfDvE>{sscS Y0OFZele`EKX#fBK07*qoM6N<$f^ia3wEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0760905e2ad463cf8e6449acd0e79a1ba0a5fe GIT binary patch literal 741 zcmV0BQ545dqQtleEp(Nnu_;8;qU{ifyP%+1h%W+a z3AoHc#1A0&0Saye7f~wMb#N7=f`Ti}s+*uuqXjXsq*3c5#l(r(jQJmWOOwuYW|Fyf z7IWrt?)m-CBX>fyN5_rp*EFErGWl~?E;B^H1Pk{^W@hmWc#G$kI7hHg!K6`-x$30%~Nd|oR!=!fgoQHm{f2AKA4Tgt86STTo zrN>K8x42suPKp>C8P#IP<20ZBNOQ>pG^>OO@E0$ayA>(+Fdd(Pfd3G~kx=H+C_Q@q z*ANb$9yNF{%yBpp)h5Cr4)N~o3a!;YyTYL<%{OvzN9Ka#m;k`1rzWZV{u8xYD#Hb2 zH|t0XQ1%li6Sm>I3A6kT@JuG7p#r$Jyl~TTsC@uXWL~XSZIyky$bn}7@K|hyu-n<` z`F1$22bzIMB%&QXHqCIqf2=>It$W)7?%vC4zt+Dq1R~bz-z-nOp0a&<4~?Dyj(6>L zn^aY$TCGOqa(Uo3B9`R}2>7$5C*<*Xu(sR#7TaM?mIRziCOLBfZ#J7$sZ=N)j}OD< zwWb0v?ZNSJT3mR*nG3j!Y<162sOdg{&uJhSq~DDO3AoSaqi8frxm<3j{zH{%1>h72 z24JZ6rA~nV*F#YhEtN`Xu<3M~XF*segqT*KKV!h1D7_GG*uz93!P$DfUiQUrzfdR` z`ip>et?noT-ra7=?RHbA)8UOr1{`8{v_QZcn^SK$BfI`RCDnt=D!mZO6~JF;J-Bd^ zX<5MhO@;0}tWkg2WoM7XSU^6XcR|Fh+plCMYaSaL4%(6Ietggp^A!?2ga`?tbwmCG XEcGd!+zBn%00000NkvXXu0mjf+WJwr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..2a743cc8b718aa9087a877b90de32c80c22d2ddd GIT binary patch literal 755 zcmVwyF>X`d3K$=|G)zH>9ZFIaM*aj7c=1N?-gpi+uZiRND;HsGa__6Ol!#xv>H7?D?uLt{`|#yDlU!+_lqBuuMB~R?edqQE54U9T}uEsoTv*6)ND4X zQmIfbm(%4#D`Myjbi!>m8~dr(>so)h?V$vmibmU!1754us8}pgI2_gu)V{E%093nY zZjPqxcIt#%XrI>CNcKPhIMLvD>h^d@QIvM%4u^w|g+r7|rN&x+DDDz)_g+%SlMCPn zoqs+tx5v%VZG9>e;HEd6T%?d-FeqZNm_Q$o$GH|{Z-kINQy7UvgwyGyLZLu`K!BM> zq+W{eD*#|jvbTy4tEvx3*idTCKd{m<5O4t|G(@39nYGT=lqT zX6s66FSwb}BQVYYj?lf}W=1Z3vw*dmLAvvBi?nGsJNkA8(&@AXB5vKzNnw-evEg7j lqOG3~mSiF-q=^3o{|$`(EB7-BIJ^J=002ovPDHLkV1h}PT7dun literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..373bc90b82c74734219ab87494b8890d83605243 GIT binary patch literal 1007 zcmVpIp-DtRRCodHT1|`EKp37b1@)q!UX*s1g3yZ##X|-0BCVc0_!s&E z3cKy^C~XhzPv{4wAf<&gT`>}OA(NR59Kfa`zJ zRjL3Op^M2xnJ|d``O8;j@dF3WX0wLMDe&$4Ed!sxKrI2TTdo6L7K=p_*b(~`C=Rdl z*@F!GF}~ovBK%C+6o|*;X7UdoKV1_>A=n|CIhIxhQYxTYt(t&lvzZ_jvDcHyBwMf7 zW~ZCS8Kc|n1{OPT1rYi1c+5tlQD8tkNruBAOQli_)rJpEJ6<2RXMqF=lRSt#d~|N| zi9{mi86pq{v%$v?-vUtLFh<_a>;An8YqeUNY70^cz69WruhnYO7AQM$+;=)1c6R>Q zBu^p)nGPEjosv1V@yO$Sd{5uKJr<7Zl*`^$E|-mTI?X1RzYz8N{Y?&Fn$PEKxm>cr zV6bVo_jkG%dO4rZ8_{UgjMMA&g!(!q_tQoqOs7-UZnrlWFb(_&AUp+Ds};K{@(|2Q z+A5%ouS9FSy}d>SG#U+Q>x^&(?1M6k#ezWy8CVWd01(GoBtwMFA|gZ0Fk;yM8dUX- z69yNZLo1*a&&l0)ov8VI7nc_B^@7l$)>;c4~Jz zy9xj=o_Em5qYT6H=P0M!-UK)7JYHMR5{ZQI{N;;($_b+YFa&6;lcF2S$6IfJ6_~w1 zaNQ(DcJ#YfuN~uIm dKr0|ufj=>afOjLWu(|*M002ovPDHLkV1ihV$cz90 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..373bc90b82c74734219ab87494b8890d83605243 GIT binary patch literal 1007 zcmVpIp-DtRRCodHT1|`EKp37b1@)q!UX*s1g3yZ##X|-0BCVc0_!s&E z3cKy^C~XhzPv{4wAf<&gT`>}OA(NR59Kfa`zJ zRjL3Op^M2xnJ|d``O8;j@dF3WX0wLMDe&$4Ed!sxKrI2TTdo6L7K=p_*b(~`C=Rdl z*@F!GF}~ovBK%C+6o|*;X7UdoKV1_>A=n|CIhIxhQYxTYt(t&lvzZ_jvDcHyBwMf7 zW~ZCS8Kc|n1{OPT1rYi1c+5tlQD8tkNruBAOQli_)rJpEJ6<2RXMqF=lRSt#d~|N| zi9{mi86pq{v%$v?-vUtLFh<_a>;An8YqeUNY70^cz69WruhnYO7AQM$+;=)1c6R>Q zBu^p)nGPEjosv1V@yO$Sd{5uKJr<7Zl*`^$E|-mTI?X1RzYz8N{Y?&Fn$PEKxm>cr zV6bVo_jkG%dO4rZ8_{UgjMMA&g!(!q_tQoqOs7-UZnrlWFb(_&AUp+Ds};K{@(|2Q z+A5%ouS9FSy}d>SG#U+Q>x^&(?1M6k#ezWy8CVWd01(GoBtwMFA|gZ0Fk;yM8dUX- z69yNZLo1*a&&l0)ov8VI7nc_B^@7l$)>;c4~Jz zy9xj=o_Em5qYT6H=P0M!-UK)7JYHMR5{ZQI{N;;($_b+YFa&6;lcF2S$6IfJ6_~w1 zaNQ(DcJ#YfuN~uIm dKr0|ufj=>afOjLWu(|*M002ovPDHLkV1ihV$cz90 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..171b0d2e56776368c510682ca0b38b59b3fe2e15 GIT binary patch literal 908 zcmV;719SX|P)^yNt4KnW;;f0n?`w-bGQq#ZmWZSd^eoVb(l z@xkp`svfL^ahfUv#wnj|5>F0LCZ1yKm%0N@=% zn3$fXC(oXa6baFBzxMYDAL&aR06Pf?+l@`*Z&Zv+M6`dcR_h-dA2-83wOV7Y@p;j1grA)b)$8?4k$`^a&+s6I!#|I(tbN4+U}8XMHk$?noNs;Jr8B2z$+d%{9sSVX z7R|P@iptZ^3jlV2qXA;BU4KDq&sP#70V|Jo^h1A+BHNa9__J;AC04drEcWs9i03={ zU%{?NKUbu9ci6`S5QbHT*f($A4ebZGM?Kon&&T{pHbr;Tq)AZEtA2cHiW-f^fq5bR z$KIYX5i-=h?g2Ish`O}2XsRIAZsU8jhZGMV4y=Ujn2+!L@34AhnJzAzA4B*zU#^>} z9zJ>;+#eqr)us|q0!ly$C;=s)1eAahPy$Lo2`B+2pahhF5(rEn&ujHyFGT}0aGpZ3 zKmR3wJb46%9zdy78hXXfE1NZsKpa4|TJ@40!os-3>vf1Pm&;sbN*uu8TrunUf;fOe zp+N6Hd=$+N8B#d7f%vuc4T5<46dC0TT_x7#H^_?zsIBxg~N!&TUh6OZUi z8ynXqdJ=>1vsd8q@>MhEt(&VN^FTZdz8b7PUmWgy_Lw#FdAx{YYz(Ch0g*6MK1I7< zzQ!Ji+T&c`@w`_m6%+Ct_AK5tHmzM808hps7y=R>=4ZZ-G#~!hEY1I>a|;&?fX*O= zrrmCjWQ+adQhX0!!w5yJ5cULDb_kD&D{*p+%#p2~qvGP@<`b`TWrw6qh$!NWl0%(2 zl9nBk1|US{h{$u4CIW4|Lnmd2q>cBTIpS>(uti}%NXibe`$fNp$Q%h00W2(<9m4f- irDl%AQPDbi0)GHGcAJ4WHB)W?0000) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4746b1760b585fd0b850580d1962a9d2e5b2d7 GIT binary patch literal 839 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V1f zPZ!6K3dXmye6xieB^uO~c0N-QITB>k>9tVZanG_V#~K#=W6uBjVC66AE0fvn^&ZIw zICf-QTrFb5xv^{cHU+1J`xV;P*mb`*y6LmY`fbjp-TSz6)5_EC&3%4z=FJI`$zKAP zvmAI=Fq$r4yV4*9;{;?fYo9(XSZ^nw{z>dziB(+V=VQE~eh2*Z^{QHJW`_RyxA*Ld z|GDa`BQ!tx>*`c&PtM}s@Q}T^vHU}2h{yKLx8M4`-6>qnAX>ife~08H$LEaGO3$zV zTbF!vhT)BF@pHkZufA6ChV!KJSN!?nx#d=*`Qe8bIQ~35*tojx4vEeG^V^(Bm6c`Q@;KFkO5q#1&!qM)x|uU; z>$|NIzuz63+hXlm^Rv>d>hGgzH>>_13|N@;;ajlpa#tpw?APIE&)!~tW@+(m&fNwf>l zw}v6=?4Pcj*U^=%)IFBZ_<%9B=8CAC-Hn7N0?*iDA6~v~{_!X~zr3og(!PMp^=B9t zY+ZkUh33Mfm1tp%2yhky1$zxPj?h&C$==E9u3Z(CyB5QwQ88s}`KzgaPv{FweW8VQG7#j`R2b>kf)*Hr}|ixZ|)l18>Im z+sfJPN{x3_Hr*21wD5>d(ekeEUK4nj+gLMSicY?Ezh7B-Z+v6K!s&1KvMy=tnqxe?w#1Cb^ zo0q=i6fRFnxzoDq%ny$hU;IR``}OdAv#6G{4sANiXr|ylskmCbZLYoU+3fsj5V0xQ zAOTI?`^srMgO^T_Q)u|~cEVhV)!};nd$0fB5$tO7^0^J~A4d0${gI4qbL42BR01_q`> zo-U3d6^w6Z?a!XEUCYAK)zMvc%hf3F6(@yECT>&gFudO$WAXXfJ(Vx6A^X^C-|yW0e4hOLlHKb$ z*f}RKU_%Wjo_cfl{_kv#w^uaDlJQ!qf2(|B#I$z**ID=X&Ye>J-u&t|`;{vTZ?642 z;pWfoZ`>V5_UC90@u|@TYP)H_2aRt-0doI^4GMIHVV#_w~f0Lk+|jz z)3+BHYrekbKe_cw`OI0z)|E4yy3yIPMsK~x+OW@7TgooI+;XhjMX4yi(D|H-`CQ)x zH>`JZrthh-dw=F}`G(!$6MOwdZ{E|ZENU+{UzgoDdAVP9&)4nwCG%!SPI`2`DC6%* zG3q1Jq=|c~TM+0Fb!*b^H&c_xX-rCPR|C6ChX@U5LtxOf^_Li0x z^DJr}ET41!+_vim-xl+~m}>l@X2o?*hITjY4WDW}F4%lwNXx0!TanqYr|M(SbpgYa z%{Sfl#=T$3Zm{vq&hT@2Ki~XTGk?{5;;?^zL$%g~4a_B%xh2*fXz$P7w))lu4wuD& zGwsU5R$bM)_p$U{&ExMeZ*DlmMK6AE>Za~|S*{0$Wo6%H-EYqNU2DT|=Jw9D;vX(^ zN$56sHa*Y1QMXF)arXHW*$*De-k-WT+HUjr>o%*Io$RX^q#Xjx6nc*IzmC_pbqcVQ hY)1saKToFp4ElepcZw9cL;;gHgQu&X%Q~loCIC|+Z?6CV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..06e21d90069c6d39dae3762a13a23c52432da131 GIT binary patch literal 797 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_q|{ zo-U3d6^w6Z*=Ga?iX6)iP+8iX#N#VoJM?Ab4#@Vi7VYfCle(bs1y#BiJv4l@2X8in6 zc+{ruNO~&)4~FT0QyX5|_s}Pcv?oWH|g%u=>l59offw^A=w;_}s6RTm3HQbdH~b<%^rM zWsDa8-Yiu0KQHpu)>qfpxt{e?f3vf@c#^eUsZ&>U-EX&J-TZRL*2V5sDn2{oOlD45 zmFKa*{ZY?1vh($|L`iWtgg+~?jMfob>M-Hx>~H_IOtuF{{|)S)dU|zG%4XA>Z&o-y zoVC8T!68O|&E>i&V$XZH4&IcnXUu6hH1}lg1xMQz++TB>iz1jfCom8~2mbpytUvI( z^wfr`*}ED_#5Wey2fn+VcYjA_LG_w_3}+AixHfmvW5EXd18;dR?Af5p<^9fEVz2Kp ztL^rVU+?Z~$(v=%_`pe!t$krgP!03H+lgO!N)zb2aQ zj_ZHzc!fdmiFCmE1FxoUT2lWjCaZasT;sLq%^w(EY~7LdB`Y-g>jeI@3bsd@Obp*& z=VfK!zG^z@{PVT{xcKB}ZLo0o+&rbP|F&|2%6~;Gy&TpM>os!IR;Eo*UpRf9`nq|H zch)bi@ZZ4C{KC0hd&}FVdQ&MBb@063U% Ae*gdg literal 0 HcmV?d00001 From 9ad0fb898f83f21a5c41046e479871a2bb8a884d Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:47:34 -0600 Subject: [PATCH 2/5] Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Used doc's description for the railgun Co-authored-by: TheDoctor1977 <108845723+TheDoctor1977@users.noreply.github.com> --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 715f3c756508..6d550a2e3128 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -778,7 +778,7 @@ name: railgun parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponFakeAssRailgunFBI - description: A weapon that fires projectiles so high-speed that they're actually lasers. + description: A weapon that fires projectiles at speeds high enough to turn them into lasers. components: - type: Sprite sprite: Objects/Weapons/Guns/Battery/railgun_fbi.rsi From 8ed63780a8eef28f53372f4c23e848105d484765 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:47:45 -0600 Subject: [PATCH 3/5] Update Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json Co-authored-by: TheDoctor1977 <108845723+TheDoctor1977@users.noreply.github.com> --- .../Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json index 12e18f015cbc..0a52230bc779 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, and then I FBI just recolored it to shit", + "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, recolored by FederalBureau", "size": { "x": 32, "y": 32 From 2095f457e7bbfa28fceb1bfa3fada91fec66b564 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:57:26 -0600 Subject: [PATCH 4/5] Update battery_guns.yml hoping to god this works --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 25d6592738f6..a96ec89a78ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -961,7 +961,7 @@ guides: - Security - name: energy shotgun +- name: energy shotgun parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponEnergyShotgun description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. @@ -1012,3 +1012,4 @@ autoRechargePause: true autoRechargePauseTime: 10 + From 8170e6e0d2e74811f910c6f07be0343e4c469a89 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:04:36 -0600 Subject: [PATCH 5/5] Update battery_guns.yml fixed the energy shotgun being not real --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a96ec89a78ba..e9278ef9015e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -960,7 +960,8 @@ - type: GuideHelp guides: - Security - + +- type: entity - name: energy shotgun parent: [BaseWeaponBattery, BaseGunWieldable] id: WeaponEnergyShotgun