From ff01e13d247d916b58bd9638be79a012c130e166 Mon Sep 17 00:00:00 2001 From: Spanky <180730777+spanky-spanky@users.noreply.github.com> Date: Tue, 7 Oct 2025 11:53:55 -0400 Subject: [PATCH] Head of Security's Energy Magnum (and Warden's Energy Shotgun) (#40615) * Energy magnum and projectile protos, locker fills, and traitor objective updates. * Fix objective * Objective and .rsi tweaks * Rewrite item description. * Remove energy shotgun self charging and decrease magnum disabler cost. * Bring magnum disabler fire cost in line with regular disabler. * Bunch of sprite improvements including charge status visuals. * whoops * Minor sprite edit for clarity --------- Co-authored-by: SlamBamActionman --- .../conditions/steal-target-groups.ftl | 2 +- .../Catalog/Fills/Lockers/heads.yml | 2 +- .../Catalog/Fills/Lockers/security.yml | 1 + .../Weapons/Guns/Battery/battery_guns.yml | 53 +++++++++++++++--- .../Weapons/Guns/Projectiles/projectiles.yml | 49 ++++++++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objectives/stealTargetGroups.yml | 8 +-- Resources/Prototypes/Objectives/traitor.yml | 4 +- .../Guidebook/Antagonist/Traitors.xml | 4 +- .../Guns/Battery/energy_magnum.rsi/base.png | Bin 0 -> 966 bytes .../energy_magnum.rsi/equipped-BELT.png | Bin 0 -> 224 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 224 bytes .../Guns/Battery/energy_magnum.rsi/icon.png | Bin 0 -> 987 bytes .../Battery/energy_magnum.rsi/inhand-left.png | Bin 0 -> 897 bytes .../energy_magnum.rsi/inhand-right.png | Bin 0 -> 898 bytes .../energy_magnum.rsi/mag-unshaded-0.png | Bin 0 -> 15137 bytes .../energy_magnum.rsi/mag-unshaded-1.png | Bin 0 -> 490 bytes .../energy_magnum.rsi/mag-unshaded-2.png | Bin 0 -> 493 bytes .../energy_magnum.rsi/mag-unshaded-3.png | Bin 0 -> 537 bytes .../Guns/Battery/energy_magnum.rsi/meta.json | 53 ++++++++++++++++++ .../projectiles_magnum.rsi/magnum.png | Bin 0 -> 741 bytes .../magnum_piercing.png | Bin 0 -> 733 bytes .../projectiles_magnum.rsi/meta.json | 17 ++++++ 23 files changed, 176 insertions(+), 19 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index f800aa2c8d..83e2e0c1ac 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -11,7 +11,7 @@ steal-target-groups-captain-id-card = captain ID card steal-target-groups-jetpack-captain-filled = captain's jetpack steal-target-groups-weapon-antique-laser = antique laser pistol steal-target-groups-nuke-disk = nuclear authentication disk -steal-target-groups-weapon-energy-shot-gun = energy shotgun +steal-target-groups-weapon-energy-magnum = energy magnum # Thief Collection steal-target-groups-figurines = figurine diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index cf5297220c..2b4c5c9b36 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -308,7 +308,7 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: WeaponEnergyShotgun + - id: WeaponEnergyMagnum - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index a6add7f4b7..48bed23bc9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -46,6 +46,7 @@ amount: 2 - id: NetworkConfigurator - id: Binoculars + - id: WeaponEnergyShotgun - type: entityTable id: FillLockerWardenHarduit 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 30967200d7..008c177aa5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -815,7 +815,7 @@ - type: entity name: energy shotgun - parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] 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. components: @@ -853,20 +853,57 @@ size: Large sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi heldPrefix: energy - - type: Tag - tags: - - HighRiskItem - - type: StealTarget - stealGroup: WeaponEnergyShotgun - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Battery maxCharge: 1200 startingCharge: 1200 + +- type: entity + name: energy magnum + parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] + id: WeaponEnergyMagnum + description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mag-unshaded-1 + visible: false + map: [ "enum.GunVisualLayers.MagUnshaded" ] + shader: unshaded + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: WeaponEnergyMagnum + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserMagnum + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserMagnum + fireCost: 150 + - proto: BulletLaserWindowPiercingMagnum + fireCost: 150 + - proto: BulletDisabler + fireCost: 62.5 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 24 + autoRechargeRate: 48 autoRechargePause: true - autoRechargePauseTime: 30 + autoRechargePauseTime: 10 - type: entity name: temperature gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2134ac0cbf..080f73bdb7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1325,3 +1325,52 @@ proto: BulletDisablerSmg count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though spread: 9 + +- type: entity + name: magnum laser bolt + id: BulletLaserMagnum + categories: [ HideSpawnMenu ] + parent: BulletLaser + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi + layers: + - state: magnum + shader: unshaded + - type: PointLight + enabled: true + color: "#ff4300" + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 30 + +- type: entity + name: magnum window-piercing bolt + id: BulletLaserWindowPiercingMagnum + categories: [ HideSpawnMenu ] + parent: BulletLaser + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi + layers: + - state: magnum_piercing + shader: unshaded + - type: PointLight + enabled: true + color: "#ff4300" + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 20 + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Opaque diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 7cfbd2761e..a24e0f5dd3 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,7 +22,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - EnergyShotgunStealObjective: 0.5 + EnergyMagnumStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index d25908d154..0a223bd97c 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -85,11 +85,11 @@ state: icon - type: stealTargetGroup - id: WeaponEnergyShotgun - name: steal-target-groups-weapon-energy-shot-gun + id: WeaponEnergyMagnum + name: steal-target-groups-weapon-energy-magnum sprite: - sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi - state: base + sprite: Objects/Weapons/Guns/Battery/energy_magnum.rsi + state: icon # Thief Collection diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 5f3b22c30d..26a4db42a0 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -243,7 +243,7 @@ - type: entity parent: BaseTraitorStealObjective - id: EnergyShotgunStealObjective + id: EnergyMagnumStealObjective components: - type: Objective # HoS will have this on them a lot of the time so.. @@ -251,7 +251,7 @@ - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: WeaponEnergyShotgun + stealGroup: WeaponEnergyMagnum owner: job-name-hos ## ce diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 5dc1310be3..c7a2c9e983 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -91,9 +91,9 @@ - - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold]. + - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy magnum[/bold]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..56ff3c1509d1f0341bd0d01981b9c734cb5f63e5 GIT binary patch literal 966 zcmV;%13CPOP)+EgVur|D1wOA)_yG^7q1FRLJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK zCQ-tKkjYS`KoJW+1;NSLLq1(tyP;aMrt;_ZU1oaB~Um_N08bp|k!T4@En+HJv z&N-qe!gxHcY-!-UURAG}2Ht-s7={7Hn09EjTJU`zj^p4>{T2Z5;p_F@I!Ga<+!SF- z9^c$(+sBoH5CTyYZ3qYe;y4BXIF3`8w9#nj@nkZ|7hx8bW$6Go=O7||a^Lq02attf z7!Mi9p8o3Y9%sjEd3;L}e168XLpFdk1Ga5zyXSe3QWowLJ2P;0e1xmJ`}L-$RT$3= zbh}-+u3G_sFbsj;w}mkVBGR^f$np3VWNV*hfR<~qxvpF3^?JG$3n5e-$6DP|%F4dv z0M;eQOaG^z>otrqg-jX3F#Mx-oMNj4+4N_To^Dq=K1cvN(|=H^oB(Kf3!GN}0o^uq o9bcbd>tCPNzeI@=CH^LU0aPIYMmwC(?S6yG2HM~$^U|92+!RnfH T;FSA;>L7idu6{1-oD!M<-Vs>X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..3f83ef42ebfc9d181f5d1efe912ac8a5f5c3730a GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX zdut=_AqN4L1FRDhE}l64j$zdTr&SwWQp}rNek@t?fc;C-vWClmwC(?S6yG2HM~$^U|92+!RnfH T;FSA;>L7idu6{1-oD!M<-Vs>X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c9f8a1f745d4d75129e71576079fb954486054 GIT binary patch literal 987 zcmV<110?*3P)+EgVur|D1wOA)_yG^7q1FRLJn#EFeBTEgk)l#E2LezkTShb-k`u|4JottS zH%@}gr4>_OjjhD#JKqmT;=K2Ztp4x*osq0+Dj*F33yN-7AT0rrElU@?2aGHEbQYur z;4>1*6i7Eh&$RhfaIVdtf{l1|85|;0&h>Dnhn2ih0>>=iEfuRuXCLtsw_0A00h7QK zCQ-tKkjYS`KoJW+1;NSLLq1(tyP;aMrt;_ZU1oaB~Um_N08bp|k!T?Zf+WYFbuhNp@bMfYd!K^2r(78<2d$RDaG8R z$+cR|NGXw0(rh-VR;#?--sbW8Ixp`20O0wDLww)QETB@UTrWUMX&lGF_k9iy4s3j3 zVF4ZupZB~A^Lo8rW&uj6OXHcV6E;dk6Gah&!2qR{O;Ab^$1%KvIF8vr?6ZH^2Vi-5 znXT>|d)+R3_q!9vpYF799EUIrX|-B~ksjD670rW+%ge6{*L4v>*o38}CEk4e&a;PQ zo|aAlc=h?))P0aZYkj#16Y}Wf#Kv9^3{pzMFuc@208tbHu)4aMnY3Ik+xJeVGr0-V z@O|G3a2yAvl->F6?rvrQX}GR?;Xr!#M`!0O&JNq-OC0n5maqwF0f_^(TFu6r%_dsw z%=g4t2Nq{%I66BYE;?Vtz3sBHvO=TLC;$XO0KZR*5CWx?jZH(&)l-nJed2)X51Xyg zXcX4g*6dX*r8H3#5d;B25TLa#OiK<7OEAg)t)Ig=LI^{u3_%e5(RG|)qy%aE(@1tV z?mE5^0b}jIQK|_7RR0v_i~oRb6t<2}<{0_cC-u*fBS((EiC@XW`}~dKF!%rf002ov JPDHLkV1hJH$e92D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9384a6a8615ace1af6d274517ec2d08268cadf5f GIT binary patch literal 897 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6 z#IgFUpeYvvoL!omT^k!!T#_Z8B=KfVxVq^2dWW|~>xC{!Z872C4fKw8{_nWfG22l< z#L*=?JKp=mTU#xSh0lxL{eEouywdWyWdi@xEqiW0ZLV3E(bCNL-7Dwn-M@Xp;(UL6 zj+q9>_vpC1w5XHYxbm05(yG#X*UP@B1}|gVCihU%*Szac@u7ul7p<%Cukbj1Z1N%X zLvhZ08a1oGxXisTlK$$?(igM{IBoc&GevV>zeb1FYdKx9o}xYhbF-8Sz?_9W+JwsYJ1xnJ}jd|>-!-PO%mYl{D|T+FRpWNl&7RCv>V z!#{QD?ILE$CrP+4UdkT644fr+ow3? z`}f1oUmtI?Uv~Xv%ek3rCSR>x)4u=Pxtqn$Z%J=nc+YrlwKKxONNz`BmMA^=$XvnI zcg-0@Gfc5%3BPXsPXBmw&9>qgQUnu^lsGlsq@R4W6s@v8LW_1nAe5XC;vt_B= zn^f>U_`%D^*XO9!G58;};%_vum20{;zd^-Q?dSi?mrS<)w%9g(!{*~xPZ<}hx=US} zv}{YL^VTkf^B?BUUM2kE_w4%nRi%IX>*|xsEPttG3P8iQ@uJWVrpS$31A7+MTmeQc NgQu&X%Q~loCIB*Qm{Qb`Ho)PG(@xm{>Y-ueVd6 z#IgFUpeYvvoL!omT^k!!T#_Z8B=KfVxVq^2dWW|~>xC{!Z872C4fKw8{_nWfG22l< z#L*=?JKp=mTU#xSh0lxL{eEouywdWyWdi@xEqiW0ZLV3E(bCNL-7Dwn-M@Xp;(UL6 zj+q9>_vpC1w5XHYxbm05(yG#X*UP@B1}|gVCihU%*Szac@u7ul7p<%Cukbj1Z1N%X zLvhZ08a1oGxXisTlK$$?(igM{IBoc&GevV>zeb1FYdKx9o}xYhbF-8Sz?_9W+JwsYJ1xnJ}jd|>-!-PO%mYl{D|T+FRpWNl&7RCv>V z!#{QjFAg7B4M(#I|N#y-0vJ?+un$OMWRE9<8hUuRiH% zWQ#mkKm(J=0tQwM2SzxvK&0YsPKZR?t4od(7$fHtCnU=p7w=7&{P2{@&*t96HPuR!qQFts$Yq>nQ?e=#Nw>G zoyS}6#?>pl=-HdkwB$p@o7#(u_ddDZE%84?-1pQYbSERZ9>h%GY&`k7{CL{Acl!=~ z`?YMJ^@s3sj#-;!?z&C)myKqXf1m%hwsGOl-x=&;+*R+iBi_iw8;LHETkz^;b%JfZ z{QILj7FEY5Ce8f0jkj-J`?L3bx;=Np3v{mUuDK-rL3W`=m&1R%r8?d_&l^<+vRB@D z>-Ub|G=SSQP&)m=n#tVykqPg9{=V~d+L?Dtzs03IeVQQW1r6N;`vrb5WwUP$w7;3S Q1sJysp00i_>zopr041uKQvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e1e5161e0afaa3fe0515b9fa544a168c829b2bcb GIT binary patch literal 15137 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..7976821be11a5adbdc4ebf1291d4f35ca7125913 GIT binary patch literal 537 zcmV+!0_OdRP)F&C9^n~HH;Te@!lA9Au6R#)NXy2P z!Y9IBLk=i>tMo*j-xO!+{H554hUdYqdb%?$oM>S!YvhF|ggyCONo$-(-NcnDEJvh{ z$Q;EaOppL>5|r2=N0BM11<9qpWiO zpQoAjPuIJ<0^oeLtj{s%-iK<%vVKo3t9k~G7q~7o{hN~0?6>HZrsg?@fgQNKX=;fB zxY~u`XFYDjYm!5zJ)MS+3+Ru*;63!N)w61>bN&R;ZF!+52&3&SmBdgi52#-M@2fhR77SO1ng-!v-F7_TQQ_3GXDi+iZr6*s z1>t?+m?H-izEHXr@T1~Fz^{s(YKAn zm&|Tl(j-X`L8HtfB|HYCT9R3HU;NuQ$&z?<`P;1Eh@(JJyfIPB($$cf7u}Gr#EQ!O zZ=P;`XfWvBoPfFq-+$?a`Yrg}^!<+m-~T*>@I9Pa75|dtH1a0;W<~4SgVr@TIj?Bi zHk__Q=bfE%a^F%|W+aj z0wNH>J^8giOeE9<67bqe!XXwUB(8pqySqGY$XXBq0?I`~Z2<#rvH>EHNPY0vunlSg zOb8L{hZ-mY3<+3;910LPJk$gjBnlxsR2FMxEMTo00000NkvXXu0mjf_f|yI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png new file mode 100644 index 0000000000000000000000000000000000000000..d35cd0a8521d8c4a43be98f1a3448c1166ba5ad6 GIT binary patch literal 733 zcmV<30wVp1P)5OMUs8M*-a9m$_TsXe!JBl}jJB(Z^ zEqow6=*j_wFO{yB_(^fL#BYk-WMTrss;8E%V!euuoSPRO5bn)e1*3c(b(5BiJv$?{ zTV@X)31URi&?&Htg-=APEt&o88~X80vmzct{tiW4ab(GfcTm)Vbj?ULMbF4*QB=AA z&eJnThD+UBqEPo31h0M2unk{ZLGXDP1Ybu`^8n{|#lIpsjlGM$RndC)p=}*bFDjb8 z17{o1b?>Cy)Q?mnGi;jhassXM(0&a~i>0i}>m1)fa!sD-3U>FPU-q{xeFKweXV@c@ z1f@pOIoFH9~+C`!Lj! z>;Q^v!=jla2VexfcM8SsA;|$)ZG$+1?8Hd911JoGQ3tRP8-myp;Q!DHuy$}^vULt9 z9e~RNpjrlE%Y)G<81N7vsxH76|FAT~xVi(B4nSOz>V*Lhfl&txcnA=c2tg?eZ$U(6 z0;H%>N^A*ANZrth0$kAm_8}Sh9~Lqsg#fgIc@C;@zy%J(Vv-9V P00000NkvXXu0mjfNlrJp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json new file mode 100644 index 0000000000..73f61cbb15 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by BoskiYourk (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "magnum" + }, + { + "name": "magnum_piercing" + } + ] +}