From aa5d344a575fba462462ed62390fc82d38c592aa Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Sat, 19 Apr 2025 10:03:05 -0400 Subject: [PATCH] ERT Janitor Weapon - Hydra (#34416) * checkpointing work * Got this fully working and all sprites done * Exchanged my sprites with the ones made by AugustSun * Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead. * Modified the hydra to be a revolver * fixed container issue * Swapped in even newer sprites * review --------- Co-authored-by: Milon --- .../Weapons/Guns/Ammunition/explosives.yml | 17 ++++++++ .../Weapons/Guns/Launchers/launchers.yml | 40 +++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 30 +++++++++++++ .../Explosives/explosives.rsi/cleanade.png | Bin 0 -> 517 bytes .../Explosives/explosives.rsi/meta.json | 5 ++- .../hydra_launcher.rsi/bolt-open.png | Bin 0 -> 687 bytes .../hydra_launcher.rsi/equipped-BACKPACK.png | Bin 0 -> 1032 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1032 bytes .../Launchers/hydra_launcher.rsi/icon.png | Bin 0 -> 687 bytes .../hydra_launcher.rsi/inhand-left.png | Bin 0 -> 811 bytes .../hydra_launcher.rsi/inhand-right.png | Bin 0 -> 799 bytes .../Launchers/hydra_launcher.rsi/meta.json | 41 ++++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 924 bytes .../wielded-inhand-right.png | Bin 0 -> 914 bytes .../Projectiles/projectiles2.rsi/cleanade.png | Bin 0 -> 730 bytes .../Projectiles/projectiles2.rsi/meta.json | 17 ++++++-- 16 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/hydra_launcher.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 42bd054ac7..2bd0dfc46d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -123,6 +123,23 @@ state: frag suffix: false +- type: entity + parent: BaseGrenade + id: GrenadeCleanade + name: cleanade grenade round + components: + - type: CartridgeAmmo + proto: BulletGrenadeCleanade + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: cleanade + map: [ "enum.AmmoVisualLayers.Base" ] + - type: Appearance + - type: SpentAmmoVisuals + state: frag + suffix: false + - type: entity id: GrenadeEMP name: EMP grenade diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 64f1fdac29..2fcf294a73 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -53,6 +53,46 @@ soundInsert: path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg +- type: entity + parent: [ BaseWeaponLauncher, BaseGunWieldable, BaseMajorContraband ] + id: WeaponLauncherHydra + name: hydra + description: PLOOP... FSSSSSS + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi + layers: + - state: icon + map: [ "enum.GunVisualLayers.Base" ] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/hydra_launcher.rsi + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: ContainerContainer + containers: + revolver-ammo: !type:Container + - type: RevolverAmmoProvider + whitelist: + tags: + - Grenade + proto: GrenadeCleanade + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg + - type: entity name: RPG-7 parent: [ BaseWeaponLauncher, BaseMajorContraband ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index ace364f127..4d7ef02f8a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -813,6 +813,36 @@ intensitySlope: 1 maxIntensity: 10 +- type: entity + parent: BaseBulletTrigger + id: BulletGrenadeCleanade + name: cleanade grenade round + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: cleanade + - type: ActiveTimerTrigger + timeRemaining: 0.3 + - type: SmokeOnTrigger + duration: 3.5 + spreadAmount: 30 + smokePrototype: Foam + solution: + reagents: + - ReagentId: SpaceCleaner + Quantity: 30 + - type: SoundOnTrigger + sound: /Audio/Items/smoke_grenade_smoke.ogg + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + totalIntensity: 0.01 # a little pop + intensitySlope: 1 + maxIntensity: 0.01 + tileBreakScale: 0.01 + - type: entity id: BulletGrenadeEMP name: EMP rocket diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/cleanade.png new file mode 100644 index 0000000000000000000000000000000000000000..ba40acdec217b1f1ac4c647d4ad4c2d188b46ffc GIT binary patch literal 517 zcmV+g0{Z=lP)Px$zez+vR9J=WmQ5=}Q5eU6BZ`I^c?%d7#<8k&DSEK;)MH4R0&Z%+N z0x&Zaqo5{5q0>oP)7V>EvG*Qur60MydmxcG1waXhX(_Lu{KY}$;!@OG96(i70A^QH zDB&>oS-UPx%Pf0{UR9J=WmCa5QQ5c4wDaEODaEz&v3Zk~%HCQ%KHZCyT>xOs-TmTnB;ubGJ z4I2pw8;MPfF}5TI5*H@6HbR2@3{z$(gF@qRVP|NWo`!be#(7rf?>q1Nedo*>2nY!H z-%)xAN+s?Kw_W;H>1hv_P_KcSrg>(X4gE6%XZ1R2B!Z@CsF4UG!?(LKk;#k;fN;0M z+3b{0NCmV(o#ByDZ>~`Ic&VdlSu{I2C(UA^IIm>0Q(|oF0hVO}pzAt7OW(3A3}YY1 zaik_PnQ>v;7L`gx@hUJoIVaNU1h)p_zJNXF2eXrNVuKG@mc`=YtB%>t%sdsFo8Q~c zx#BJgKq8S4x!4oZ>Vz+#c51V}TR_i+z3d`a!f4R}xr08{t4=d+r3_;qfPDV#c?GI_ zht!5_Uyv(aE|&l>O_S8UQKHePRR8#Aowc>1++Y)7fSsKkKE>Zr-8%3sSlwPyax0I8 zdDEm;s{ycQ7}$+=JLPx&s7XXYRCt{2nm=q4R~*Mb7ekdE7bl^IXpOnV*y@%jTdJZIU8)X<0rq&R)PW4B zTPG%jRH+jks5-zz#hglrsY5$8Vxa>;*bYuERv=Pjh|lrgwvQpYliSAeU2^A3()XFp z|9u-SeC``@Cd0? zDsV@2T^EL71TKOSgps*yR@k-;z?*WJQmI6-SPaBAKq{3I0|PMt48y>(ES8rGf!IHB zPy=(>tUDt=FDwKW^uM{0xW)JDH?b@W!!Q6u5F#At7Pvk?FXHhy5N`0rVo|BKD(3vhjY-W~j>2M?%mLX?$(^m9OUB*W5i+u)Ef=zjRwO*r%+-isn@oB1rI)o;MFUag*fq^`??=#zZ>Jp z1gmQ$#?B`JD8G5jtJfQR^x;`JbC$x(qAz>CYk+Orkp&O1w!Y5T`6R1rC5AMO)1xB* ztd?G37-QU-dFZPScotyc(PIU|t@gdx+}u( zq72?4moK;?d@wr7FTeh#0DKw$hIYHn(~U)6A_TS+?kBl?L20$yZt%LUi)yRF($X^} zAAjPCFmv(Ko+5ZIf~u;DTCEm&1~{y&tp39nXPuBMEJFtJ^(Q;mL7=LtP*wHtK8CWB z1+e35I-NQ6{)Wa;m@J7zB9TZW5{X12kw_$xqk(D8iXaXn!)9u7LQG9gc=prtrf98J z+n+~$#_vYxk=z#V#?>pAeP^hz28qSR-@9&$JB<=i9h*7he_>vtQfp#amZt`aKr*1S zQ6dUD$6t8#Sh@D+SAe&sDo+ATO-_iaz14Ma=Q@hn?`+X=#;>+2o`2s{fX^>|)>XyM z!Ta4PvDf(bH^1|2!&3&>+jX>|;jW)Y5qxLC>o)#)GSSmcPXSg+>wA74b@030cH_we zL#N*NWXp3A{Cecu|GXE)J>M(%PMp)@z3}umcq4Jk%h&pf)3C7{e>_`qn<;wHGXsL^ z$PALbf`<@Rt#@V~3RP9b?dc!IepXxkCX~}*=h*qM3lQ4T_;EdVKUNPzp>rHFKq8Sy zB>!jL0fkF`;g~U~nE(I)4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px&s7XXYRCt{2nm=q4R~*Mb7ekdE7bl^IXpOnV*y@%jTdJZIU8)X<0rq&R)PW4B zTPG%jRH+jks5-zz#hglrsY5$8Vxa>;*bYuERv=Pjh|lrgwvQpYliSAeU2^A3()XFp z|9u-SeC``@Cd0? zDsV@2T^EL71TKOSgps*yR@k-;z?*WJQmI6-SPaBAKq{3I0|PMt48y>(ES8rGf!IHB zPy=(>tUDt=FDwKW^uM{0xW)JDH?b@W!!Q6u5F#At7Pvk?FXHhy5N`0rVo|BKD(3vhjY-W~j>2M?%mLX?$(^m9OUB*W5i+u)Ef=zjRwO*r%+-isn@oB1rI)o;MFUag*fq^`??=#zZ>Jp z1gmQ$#?B`JD8G5jtJfQR^x;`JbC$x(qAz>CYk+Orkp&O1w!Y5T`6R1rC5AMO)1xB* ztd?G37-QU-dFZPScotyc(PIU|t@gdx+}u( zq72?4moK;?d@wr7FTeh#0DKw$hIYHn(~U)6A_TS+?kBl?L20$yZt%LUi)yRF($X^} zAAjPCFmv(Ko+5ZIf~u;DTCEm&1~{y&tp39nXPuBMEJFtJ^(Q;mL7=LtP*wHtK8CWB z1+e35I-NQ6{)Wa;m@J7zB9TZW5{X12kw_$xqk(D8iXaXn!)9u7LQG9gc=prtrf98J z+n+~$#_vYxk=z#V#?>pAeP^hz28qSR-@9&$JB<=i9h*7he_>vtQfp#amZt`aKr*1S zQ6dUD$6t8#Sh@D+SAe&sDo+ATO-_iaz14Ma=Q@hn?`+X=#;>+2o`2s{fX^>|)>XyM z!Ta4PvDf(bH^1|2!&3&>+jX>|;jW)Y5qxLC>o)#)GSSmcPXSg+>wA74b@030cH_we zL#N*NWXp3A{Cecu|GXE)J>M(%PMp)@z3}umcq4Jk%h&pf)3C7{e>_`qn<;wHGXsL^ z$PALbf`<@Rt#@V~3RP9b?dc!IepXxkCX~}*=h*qM3lQ4T_;EdVKUNPzp>rHFKq8Sy zB>!jL0fkF`;g~U~nE(I)4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px%Pf0{UR9J=WmCa5QQ5c4wDaEODaEz&v3Zk~%HCQ%KHZCyT>xOs-TmTnB;ubGJ z4I2pw8;MPfF}5TI5*H@6HbR2@3{z$(gF@qRVP|NWo`!be#(7rf?>q1Nedo*>2nY!H z-%)xAN+s?Kw_W;H>1hv_P_KcSrg>(X4gE6%XZ1R2B!Z@CsF4UG!?(LKk;#k;fN;0M z+3b{0NCmV(o#ByDZ>~`Ic&VdlSu{I2C(UA^IIm>0Q(|oF0hVO}pzAt7OW(3A3}YY1 zaik_PnQ>v;7L`gx@hUJoIVaNU1h)p_zJNXF2eXrNVuKG@mc`=YtB%>t%sdsFo8Q~c zx#BJgKq8S4x!4oZ>Vz+#c51V}TR_i+z3d`a!f4R}xr08{t4=d+r3_;qfPDV#c?GI_ zht!5_Uyv(aE|&l>O_S8UQKHePRR8#Aowc>1++Y)7fSsKkKE>Zr-8%3sSlwPyax0I8 zdDEm;s{ycQ7}$+=JLPx%%Sl8*RCt{2+FeiDU=#=NKRRXuWxQB}O0CgWlj((*T%kd)mR;-r(T0MPyM-MilS`fcgoSL?m~G6oSmLvXFH3YWg{*`k&~5`?$5~z;zBfx)~0Y@ zz}3Y$>sl5PqKHg7+1MOV{ea-aMRYoBI^Kv;cy5=QP66&&}=p$ zs;aSvU){$=QJgf#?y{JT)J%te}Am z?x(}E@&Vf60bBKmd>((Ta-qtGFBsMbi{=y#Ka^Yz@xSsoY>sTA{L9mah$-pfftz%n8yuH#Dyqs z4IQ119=PU<%Lgpt1}A!!jh*c*&Q4DP_xqyq0gL#96Pa`h2~kAXvT${A9%!-L7f`D= zBGPx%zez+vRCt{2+RaYlU=#-6w>re8lz>=+LMhP}5_RDcH)zn+WEOK7vzr^3<-`kM z=@oD-a|M$qXn;aAQ+~uQh>7#f0^2D=%TEebCg)kUr8(#HkK}s+LI@#*5JCtc#8atI zW^Y}?GOT&+(DwK2hD(JqGoSmxROEvsN$fIzHFBYxeYoM=HadT_wVeO}RI3#jhT(er zdmu@YU9+=JtCz~{oonr`cR=O#j@#gQY;7kX2m%I!!J_M3IKwbFw+pnv^PbHE9s`h5 zNhU_32=gJ_w{$d{`n$gRPXE>^Mxu~YNzcc?bpR<@L6{Gr)9qn*CxPRm!$sE_m@pqg zN>)7gj}4$$JZDz(@y!?_qKJ04i;J_sv0X*^Pew^pV9kV`%rD0Q~LGiBnaLRjUWG~31 zW&FIp!SzjLCEfwRa0myvENTrMj9Ui)n5GGdF+qG|Kc)##Y%-Tb9)R3A%qY@2qA3!V+hGB4n!2p6FU~4-uHHV}o;f;Q&0000EWmrjOO-%qQ d00008000000002eQPx&JV``BRCt{2+Dl9mK^O<{{~7~j+0qAVOv_6J5?szTXMDJ?8*;F9rYr zQdyNA8;bWAOw4F(Oi!+p@^&JTC})h>mT|NK_V)I2{tpI&=;?~(T?LBr6ZQ2C__X-} zy%+$?ru5ioY>W@j4MJ5_)4)Vg?z}AcS)%!}_1QAExw+}64daY6#tM(aDli%w<1CxP$m}b< zj4aE%rluAEQ0@1c>Zs}=X1;#QJG-JN!sqj2cX!8f1%yIjB$EeFRW)y!vwG9{j!R`# zwp+<^1q{Xe1>=6yFvcKB61DDqMa9zf3ISvhk@ zvMh6-&kt{9g(;TFWU#!lDx5B_D2f0a&oThZ6<~}R>zyZ8UxNV9P*-bu##kE5E31%Y znFD~&=g--Lb~BqV*4Ws@wfg6k3|EcHvdn`4zv+4Q=m_iU8&~Ex03n1BLI@#*5JCtc zgb+dsJALV(y{(nEx3xMx1ieiCTHX+G%E?WV%gog&j&_b03WedVtk93idQvX{09JPZ zilrsHqoo-Du(7qR$L1H8T=nPrY*6z%eTa>%ZBz#Wn5g=QN6NEeo3z!@(hSDZ__eI0PK&!OVx)_F-a)uMWYYy>r1XW5Wx7<^o1Oa zKka(LjoV;;aY?Ydd|}7+3NQ}7p|1AA1`hz^Q`3U>&9l9;t6#{t)=n;BQ6dN-gb?D` ye*l+1KiCQf^Z)<=4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px&GD$>1RCt{2n!is|Q546&4}q3Tp)_=Wf?YpwJj!f6?1V!g3wtmG|0*?Q36~8qa6yk8{sGzwW)mIRHTr z1VIo4K@k5Vk{MzDC9hCFN5AiwTHCC&m|bAA+hMcYF*X_yg99E>PTuG9mzA+{ompBd z6`YuuEHTK@<;1|?kN|*4{;P`xg;cz&xwY6DOV72}{4Bs!&Rj2^Qn0R{YdBJHF)p=R|g_-Fo!?F}O zbGTjvgX5x-V1z<5Vs&+;AgA?beri$7ZOlSZl*0eIBk*qjtxnm}j~7xfI4-ugzk+j) z_SP2IY_^h3g>(U&b3=o&*-SZ`D_VD+{$lp__H^Gje@6Z)Ux)-_O!W7Akj-YGD2gsh zDwB6^3&uK1lq54b0KmaP9I`AI);*qhCLHbEhNV{yuh%P_T@Gx1{8aPZ!Wa{bF*uz) zNF)x=uYg!ADlx`{k@Eo1$rv1t&XV7gnVeyUs&yU!c6O|LW>5VQvMfuCG2JoNRe(kq zZns-#vk3r!t5<~45y<6_k{Wx;@ zVMvHdpVj=qkyZdqUx?H$^?Q&iFg#6?PAKb6Oc^=7h8oB&&%{omV z0mhh^+n5DEInqsEB-3dCfXCBcvr*^qDDptk?$y=VfmkdmDT*RhlYOAZJ3uu^h4VbZ z;c#7>q@3q1)mL=@ik$~w*gCfgHN#f#VLDsdAp`A2*z0m(d2PKRE%JNQcZGTk0Ms-_ zQ*{Nn-EI*-OaS=v3N*@j09amIm(-UB(7#A^=XBtxaT^i@K@bE%)QR8A99HD(ogUf% o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g0!lhqyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/cleanade.png new file mode 100644 index 0000000000000000000000000000000000000000..28a4bc828f688c8331c6f993019a5f228e0520a5 GIT binary patch literal 730 zcmV<00ww*4P)Px%lu1NERA_J8!ghC_`4?!D+92AN)JxB?N*rj|jYf>JS7wfBmJZTl-G9v0Pe&LPDi77Gr*5G+ON9>7U$<2 zrP_G_z@<||n!NC04U6-0rr!ca`^gDU-MZaz6%FF!|0chUjm^KoPxaRn!{HYEbpQYW M07*qoM6N<$f|F2B`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json index 87ce717f44..b4d8f09a82 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111, cleanade made by Southbridge_fur (github)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "buckshot-flare" }, - { + { "name": "depleted-uranium" }, { @@ -91,11 +91,20 @@ ] ] }, - { + { "name": "grapeshot" }, - { + { "name": "shard" + }, + { + "name": "cleanade", + "delays": [ + [ + 0.05, + 0.05 + ] + ] } ] } -- 2.51.2