From 2c728dcca954e454583b44ae6ec3581295b1588f Mon Sep 17 00:00:00 2001 From: Terraspark4941 Date: Wed, 12 Feb 2025 00:05:34 +0500 Subject: [PATCH] Make Advanced Spray more tolerable to use (#34209) * initial commit * Fixed the eject order * FINALLY got a new sprite, its ready to merge! * I FORGOT THE ATTRIBUTIONS DAMMIT * Remove extra whitespace * Sprite update! --- .../Entities/Clothing/Back/specific.yml | 20 +++++++++++++++--- .../Weapons/Guns/Basic/spraynozzle.yml | 5 ++++- Resources/Prototypes/tags.yml | 3 +++ .../waterbackpack.rsi/icon-filled.png | Bin 0 -> 1047 bytes .../Back/Backpacks/waterbackpack.rsi/icon.png | Bin 828 -> 829 bytes .../Backpacks/waterbackpack.rsi/meta.json | 5 ++++- 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml index fcdecffc8f..9ff6871b3c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: ClothingBackpack id: ClothingBackpackChameleon name: backpack @@ -20,10 +20,10 @@ type: ChameleonBoundUserInterface - type: entity - parent: Clothing + parent: [Clothing, ClothingSlotBase] id: ClothingBackpackWaterTank name: backpack water tank - description: Holds a large amount of fluids. Supplies to spray nozzles in your hands. + description: Holds a large amount of fluids. Supplies to spray nozzles in your hands, and has a slot on the side for said spray nozzles. components: - type: Tag tags: @@ -37,6 +37,20 @@ - type: Clothing slots: BACK sprite: Clothing/Back/Backpacks/waterbackpack.rsi + - type: ItemSlots + slots: + item: + priority: 2 + whitelist: + tags: + - SprayNozzle + - type: ItemMapper + mapLayers: + icon-filled: + whitelist: + tags: + - SprayNozzle + - type: Appearance - type: SolutionAmmoProvider solutionId: tank proto: BulletWaterShot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml index f2e93a607e..616a799aff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml @@ -1,9 +1,12 @@ -- type: entity +- type: entity id: WeaponSprayNozzle parent: BaseItem name: spray nozzle description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank. components: + - type: Tag + tags: + - SprayNozzle - type: Sprite sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi state: icon diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 805eb4d523..968805a7b6 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1195,6 +1195,9 @@ - type: Tag id: Spray +- type: Tag + id: SprayNozzle + - type: Tag id: SpreaderIgnore diff --git a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png new file mode 100644 index 0000000000000000000000000000000000000000..913b1a289d849677cc9b28e8f6157213d78e880c GIT binary patch literal 1047 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik{1o(uwy2vD0D}`vwSZRsc7bq_8FgsM{yxLnm-$2qaT&~W`%gahG%*Dk; zRaLd9sHnZYJtih5D=W*&%1T>XJ1NGhamm*B=^OKxZ=JSzSE_k)t&g~+qA3{r^%N;o_zoF)1QB4nJ@a+d-Mhn(p6`-I*iEBhjaDG}zd16s2LqK9?UWuNc zYlwoWo}r#`&u(J{pqg!|5uRzDo>~kXKn^Q|6eBAGBar0<#L`eUC{{HXnZe>rK(-+x z6N3PdjsoJ$b{4RB7LW}By=9CHFMyE`qtPs707^|@XJ7%UG%zwYU|aw(6=Wmp0*Fad zfNT(80-DPNRvBbz0c1gS85$UXWb+(sBsj!_X9JU0ou`Xqh=u>!NjJj|Iqy?Q0l5`NbzJ62C_D@iaJq3U;Yf^EU$JphF-zd|uV+ea6hxFVR8LM}V`Or@n>oc{ zmU2YXuLN(S%`MDM3wancC0V1L)e{-RW>2?Vav>rjCMqW&sY@ks5A(EejtLufU5m-j z0}6;H6lc$7h!t5o_u9ID%q!lW+!nUWfa~{^8A+@b30bSxep*yqQ4&#+P~pq;#PG?k z7jtChPH7OlL}HBgAOqN_{qxQrFHHkufGQ4H($Ty zB?30GahtdYkyG%FxyAxkLl6de>KIu%&Bwq$2`&~WB45eot po^q_`IdEoXJ#WKFGggN`tb4y)4=Q|m@Bt`RJYD@<);T3K0RX{9whRCO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png index 7a5eac53021b0522c4ca91026b36a4c278c9f39e..d6636224af71dbde9cf2915900f42465f6ea9695 100644 GIT binary patch literal 829 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijk1o(uwy2vCHC@$|XJ7gf~7%o?*s;X*bWtEkc)!yFjV5--d6TY}H*2Tpo z+}$=K*rRdD*7)fg^OtX(ws}|a{LSs>-fw*Q{o2<*l?%2`zWnjz`=6iw{9ASB%lvDf zD^9#y_UzlSkH027_>#AFN6+;~N8f+X?Vnn-_rR1}kB)u#(R=%8&5U_9Q|Ba1o0i$x zF?rd_f@N!fjtYvu{u4+Ulmz(&|0fMFBrUyA0o2P`;1OBOz`(a3gc&VZgH?cn5+$w? zCBgY=CFO}lsSE*$nRz98ey$-3rh0~YM!)wkZv(2?mKx!i=IN=$zyaj2GDtD9GB5&J zUO+4jWrIRlgOM35&IDu|GBPm;0O=?o&TMA^i)R7ZAh4{Ak>Ld}GGH{Cr3^r+3G56k zK$QkY#s-WFAf|$BWL*F;X$p`H0!%=2nZPQ8EG>X6s4hbT1CZfc;_P0rb*=8V1=r@iReb-y?60_xv&`IkUsnBReUoRGaAL`a z{ZH0AHnte4z3!f9xR}{6XJtr0P{!|+hA+Y;LK{j&AL&#Javo-J*&!T}zVdaUh@gjU z+B3F;xkjQZn>iS4&26k_&p)58u|dNA67$TC=Uw`G;^E!dB34#RIk)xlr)>{w^xLJ9 zFgN!rZ@GrS%x4U1n|@!dx~g?!{d-4U*&A!jZ9D7*8|)T7Nc_Dcbiy^|1IpJvUjBUg z^=)hG+21nx_dIxCCO<#^zO_i^a^Vj*{RmJJREm8X&Uw>rD zmeZ>9^BvdlN&Nt1v<(O#tdOv`s}S~2iXQvGZ}J}d0Ac^6sH4&lmLjmS`TnzCBfSqbLfpM;576$~G}JQjNy5g*T?DX^DVgY$I1d z(=-%C0jQEtReu#lQP4E4dj9&wVF3Ch7l1G$(UgE;tWR=rfA$psnx>IVCP^lf)pLe( zfKw;EtbY8;@>(TFdt~a8Xh^_tJ~zL_My^086e68YbMx*4wj40%>0l+lODK{iamvxPUd z<+V*C3P7dbKfQR2&FR2qvvI@$&h8^5F7<2RaT76Tr{QHz;Sr~(;D}NuL*AZg6?=}GO&4*<5G~1r_>aa?s zQh#R-07PyKlhxBKX5uVn;$-zSksHI!73-j_2ZSukVrFKBU@(ZPswAE)RS6lgSS;4^ z?b{{*5Q#*D+wCU%PN&xq0xEBT-g6Fic6LZ45^dSE^o|SrC&ggLIHSI402VWGR(7AG ud?|d|wmr*_(y)J0)JDLH^FtiszratQKuTA(jZF&x0000