From 1f97b99cfe0580022ca6ab2066297c014e54cb25 Mon Sep 17 00:00:00 2001 From: Fansana Date: Mon, 18 Nov 2024 19:49:56 +0100 Subject: [PATCH 1/3] add some wedding essentials --- .../Entities/Clothing/Hands/miscgloves.yml | 11 ++++++++ .../Clothing/Uniforms/weddingdress.yml | 14 ++++++++++ .../Gloves/goldring.rsi/equipped-HAND.png | Bin 0 -> 327 bytes .../Under/Gloves/goldring.rsi/meta.json | 18 ++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1581 bytes .../Uniforms/weddingdress.rsi/inhand-left.png | Bin 0 -> 486 bytes .../weddingdress.rsi/inhand-right.png | Bin 0 -> 459 bytes .../Uniforms/weddingdress.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 69 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml index c956bde6d76..654181f4758 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml @@ -133,3 +133,14 @@ fiberColor: fibers-blue - type: FingerprintMask +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGoldRing + name: gold ring + description: a band for a special bond + components: + - type: Sprite + sprite: Floof/Clothing/Under/Gloves/goldring.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Gloves/goldring.rsi + diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml new file mode 100644 index 00000000000..e044e3286d6 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/weddingdress.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingUniformBaseSwitch + id: ClothingUniformWeddingDress + name: wedding dress + description: a beautiful wedding dress fit for a princess + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/weddingdress.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/weddingdress.rsi + unequipDelay: 0 + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..213de63b2e8d4f011916314f15d93ab7d747080e GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`9l z&fLg*$U%VRzxG0QZwDv!bq!rB8vHyMI^|Y85wui!em~*;v7hVTr9XdjV6SL>)yLoF z3<(Z}Oluqp87nw9foL%M2iFE9wnx~5!kfK+KVJD&ba#$@-0O;a`ELvA^3VNB-K}yZ zb1lPzE7Ov~cme`SPaR=czD;CvQbW_KU^O<2txIQ!GK+-FH8MP~QupW@i3JN@P3dIx z%hgOf%D@`B+=r(i%iBsYEnaRbXTOIgX2|AVdk{$U;oaveZ2k0o1OojE;Ur( zvg2)7VaU)i>2whv^ClC?z3gl*CsQrk86#))++${5^kmbV-wgQ-!j7GvE8YMDhQZU- L&t;ucLK6c3%NK)U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json new file mode 100644 index 00000000000..8e9c42bf5ba --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dzordz - Discord 'Dzordz#8811'", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..db731139184c33c957f3b74fe2bb6206cd5b76e2 GIT binary patch literal 1581 zcmV+|2GaS7P)5A+_&0}X__;9XrupG z1ei{zj-LTkq0&IN+jqbpBp2?-rOn0tLATrU?H>+DsVFVOv`m_I?LfIEw*S3(Fyah8 zJ3Ds_Bl{H*+UP&~e35Dt^twGNl~#Q3p}!a4oOy_B04Tq{u}&u^r-F#r9Ij}ie|>#T zj9WyxsQlet-}gTHaX&79WCPS{H7eu_;`_tHqh|zM(FSlIA(V_Ppgt)SSutpaN!zjSq`FxHll~h^k+%VkA7m(2>n(nKzwBZnL)Ng3C7;KkmPH4G6UaS_V^AkVrAJI?H0Go4PwCryk- zPmkKwQi-xzgRXCGg%FiWnQVJXh>lbZ085kDaeE@%U<7!jKN!%|alHF!A)n7vqh1xB zzHhaK!nh&|%jFF!6brGLBd-_UdApBY8jeO(tybv1*%E7SG#ZOB^_nLPk6#v6S64lL_C6HGcU;vd;PHtKAcr2-{^jMB z@IEWaA94>PE5#M!@ym#UdEVzeKvsN_C(GGs4vzdAk) zp=Zaf&Dl_fvcLcK>&$c3Z9DJZ|3XH_pkkpQem6Fg8G_IHa-aJAm-|((M>!A7jQ~t= zd)E|-;Pdh0pK~X}eIAS7E#p9hIiMUX4kcAZrC&1}f6tPH=L?VDt{?DGK z0P@`6Tn1OH%#aEQq1Fp5^KFm{o?EU-Nc!S6el}5pTrVICmKK6)626%MfS`JTG~id0 zkQ9lQ07+qq3JpprFUa7znQIx#EtUb)5;Z(>hJ&GaBfPz{NyTD5u|Qz}2e^;;w41tFFJ{7U4I8?;ld3-AL{^OMQfWpP1ed_jo32VnC-9$wyck$!^mSeNidE|+*q z2^ZMqK#hQDn)KJ-{|I?FFTgTJU5b$-K+gG*tGt*Xlc9^tOWH`eI6?+0L{3l7LuHJD z$n^op^>Jp1l}Ba@V5IFI= zx3?{1Aa@VoewH;#f^@C{Wbbp$iDXz`TboIZt3?xGQ4lD;{6pFM9Bz32 zBV$aGN1hX2okG1nQxl*@fvQVn1914T(sB+SD6N+89>8lK?C(CC`Z5ZrFG?P~ckd?FUysGl?91 z>{WV2n2u91 zX<$t~Z}@^Ni6cd`rH>!KH}l^4ON@_Ke!f%5A~Ms;`V8NJ3K9FcLjCHe8zvNKC|ff~ z99?YTv-tTGwgrz9|JSe2oRv{~k^SCV&F<%>{#_}Y4#Gx^8JEr!>RTzeUo|OS#%z-L lY=^k)gvD92EdMiJyx;8DxL~V1Fy0tEUHx3vIVChP0073c(Fy}3|Ln`9l z&NLKjG7xatxNOn#hg@Ig%$uiOz@n8^`?&g}tD;1YwzA}@2{~o|&p2(IuJrl&q{_do z3?~?83I}kfC)|%ukU5@x*<{N)$+m~L zw!K~Vr)l=}uA{e1e2?Dqu6wvCATQ$hU&V)Ej9+T&?L)4AeY}91g`r}Gg2T^MtK{ay zZj3mtbg#7~n!(|t#vNNbOZLR>7y4J~_A z_|CB1Cv#xkgwnbqoEnx0rOD6SzgqtmWAx+nYZHI&e)Q3ftHHkRTld%F=Q+OV9}bcC zF=6PLzk6NuoAQExS6KrYlGe0X{*hWRW3&6apHdCV-5xum8G>HSeYi%ZfK4 Date: Mon, 18 Nov 2024 19:50:29 +0100 Subject: [PATCH 2/3] adding icons --- .../Clothing/Under/Gloves/goldring.rsi/icon.png | Bin 0 -> 234 bytes .../Clothing/Uniforms/weddingdress.rsi/icon.png | Bin 0 -> 708 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/icon.png diff --git a/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/icon.png b/Resources/Textures/Floof/Clothing/Under/Gloves/goldring.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..676e53d96a649961df4d16a56feed11a4c131f17 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFUg1Ln7Rh zQzQ}&SRD9f++&qs!s6x(B--*g{_Gd{C?D2!Z_kH@g~^Aw+gQcrCcIIcWZIy!cjJLa z_Pbhd9O=+}=2^yI*L|XpC6e!ghec!P{VulF|JG&(6GTKq$`5o3^Y93l3CtJsC}TJ= zeTU9L^>%IB32zuCINs1vI$ks(GR2bN8AnR|M5!+ZdsD0%X6U%}%nD@hX*-a?0VNn1 Y4s=8)rtSE&0q9-^Pgg&ebxsLQ0D?MHp#T5? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/weddingdress.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4122946817f172c1cd4d1f9c533d28eea549d027 GIT binary patch literal 708 zcmV;#0z3VQP)Px%en~_@R9HvtR@rWwKomW!#ux(zj2$adQ&&x&E4BasA#Iw6#KzccgJU)WQw@sx z8i*1_l{}B=+&gEvGYp3hUfc)oj|+i|1OKlBgrw9k^iBXFgc^qNDlxAr%JY(*s}lM% zfs~|FltieiI=J890;V{M63Po4%xBdxAygJ6Y&JXG-mVAr90X>Y`}+eWNs7@(hNewm z+ZMOkc$APM+=T5lBP`njZCjY;uwfib!1MfW;IdPOBq88=zKg?gY}8E)cWw{rIS9-m zxW9j(nx-PlG8|7&XzLcLI>vnNAdF+IZ$1s`IS9-MgkeN^LBM9S#b~6UEKBe_2gh;1 zalqVpM+d?%rtJTDI-O9K6(*|M4Wlf}-M8g(fug9eaQl{Yfy2x+@$m52xlmOV#>$9A(yMnbP-lG<)4Hya7bV)d!B|yr%5v}=2T7D5k0cfk zuCA6ipU-gLl0X#4G|LL8V+Fr{|H1n64dNuhYPIUD&+{CXHG{X^LDMw|yZ}KEFn3=^3$^xtca9mODw;8-*4`~$9*F6yR%ZOvZn|000x5+{W24*{&1 z*`0sev2k~IkL&9d+Loee>h4maZG)z5yTKeQO0O7t5nv900*W%~l*Mt3@mPf Date: Sat, 23 Nov 2024 15:01:11 +0100 Subject: [PATCH 3/3] add to vendors --- .../Prototypes/Catalog/VendingMachines/Inventories/theater.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 4d0ecd90cdf..5506caf6099 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -99,6 +99,8 @@ ClothingUniformStripedThongWhite: 1 ClothingUniformMusicKingBlack: 2 ClothingUniformMusicKing: 2 + ClothingUniformWeddingDress: 2 + ClothingHandsGoldRing: 2 emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1