From f0d4ef4dfda8d4e59305136973da628ee7f82c87 Mon Sep 17 00:00:00 2001 From: AnderFan Date: Fri, 23 Aug 2024 00:08:38 +0300 Subject: [PATCH 01/11] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=88=D0=B5=D0=B7=D0=BB=D0=BE=D0=BD=D0=B3,=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=20=D1=81=20=D1=88=D0=B5=D0=B7=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=B3=D0=BE=D0=BC,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Misc/bathroom.ftl | 2 ++ .../Structures/Furniture/furniture.ftl | 2 ++ .../ADT/Entities/Objects/Misc/bathroom.yml | 18 +++++++++++ .../Entities/Structures/Furniture/chairs.yml | 30 ++++++++++++++++++ .../Entities/Structures/Furniture/fill.txt | 1 - .../ADT/Recipes/Construction/furniture.yml | 16 ++++++++++ .../Construction/Graphs/furniture/bed.yml | 18 +++++++++++ .../ADT/Objects/Misc/bathbroom.rsi/icon.png | Bin 0 -> 913 bytes .../Misc/bathbroom.rsi/inhand-left.png | Bin 0 -> 568 bytes .../Misc/bathbroom.rsi/inhand-right.png | Bin 0 -> 593 bytes .../ADT/Objects/Misc/bathbroom.rsi/meta.json | 22 +++++++++++++ .../Furniture/deckchair.rsi/deckchair.png | Bin 0 -> 638 bytes .../Furniture/deckchair.rsi/meta.json | 15 +++++++++ 13 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bathroom.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/bathroom.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/fill.txt create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/furniture.yml create mode 100644 Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/deckchair.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bathroom.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bathroom.ftl new file mode 100644 index 00000000000..23bcdbb8ad0 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bathroom.ftl @@ -0,0 +1,2 @@ +ent-ADTBathBroom = банный веник + .desc = Веник из сушеных листьев, для тех, что ценят классическую баню. Поддать пару! diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl new file mode 100644 index 00000000000..f943e51ce5d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl @@ -0,0 +1,2 @@ +ent-ADTDeckChair = деревянный шезлонг + .desc = Шезлонг для приобретения ровного загара под светом ближайшей звезды. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/bathroom.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/bathroom.yml new file mode 100644 index 00000000000..f719a3c88a2 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/bathroom.yml @@ -0,0 +1,18 @@ +- type: entity + parent: BaseItem + id: ADTBathBroom + name: bath broom + description: A broom made of dried leaves. + components: + - type: Sprite + sprite: ADT/Objects/Misc/bathbroom.rsi + state: icon + - type: StaminaDamageOnHit + damage: 10 + - type: Item + size: Small + sprite: ADT/Objects/Misc/bathbroom.rsi + - type: MeleeWeapon + damage: + types: + Heat: 3 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml new file mode 100644 index 00000000000..d88213085a7 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml @@ -0,0 +1,30 @@ +- type: entity + parent: Bed + id: ADTDeckChair + name: deckchair + description: A deckchair for the acquisition of an even tan under the light of the nearest star. + components: + - type: Sprite + sprite: ADT/Structures/Furniture/deckchair.rsi + state: deckchair + - type: Construction + graph: bed + node: adtdeckchair + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 5 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/fill.txt b/Resources/Prototypes/ADT/Entities/Structures/Furniture/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml new file mode 100644 index 00000000000..03be554786d --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml @@ -0,0 +1,16 @@ +- type: construction + id: ADTDeckChairRecipe + name: deckchair + description: A deckchair for the acquisition of an even tan under the light of the nearest star. + graph: bed + startNode: start + targetNode: adtdeckchair + category: construction-category-furniture + icon: + sprite: ADT/Structures/Furniture/deckchair.rsi + state: deckchair + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml index 3a6150bb5b1..37b470ab080 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml @@ -33,6 +33,13 @@ - material: Durathread amount: 2 doAfter: 1 + - to: adtdeckchair + completed: + - !type:SnapToGrid { } + steps: + - material: WoodPlank + amount: 5 + doAfter: 1 - node: bed entity: Bed edges: @@ -72,3 +79,14 @@ steps: - tool: Screwing doAfter: 1 + - node: adtdeckchair + entity: ADTDeckChair + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 5 + steps: + - tool: Screwing + doAfter: 1 diff --git a/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8fea8918f028cfe38f3a1c3fad7d5170c80ff9bd GIT binary patch literal 913 zcmV;C18)3@P)Px&F-b&0R9HvtmQ6@hVHAeXP%^a1xuX!t5IPRi&$voTFmsd8gqaY?Y{Z4THf@5o z(ZWs8rcJA6<)T3d%7h8Dg_&gGDksY(bul_bqt|H>NaT(8z`1-*-~E{xLW0g_?%bd6 zea?H%`R)zS0Y~6~_37UQ=)T--&A*thJAs-P0KnqPBJHm227+xt3%|N@dV$si0KwGt z6y=xl1Q+nXGv3L^Dg?xhkU>+KDMuYo05tOAaLW0boHuh&aH;AB?+d_yXuV-}gtBVsBHViA%9r*kt!xA}tg>8RcV$ z!>QtrBKL}}M_d7<(Nq8kVL@aW>xfaTEygb7mU7ga>}41L_!0MA0stVS*04T1nPmXP zY<6~^xcSv2bI0UzAao5XZg`deH}#qJ@Y?C4BrbgX@{2;zv%DTg6Copr*_XQefzSd-y&=k(?}Vwe z^^I;{HCSx$&If)@CIb^7?}f~hjQy2_-Op_TTzdczxB;T#!lTCpEwH>RaKF5S~$~#;peN_(Se3w znA#&{7DhQ{?F!Kix&ao9+Z-OU zJ=o6x|xpD#g*^ztXOjxg^FvL7K z`EyDB`>5gr*ZO?R4!k_N<-MI%XX6KPfys;)4)^yT-&A>v#j)e=``1%a80Ij)S~aa| z|2MXWT<`B$1+u^VceQBhn>i<$v>C#8ta|vkZQ-lD{-zUB4Pp!CzqbkCShcH;%OILz zoxuG=<<(|o_BCt~z6Gl-_A`2#G1rJXtXF2(!t~-#2}2ZPNu3qLS_Uh7*@iHNx%2rP zv>VR(vo8>Jc)pzZ0@s4iml-oyFZ_Ios=Oie-vx7)|ECxg^MyCDK6oei-2C$jsYPbd zH?N!biLK54y6Ea%x!3P!m~%ujUPwy6zB%r`43FcHJ96pl3E#g}{N6V;?IO!{!95qR zZ_~WSo8Py3)ugmY2?qAB>1s8dTfRT+-?*vdfPljphAS44%o{TFnKmq#QOskdkp5NY u+&^BiH9H;WFZDbJjBvix2+uTMUj{88n*)eJ;8O5p5asFW=d#Wzp$Pywy6tWN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fbae9a2af4cd4e7341e4a623d0c7c441088f3a87 GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zKYF@2hE&A8 zon`39Y$)I=yMtjiQ;Ulz*A9lWLCQRl^CSMf>sAG`HJzpv|@(?5m{zP(lbG7btsIgCsRLgqWS?A&>kF{Cs~M4^;n z$$YV$3)fC9-^a+Z=yk%I>o?8!RUXLwwRZjP)84PN&5l)u-wk6hJmT5K$uMcv!G)}R z4;JXX^s{gXGPT%pfKld(>RnEDk5z2#Vipa}yOvl#WbnND-~tnSLBRA9bs2?~QZi8w z82DaIde_4ID{S%mKYR24{J(eqHsi`a>JPX!nK#^TOy6!i_Z7>`qK`}tm&Li9l()Qf zO!0bLqR)^keBjXPVmdKI;Vst0F}e_FaQ7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/meta.json new file mode 100644 index 00000000000..a59e93fb2d3 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/bathbroom.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/deckchair.png b/Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/deckchair.png new file mode 100644 index 0000000000000000000000000000000000000000..9f9a252f3981eb11373837291622e7ac7c2decd4 GIT binary patch literal 638 zcmV-^0)hRBP)GCZN$zO0G2GetWexas7R<3rNUH(+8Wn(S?L+>W2JQ^X9#I-|vkk4lK3Q zQcErMzpHaspxy1>m0VB42!Pjzbga9AuCJ}K(G>t3&?`;+a|3PAx8oBw+()%~OFy)z znxG;p*c$YK0+AI}1H0S3EARLi{&@}1r(m-27HP(&IYA)j@XrqByYMWLCv_WO;kmHb7a+Y4`bi4KD zD@v2={Itm&as*~2Zqv;p)ZDiLrh*mo^T1)om$0efytO)bC*2=L#wt-PfSVyK^+4^~ z(geEq8uN{yG=Y_7s1QHPefd97G0+Opno3~pYSUzHXy|%-037;sntoXsKpdS{-~eV21n(d3cvf+| z|1`b4Tom3WBUyj)&is1t?D~ej14ls+oc;#DLu)5f&x3^k000hUSV?A0O#mtY000O8 Y00000007cclK=n!07*qoM6N<$f_KRt$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/meta.json new file mode 100644 index 00000000000..a007545379a --- /dev/null +++ b/Resources/Textures/ADT/Structures/Furniture/deckchair.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:unlumy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "deckchair" + } + ] +} + From 12b2d32c657e02f8d605c3b68840dc163a1a9677 Mon Sep 17 00:00:00 2001 From: AnderFan Date: Sun, 25 Aug 2024 15:15:32 +0300 Subject: [PATCH 02/11] wedding --- .../prototypes/Catalog/Fills/Crates/fun.ftl | 2 + .../Entities/Clothing/Uniforms/jumpskirts.ftl | 19 +++ .../Entities/Clothing/Uniforms/jumpsuits.ftl | 16 +++ .../Objects/Specific/Service/Bouquets.ftl | 12 ++ .../ADT/Catalog/Cargo/cargo_fun.yml | 9 ++ .../ADT/Catalog/Fills/Crates/fun.yml | 28 ++++ .../Entities/Clothing/Uniforms/Jumpsuits.yml | 80 +++++++++++- .../Entities/Clothing/Uniforms/jumpskirts.yml | 103 ++++++++++++++- .../Objects/Specific/Service/bouquets.yml | 120 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 533 bytes .../black_elegant_dress.rsi/icon.png | Bin 0 -> 244 bytes .../black_elegant_dress.rsi/inhand-left.png | Bin 0 -> 295 bytes .../black_elegant_dress.rsi/inhand-right.png | Bin 0 -> 279 bytes .../black_elegant_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1199 bytes .../Jumpskirt/black_ghotic_dress.rsi/icon.png | Bin 0 -> 500 bytes .../black_ghotic_dress.rsi/inhand-left.png | Bin 0 -> 263 bytes .../black_ghotic_dress.rsi/inhand-right.png | Bin 0 -> 264 bytes .../black_ghotic_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1074 bytes .../black_wedding_women_suit.rsi/icon.png | Bin 0 -> 498 bytes .../inhand-left.png | Bin 0 -> 340 bytes .../inhand-right.png | Bin 0 -> 330 bytes .../black_wedding_women_suit.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1525 bytes .../lush_rose_wedding_dress.rsi/icon.png | Bin 0 -> 605 bytes .../inhand-left.png | Bin 0 -> 267 bytes .../inhand-right.png | Bin 0 -> 256 bytes .../lush_rose_wedding_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1600 bytes .../lush_white_wedding_dress.rsi/icon.png | Bin 0 -> 638 bytes .../inhand-left.png | Bin 0 -> 268 bytes .../inhand-right.png | Bin 0 -> 256 bytes .../lush_white_wedding_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 727 bytes .../Jumpskirt/orange_beach_suit.rsi/icon.png | Bin 0 -> 337 bytes .../orange_beach_suit.rsi/inhand-left.png | Bin 0 -> 270 bytes .../orange_beach_suit.rsi/inhand-right.png | Bin 0 -> 263 bytes .../Jumpskirt/orange_beach_suit.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 610 bytes .../Jumpskirt/red_cocktail_dress.rsi/icon.png | Bin 0 -> 280 bytes .../red_cocktail_dress.rsi/inhand-left.png | Bin 0 -> 361 bytes .../red_cocktail_dress.rsi/inhand-right.png | Bin 0 -> 334 bytes .../red_cocktail_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 774 bytes .../shortdressblackgold.rsi/icon.png | Bin 0 -> 353 bytes .../shortdressblackgold.rsi/meta.json | 18 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 962 bytes .../Jumpskirt/white_ghotic_dress.rsi/icon.png | Bin 0 -> 433 bytes .../white_ghotic_dress.rsi/inhand-left.png | Bin 0 -> 299 bytes .../white_ghotic_dress.rsi/inhand-right.png | Bin 0 -> 290 bytes .../white_ghotic_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 556 bytes .../white_short_wedding_dress.rsi/icon.png | Bin 0 -> 283 bytes .../inhand-left.png | Bin 0 -> 366 bytes .../inhand-right.png | Bin 0 -> 269 bytes .../white_short_wedding_dress.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1054 bytes .../white_wedding_women_suit.rsi/icon.png | Bin 0 -> 520 bytes .../inhand-left.png | Bin 0 -> 281 bytes .../inhand-right.png | Bin 0 -> 290 bytes .../white_wedding_women_suit.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1127 bytes .../Jumpsuit/airy_black_suit.rsi/icon.png | Bin 0 -> 506 bytes .../Jumpsuit/airy_black_suit.rsi/meta.json | 18 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1131 bytes .../Jumpsuit/airy_white_suit.rsi/icon.png | Bin 0 -> 516 bytes .../Jumpsuit/airy_white_suit.rsi/meta.json | 18 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1271 bytes .../black_wedding_suit_male.rsi/icon.png | Bin 0 -> 507 bytes .../inhand-left.png | Bin 0 -> 816 bytes .../inhand-right.png | Bin 0 -> 789 bytes .../black_wedding_suit_male.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1325 bytes .../blue_wedding_suit_male.rsi/icon.png | Bin 0 -> 514 bytes .../inhand-left.png | Bin 0 -> 813 bytes .../inhand-right.png | Bin 0 -> 785 bytes .../blue_wedding_suit_male.rsi/meta.json | 26 ++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1275 bytes .../brown_wedding_suit_male.rsi/icon.png | Bin 0 -> 511 bytes .../inhand-left.png | Bin 0 -> 815 bytes .../inhand-right.png | Bin 0 -> 778 bytes .../brown_wedding_suit_male.rsi/meta.json | 26 ++++ .../Weapons/Melee/black_bouquet.rsi/icon.png | Bin 0 -> 602 bytes .../Melee/black_bouquet.rsi/inhand-left.png | Bin 0 -> 1298 bytes .../Melee/black_bouquet.rsi/inhand-right.png | Bin 0 -> 1613 bytes .../Weapons/Melee/black_bouquet.rsi/meta.json | 22 ++++ .../Melee/bouquet_with_beer.rsi/icon.png | Bin 0 -> 1022 bytes .../bouquet_with_beer.rsi/inhand-left.png | Bin 0 -> 1869 bytes .../bouquet_with_beer.rsi/inhand-right.png | Bin 0 -> 2119 bytes .../Melee/bouquet_with_beer.rsi/meta.json | 22 ++++ .../Weapons/Melee/liliac_bouquet.rsi/icon.png | Bin 0 -> 598 bytes .../Melee/liliac_bouquet.rsi/inhand-left.png | Bin 0 -> 1200 bytes .../Melee/liliac_bouquet.rsi/inhand-right.png | Bin 0 -> 1443 bytes .../Melee/liliac_bouquet.rsi/meta.json | 22 ++++ .../Weapons/Melee/rose_bouquet.rsi/icon.png | Bin 0 -> 781 bytes .../Melee/rose_bouquet.rsi/inhand-left.png | Bin 0 -> 1095 bytes .../Melee/rose_bouquet.rsi/inhand-right.png | Bin 0 -> 1506 bytes .../Weapons/Melee/rose_bouquet.rsi/meta.json | 22 ++++ .../Weapons/Melee/white_bouquet.rsi/icon.png | Bin 0 -> 837 bytes .../Melee/white_bouquet.rsi/inhand-left.png | Bin 0 -> 816 bytes .../Melee/white_bouquet.rsi/inhand-right.png | Bin 0 -> 981 bytes .../Weapons/Melee/white_bouquet.rsi/meta.json | 22 ++++ .../Weapons/Melee/yellow_bouquet.rsi/icon.png | Bin 0 -> 698 bytes .../Melee/yellow_bouquet.rsi/inhand-left.png | Bin 0 -> 863 bytes .../Melee/yellow_bouquet.rsi/inhand-right.png | Bin 0 -> 1248 bytes .../Melee/yellow_bouquet.rsi/meta.json | 22 ++++ 107 files changed, 911 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl create mode 100644 Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl new file mode 100644 index 00000000000..d3896154ca0 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl @@ -0,0 +1,2 @@ +ent-ADTCrateWedding = свадебный набор + .desc = Содержит набор костюмов, свадебных платьев и свадебных букетов. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 16ec0c2cacf..074b2f3d002 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -108,3 +108,22 @@ ent-ADTCapJumpskirtWarm = { ent-ADTCapJumpsuitWarm } ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка офицера синего щита .desc = Белая удобная водолазка с юбкой для Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск. + +ent-ADTClothingUniformWhiteShortWeddingDress = бело-золотое короткое свадебное платье + .desc = Белое платье с золотыми блестками. Для тех кто устал от платьев в пол! +ent-ent-ADTClothingUniformShortDressBlackGold = черно-золотое короткое свадебное платье + .desc = Специально для принцессы! +ent-ADTClothingUniformBlackGhoticWeddingDress = чёрное готическое платье + .desc = Мортиша Аддамс ставит лайк. Лучше этого сексуального платья вы не найдете. +ent-ADTClothingUniformWhiteGhoticWeddingDress = белое готическое платье + .desc = Это платье так подчеркивает твою фигуру! Ты будешь самой сексуальной невестой. +ent-ADTClothingUniformLushRoseWeddingDress = пышное розовое платье + .desc = Специально для принцессы. +ent-ADTClothingUniformLushWhiteWeddingDress = пышное белое платье + .desc = Ты выглядишь так нежно... Как зефир! +ent-ADTClothingUniformRedCocktailDress = красное коктейльное платье + .desc = Девочка, это платье создано для вечеринки! Взорви танцпол! +ent-ADTClothingUniformBlackElegantDress = элегантное черное платье + .desc = Оно не слишком короткое? Мою попу не видно? +ent-ADTClothingUniformOrangeBeachSuit = оранжевый пляжный костюм + .desc = Цвет настроения оранжевый. Для любителей апельсинов и хорошего загара. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index 2332cfc3b1a..85b1a506057 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -182,3 +182,19 @@ ent-ADTSpaceSecUniformService = комбинезон сотрудника SPACE .desc = Стандартная одежда корпорации SPACE SEC. ent-ADTSpaceSecUniformOfficer = комбинезон офицера SPACE SEC .desc = Стандартная одежда корпорации SPACE SEC. + +ent-ADTClothingUniformBlackWeddingSuit = чёрный мужской свадебный костюм + .desc = Чёрный костюм для знаменательного события. +ent-ADTClothingUniformBlueWeddingSuit = синий мужской свадебный костюм + .desc = Синий костюм для знаменательного события. +ent-ADTClothingUniformBrownWeddingSuit = коричневый мужской свадебный костюм + .desc = Коричневый костюм для знаменательного события. + +ent-ADTClothingUniformBlackWeddingWomenSuit = женский свадебный костюм черный + .desc = Это женский костюм, для тех кому надоели платья. Выглядит сексуально. +ent-ADTClothingUniformWhiteWeddingWomenSuit = женский свадебный костюм белый + .desc = Это женский костюм, для тех кому надоели платья. Выглядит сексуально. +ent-ADTClothingUniformAiryWhiteSuit = белый воздушный костюм + .desc = Такой же, только белый. Не надевайте под белую рукашку черный лифик! +ent-ADTClothingUniformAiryBlackSuit = черный воздушный костюм + .desc = Готично, строго, сексуально. Для тех кто любит показывать свой красивый лифчик. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl new file mode 100644 index 00000000000..26900dfb23f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl @@ -0,0 +1,12 @@ +ent-ADTObjectWeaponsMeleeWhiteBouquet = белый букет + .desc = Букет из белых роз. Классика. +ent-ADTObjectWeaponsMeleeRoseBouquet = розовый букет + .desc = Нежный букет из розовых цветов гибискуса. Специально для нее. +ent-ADTObjectWeaponsMeleeYellowBouquet = желтый букет + .desc = Это букет из желтых пионов. Специально для ценителей пионов. +ent-ADTObjectWeaponsMeleeBlackBouquet = чёрный букет + .desc = Эти розы точно не окрашены. Они такие были всегда. +ent-ADTObjectWeaponsMeleeBouquetWithBeer = пивной букет + .desc = Будьте уникальным! Подарите букет который можно съесть, заодно опрокинув по бутылочке пивасика. +ent-ADTObjectWeaponsMeleeLiliacBouquet = сиреневый букет + .desc = Маленький шедевр генетики - розы сорта "Флидефарбен Розен". Приобрели не только цвет, но и запах сирени diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml new file mode 100644 index 00000000000..4c76516d47a --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: ADTFunCrateWedding + icon: + sprite: ADT\Objects\Weapons\Melee\white_bouquet.rsi + state: icon + product: ADTCrateWedding + cost: 1500 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml new file mode 100644 index 00000000000..adeb3c1f94a --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml @@ -0,0 +1,28 @@ +- type: entity + id: ADTCrateWedding + parent: CrateGenericSteel + name: wedding crate + description: Contains a set of wedding dresses and bouquets for the bride! + components: + - type: StorageFill + contents: + - id: ADTClothingUniformWhiteShortWeddingDress + - id: ADTClothingUniformShortDressBlackGold + - id: ADTClothingUniformBlackGhoticWeddingDress + - id: ADTClothingUniformWhiteGhoticWeddingDress + - id: ADTClothingUniformLushRoseWeddingDress + - id: ADTClothingUniformLushWhiteWeddingDress + - id: ADTClothingUniformBlackElegantDress + - id: ADTClothingUniformBlackWeddingSuit + - id: ADTClothingUniformBlueWeddingSuit + - id: ADTClothingUniformBrownWeddingSuit + - id: ADTClothingUniformBlackWeddingWomenSuit + - id: ADTClothingUniformAiryBlackSuit + - id: ADTClothingUniformAiryWhiteSuit + - id: ADTObjectWeaponsMeleeWhiteBouquet + - id: ADTObjectWeaponsMeleeRoseBouquet + - id: ADTObjectWeaponsMeleeYellowBouquet + - id: ADTObjectWeaponsMeleeBlackBouquet + - id: ADTObjectWeaponsMeleeBouquetWithBeer + - id: ADTObjectWeaponsMeleeLiliacBouquet + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index c064ae37502..6247c191fe7 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -537,4 +537,82 @@ - type: Sprite sprite: ADT/Clothing/Uniforms/Jumpsuit/space_sec_officer.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/space_sec_officer.rsi \ No newline at end of file + sprite: ADT/Clothing/Uniforms/Jumpsuit/space_sec_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBlackWeddingSuit + name: Black Wedding Suit + description: A black suit for a significant event. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBlueWeddingSuit + name: Blue Wedding suit + description: A blue suit for a significant event. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBrownWeddingSuit + name: Brown Wedding suit + description: A brown suit for a significant event. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi + + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformWhiteWeddingWomenSuit + name: White wedding women suit + description: This is a women's suit. For those who are tired of dresses. Looks sexy + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBlackWeddingWomenSuit + name: Black wedding women suit + description: This is a women's suit. For those who are tired of dresses. Looks sexy + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformAiryWhiteSuit + name: Airy White suit + description: The same, only white. Do not wear a black bra under a white sleeve! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformAiryBlackSuit + name: Airy White suit + description: Gothic, strict, sexy. For those who like to show their beautiful bra. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index cbaf798bc8b..01477ef1444 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -215,4 +215,105 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/turleneck_white_womensleeveless.rsi - type: StaticPrice - price: 15 \ No newline at end of file + price: 15 + +# Luna + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformLushWhiteWeddingDress + name: Lush white wedding dress + description: You look so tender.. like a marshmallow! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformLushRoseWeddingDress + name: Rose white wedding dress + description: Specially for a princess! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformWhiteGhoticWeddingDress + name: White ghotic wedding dress + description: This dress really flatters your figure. YOu will be the sexiest bride + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBlackGhoticWeddingDress + name: Black ghotic wedding dress + description: Morticia Addams likes. You will not find better than this sexy dress + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformWhiteShortWeddingDress + name: White short wedding dress + description: White dress with gold sequins. For those who are tired of floor length dresses! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShortDressBlackGold + name: Rose white wedding dress + description: Specially for a princess! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformRedCocktailDress + name: Red Cocktail Dress + description: Girl, this dress is made for this party! Blow up the dance floor! + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBlackElegantDress + name: Black Elegant Dress + description: Isn't it too short? Can't see my behind? + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOrangeBeachSuit + name: Orange Beach Suit + description: The mood color is orange. For the fans of oranges and a good tan. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml new file mode 100644 index 00000000000..ff320403519 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml @@ -0,0 +1,120 @@ + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeWhiteBouquet + name: White bouquet + description: Bouquet of white roses. Classic! + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeRoseBouquet + name: Rose bouquet + description: Delicate bouquet of pink hibiscus flowers. Especialy for her! + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeYellowBouquet + name: Yellow bouquet + description: This is a bouquet of yellow peonies. Especially for connoisseurs of peonies + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeBouquetWithBeer + name: Bouquet with beer + description: Be unique! GIve a bouquet that you can eat, at the same time knocking over a bottle of beer + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeBlackBouquet + name: Black bouquet + description: This roses are difinietly not colored, thay have always been like thah + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi + - type: DisarmMalus + +- type: entity + parent: BaseItem + id: ADTObjectWeaponsMeleeLiliacBouquet + name: liliac roses bouquet + description: This roses are difinietly not colored, thay have always been like thah + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi + - type: DisarmMalus diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..be44e8fd96597adf3382ea302dc0cce1c67e6a46 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|Vo6 zPZ!6KiaBp**%lp9;A!1D^N7j5gJH`)G1mMSe#5veDts4Xuczaz357Y2JCFFQ-TZE9 z-OWBvAi`i;2hd0ch6BY#7fXzewWLPst^B{$@K{Uk?6CMdCnbd25^roh|9OqsBlEBE zMMr<{Q&(D)D8U!LOvUtzE8mW|_3v++J-=hFoK<8}w{G7N#*=TK&JpI${%~*ptL5|N zD;7E=JTrg)*H2^H+0Qy=4ot@C>M!@Ir-}7zR%hcY>W;j%nF2OB{f-)6_lSV3`O$xX@e-eV;0?>=R!t^Tu8FfB{4uXIcDwPaZ=M^j z*)KZk$pZESg!plLg}p*v@Wr+EZqqKEH>#33uCM%S-}2jUuN~pMY|>il_N#9H>e6mi zw>iZozQI?SI2ZkWQmi>kGAmF$AnNhfD-LUoonIgE;d3o>FnRT{BBY-&Fgbeu0@ZBx ziuWsD?@C(zG1%)>>f465UE8^u(#<>sEe}LR*Ea3+$gTPHiy^eiCU5sw*A9*MPD+YP zv)A%o64|N2Q5TlUnw^^=`{SI%al<1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_elegant_dress.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1063b66ff31eec6f4070227058d018fc2d340fb7 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D_gD7ehi z#W5tJ_3dOsK4wK87IV#l!~8KH|GNkNWY1GLx>QMtQ^lw}e9n`X5h^xL*#`<`jz>0h zY>Q9l-ahrA=F;^x&wGNpe(wE!@1da^gM(M*OLZTnGk<=Z3Hj>#$fxn;_f@MZKiqeB z7r1!r3`2v!A?@{BnHXG-+-Y7a^i8O`Z8mF~^o59fBW;*J+ER4|Fdsdc>C+yos4p&?^^yWy?r59HkKV?1IUv7 zCkzgU?q6OTJAY2`xvyspn%z4N{Vm-wZ5&7S|E8E`1fCd)`;;oxhj(-eA`5-Ns)}YuEfu zQu+S-y3$jNwIxhT{ui5@FNj;xvpT}m9AX@h{9v+KO8wmm^O~o&s|y#ctCnex-uv!t z!Rg9*la@#<4)0sIYo6ZQCu@#%TEF6(-w@d=e7|&W%rDk7Q-upZfV#gjX8Z`?S+QSv PF33brS3j3^P6VQk7#l@glS|)fGmq?Q9Bhfl{xRc+;(LBz>6O%M&0E59`Fc=I5gP|8fNHwPXJIep1 zBiwb}Rv~@mV^Qr_SH7j%sq4D+J*5+qI_&A%gLFp5u{`AUj_L9r?;bAdX|f2}}sDT%PBM<5)*mWe$e}D5bD% z8$l2V#_@0ea5!l7+vxy8NaZ*VD5Y4h*Mf0*p5y)fU2sYq$5^k|pp?RKoY7H02&rbX z8SeKxJkP`Ncm$;sS(XX)vMd9o6o7h+3V`tTJJpl1z!=9C8SwD-S$nt%^ z@_oOO`%p!Glb+|HYep!`Qix8KNa!2_U5YcK*;Ti_4sC|;A7GXGO>{bdAJc@8ic%_+ z%f?emg)i@zZvr!dUD@o?1)Hs!`e~!p0qpH(jS07E5qe-`4A^eEx)q@ z6V6akf?p<&b;4K3Z!O&IcGYsZR8q7HmASZy&1O@{i<%*@U1D2#V*$VMcoaHLm||D? zsA<_?Fc=I5gTY|PbQt}kC_997T^G08ZESbF z@NazV0W2^e0(fuB*%*&H3+y5cLyMjGrfG^aP4V*bQtPIRmII2Sfa5p-AiQlkUtnrv zd3;pp9E<{*Lx8>E^ZAT03@!O*rl}Gnx@06tVufK?=OgGwp_T)JAgHn|6NK#d`_3cs zsgUJHQDkLV_E!Q`A6i2|HeOb!EK4LwqSK`|T}cuwDMP0}?OA{i!PnQ<`tL_4N461$ zp~YvS@Hz|`f?5&4dH7o`g_+^&^?KTG0PyFu<-0OOw?PY`?RGn)*`y5BY4A$$Uwrx7 zV7d%h2>tl{0OJ6i%JOkF&y@cxA?wh#4!B;g+B#_c#|UqHQ+nFePG~cp*QF>5Egh8R z%%)s{u4IMFt|ef_iWMtXWI#&k-?2Z#M-KURyImxS*_Tk{kTZw~ z=ks}rJ)KTo2r=33_d70^OH%G=1(@7gJM9S}rjtr319EFEaw?JB0G!?b6NdCBpz0vsGm@=jdzH_Ro^jmx?R{sR9l zAo)3t4IqODG4(l)I!P(La}Jx$CM6$$@0+ozsw5FF9hjVvB4U0`r-)cIwr%UHs)`cE q;GDztdR^psYG~Uw`&El!NyHaEOW}$FhQhx90000+g^u?D`?3wQC*H}N!Jj`1sGOleJ8NzA z+S2^m`%?{H2}+us|9stj-RoO#yHEV+3_2C(b<=(SW}`l@pR?aT-=%Z<;k=F>!G{ai z3fmR!5|mu*#9aM+XKwU%eI;g)Squy(rdy`HD4qM#Pu3%)Px4=p$3)w-jMR9^pq9T& zuU|ebW&EY;d`Y|Qmvf)vd$@? F2>_YsXOaK_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3d52a9438eeb97bff10204b53adf578869647a53 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;i&0 zi(^Q|oVT|w@-{07Fa%ihc<*2^-reAB!SgrkQb6v~tetA_|29sv{_y8f8zWEy!wJjj zbBb?DxnG<0d+j`l;~(F;J+G{*RPQ>xbNLi6ua$3P-9P2No2?!+{j7;^;{KYos^71& zM=urG`A0sgxPIoJkVmICwb-`QpOXa{#=xNT@}@;$=$gCJTWzJ)U)`|Zzx3Tri;ZHh z&wQQjzbXCkk>WR-ADQW1+FbZ()%}F;O1884uO(%dF+A8|z3No?a-C^R2_REEUHx3v IIVCg!00FFSPXGV_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/meta.json new file mode 100644 index 00000000000..0cb998035f3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_ghotic_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e6dee16388a7e73657a9e603b87f60f703ab479b GIT binary patch literal 1074 zcmV-21kL-2P)kI1t9abcAUe8Vok{VXr>;+=nHQeTzBlXdjW}Jr?i$yb^&++{HeDr_I<+7>k8ZR#|tTws&RaL=t-J`#iWeLY|*!p*4AB^L; zx#n|R$oNH3pe)OypQ0!*pU<&aELi%ZtVNbDiUPjxqwfVY`}#B2^aL7wpSrH`z522G zXFY(#9mhG_m~J5MOq|m%%Mx{6pM18iYm{Zl(jUD906-~)EXz>WHI~a|1ALqPEX$yj z;xxyiC<;_ng}Sa=LsV4-0Bs$4AcvD~Le{4N0tX`qApihD5Fky{qk8g!OM{}WFQtSK z0-oo!L9i^#&hJH0Kq-YV3`gsWF&)XW44chn1^^Ea56#`(9q#Y%@#VjN@W-G3;`Q|v zZ*OnN^Lz#z0$~sYrsE#ePm<(FpXlogAx7(;G(eVR@O{56M^V%~K0dbPzyAJ&D2m$h zZntZwqq^6aGNezl+vls7u=UTz04ZfV`_!=B!J+!iW;2sgo)sTMUw;f7{gVbzO0}*B z078g15T$7f-}jNGX&Znj1^_^kB(qC{;wgPHxE=sa^jVhGH#zzmqd*9NJzJ*w--D|^ zDhLuvDNqcct!GtLtuc1H9j7@qx;}8c5i-$d?E^>@0QUPmq?Fk2_nrEw(Oq9k*(saA zGJw9ugb+xQWY({n61{yXC6XlR1UnObwg>zu&|oh$x{(3OvOHOynrrH_4M6+vvGv#H z+WKt&p^puE$10`RA0U_T-uf1c#bU8oEEbE!VzK-Ju#d2xo}L=VaoW?^p=60$LYK63 zH?Uf*rb&py!UDxegO}~c`Xz;+{IBY0wW(>wh zs&owHI8Mh1Q!feKw$8kXC@|2x1HF~Cql(NlSp=H2@ogt!ARTaW8 zgp|@K0GY5_t!7nKK}v}*437rQy^uAE0VKNJZn0jkk>@!+fBaz5lo6jlen6h*Sg+UE zZnvF2abeF`9LJ4*ZB1z`X_`)YGu-b(5CokRm?(-GAq2Y*?AKub&Yti*kJHpe3~5n5 zz~ryNp~36PO1Hpu-NAr6)VFi6gP?BVIF8%Y)mvSU1BZxDdy#&BxIvI@F{`xGa5W_rTl=Y6CN_x*7GzX?!EIUxjb98V@|+m<9r z5JCit2p$1|G3HAbeDzvuj4^Z40T7LC`s)1!UWAkqfHX~Mn&wN~cfnfA@pv4)Lx!l- zT2mB71hCuf+-kLAyq!-xL&WE&*um}jhLosNa}F`T5FOd8P-{rx&3}W ztbhLcAj`60T~(DU%Q6D)x;Dn72kN>Ws`rU+1wM-xMG@6?J$d=00AmckA^<5RecxlP zrD+OF~$tBg@y0%53w`a0t@vT@&Et;07*qoM6N<$f`!K6djJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a34008b583303680e6db4d81ca295b14adb60218 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|O(Q zr;B4q#hkad4D(tH1X>^7ELo>n!+JeWqh|V@Y1h7cIG&y|xvQghOUmXm4Pn3bA7i~F zy}{?J4inHk5MbYWEoXP!+|AFQ$=-wKPKWsEbR{xwQEC(~7sw z(9oBA?_W!f%`L$)2OjUeMaUHx3vIVCg!04IEt{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7aefdad6a0596d9d30c380444cbebedb20bca71b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FkZ zi(^Q|oVT|O`wlAzv_72vc13IfYgW{|P1{RP+ioj(t$8y|RyDAxC6#;e-~DY&vnAb1 zjD>(2LEw+4=G5b*BD$6Lv)Xk|FUp*?W$kC1`al1)qCVH{7EIQe^kmL%`J}W-OXhq| z?Jn@Rr`RIoq%rBqUj3)fcUQbW{rcY3H)nT8O`Q^CXl(hst>WM8X?yl(%}!f3=W}kg z+v1FqyQ3QZFNkU=jh%ljuxFMz#8L)^9Sh=$nbVJC=T&^0C0)@|ow8@yy@Z~PGj3jf zdiKq|>Gr3y@90&X<-PJqF7bNsD^v3Vw>z%&*1VLK3t(VFj>;Oe%h_0-fq-0a%b#NYYJROfeB-sl; zK#<5g-S_U@yLUg{12SaDkRd~c3>h+H$Pfnm&%d?7AMM;f-~6DgH~8f@n7gm>@7uR` zB-tHc*go@I(`JO>U#AbmI_BY<+^~K2km|Um&4%r>lj-oEGM-;mH^_ggtQ!lL+xyJv z7|iJy%r$N1nzlnE=C8-O?)N`p@OxY1h#l9o{r_BU?@uIzgkP!%zT-*xb8&jV8<27RKI>x;-qtcsA3{SGU&v=l;$C zM%^CrwFQXplPDpdREYVFIsmx|Ue@;6EG+;4u20@!czo+$7oR^xf9C-GodXnCmhoWu zv&8LbaVt6s}PimOosAJUa;o{{h zjJiF{Z`4tEQiEp=FzWUawHs@+oQ}crj}`;(JZo^Pj7m9R4FE7Yzd+&BrKwp0@n5`r z1%CQfx7N|$ISACPZmlQckF)@%V=(f(JgD=YX^%HrDNoH3c>cxbPyG?6k>;Pt7bM|V zD&TT^-zO(?2X050MqaCwF*?8S%lv6kDPtP@0FggmTY#pQd`l3Ylkz8Wf-^p zDj-8(I&f3O=@=}@s=)L6ij+9pP&tGts^Smz0iHEbj&`7tM~i{?{BxRlsp5|V{(n*Y zW2*q~d8dUWD?%8*rkDH=ZN|dhCE=GYgJf=Lv`-)_;Mi;krO@EHa zj=PhB@4R?yo;7zI88T$ZkRd~c3>h+H$dDlv!}b{yao;j|*Efv+4BKakWQu(v;=|O0 z!s8|X{GH3??(}r!UEeSOU^fn&_eP*BNoYQi&~$92BP%I{R|GISWl*PqV8>X5@%h-*o=R>Wp#?^x$*P-c06yN$i2(*NSz^|?0R;YrSC*LJnl=MI zUXS&64?_ngR&0J%W&vuO566qpD&>I8 zsV`Y6N6%<9$8z;y{Lvd1q$X^>_`mPg*wu-bVIE1l%wCM4tiMZS3S>+o8;|C*Yen1$e5xb8%F;1FY3dEc5 bq=f$gy^}$7Q&8Of00000NkvXXu0mjf8_(hT literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ceadc97e97456980851fd9e2e23250958e1c39 GIT binary patch literal 605 zcmV-j0;2tiP)NOC0s>6Hd%e!+kZ{NJx1qu`> zP@us7fYZa~c%yN~R+rZ@<95IAm+D`?m9~HV9$oRr#<`5Skc5lVt4TfP$JTD?vUxQ} zF) z02rI}zA4PT#!(O^$(`A00KMLm7dqFsN$mLhnb9f{ z1)EzUV)dMD_@{nnkm<#!5vkrCk)#4^{gm!%g6H5yi^WB#jQZ*Ni z8LjE2r2l#xt!33QdLRlynYwDZ==Ixh@>H^aF{%>GD_a{fMIi6ArqLUuN)~}W1ytvc z3Rx3jYynBwxxP(qy`$a+a>tx5|A`mwa=00000NkvXXu0mjfD6bsX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e55b105995a5904449f7bbd1957ea1794b2edb90 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;jrO zi(^Q|oVT|Oxehr9uwLMZ>P$#{*l5$p{*^`U#33bxFs@q?0iHfSY2in|?=ty3{Y=^K zZYH2c28l;Sm%q%-b_-uD;(WgS@!`bdn_u3x6g0NeO3KzWkN^2wTEOnhmfP3!ayG@3 zoa>r#G4#cOqRq9HvCm(JX2%`j0hz(Tps-iQ|CVoL?Ive=snzOl=cKl+*9v-at0p$@ z{+kW^OZRui?_x}3uhlbMqG7xx_1j54>y+4yim5XlCo(lWT<5fD^44#B9!EhYdAjH literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_rose_wedding_dress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb261a248282ab8281bfaa6b323e7979089c90c GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;ir{ zi(^Q|oVT|OxeghKusz_i>U{9vL8DD0`&SmZ69*S6_;Kxek>I=Jpoh?(eQSMZ|DTw0 z`n45MBg2Dl0@dpxv))d=ao}r7-OtQjGu-#D_1$(W`qs~d8@K-d%gMnP!*~3_sk7Hs zzYSsx~>L2N1VbzPO5!N+p*Y zJ|sulOaFxAZy^6c)kEP3Qq3(wGO0`ps^pSWBaph3Lvbp3t*o@PS`)AF^kCjHyE{9( zYizjeCs|^5hW*~WdGF1S_kaWm5+q2FAVGoz2@(Y1x8swkmw*4GeDvM-(tbZ39OH-W zKd|waaZQq41NK|`K<^D0;rEmFd)_`9%|Dg>mi{62(R%~7-_o`5@VA+6JM>J}*WtGr z+i$g{eIsGD-e8((G0n7?-WxF8W{xO7A8JZzcNf1Nx28B^Tkj2=|5>d!t|Wwu-)4b| z;0LbTEEc~KMTohXSpY!pgZGikW&preQ%F;vP9FepZd%=2=D+^|0A3#+;G3`JL%%;F zKh)G^p9_ANRu^&kV+pugZ?ICa7}&noY>s8nGJg7-mt(KlbpDRZA6wX!^%^VW^S<|O z!@#pA)rk&%d7Ek7=ZSP=hdk1qfv-s>|HTL(WqIT3wihZq z(8*;pu7CspN2gtUn#+#O5{Uo##wK|8TV5z*ZF|SncX^>4i$Bx?G}B_a%pKo*8oX(B zeQmjHW^9(AnHHnS|Mc;aGvhSV{4>RZIQ&uttkxS2Ir%v-oMD>zTsDKF(@Q0gTja7C zjAI|*@Lznlkk3O+!LbDIb6oytK~PZu#?Y}D%bMOv9exc{HfLXV`aVO z_=xDZdsXm*_a2)k%^gLC1PKx(NRS{wf&>W?BnZTQOJ`o(v`qH9Gsge+TY4;+BAiRywkhLU=_0lT!u_8gLJs zlBI+=3ED^n5UcnCHT5`&L(C4gm&+o$>I%J zNYtBXsjz&|Ya0ftm5ML#&MRQtbpaxHYZbf-&`gWfwzeFZ0l8aB)8mDF9@R?48NBRD zobKSs{3ZeVHlL37BA3m$WFGmFm1^`>)@#06J?cZ7A!_66^+sb2hWGoLY56u|-a0{& zU6z#+T7c+|UL;IVyP6uWCFnL|qLddQOzD&l5Vc9OG-O6RcsHOVq^M?~)Az3$qe7$r zN}GEVpx)p|@gQi0iWCGzN+6=3f(a7xs!EW}K3|j}s#mIQZ2^!6!9c^JJY6oE!H=~~ z0Pd^}Z8T)2IcZSs05II}5GeY8TU`PmuU{0ttXeE%&DW7i-GO?Ssicw2&2)=!^H{y>IQMbvH ysy7Dw2P0v9KoG`}yAL}tUbVUui01F4g#Q73TN-5n%WI7Q0000Elp8X@H(MY@1&@jYq*q`4p_{hm?XZO4zK7rd){}W zJ770t4vS*y4w!#o@>aV;J`c#}0kJ41CP+w<_s71mb#Q=B{Xruo79>~{r~hfSJ5+8Ao;dqP}Pq!D|Zy~hWox}@@DW&OH6xZsxj@pWS9;BOZtXTk( z-n(Y9)|-TB?j6ToZY6vkkPap&nGTT)kt((djXLCxbv3ungAk5wfd^qO=GYeMiYOJ( zYIkTlb{L7-e!WRT?wSdiTK?%s!m%yX@q}4NB@6=~!blK!_$MU?rXHAzkYX1>saaSQ z)0+<;q0YWau3~hCOgj!e4^JLGz|G5z^BGbdH6~_1X)@h(MR{^W%XkVs;PZgo=1e#b zLbxUhPp(4dsFiS=Mr}i81XP{2X!Pb)rA$Ds0;= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..31d32e01c8a43607c953978ac42823e3d9722a16 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;j58 zi(^Q|oVT|Y3LbJ0V7=gyU|?ajK#^x@0Q1s>j1Im62_7b%nT%?R?wiUFe3;jLvwpH| z`TkWvoeT|zdgihBm!>UQRm@{MN1oq${+0aaE@ytM=ve#oPR--@`3^rW{QY=k*T$nc zv*w5zDu=!}aJKCGr(Ns9Pv6_qAqg@9=)yYHd0TdGYD;OiGcohOrFxntK6Hu3)}Pz% zEWDXm|GG|ie+ly;zF#p}Cj!%6oR*m+TXtewlJhyEW+hgJ$FYoTpC)h3SyH$jWR$0? KpUXO@geCyfb!rm; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/lush_white_wedding_dress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c6c1dd5e6849d813e79feddc2eae7d3460eca72e GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;ir{ zi(^Q|oVT|Y3LY{LVS5mkU|?aEpvbe>fO&C3LDrhu0xf_Z`#a?mxe^<>!6X z!pc~7pjL)Eaz*ELwb$-F&pT(`dVAgU+Hbe7g{-divbHzb_HDmC&4<^&QkGWFdhYj$ y<;oe|St^?flV-$f7k^Qic$R%-&RIT&n)iHqWs|q+bOi*1w0pYxxvXIrS6Au~GRUj62}i2H5CR2DbWVCY7f{(C@F8AR=-c$I<0PM9E}; z`)ijvUw%4yZIod;1ihVnKr+ABesJDL7qHSd>Htl0+ud4o$z)*D%(K9>1HJ>ejFt)}{YRT7Po`g}0}hV< z4)@pYQTGK0N55iyD5WS2Lt3p?L`3N|@BSs}3xXgBf*=TjAP9mW2*L}(>hrZyDosy$ zo_Dg8lunE5Ul0WK+p!t>C;13TM6?`9(D``|Pg&LF z19Tcp&%i@A=3#t3V3+Rv(~~@Xm1rN(SkKVNc%Efr9)+Et&JgFao?-Ltb7iw2ZF@c2 zTc_P|F&(0?4aQM`hn>yHr+vBls^F(UqU8eoWymHZ8l4Z||MT9$s+a|NZEi+B@liLK z1%<-Lu4Cc*fH;oR5XkS39S(W;+tuUy0nSPG27(|6f*|}i`~lXm<9Zg#c%lFR002ov JPDHLkV1laGR%`$O literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..918b8c30b8c09b6c43ee1f6eaf9ca2af1d2b4ab6 GIT binary patch literal 337 zcmV-X0j~auP)f%sDC}{fVky}A0(k`Myo9gdgXAH^ z!uGC{6lqggBq(^?6{!p)a7>Eh{J?`SenbNMYi60*9scvN;BYt`4kaQY8vk!pE|YUP zY5{4Qs{B_K@H|1jXT6hli-YfHZUH}LNquUB7h&QY9^Q}8jTK!*=B#DTK j6t?VqUxf~b<3I8P&(~@#kq*Tb00000NkvXXu0mjf{ez3& literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..74078d7901c034a382f0e08e3ce94b3f3853d7a3 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1F1K zi(^Q|oVT|&avpLJVSAtvR#q0(F_+t-?Xbl}Zw@`>ZDuFg7R_m8(dqLrdCvN|_G+v4 zzxf|_Rl70*bu(OX;!rGmw|U##-s;8lnA_*_)gSDOu(MB_ohPMsE%Uje56BcCa0ofKcA`jSue6e(<#xBAC#LV% zk36{}Re5$^j{oBMZP$zT?O%T4Zw6CQZg0%D%SmzR&p+i0GZcN(0i^(o5c1R3J# L>gTe~DWM4fnB8iq literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/orange_beach_suit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9c07a3931b25115997ee098e3c14ea665ca15807 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;jTG zi(^Q|oVT|W`3^YmFK z@w0ZIP6mb^!Q`Iz&sJ`3I}^li=KHy9o>le~pTP?>cZ~wpcHo_;&EHw0J_|gd^fp+??UTdRxX{F2~fDOqlBhGRV`_&t;ucLK6Vw Cx4xKLhEyMx%722O2Q2-L43WNXCEe%fg1miA)1gJh1QES`BB68Ayb#=zqnzuRT znaF+%@e@j7ZRX) z54zj8YTO{0`sRr1!En(RErG7i>t%2)I7485KMd-pt^Hm^0kGGZ?zk^*-8Ee9BH~TZ zq|EZhudj_zZ@~6{7sSV4p@6sZRMSV#G0(i+1PcWq&l=i&^hGnE#OcOoixui*FWr2& zo5T6h`dd}&>ozIk8BhY4q8S7qoi{lEfYo_I2qAdSiM zbojIDKh%jeh8g)@iA?RlY#w16&GEC@;8Ts8Ax;BS%Q!}v<(K40A5G^136t+#2JA8~ zxq+<$_Fo$S&BUlHy>f#_gD0s@# z#W5tJ_3f06d`$)-uKmZ(spzQ~?EJxAGq-quoBu=pm^liG6HB%_%Sv%3UD)F^=U(Kj zJI_Aly*SP48YtrGk;@_USG;;<;s>MJ&kXzv_hmA0E1J*WzuPQu`-%Av6-<5FmsN$c zzOa45*5~ROCdP1QR-0WRds$F(>jXh(A7{%4lRnr^Jm_RG`|0o1)7u4fA71(p99p~g zzRrO^bK{$@E4*veT=(|gxhbwOS6jZXlRdxRWTCRzy_y>j7QYi>>Zm@zcvHvaRRPc` a4eIh=9G|}|ix39-iow&>&t;ucLK6T%R&mn+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..911b52c1dd59a5b5eb38b5ba5b20620f91dbb85e GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TS9 zr;B4q#hkad46~UGC60Ym-?=+qX=>T3=I;1)Umjnno7fa&wRN^%li#IFYv&Ydyy9J{ zxbNYDPyc=O759{@?9}=00W=u|bmmF7M%)cwpSko|fW2pE*1r93uKwHhv-5iG*Qo7T z{9nCpEqx{)&)_-B|5&1(xxefBMUSnQmM=5g6Mbd*lBYRkYkt4`s=D*& zZTEsnzyHZv?dCY@f52CG{qI+%Yo18!hga@wobG*Azm93!vG@C4PqI$AylUE&w#(<# z-!np-0U|A4D;lNwwm#XU7UZ-4_rLf4 znd-Y_hM&V5z75NqiXw$Ij|wTNPFDQ?a3@27=(l3#*h}qS*MfqO!PC{xWt~$(69DH1 BoV@@5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/red_cocktail_dress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5603d958ce10ade5080b089644257df190533fc8 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|O(2 zr;B4q#hkadHhLWn5NZFYf7PZTdg10K{tHX{a}Kr_O#UY7CEmWO*{Vd#gfECwXx(?G zV*V-b&1E?r&bc!u2&YV02*9?yTcR9AoRFWt}c zF3p_G&affw%07GYoc2)|0lo3T+5w|@{IRu?^~M)zv#P=Vry&oUkhwG*a_kqMy5t? z`|Fv7>Rp$)9eWX8!yqtQ%Ch`@id}+7O4gG5zhk=06~Jm9@pkz1x~PY#ynIx{yhS=h Vsr0wI7BGMqJYD@<);T3K0RYU|Qzs;uum9 z_jcBPFJ?!9W9F^Cdt6#L+Cq{_LD?DeZ;C^z4;g8T0 z-2>4FnhyM}G`?wBDY4uAf3BdA>C;CAnm6y?7SP`P`qATep?B`=>v+6cU)y}K`rjHm zHSW{5g+DL*+aGmPhHWw9mi7IUejR*zWKZV*^NGGIrerXz`pdwgbLVQC#?g7~iy2mQ zug{&^b?)-a3G){^IWVpW37dR$h0dv^msaroJ^0}M_xC&WtM-Ktra3X+zk3p9QZ1MSLT4`yNk}zIW^ViWw5; zU;R{EekEzPyy`Tk25yGZJT(TX-n67u`$U+OqSo#gR!S?(Ja+2O(WF9?8Veb&ue*Kg z)Y*TmaG2G4+E9egh4I8+?*My_lcx?eYIHXXxYkW!HYnpw)nVpX8Wdu6lQAU4x$`t1 zDV()33(7lI9$DJ?`qtcSObfV9|0?Tvf9D*7L%_7Yg0(x|X{9qPvu0iy{&nGj^*cO|{aAo@jpI23`tlS4m+#Pxw_bzL`#q@cfJOlUFwT!F|_FsS6O<7Xf z{PII;wLK%R!rBu7#|#?+v|N`?mUVD7o3i5#m}C5%?+5Fp`kMi{xgY-klP_OtglC$s aFM}44%>l$9a4C2)i1Kvxb6Mw<&;$UzE>YV6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..17fea0ea7556d46d219d1746d16bee348875d24a GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<(w;7kArbD$ zDG~_>EDn4#?y*WRVR3T?5+}GCFTXwZpI>$-v;N^XIUy20+UF;wik+NQwfEKBH+*$Kf(D#A&V#9gz$jh{GUwu`T5;${rdEj+rmW7 zZinlnnJSuYKvx9KNPh8%AvX5${~I;@+y3bo;;?T$1@&y_M!0=i?sR~*wa8ZE7}NN zKdc>PL!tU4zNnH>&MDG}ByM|C!@@FMiBUS;__ zd&-!;G%F`UtOHETW;>fY92aQT8-dC>Ei*uz2WEOZ3U)fv-P!AJUmW(ea8iQ z11C_fH*ny%Ugewh1|A+KSYKPsKORu?|rL*WKI^g8; z3P* zyTEG|@B^@POv|2I3xu(!@>)TZepFgiKXVJH8d?+NZ3WNP0krU;*Q`8S2NZ>JK-C63 z3)0L0GG_vr`n9A2^gy!ydO5YhqwxfzKYy{ey^;9)RqMwVAaNp%5u@>B_CBW*%Fth! z+3FbV?f!l$L*w|`?ar;`(@>UvWClG|6^V!ws@7L16bgkxp-?Ck^O%+`eg8iTrP##> zCTNpFs$dFe1BACr5X9GyvsoI?#s6a5w}2eERsox2ZR9gtp;?S^yt+=kK<* zvg{jE2E*YH+RAKykhi7ivk7z9Q!g}5=~l;J_x;~~s9dhPr^jpZpGzNu!j%UA8hpxj z01?iU>V&8YhGzn4;{OTH0BLNDLwFY8E6E#h+ZP*rva+|mQM>KW`aEw#DJxWJW?{-) z9!DLOiRzwd5N-i<5b7zC#kLn89aavg+JLHg@eUBev}|@i8ZSJoP{lfcp9StmV|h=5 z;aGjt@idwL7$F;?p8a`SL{EvQazLwN1S(I55FB^@+S$~lgtuEA!#}zozIdAe&k1R5 kNL;z)sZ3Fi$1-jB2g>>HpBKb=(EtDd07*qoM6N<$f;e%;GXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..314ba35054f7d7ef294895cecb0f54c8a4f9a692 GIT binary patch literal 433 zcmV;i0Z#sjP)^sVqe>r|MSJg#iY54tOG-A(gtY zq#H{*xC2s^hOKH}AS{lA6anqfO1DFF6D1;v^TXy(iW28u=NvoNHlWdHG@25)o}@bQ z+Tuh+St3R8M#LGpqlAduCBn^`VDT)Gzs!{}ainVGP0Zl$cbUV>Ie;?*G zhU-a^yKq#lC&{!$Vx)XArY$Jlr?!FgbiTY=kwE%6uU{5QzhJpu0RT)}5CF^<4#w65 z05G;Dm@k|}oby#UE=m|pXLx?RZvjBx=wZ2D!MMJ{*Y7sU;dbBX0YI2<3*vSjEoG}f zqUc7`xY(W^?f?KEpFVCbFG_t=c@?B#QNI5>T-|w8srJGgBKZDM+LUq=Se#KY5p3cuTE#?W(6j~J4u^$;MZ7ysbe1R^;8U$h bvP>KRe~F^i47FB;00000NkvXXu0mjf3|P7- literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_ghotic_dress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc8da4dc13bdd49473a46ccaa41b06c411f738c GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1Gs& zi(^Q|oVT|Og_;ZmS|2Xm(9m{Hxc05*>gYvhK1_GzdTrFKZ@t`O;WqF2t!DFXzOOpf!y_9vLV2&UhFY9B`O<@oCJV68o>SMP|;0oA&>`b1f|dPo1l*D^k~GSC89V{8UXg$p-@yXrc;*EH|UzJkI=1;=`D|tEo93J z6qChMFb0b(RtHx`R?@^LOLCh29~dVWr2llWPKG-o00000000J|nxo>_Z(V=R9#QRh zcHel`X9qx*Uo5+CCe^R=OsVFm?8i;p>O2d&4X)|CY=Z|^XJYMnj=tQl*z>sMfNIx? z$^ELcMWNjA>{pm^2k6IKBnzT+NmOn~Rs|6eJ-vRi=X23FwM`#_>(_av)M4FT#=g_G zm^nb_9Q%7neNyGNzi|61w?Q2+1Fsj~3<|*5~Jd8$rB$^zN>(0&wlD4Sg2tT+?AC zzLVbvz&{3cwol$pZ80$PWmS+!$LaF}&`6@WI2CQAvlFBA^*xq800000000000002s zf8tt=y*odq6!)R+r7|={5PWHl3P7D_N>^uMJ&LxDOFhuUxj{lBtAYe=y3e7J`&C<- z_oO#^3y5SvvMS=#=c(;M(0V!$V;G+U(j|#x;l-Jubb9GBn&z+AJp!@yf;UB&oD-Wm z07HDd#Gh@D@C7>n=CNZRL9_W|@FZw!T=HkoeB1$DmzK#-GKvuZBI70KOos^fByw`N u*D9wcdVY_xc#ZjQ$86IB0002M{qPM5ittzTxqt-#0000_gD0tS> z#W5tJ_3f06T!$QZ+UmPcb3Q$$r?jsj`~IP`$KO1Qo|3oEK~qn*-^qD;cXQZ5F4K(< zCh_O(_dVcm7p%?@{2J@|ut8}B%%C=_0HS6=B0 dbjY8n(rY)De+cKCvK#0z22WQ%mvv4FO#nUxbdUf5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..61c8cfa777209876a29051d457737dcc4cd01b73 GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TRi zr;B4q#hkad_In+15IFwvewl&`)$wQDs>GXT_-5Z->&65$8wegG7ACK(SQWFpb=$2UE?U2y=^vYV?cq}^S^p`o zHwIol#vk-%_WWArS6RB<(wlc|+!b|x;%Pm;?}wijtqgi)Yr1sxp_aLK_omo{u1nXv z6MHvm!lBo{1D>n3Y&`n++4ET5?zb1Sdrp>yt(c;@O>z+O{C+2`nZ*0VLforN~F8|2h;`}7dPwzp|URR*x z**nYi_TLY%pELRXb_Mg#nx&TZ?^TUtU&$LYgG>Xudeu#-o5^vz6orB}n{GP1=MC$X zoZg)D>A%vyF=cIY`!-|x-5)D}O3vw-n%@-YTzT`rg?|hhZ+MG0my5*e#=i%d;pyt< Jvd$@?2>>)&Z3+MY literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/meta.json new file mode 100644 index 00000000000..0cb998035f3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_short_wedding_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5854a66529dcaf51af2bdaac901ab66a2caa127e GIT binary patch literal 1054 zcmV+(1mXLMP)24ukN=xZKRTEn9oBN|MVeTee!&<)@0L00sZ^@Ghypb z!|S@=wmBx&7Oa7Hlh%OY?$Hv`pXmUeo^7LQ zT*4YK&?sPxF>An3H7?P!ZIR}LXm#4?ntfOUHg-hU>;u5~TG#BO)oBa0>lp*c`_#dN zu8*Anj5>c-Hvo*BlhAckjZ4QUm}frn`aRnQUgm!)8FM^GBc#=7qi5T&2F$mq4>@bvVAo0}UA7zM(^@9AK@enUT>%f8Yl-1>>I z^eLdx3UGQ}@(ejcli!-s9E?KWD+Y-mv=0C#bG>nWg+jT4#`Trsx@`ENUno}` zzk?v;0Dg`obRGFzR&!sI3EzI9TtPmUbp*R0`obgNZ-F{HuhRoL;O^1#{4JX>^@SZk z`)|M3!zOHf-{%1YeQeMgJK3X0!+Yy16bgkxp-?Ck3WY-PKSHO$#CzMrpAg?Zm~!o* zloL6@t70SysN=j%qUpFmXM(9@%#oUY4<}Gs9vB^mxiiLo34AI{`FddDgeV+AI(+9v zYXW!z9g33pYJ3@VE>G1Nvf(R53gybUa)t7Pq6k-r@N~^Sj`wy^C|A%m`&e6v%gf8X zu(lG{x@I4Ras|hGyRSMenve}N1xWN{e+LI!8QeE6kXkfmycHg)MFaPZ3mj}^aI(MS zut_?_TGNq)q?KUaVhB+i+|^*G=Oy_zxH}I_93XuS=AewUyAn*g6Q(uJr^uxVyWrFF z?t4=A0X^Gx2o!5gMr&|X>2Y8b@o6vOwnt{E9)QU(qj~5qP>KR~u@u=8nGL7sCB}af zMA>=X2L2l$s12di2gojrkg5647D$A}+zyB`_{q=~t`8tuoiKWGUjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cbda50a65f10a2be93ddfe6df58b0abba588b126 GIT binary patch literal 520 zcmV+j0{8uiP)Kz1Tn`DU~o(@IsV0d z1HS?$2??NP7+>h}A(nt6V89R%yCqdqZPJ5)TgtX{w}iPquIJvK`<`>&+d@uGPEJk+ zbP$P%$hb8T5gkNh*V34=-FS3yWtH4^UnT)Mh-CHe3T?NG7Yf5&5E1c0;aR`M`+rS< z4k9TP6iW;96O-LN+_O{Npj1%SBCJOM(D(h3E|}`uZkN9AXGsTuN?SD5n*)r9vf}{I z*s9X%xFd1X1uqm9=4MjQn6**acDw9vZz_OFr6R>*k;UadG}b)+opgA8dSoyd(ChUS zd>FB@RkcZ-&e6q{=pYi~?1SS|Nn)<0;o$gG#=V!uL=POEoyXM!c;Q!0GnV1_{`RIi zJUh24GF3p|_i5H^@!@61;aR`og+i<2vQyol)p0Rb(0Bl#S+6M@Q>GeZm}E{{#ElA>pLaCs*y#61@*7tV5c_0g!K19hGmmP;@y{3j^ zQxz}`ek9=b)k}SzssQuHvyD$8vkC7W?g8Q-Pv7_9GnSL{6W#$=6e30Benb-h0000< KMNUMnLSTY5RqRgy literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c6186177a8c56ae25d55bc011d4364aae6b891c6 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1G;; zi(^Q|oVT|&@-`a?v?gkMSI$23OlRUTO@-Snf*KVe9*V5J=ga%P)c2}RkQ3T=XOA~0 zP#XwHd0zT1HMjU_nyiLr|Mi+E<>DCK*UM7xs(3E-o3!L{q)XrGAoZzMnoFk?oxAjW z-JH#J_bZ>aSe2c5#JAx@VY$rJYs%SEi;w;h`ePnjcc8d#{zopr01#+zzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..be1f32f6de2e9a95d6e97edb47ba124df12c9d6c GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1FVU zi(^Q|oVT|exta|`S{`2T-h2B?&NrdEH(I}$edW-blP9&Jsc}ln^b7xQvxw9-vzX5m z0BQq)2hNlBU5|V6WZ#mwqUtldx2Bwk>Ut7)&G+;!&q-~ClT?moiyDast9&=`lRD<9 z*piTT>9v;e<&SaMtDf}5Z$& zn4DN`9*`XO?c$8^`~{u!n!@uRSZsf`COB?y8zhwXOX~OlN*3bVj acvUl78%2w##`-#ejPZ2!b6Mw<&;$U%mUgrN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json new file mode 100644 index 00000000000..0cb998035f3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6bdf36ec2ce292230352d6613819ff3684ae9c92 GIT binary patch literal 1127 zcmV-t1ep7YP)K>y_Hz2&;ws8s*}t;2mTo1*$FKb26?N-!-O z*B@+%>c_r#D&Cxo21cQ{+B7ZOpaZCAC9fTTk%bdjeYRgz{|=A1zpbK`ngE*9cRx+~ zO{K*={Rp`97dl{`_+&INqCWEuf>%EVvGpTEg%xKf+CDzQ=5N0T?qR|+(Q=5=_v?hU z$I%as09M?zY@>aAF)BVm#LWHd17D~bMG@5~dwK7T{6^$b3) zZle0@A2`_C4cJ?$zHphnfh!X7)Q`0ZQtsbhj`ZfD{uEebpIg7M=z`X%Y5324LI?n$ z+wB4X4)%8O?A11`%MNV24*g&1=RaF51j^p5?GsZuMue~uj zj)PvW$E6<`0qo@O6_>m|LJ0mnZ-Wp5>#_rFeIwA1{)y5$HQCdF3s&C`bp(B%A*O!# zx-8dSR($P|=H4wVh24RVlQFLTvw}9~*onoQ`*dA*RaJ$yz5xKZI(v(?U!DR0tji9K z04{y5fl&uIj)U>|7Nt@dw%y0l(ml|D{r%UUnLP?q2LNBfokH70^tm=c7P{ss544|? zn2Qaae6QCFd=}A9kGjL*jpA<`4sW<^a>739Dj{tWi9{liNF)-8L?V$y!2Q$F zpKF_p1^|Gzc>|%pzLQX{yPK6|06?L*>NRIpAOVD@swbm?@qTm%zWiOLtW;mP4~w7J zOfV(=0*Nqa=A}?vZ9Xi1LfVB9^Jr}C1SX#}`y}ju)~RXG+#5|%(ZaMnjM%H6Wk=;}r6w24^%3 z>rb~v=zAy09smG}uIm`z+Bn$T1tBE!O^^`c9_;O6d}~A3bpTMNV-X^@1Exod0nFy@ zRaNzh6!L%&608dd)&g)HgIt?n>u?_^*JmbA(bhM-%8{(l);C~Xc4oA{H~}vDCtUV; zH!T|C3V=Y!XI&fM=h>@mmpTCey4@~YKoxr&A_I1(Yj37J#W#>lVfPxQULf-V2`?xA z^!ZD#F|Wz9T67E|lLrzWgLxK2WHkoSZ_V|WtO5B(01#XTv^)-ZN5J=h@NWU&>*f<$ ttCunUN-002ovPDHLkV1lA86CD5m literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_black_suit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85e8f7a37c21dcc9a3bb8ee14709d02f0fea6b55 GIT binary patch literal 506 zcmVzO3N51WhBQ(fKiWDi*e^-oVF;}bG z03b>-pmu+1b7h+=Y5TW18Z|*nhb)HbH+<0o@$*dceUp5ngC*U`i z6`k*Oo;>CSwg`VrR&+Py(vw(7x5#`vXgh1?4GU}$?A0w=&4#C6nyuQt*$6y|mHz?& z$YfHXyIGcB3qX`)_wGRm0U>0bZ#5gZzPtCt#)EcDlw|*4(gTQ+%)2j~gJfc!BZS~( z&;ua^%4;9Y`K2chwYw5T@Py{dw&%73aCXYr`|(6j1wLmc-rf~&&jo$l3O<35BFnO% z>nZ?1*Hu`S1pqj?s8IC@2UtN4grj5Th`Pt005oml*ii%i znc1D^ou`vYI`0c86bgkxp-?CkJt1Azsyl>jU#srWF5-7@-1@baO$Z^R*0M=o^t zYPA&fo(3TjKp1@ig!Kbm;>G!i&d<%__Wj4MdkWK8HrP^>l@O%Q>iD&b==-h!UcA1$ zUz(qrb^7P$W^ww=1o*c4?mlZ$=#|h*e|fc9qK_#0p6+;wj}8rL0FcY&oB>atnZWqu zc~lk`005?GY5-7c*@W&9U8Gh*KlOX=0o?!q0GBRZ40MzB)9d4cj>k^k3)(NE?`Z%# zz`E5eUC0hQ?iq#w!!Vrw%Hjg@GnZX$7qY|Jy47@+qO2i)`ns+=`ns;;d#8;zYtLM5 zvigB5fS>%}z!9g$9X%Dc3WPsJ`d#fYG5rt=6)M zpE!m6t2ehS&md|oo6yg%D82O4V;KOzN9!$4WzI&@_gw)&H+4E4?CpI90PO93MyJyO z0Gu43lo}_9p!=Fz7Cu^U0sJ(9PM(?}qc5}x`aw;g45!mkh7*Pw-e@#j@5AUvGGJxp zxy#+7$A+Q|Cq<*tfN7cS6rU38=gqJLZMJ76bgkxp-?Ck-bkO=vbnb9)hYns zWcoOI9ihj~T6KqfYW_TwElg*fcG+aC)Wv?O>gCmHDL*k1`UqT>TFWM{HtKvPm?D*j zjC3MIGcSedZ28qj9dXqJ1VIRKO+IS&DYOCWRY@!Go zFgi4-(fS)cZ=Xt~T&eP;F$}|17r@p6u;nx&NPPqfS7tmXPoa7HBw;nYOekELks42W z54e8qs`Hv%^69Y*9^Si?_$K)9-W`oKfsKKUO%&;XbGaO$wK#lv%F@zOUw#SldktGJ zAp1=uy#m;r{MmEUPJ6#5&uh^b!b~2B_%+zif{3JIi1xogBDm~6a xHy^)Ry`-V~Q3!3opU%l|Z*TumeTCv5;Rjs%qi5+Y!({*f002ovPDHLkV1f-YBToPT literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/airy_white_suit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9c868729c67d4aba9e8befc1398233a38d8360c0 GIT binary patch literal 516 zcmV+f0{i`mP)BO)U6Y1QYISPdHvpk}Y_Y^~SKr~CC95fNjI zh1q*$k?`B6juiA+NQ4mxv~-8NgUY2MF0ZZ~Yc5W*c3ElGBzz~}4j+6@q;jd~2;a*b zz+D@BPVAC1C*f)56`qR67y#sQIcvkc%mLDe$GEFk006C4ivd7i(Ma486W>Y9yaT2H z0H9Df3p|bJi}%CeDPZ5ADG#N5Hfh;&&cQji`gipTj!w@VwR|?on)1;4DuRRpC*Tf` zt*==<&N<#*+u)pI*prdi-FNie5`K984y58S)>kyLhkIc^^{^*T_4C;z>nj?G`{RZ0 z1cDYBh5=O_0RU8W1j8@@0Nd%qx%LSZ2!oIiBom3b_xP2-{r!XEbQ_!T{}pi4m0y-C z@ZNo1uD~KJT_Du|0f9F82Jk&q*L4lL4vfcNf8`bNfBXO@t>TB=&2gmw0000`4&B zi+E8`y9&CZh)n&WZ+OjSXZFp^Ze2`ZH_6M(``-JKNrq&IeDVx<20R0v0ndPEz%%el z8F3#MyQN1|}KjqyiEM_D9u zLy8u^VFCa?F)=|WCnvPOzfTAn`Q+rJsdsmG)5ypO9165f$SCTS86WM3hle$4@a;LN z@WWB$-mYAN-`(9&rBb1#r6sC3K9%BM}<53KHLH3h`JDACWZpZ@F_+etmsS zS65eN>fPSnQeR&m&CSi3F33@b93u}s=x3Q2Uk-rFKH9bTkpzH!EI0@b(_SXXzYgZf zUXY*%{o&zZLVwvuTXx~|Op~^xOp6~$06;kSgM$OJUV!1VvonLgzP@g9)FDTL9y?(K zDgPusW*F+O1UcHZ__1q%4T$O9(a~XiSY2H;)4#vJpB^3_{+arAKbO;u$e38E%Z~!q z8#($?$JI}^b2*X#9(7i>^Ocnq+Su5z#by+0gb4(3_)LUtITzBaj5u_8qhSl5U;1!-90j@VCYKKwa;)j5_>`-e+l!yRW z1~~7z4IyQygzXQ310Ol+Nt2oYOnZ9;cFB@D6xR>$ATE4gJ{gs9SV6z{{lh|tLdR!WQ1~jKKxU|H1Ag;Q z5YFQ`_*UNuxMm1^kUqI|qGW0UWbinnN0Q$QM1f`1#@{5s9(<4_Xfad-@D~`atEjQD zG5Y?opv70~0|QugVxQPYyS-jrMS#o5<>h5~J+`*C=2FR2#uylNV5d#0MR0t4JQx@l zFqk(tH)i^wf-`w6Lg(k_w7a{jvZ)QAP$&dLLqldA;!(#XO;1mcF?DfqK}SbN&G7-? zw!_oY)4|NlOfWk;8|>`t)U@0BY3slM7BGQr+jIG7>&SZQM*zk!5_tBOmzSmOrj&sJ zEFS%|Aej&VC*V*kE=hrrRq*gz^{nvgCN3q>nd>McvHYply#IQ*EZ6v{z?ysR_t(LDG_! z1$Jrzv`)V?{Z~(b`uhML!B*_~j8!jx2|m>G&C5LlZNk7`H6OMbCH&V*0000EWmrjO hO-%qQ00008000000002eQ5#-t;0K6u}4Rtq&r7gZ3S4?}CrCFW^-WFXBZH!XByxMP$3bz{pfs zoav!Zn7~dZlT0%CCs~m|0fB%(Kp-ICfxvJ$%=u=sS#DoLHah#(XkqFwN)l`2!mlid>9LaBQp9s-$TuycK3sg?MWEmBYv!lZNzUi<)hC%}#qFfv5IVjhxPVkaPDngrd5;c< zgY5TvS*=!bJRYUdXvk!5ka#o`{A?QZp&M70*A;P!j5v-XsM!P zaY6v6%jHrViwukUs=LW#q8yoX2)op zR;yjd4)|$4M$VLBv)TB>R@+}SA;BS20we38=i=3b_~zGaVleZ!ve5+|5C{nT8w9=q xmUP9;iaFqk0000EWmrjOO-%qQ00008000000002eQK*_9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..162a846b7946d0fc39930d4df820115f059022b0 GIT binary patch literal 816 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV7lw+;uuoF_;%L8Q;!S;8aAKq zlAFSMu{kbAzlq)d9W%#o1G~fXYWnUj|H$}-bx-BRW`z!M*Cn_0EmUvs-}W*8Tl*$q z4c|*XYM)IfcNrhc2xRhd;M8DLUBEJ>K_~!&v#0q$hDq0sON*KhKJbmN@(Hu{emApE zr}F+j{e8@zkJ*Z)wQq@9o3S^pev#o^zr|5&-Ar%gZQs`K7I^SS-1_vk!--pB^w!?V zG3%anc3Fqp?6b$J?F3Kln$Fhn@o(MznDy6F{$0%yU0YvczW?z&x5X2`><<#OR5%u} zcEt;a_?RY#AAe3Q`gH7A{*gO*=7*D>f8Hr+ci~;xZkvtE&rjGLqgQWhKmR9hlrFH1(1-!(E+e z=Ji%{-)z1Ap7&UB#KYryGV`|@$yq*`+5R&n?@LOpQth*|Qo+Bp4=mZU^7r4oV~;mp zZR|hQDO-PP4P)e~`Ck>gWm>I1drKQ^ah|HcaAVS^X?Jzy^{@QnsJhB3F@IX`^R0S~ z4;5n-L_FrY=MK5Q%TMaH2c~zv)CkWsUtb0- XAe#e-LEuvGWDw=)>gTe~DWM4f{}*b% literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_suit_male.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1efcac2193c306b53e9ba364c87ea5ceb07fced2 GIT binary patch literal 789 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..97e34c0cb5dfd083bb8572c5685e9000bf5f66a7 GIT binary patch literal 514 zcmV+d0{#7oP)m1$X}dM<-{e4Eh(iIB9Wl7IhF(Tv|b> zO8u4EGw<4q=~0@y;Gl31+L!O%yZ3$hjwFByQfRR$U9%3e755_oV2yI z!82hBs_Tld_|74Jf*fzpVC`4l$(j$iIypdXsf5DCEf!X`VdZ9d%}R{}W0UB3muT0{ zV&^M4Ajnzc8t}U!^7%X`6q(kk&P4`dRYOStANte?XWBDGOfRl+Oqp;PL7#9cTpMzs zCgAZN{@rPxo%UP_s}mJajt2FypkFm&1<*OlXDRORcz=iU2rNhk?GZIO#|n@)MDhCW zVH761PAq`#`e<)c>%0dkOeUcBB!mw1@F0S?wNzY#TxajSM@;0Gy4<3LwFFq{EUc;d zAKP0^Ae-Za^a5i3jTSjIYY7Oa3(G$OH!_*-GQ9y4MBlTmvOis14nH=&cW%j8Wrpc7 z4j2dilmp*Ob+C8rvU9Eg000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Ef?O2edjJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8c44769f38387cda1f9c3b32ad565086dbc1f98e GIT binary patch literal 813 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV7le$;uuoF_;!|Wwy>kb@%ejl zcW0Ic8g?jptz;KGDE{S&{)3I~=j&MP+v5*x7T@2Y{xz(nK|$9fNYL3k$7k}}9sfJ~ zeavpBm`65q|8Gs*eE!U5qx~~a%01IR)Xn12fD?%+1nmENU)z`Eezfy^?^!4Q z)Z>$X_UdJCEmq5OeU9Qk7JF)*<=;>1TBiTH*0+-7`cZMizs=vTnQ8ZJOZ;$kwJ)dC z?Pos@N52-gsm$|wJ^R+tIq#PDFZc62Uo^?Eo40v=OlB8n`?t3I-FMB_GjCkIFediA zP~NKdOWSv|HM=)IbJ(}!s@c;yhc=inoHe}hU*qA)@RhOICl{ydr@TIYORD7C7Vl-x zKip2|{B5sRBOqV-X-^TOKpDS!7E{aJ)7E0gT%7&%Kh~UXiIrmbwrIEfdH4M}w)t^; z|3rsR`^&GseSe-}Z}+zfzZ+tEgZ>+y^?vZq^UcN2^N%N;t4eCCeOdm^==sO|d*(}L z>8s`kpOS9evH2a-{P630zAX)B5LysX!|Jwo@kiOW@jPbHn%8J<{ciZ@x}hck!3&zmDdq8?Nn0 zPFC=r7p}*!;mB)K`&m=p9hoG5dy(zjLhcv??0>Jnm$2~bC~$6G@UuWCepSUI(`~A{Er%EnJV<{j zDAIO)&vY;601F1I11h#mC7e%xwWVBC5fN&r4&qVptZLbO*#A`4v&{tzk8Uws<=s)m z(jy_&Y;yd?%=2&4AH^gt{>@tOl_Sb&*1^U355pL`_IdPg=x9@z{nm-~{sq5U zbflV`m_%Be5nzhX}-P;T0k}j5QD&_ Q;K?A$)78&qol`;+04=0%wg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blue_wedding_suit_male.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6f9f738dbf58cb505989f312f89102904841a0bf GIT binary patch literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA|*D;uuoF_;!|mwy>kbvHK=B zkN93)Jbu;D6 z=SNdsTFmCJ$vrVzsBc3pSCWpj2DzsabUuU43q`(@0i(jyqg-$w%k6hwQkmJv~CGOjM@v`Rf zlM7|`)U3L7?%tk!pKrmN_AXRue(t!}yV6N|ZE)4=k6knB_OJi{t7H<_xo11QgQj{k z@V(f0OF`<``7iHuMON-)xb(1(=|)cHmv=T3UL4xx<33-d_P^Kh)!&$7FFcpKoDzR5 z{@yO<`mO2TKJm}kr+qu?UTxN<{jbZs^Z$3xOJLdY`svBV?O6iZC*>mkhu&na(G6Q3 zd+5TOUmNA#nC>uqkhZ7nuF0YZskfImZP}xw_jJ{a?P>+3-&O7k@9RIZ#69U)r^?~E zG4l^{H2gfdp84RpuKtwGrBh^UuL&pbc<&ciCSA4QbXH5;i(?WsXD-j)&AvrH@8pvY ztA$)tO2XE!JfD*vuPDx~ZRT=Rbu@BE56FD4z} zDbrc8q{T6Oz4WJj?Ltcmy@V7Paihj6A%{~oQ?lLNj-5SqADlcH{})L8D-PAhAq$o3jN-bZD9Ir zzrnvB&ni{`1&%jyOSK9%gzT6fzrO0ML*sMd?Zuy;sn45LddGJiP<~%~zmB0=jy7cCVR5y6ePapTTi#Z`9-f}mgp7owm$SAv`34{+mJ zEC@n3-6dhqre_jAoefjeP+17;^jTR_**L%(I5tX{dS&4Mn-C57Zw&OS1z1UoOFqJ6Y?uF z{^9+JZOz}83tIU5wnYl40QjjRef0UqD$UN$5|W0`X0xgs?~GCAP%lPTq7Z@c0RRqO z1GlP)@S75V!L3qRVN6U+sHCT-pV9O*5y~*MSBZ#7sKFusy!gWd-Bc{spMtKAn8HQ~ zDSkr%7<{$3Nd>D+gFRhz?ebZA_2vWh_YbM$QAYi8VUrRzF)4|V+{ufNzKM8;YY4;u zH`OM@cSmxCtrs}?#ie!Hr~;+aY1M%}>d_7&=-*EB!$*8h8rQn`p#nhtV}soaD7R(- zM_D?Rr0nUV>KYzpHuM8AjKg@Y*YQF4VX>t6p#lI1$sp+5mtVD2AN5GEwDewil-baa zNpM{&J_vvE-gC;W775;IQv8MjEEh`7`0ARc-ugVX{fJD%@RC=-+veA)3+5-%pfek zdM7^G!GV+4#cwzR{D`0qz_%a0s1XS27iB#s-wKA708ktDiuFP2wL! z0EFG&%uo;Epu*$3Qv@QJ%(xbTKxQEgzyc<)!2w*rNk;^c0GvF|0XX;PM@L8Pa{@PM zZ0u6xA^-zez+?j#KARvFK_mbGIeGjDieo9*B)xw1qKgm{i^?N;U;-N)z=cJSVu}Ue z!w3NOJF6ol&}x5haEc&}Cl&wzyf46DJPWuSwdcF<#PM=+wuN153BUmX%KHI)UVz)8 z^3F2}z}8Ki`H2OZBehy<`UD|9Y1Q2W@ywY6z)ir9b4)lJeSaa-yJEXLi=r$(sPxZSwqvCFUR&03@6u>~!*eBIqWMSfWRO z!T%?31o)rsrcN$>pPoXP(C#=ZV848f83l|2`U?C3R$;KY1t#~r0000E lWmrjOO-%qQ00008000000002eQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8ba8a13a7c069b1ad7263b25120435549c0c7ab5 GIT binary patch literal 511 zcmVS5T2$#iBeN3f(FFi1P}HWPriV!;MrFYyxF55=nDv5`X~WUUOak`_9Pw}{7p@h zHs)L1n1(&I98+_-Mu!J`gr>H=#x!jB5eH6%gpdGEhN59Kq5fbHhIusb)pgv=|S5R*Y*u{@souR>oE$VAaaxteV-_ z`2^6&OeYfgO0O{Er$m6Ch(AWbDBXACdm}(#5mCA?G-$UP*)i|>FQuZr2nn5|C!i1>9+CWm)gQF>aQyF3Xj&qoSl_g8tI64gmJ>_wa|)+F zewXIYCVsDV>Fk;BP0pXm@p>lu(3MHW0VfjVkTK5|d*^%oaoX4Q+kB4(+Y9`R-!6X)}?-CrS+vM*wl^tQKUx3jkTT{)91P`K{0 zc)J)|zl0V0r=4rJX;eN6O;7oAP4?8$0zLjL)ym($riQF$U-kXWytNwP&#$lja-6$e z`;oH$q;MsMs^*!C)f`U5)CU>J$a2=+I3uo}lf!VM`&r$bbJJJND}Qgl<~7&m{|{4c zz1Cgwc-^nLme)I#Y*^|HbGvijdA_-Lutf3k%^)?i37g+3l*~)#*A6>bS3iY2a-~S| zx9%_JwTv6{S7%4pzY%R<(Ga`OG~L{|w0xaf)`tw~dwL=Nw>h1uJJKxwhf(ljNzRsq z_qX(ap40s}=U3VK<)8jsjJ?`&^U#_2-e;e_#N9NkUel>YLYsUG` zIXp8N%RlxsK5pSKH{q~S?|b^WTCy@`f3p01cHy)od<<;wm%Cpuh+=>0Ak}n*@d9(n zWo3uy0q35p^r$ILWjHfAiJ|ba@|^fSQ|+nD*>RdM6t z!1XNuSKa-?X7H86Dt^Mj!)B%046fBL1s7#-2wi4hupu@suZm@@KgVK44^;+_Jg;xp z6YG`uIQw*$MEv&`aGkdKG-t}X|E&k|A3b&X!_VkH5t!WhQX@Rme0>?TfNTyR27yb# PlR=cHtDnm{r-UW|v&v)2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3cd704f8713951f9571ca2c6cd316f4f5e563f90 GIT binary patch literal 778 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA}5K;uuoF_;%L)EMZ5HWByr} zu4D*lto_I@aX~?3sRHZ$1KbDIKLpmW-aokfgW?`RM;1>(Me~CRyt$v3pH)k{n}2BK zY+c{%-=I5Uq zzD|47HZM77b==g4CX@K@`<VQWlZRJNy$V`hEKt5X_VbnJ-AfblubNNh;8Ye`z+4p~ z{pY}s&+5CwyRL*Vw4V$f zxBIIuEG|zxaMZp0^~bPHd{@lOm&EC+bDx~QT&}Cqv~lrXwM1WuvtmZQ(~9QV>^S^S zjoE_*9CJ*uC~z&QaoN)d86b!U3^@#X1%|IDeJ%)nk@?7YrTV*mcySgq?` zi&hr(IG$zLq<^EEOHr7ir?f09+sA3WWQ6eSiziqXd=AtPSUtsetwUfITgdO!T!= z%wn7$86Tfj+hBd;-2TN33pq@g*RjX{o*&0}b~{k-1LHGxLJ{g8q?10|?&4rcxeH9m ge5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+0HPsa@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/meta.json new file mode 100644 index 00000000000..0cb998035f3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8e820ff8af17579c228f783d9ac01d410ce4ebdc GIT binary patch literal 602 zcmV-g0;Thuf(gBy1XaX&?hNX-iN2{wg1$L{Lxa(8hI#`-{L?`Ci2xASL# zqmFv+%KB_Bio)}Hv)N=#@BRxw7%0#4$hO^Xt94(9mwh%1At0rMQtH6woP(4Sd7gU) z>H_oE4MkCSAq2G6u+~O4rBw7TeC`U-Y7B#?ves6o=8RZtqjeXE7j3}-KuQ?}uRa*ig%0g#pio^E|l#0v4 z>s|nDvetr#YJtK%oGs@Zh^YS<8e=jZyYMvJSiB~pDky`5KyATW0RZ5*-aL%GY>*;F!}*Q^I&P^Vid>jQ#Wm2$cp0fM1t4_#uDpZ%1qK&D})y zcdy=HVwV1&02Un_H0kThK!#vIx! ogT?bbUzZ-(_r#+D9Q9E81KTz-Kg({eO#lD@07*qoM6N<$g0*`Mg8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e33f34244d3681d3efe1ee66048948e615824015 GIT binary patch literal 1298 zcmV+t1?~EYP)uDaPAq67?`|B7Ob;A5qDmG) z3gOUm50whO6wzkVDiZ%i(56(Cs+gii>WvczsE8uLsYj41kV!m-NVQ_)#a@SaBd~XR zpmsyUk2qcfs^)XCG+w`X^L9M5(kviJk|arzBuO7EHqVr^*|U9#t@I-(%QCUs-%ia> zDKo#$yxd6Oh7dZ?YhJI?mjdLR+_tuz7KISvZa&-m1OQH?PbdJ8tL1QS?VbVv)0d~W z7pMosuRtuzgq5*~X__J&4uet(0I+Qvu`gq|@%@b*_jT&hsdD+Z@=$mnjHRU|-*S8v zUxQD~PKeS%36A5yG)-{MVVWjv+lJ#f;GDm;Kf^G}gQ3Bp;n*-Z=g8;teJ#KqKZBJP zN}!a2QVQF)5e|m|pwk9Gyr~Gfu9tOPA5v8n0Qx?7z~=%ujsxJufZMacw(ZV$?SgE@ z=9$8ub6h)j&5J}L-sy8~eCLG7X^768;Me%hJuaxI9*vNF)M62o8+=yY2V#T=79LO;fa|{+q5l{nP2<*r#J+baYh2{&Y>H=o(o(RS0NzW|F*L% z3;5ZOpL{(Vyl~_~z&vAO{Il@^@)5z~$B!|R86f~R;B&EAmIVQK1t;ew zH;Svpt_KhJJOhp%Jt`=rc)0oyM%+N9Qt2cb4u?gpRtqM-O_F3d2`gjms33-61XNXR z7={5M1cVT=@(P$K=X@U?! z{+R_E0M>UJQ`0mI4h|xp&%?HDRI61`N>QuTI>o5h>$}d`_cdU0Zc-GpMWnw=Z{C`_ zH4uqJVB0pLG>SaWyPWg4-YJ%40RhptZ{Nqtk1Noq*16l9b7)Zw!(R+z?UyywH|jfz z`8vK9U}}DfC`4%xm57U9T@0Q)dD8VfZvX(u9)iW+7rW}uFpYq!s104$J11E3WdPo;Ng8Oul2Co-|zi=FVs^i^2>Q}&fUeu z#ULR>JgYq;`$PMC8vF-u>jO|Kl|m|&dfzEYk|arzB>jK<4YGLvcmSi$8UO$Q07*qo IM6N<$f*3?&LI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5b0f5af90c59e53622e0a4ef2390ecc5c96aa15f GIT binary patch literal 1613 zcmV-T2D15yP)4}>RQG@-aLqLc^JXvD-Ajl7uPyBHLO-2$CnrP5Bf)0W+3 z+s+&xxCpymO1mq&dVY_S>DTZ3=A4<+&H)&PVHk#CnExkorxTcKJC5#vSQ9x{#%1l_ zzyBZ4=bH(tMpX)6NhBPpwVU946YHV}1R29;bOC4pz^k9V3bSHz?u>g@Q@EJ{)Tm0; zsA|9YSgagFtQ>1PiM>bnwv>E3)TqhXqpB^QJ`rW96b(rpY;L+_T$6H7ku#mpeRZ`5D4)3 zd>)lbr3Ao}NF;7)!YvK(`~5XVQ3OJ+9xfJ(002q)VY?WaziS`-ZcfX$mX*D0mE zWm(WPtwbsHq*AFHO}J%FxLhtI5(zk+P5@U6*E9{1B;A+>l+u5>gyw}pp}N!QX z1AWi*A^&k6WupvAsa?~w1%35Hp%4XyaQ?#i1^@&D!MYMqc+)hY7j#V2CouT(Ap9Nv z??Lh4jVa*w`)h$fKqwZAkR%CuLC5-6*5kW_-(lIa%NEt#zuB65*VN^uGG8i{;C8za zkH_~bUhjxVu9M3KL`o*tj zH()WX_FAPz)m{J^0CyxDnYAWh7=~dOhG7_nVHk#C7-nHnKTzj9=B&5F3mOOM(8)t{ z9CCqDqpCdf7!ip6)Av8kY0gb;koYUZ?++7dqhA7ed>;Nz&pk5o$g=E_tko;`f=*NV zOZFFJKF@Rjm;`|B+qdJ`v14t0Nn71K@WKI_YNWQ#EMASOXP$faIs0FIt{IVV#BMdL zyub@O0G;pTi-nI0=(^H1b^RRAW>4E&d~Q2{dPF6lI2#E^23M|Jd8*gnyOvfdL`g(G zmmgcPXGLS%^V`<$Bs5yd^nREuCEDq!jN*rf!RpnkyW5F9Q_DkW-Nto|9`x86jRvNsrZ71<39r`+t6_oI2y|UXB9Y+A<#JOS z3e>17$0{+z-icXmm%CsX2Iq7-VVWj99uJZilkoNVP%4#RnkIMp^yxX-sL;|qAaHkp zlu{*IrBXphM+XYo0z4iM%H=YQih)!r1psKa_-ir%ezVzZMF3nN5P&SpxP19C%9qOs zhJ!FB4H$+oUaeMJN&8Q=Gy?kj`@!@4fZc8%?c%y1?T}FTw1DbF6+WL20IoJ;+=zvC zhok{%U>ZR1VEEvbe~PUrN^y<0}Ns>@1l`!<$Q1QfDC#2=iFUMEAzM9j$jV+CU zY&MHzGC5Xj)COHox~6kqo=cuv@$;`gPd5`= z(=-niC>2E!rfEVH#qqbFep}wKcS9l65gH#pJUplCfVR6i{K+uoCOItWS#r-0hkrOt z2;oiB1Xt&b(fH`nOg3{{>x0*iyzV|bc{Vos)+h&nB$G+0-5mc;Tix7uXdn11{6MGN zIr!!iZ;o1~C8g8p@r&7uSMGZBuFl&n9snA&@ojKPaA`7`l;^v6V1D)r69Cxq-j=>q z!m4ipJP-*-ni~Fh!hHM|paAIcmyYKEY@;Uq&+a&37=~dOW^wx+g4=x!^C*>%00000 LNkvXXu0mjf!NTpN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json new file mode 100644 index 00000000000..687de27cfb6 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef1da07287486139819b06f9d263eddea813acb GIT binary patch literal 1022 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json new file mode 100644 index 00000000000..687de27cfb6 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..49138650ac5a734b33ab8cdabb2caaa2323bca1f GIT binary patch literal 598 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json new file mode 100644 index 00000000000..0f1efa045d2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:not_so_big_chungus for Adventure Time MPR server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..33f7ab581769f809b49dc3a37ebf9370ad4a4275 GIT binary patch literal 781 zcmV+o1M>WdP)C_|tOP`D2rb2(oDy(`ZV7b;XAE=; z`VR!WWp}!mv`}cl0fRLqi!s>7;7W_#&Bxc_eCLyN{zYg@z;BU# z`gHHz)4NXxtgym8K}2+)=hv4h9#v|JZ2f4D5fSy=I}j1^tDE4&M|*6MITtFT_OHk) zd7}wy=SifNUpD}IV_^|%Gl_{PK<*ELqzwSDQdP}dnFnE8UU2)<%r5rrABaDVuk)t*(}MCh>Hv);^Kct5TWCNxBF@y2QeeL4$gK@SU`Zp{^coMzx))j9Z7p) zamS02>(D|e@3GV-D^!al7pR1V1&k^+lFB0_AqT>lFuE`vKlt$mUteED_>2PJ4PYJY zL`489cqXfPqX{dY1v*|-NIq-KLSP$~>ScNt`v%w>qM`UhF`-5tusLa~exO$Cwv4Yu zcFd^`leOR4N%`P9_~F3bb5*D7L0_L~c=Chz8zh0^VSD z9|%J)mSlRsq#!Gw7311U)$ev+k>?&=m}msov>W@Er*!@N!-PC(gJ0cDz5$6i&ih}` z^?Uf~yHHzKI*{2`3n^5K1OVYJ2pB%cdP8Cm%2h7%S;)_B?)E*7pB+vf)UD5KtI#pV zm?V}tn<~Im0Eky2C(|9$YtH$1=+B1h0l+wScwkYCDmBuZ4{!GuK7{C)c^>!|Sn5co zBlr6=j`<6#?!dzp5dN~668={qPc*X0gtz4i4+eh#oNk|2PyIW@00000 LNkvXXu0mjfh2~V# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4906fef9863b0ab79dcbb52afb362f2558105568 GIT binary patch literal 1095 zcmV-N1i1T&P)~40Ycwz50=IeB#S58E|m|B;?5S-^$M24UyW}8lNAevOEO*UMaGp8R*+>$gcX>2~u zIe#xsQWB$(fViic*9VeTUFqI=o28V+GI}-wL2lT6@ zEO}*?yqqVKI+@C-OX9EX1OPyN#Os}IOhn^MSjzbFXPpySGC5ABu8@}1^lU53s1+NW z4ybJ3s;FBwW7p@;0m*TgqkjRnZd%#PByii!Fvli=^V#OOilR8(){Y4d1<8-16q;yW z3fCA#k~(um``Jv12S0tiBO`uY2u;|XU$O@nk@&LvK;ZD>dgerwtQh3q1$z&;kX?Lk z$2&XLZ!(zBuXz#(P5dA<;RhB@fKi>CEUw=UFQ>(OK&g{$kt9iyBuSDaNs=ThYFbt^u0pLsm=0EdZ*E5e)geJ-WdP0MtN-Hs)Pk==t zGY#a6b`l8SP9Fx24Pd4;<39V^*;*^{geEKi8$*MkiV=>L)h(Mn@O1;zbAWFXkeI;k zKM!H9I`2L6%6Bbw-f>LoWg`-&HF4FR_?Pql6-ZBy&n&G}svWOhZJx}s z=?@uXTT8;xQ$X3a)vMlhNA>9w&!d*O1oQVxz%4fci>3YcCfup}-bGht)}B=)u+0ys z8(>C+ZXW7#uxEw{3x*9Z|?(^1@t|D!V`C|Zprz&VJ1_+ zxhd@W>{+P(+W`|^<$izLQ{VADKxm?3((F3&@Byg49;Lnq;N%DgF212uOw)VnK(wU> zlPn`W?Loc>_9=sC{1kTAj-hDGd%u6V{k7lG+Zq#k8H(aTIuEl}bG!NjHKBGAeI3Sxr&5fvz9j$v N002ovPDHLkV1mi`4od(4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0357ac0833e2ca93179b0b4f0a9ae99bf7b1b6a8 GIT binary patch literal 1506 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 P00000NkvXXu0mjfqt|_^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b84b8660893b365b02c1192eea724feb37ecef GIT binary patch literal 816 zcmV-01JC@4P)k7RCt{2+P_Z|Q5*p9?*kPfG=PmE#2*8*Vb>Vl4F3R=CJZP` zF)_#>35jJfQBT+$)QgG{Ffthz28+Bj$q>0spmX|YE+S~%LC+>ftAy-P!gp7zRt zem_%t?fbrW-}hsAUjRY~A%qY@2q_USaOm|IJQoZFP?Tg8CHenL#&BH6?S|v}UnRnd z<@OlMN|a z$}{>BZJ*hlwt>?b{nP*NN$nGh1}|{-O0ZUileWce$~{g1fQoViJ$LkF#k*7+FveJO zqo0MfI_RJ7a@4kex(mWu9W*!knf0u7pmqPQhGI?+K|%;2gb+dqA%qY@2qA=!Jue)M z;aqYx=SAPVz|B7r?p1oxw@s8}Gz<5k>a!)i?1`95u4csKn$kDbnZ5o54wk#WU%DU5 zG3yd^VPy@CLMCzm0KC9$x!Kp#B|U?PifJO6h-jKBK93vOp(WFs6)-eD4qwws2oX(D zk}+)81(?`3)tTc3uBy~Nc!A3T03c#UGZ7b4Y5V&9MZ!Q)-q_uH#k-Lk?7_#|HP-jJ zOqL;H91+nl3)4T6&`~!u(~bUkfvfGE?8xBHO%|U0Y+t)46cuL{ma%{O>h30?WqjL% zhXNZ37wQ7yX~i0#D+vGq*wR&FG+`hjqHY-W3P`SH>LRmWYI`Ry*YEje^7 zgHXZk`&ybB))`~@yjtNyb=_B= u1EbXVdmb-vwU6g-dOZw62qA=!f5#6B&`NZoRiBLj0000%VR~=|2b}BHOlTC=w+-o}_9Q(FTf>KN@V@ zdt;|ok{P_E?)y)wdLH!IfpBb$h)4)QEpP=Fv~J!)0B}(^F@u)7u1cj* zl}cw(W>J8fz5Uelpsywnj#uZ-0jL79Pp@fBjL+7uVz!eTTnW-+m9(N(&KSyk>FPH@fN)8PJT{{BkBo4= z)4~4Lt^#yy0G=cA8w@4KF_=gJK>cwoQ`8#~8OzMNy;T-J#Q}T97V_mV90}NQyG=|# zzLI=3h7-u~`26R0{goptb>!Z+007gn(0%_2f{_FO zWajE~@}JgaZQXmsTx}Lj?N!_}{}hW)SeP_ZFIWG0C0Zr)z2EHm7cfm zN548T@loNHQThwPT z=ZyE7Ys&|}7=I={F@zBB*L#*V{O$G_?Y_N6A$3prvM<5?x4yLRR4g|dYHK`84nJJ^ zdwPdeNZpcBrJ@(uzo47=pQlQtvfLRMV~jDz{?}dr%n>#5dxjzC00000NkvXXu0mjf DAZX9H literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json new file mode 100644 index 00000000000..687de27cfb6 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e24a11fb6c4acda37da7ccd5af146548291bbe7f GIT binary patch literal 698 zcmV;r0!96aP)v#$cixi>EU>@~uq}gZ%b%yytYXIpy>s$2(N7tAJYmIfF$P%0YIfQQ0dHoOxytQ_j1d-wgDTZ5&96a1Nd(xzOu& z0viky@ck%ZQEf%@6y-wnqt6L+qIbN2`KS6<_A>mbF%Me`Kf+B!bG zdY{OVn1Lv~`T7yt+PY5~hFo$D#IOIEAgAa4qC^k&5z+5Y^k5&+{Y7b}50r^NNak9J zz{FD!CV%&{kNuUGxVv(2?z(@c<9KQTQ-6}p8w&w53uwIk9LU7K2xuaBNtWvs0)U;9 g;#~eGEb!m)2i3i~bnw=lV*mgE07*qoM6N<$f`83BlmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..207e86535b9c1827c7106bc361c0a4e13aca25a3 GIT binary patch literal 863 zcmV-l1EBngP)b8f~;M0COJ3wXUZ zh=|BC^#hY&<`+D|O8h2Lu6sO9f=GGec6_d|OdUo#{?95Xu7t|{;MI2B+uaXd)B#ur z0Lxqgq_KK(GjM=E?1zz#?@Gje`$6|uV7u-`9zYJlO2SD0NS;90&hUr*Kw%bYL@iH# zCjtANvt9ex0CIrL0&?}&am4D%9?;UzLfX_EjrNQxL_|WQNQe|^QElIIdOq~hlkow{ zWS7adQ$$LgkBG?s*6;C${Z((Gr`}%A183s?&lqEjF~%5Uj4{R-V~m{>{p0=K;_qtu z0M4Ar@9#?q0MMF9Bme*%uRAU~k&u_MfD(!Y08jdMW9smZzg9WF? z4NeRwT2$NBcp+s5Lz6?Ycf8H1%hV27As~CzG8fk%4G1d zhLMi%xiYHd*vnBPz3$QVwXFA|@1}&HI`1t4T_VU0Dkh|{i<%SEV zIF^9=#`}fl<}1s>B~^6c}&rTOGn80mS~Vx`mAPk#H!~WF1puS~*Z`~}?E~3-Rw*U`(tw#yK#izCVfJ(;p?KS~Ont`8FU*+v z#hI>=uIaX5TTS){P@%kt z{td&KJh><0v~&|-*_LKhPaCW$D>g5+)a~`%-u{;_==kz^iMoaz4Od7; zZ@lvPMD)s#76!0v(vo{bvWVo@JJvQbnMt1-Y4U%|bWFOrD9H?6_cBR~(b$iYwD>P( zo=}u#F=g_2-i?xE&!{`vnF}$Jl=&f2nzXasBrTE`c~30>O&_Hhq%=uNW;0zQFG9%B zwUD8w3Y{1uNymlsQl3w)${O z-Dkza4sQOcc`iv(nxsrJlkVcCLmOzOzu|(-3;&q>_})=oDWQxF7PfGD#B0ILE8~VG z8^T+UY>^PmLLgI8dVl)ob7yAn{GrpH_s~;wCpY@|1zUq9!Pa0J03gZ$Q548IeHciD zv0}%{VaE#qXxgu9LLeL+z++#${fPwtiNsl7W#xRnw!NXay1cxq^^Mlv$(+bUyW{;p zQ~Rq38Tzcdluc0-MNt$*Q4~c{6h%=KMNyRDLWaIEWa#ApuyXfGt^U(`&ts0hW*F93iS zt|p74xm-Mcy?h)e8DG=B#nPO<1TzBEnN=k1?C=A?Z@eev<#8D!rXKL(-(3 z4U;lO$^;9~7lbXZVjoPI#~ z;n)!r70)RnX#qgU(4EkJJ%CZ1xYcc|Z|?hwirOrYgyTd(`T$`gIuP+?tS-!WV2b7? z_pLlFK;^Wj(?ZM^!M3$_E@#0?hC#YOVeVy(`x@y=t=3Q1#wadVT3&-sFzi-xnm)sL-!RAFV+djng2bySE=L>&TX_6${kG9Vo z&zQk?Uwnn6ytxOM;=$kBc%*adVa)e-(r)K@uqUTKKJ(*_(>V6)>8i5Q(hP)cLpXBN zw=HORzF}O?6dc*sabVYXyHA+uOTBsbS`17N{qkGq^6u!>1?`*OulAbxR-PBYCw-OC zp8oO^El1;~6`L|R*j?(niQ)^FdZ&gAJsvXjz*xup;7fhawu2w7pITNs({-H(lc{WF z^OBwW&R&kb)ftJTyk?#>Aw#cx&saL1elL$_;S@zt6h%>#G58ZRqs5{Q>ri Date: Sun, 25 Aug 2024 20:21:16 +0300 Subject: [PATCH 03/11] final commit --- Resources/Changelog/ChangelogADT.yml | 8 ++++++++ .../Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl | 1 + .../ADT/Entities/Clothing/Uniforms/Jumpsuits.yml | 2 +- .../ADT/Entities/Clothing/Uniforms/jumpskirts.yml | 1 - .../equipped-INNERCLOTHING.png | Bin .../black_wedding_women_suit.rsi/icon.png | Bin .../black_wedding_women_suit.rsi/inhand-left.png | Bin .../black_wedding_women_suit.rsi/inhand-right.png | Bin .../black_wedding_women_suit.rsi/meta.json | 0 .../equipped-INNERCLOTHING.png | Bin .../white_wedding_women_suit.rsi/icon.png | Bin .../white_wedding_women_suit.rsi/inhand-left.png | Bin .../white_wedding_women_suit.rsi/inhand-right.png | Bin .../white_wedding_women_suit.rsi/meta.json | 0 14 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/black_wedding_women_suit.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/black_wedding_women_suit.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/black_wedding_women_suit.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/black_wedding_women_suit.rsi/meta.json (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/white_wedding_women_suit.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/white_wedding_women_suit.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/white_wedding_women_suit.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpskirt => Jumpsuit}/white_wedding_women_suit.rsi/meta.json (100%) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index a5a5abc1c23..ad4113998f9 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -2526,3 +2526,11 @@ Entries: цвета для аркан. Короче - гетерохромия., type: Add} time: '2024-08-24T22:38:34Z' id: 286 + - author: Luna and some AnderFan + changes: + - {message: Добавлены свадебные наряды., type: Add} + - {message: Добавлены букеты., type: Add} + - {message: Добавлен свадебный набор в консоль заказов. В него входят свадебные наряды и букеты., type: Add} + - {message: Добавлен шезлонг и банный венник., type: Add} + time: '2024-08-25T20:08:22Z' + id: 287 diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl new file mode 100644 index 00000000000..ddbf858a4b2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl @@ -0,0 +1 @@ +ent-ADTFunCrateWedding = { ent-ADTCrateWedding } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index c5076307829..cae99fe8b6e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -606,7 +606,7 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/brown_wedding_suit_male.rsi - +#Luna - type: entity parent: ClothingUniformBase id: ADTClothingUniformWhiteWeddingWomenSuit diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index fed192051c0..dca52bcd6ba 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -251,7 +251,6 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/turtleneck_brigmed.rsi # Luna - - type: entity parent: ClothingUniformBase id: ADTClothingUniformLushWhiteWeddingDress diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/black_wedding_women_suit.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_wedding_women_suit.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/white_wedding_women_suit.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white_wedding_women_suit.rsi/meta.json From b27aa74097f44cd69cea4fcf634c0ca588f0336b Mon Sep 17 00:00:00 2001 From: AnderFan Date: Mon, 9 Sep 2024 14:53:08 +0300 Subject: [PATCH 04/11] add rings --- .../Catalog/cargo/cargo_service.ftl | 2 + .../Entities/Clothing/Hand/gloves.ftl | 15 +++++ .../ADT/Catalog/Cargo/cargo_fun.yml | 10 +++ .../ADT/Entities/Clothing/Hands/gloves.yml | 59 ++++++++++++++++++ .../ADT/Entities/Objects/Misc/ring_box.yml | 32 ++++++++++ .../Objects/Specific/Service/bouquets.yml | 1 - .../Hands/RingBlood.rsi/equipped-HAND.png | Bin 0 -> 184 bytes .../ADT/Clothing/Hands/RingBlood.rsi/icon.png | Bin 0 -> 523 bytes .../Hands/RingBlood.rsi/inhand-left.png | Bin 0 -> 415 bytes .../Hands/RingBlood.rsi/inhand-right.png | Bin 0 -> 401 bytes .../Clothing/Hands/RingBlood.rsi/meta.json | 26 ++++++++ .../Hands/RingEmerald.rsi/equipped-HAND.png | Bin 0 -> 185 bytes .../Clothing/Hands/RingEmerald.rsi/icon.png | Bin 0 -> 509 bytes .../Hands/RingEmerald.rsi/inhand-left.png | Bin 0 -> 418 bytes .../Hands/RingEmerald.rsi/inhand-right.png | Bin 0 -> 407 bytes .../Clothing/Hands/RingEmerald.rsi/meta.json | 26 ++++++++ .../Hands/RingPlazma.rsi/equipped-HAND.png | Bin 0 -> 187 bytes .../Clothing/Hands/RingPlazma.rsi/icon.png | Bin 0 -> 542 bytes .../Hands/RingPlazma.rsi/inhand-left.png | Bin 0 -> 411 bytes .../Hands/RingPlazma.rsi/inhand-right.png | Bin 0 -> 399 bytes .../Clothing/Hands/RingPlazma.rsi/meta.json | 26 ++++++++ .../Hands/RingTurk.rsi/equipped-HAND.png | Bin 0 -> 186 bytes .../ADT/Clothing/Hands/RingTurk.rsi/icon.png | Bin 0 -> 508 bytes .../Hands/RingTurk.rsi/inhand-left.png | Bin 0 -> 404 bytes .../Hands/RingTurk.rsi/inhand-right.png | Bin 0 -> 401 bytes .../ADT/Clothing/Hands/RingTurk.rsi/meta.json | 26 ++++++++ .../Misc/RingBox.rsi/box-inhand-left.png | Bin 0 -> 411 bytes .../Misc/RingBox.rsi/box-inhand-right.png | Bin 0 -> 403 bytes .../ADT/Objects/Misc/RingBox.rsi/box-open.png | Bin 0 -> 347 bytes .../ADT/Objects/Misc/RingBox.rsi/box.png | Bin 0 -> 271 bytes .../ADT/Objects/Misc/RingBox.rsi/box2.png | Bin 0 -> 223 bytes .../ADT/Objects/Misc/RingBox.rsi/box4.png | Bin 0 -> 223 bytes .../ADT/Objects/Misc/RingBox.rsi/box6.png | Bin 0 -> 223 bytes .../ADT/Objects/Misc/RingBox.rsi/meta.json | 34 ++++++++++ 34 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/equipped-HAND.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/equipped-HAND.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/equipped-HAND.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/equipped-HAND.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-open.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box2.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box4.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box6.png create mode 100644 Resources/Textures/ADT/Objects/Misc/RingBox.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl new file mode 100644 index 00000000000..9489e1779c3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl @@ -0,0 +1,2 @@ +ent-FunRingBox = { ent-RingBox } + .desc = Коробка с кольцами для проведения свадьбы. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl new file mode 100644 index 00000000000..727b900ac8c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl @@ -0,0 +1,15 @@ +ent-ClothingHandsRingPlazma = кольцо с плазмой + .desc = Очень элегантное кольцо только истинные ценители моды могут оценить ваше превосходное кольцо, с твердым ионизированным газа по центре. если вы зададите вопрос "Откуда достали твердый плазму", мы скажем - "Потому что". На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". + .suffix = { "" } +ent-ClothingHandsRingEmerald = кольцо с изумрудом + .desc = Золотая классика в мире колец аккуратный, модный и стильный идеальный подарок для любви всей вашей жизни. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". + .suffix = { "" } +ent-ClothingHandsRingBlood = кольцо с кровавым алмазом + .desc = Кольцо из чистого золота, в центре которого находится красивый алмаз кроваво-красного оттенка. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". + .suffix = { "" } +ent-ClothingHandsRingTurk = кольцо с туркенитом + .desc = Красивый кольцо ничем особенным не выделяется, но для своих цен они вполне приемлемы. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". + .suffix = { "" } +ent-RingBox = коробка с кольцами + .desc = Коробка, дороже чем твоя жизнь. + .suffix = { "" } diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index 4c76516d47a..491e4f9b542 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -7,3 +7,13 @@ cost: 1500 category: cargoproduct-category-name-fun group: market + +- type: cargoProduct + id: FunRingBox + icon: + sprite: ADT/Objects/Misc/RingBox.rsi + state: box + product: RingBox + cost: 8000 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..23e5d92ee6c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,59 @@ +- type: entity + parent: ClothingHandsBase + id: ClothingHandsRingBlood + name: blood ring + description: Good ring. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/RingBlood.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/RingBlood.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsRingEmerald + name: emerald ring + description: Good ring. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/RingEmerald.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/RingEmerald.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsRingPlazma + name: plazma ring + description: Good ring. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/RingPlazma.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/RingPlazma.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsRingTurk + name: turk ring + description: Good ring. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/RingTurk.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/RingTurk.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml new file mode 100644 index 00000000000..0dd3aeae865 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml @@ -0,0 +1,32 @@ +- type: entity + parent: [ BoxCardboard, BaseBagOpenClose ] + id: RingBox + name: ring box + description: very good. + components: + - type: Sprite + netsync: false + sprite: ADT/Objects/Misc/RingBox.rsi + state: box + layers: + - state: box + - state: box-open + map: ["openLayer"] + - type: Storage + maxItemSize: Small + - type: Item + sprite: ADT/Objects/Misc/RingBox.rsi + size: Small + heldPrefix: box + - type: StorageFill + contents: + - id: ClothingHandsRingPlazma + amount: 1 + - id: ClothingHandsRingEmerald + amount: 1 + - id: ClothingHandsRingBlood + amount: 1 + - id: ClothingHandsRingTurk + amount: 1 + - type: StaticPrice + price: 500 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml index ff320403519..b9d26ccc8d1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml @@ -1,4 +1,3 @@ - - type: entity parent: BaseItem id: ADTObjectWeaponsMeleeWhiteBouquet diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..7cdc64c541420314f6bd9e528f085e8b01708d57 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL0?Z7$B>G+x3?DZHW)~>T)e$_UgS-o-qgnV zCM#DehpJYduYJe11E`RJVY2bscdu7W+#le->b)E%Scri^=f+#(3)_D%1G)EA^;fFVdQ&MBb@01u!zv;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d9f9d5b719283fb05546164d3ad63cf191eac35 GIT binary patch literal 523 zcmV+m0`&cfP)Px$t4TybR9Hvtl)p;DP!z_$B>jURh)}w;rQqP;S{xlJiuwvtDI)HI;Ns%q6S#q=(gx*^sMYv~4ZbfW)T?;@lIKg_X0u zxSz?n*M7T>(~Ghagfsw)FDH{gqk%ie!DlFh`GYUarhYa<#R(|@5?{>#k2}DkVE~B) zs?8>9;V?E&y11zV(TISUO99u<@~w~tpq^LqKo~&VG!c!(@X%^u@3@2eSDSfoBTm~BwD~PvkScTLhwI8X70V>(hhhb{2S1E6k*>$AMK3kzcQty!I4ry<{JG`blcy}`f83`$^;hrE+^kuuk+xu1rg?|0ryLYGh z&!m&}s+E72F}OHy0+(Gd^QDExyoSbZZ99iezqKtTyujgb^`p*7>x#OOEh8lzX z-dVpnzA&z7{k{2_os%%53tt?ofam(wtx5}8_1v-q7$<&-ikLmGL0;QC&{5xl$qE>* ge5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+07oR9*8l(j literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..58a7bbda96b037dd61d4869647ef57e8f41f0512 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4Lw~PLn`9l z&fLg*$Uwk#uILE`o`Wu5JWO&9^W-!pG;S%$3}RjC;3V?%mq=L6_e=9c@7MpIAG<^Q zSnHSDj)1AlKaC`F})@ky3?5W)E>iJ5Rr*kU&(q(LT!KYoT;vm=+ zr_Oj$Htd&2gObQzKc+?2YrafmaMh@q%i>ZV@lu(wE8vS2XUDq@m)w~|7QQGI61bbV zw4X)8>Ede@gR!M5z5Dn7Td&`;?0ElvE9=hRHyQ4HFWvB}!B%6oo;c|@L{qsQ(QJAfg{mm1-j c=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!0E|$d3jhEB literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json new file mode 100644 index 00000000000..88c5a64c8c5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:KING_DICE#4881", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..660184ce62de9c4cd29a96cfb34fe953300133df GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK|fCy$B>G+x3?DZHW)~>T#PRfo0eGLdu-Ez ziE5^$OIE48-+BHnLpV?+!+|AF&(z9F{^YLIs{QT(5&?pQgL(5C_Z^i7GJmXl#j1Ep Uzopr0B8C-%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce939633db70d45434e21241e03818cad79b1b85 GIT binary patch literal 509 zcmVPx$ok>JNR9Hvtl)p;DP!z_$TC6B_D3(mtfP;dAOTbO2&_Q28Dh}ckI5>3n2^^io z;wy+!ijYOBVkvZSCApSwIAj-Md)5ak5+!6^w&XPYQ_xs)NeCMVRbERU|M*@&I zkT~#v9oXBzXZQ@M9GQ=`u>&l;SpqWFGSXRFalCb^IIIDt5JmtbUfC_`jeD=SyKku5 z@!7Jve!O@%IChO7!~iV5I5Us@WDfQAg@UNxG%#2A*$fjWL;xhd>Htou2m+vLJ$HcS zqjKT&3K+|1h=l@haxHI#7=U^{onHd%2_TyWMn`%8=PkhVHGpk>cgUAP3gl%UH)ntx*xJ_1?IexklTYH9d=qH*d~g z|IEt!-|I=&^SK;YRQw&3C&)0!Hc2t|I(%X=VLHipA>2WEfuP5{1~&yuhF@GhMoiP2 zzdrwZ>Rx|;Z29>Qav6Ik{o1heBgf90Z}06oTX?fRo_qJ)cMEMVR3-0MEdGD4|KNuG z+W)W5GtJn0l39Z5`|`;F(G@$-IXk@awPNaMdVZy$B*X9Ui@hQYR)J==f(Nb{ZiyFc z@SEc6&$6ME=WRI40^!ul!i+hx&c8(&U%1@-;=&Mp{6d{8KIPd>4JZCG{$g14oqZPP z0r&OK?3ij9oFD#Mv$Ow#3&X_ba7LF)*@agT3r_iButBP6#aU%%v5RW+{$eAtuyQH zPVOjC{dryWdOU*z(pmPzal&JzTIG=v@9fW%HHVYznPwSK?Nsc)satIwJw?6mD? zig@?@?`JdZ<%f6vzCE>$OW@8tcgC9Td0Y(J(<`}o>}B{)Y3}%Md13B6)rJ?_Sr`^s zulX{O!BwMbE{jWf#7kwyu7EFAoE`5rTykd;S@@z8YU|hQp16CS?ZLkNyLqq1 z#H!ZXd+mq822<^W<4xD-4YM0vXUxvXG+x3@O(9#9ZqJ}|#c_R_}xLRT^) zA218?#!l(-C@*?^j@bgJl%c_Qf7ZRVPgd=pP@D25P81{r1V0{ZIe*~JBYq%rkN8Ih WIZn}pe&5&AK~kQselF{r5}E+SfjYAQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..06004ba8e9a48c4bebc88d8c08f3e9dc05661d77 GIT binary patch literal 542 zcmV+(0^$9MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kcU&K~z{r?UTPt zf20COJgwo&?5eN-I(9lp@6huVP5N*{GO|A78I5vsW(hyM)hLP|N4doKl zmY@!z5`smgW^eEJ-uKlvhrDxXxepw7e7X0Y=brbzkVqtw|Hfv_!W^zaHI{Yu!{X-& ze_#r)&j8)-DcBueR{uyw5Q>SL5ZX-Q+u?cip$m^F!5NCOdhf_8n`>_=933k{Cb&1& z#dj6~|DaYlMLL_t^T7rD!^S29kt8~d`A>83v5Z^(R(2NppSf!mAT=(~BO^knFE^*_xbE?Z3S2?Xv(cqf3B_B76tUUF!rp|A=i1$D3 zldsKL6__TeFA((LYv6P2ZE#blWRhxp!tg?Sf#3xW6@Lfi2{H_|tY(sp5A!ZR{jufy z*Tm=V1@1Ag-M+*wC(qU?Z`=Mz$=!8UvR2yj!!!7|+`E;3;?Dlh$!2ffPy3&JUTVv| zXN+fBe_!@op-<}k@rBFHFD?wx$1l{m;!~d8)NtZ2<1dCq-`Qtz9&lg(%#Nv+ zq4?pyH9Pw+xG+p?4rg?^l%2SiBV%FrL@5^smAzuumZ?8r=lJ64ILGYpa$uP9rABzB b`T8NGPRM=pSK^a^er`xw4cf_MJQyzn_M(C|w) zk>M4ea;+bO(vrAxrYo{;zveKwcngsQuo0p$`eicN3SK=X7Yf^4hOq*I|$O!VMgMuigA!{_X$8*DqN%ynlbO>Bip-hBv>h zZwGv-k~(ln;qyN^-HyBO^%>r%*{(Nln0L4H#aYgd1$REn`8k|_=kjHm9b-PjWDiH7 mrQhO!;mDU7;hE;^%b*2ha{w_2Tne5HqC8#wT-G@yGywpYJEa!@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json new file mode 100644 index 00000000000..88c5a64c8c5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:KING_DICE#4881", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..a36bd8650a079dd9ddeec125214d26f66f062b75 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL4Qvd$B>G+x3?DZ9#9Z*y=c#yonUQa9g-aR zz+7dFV|$r;gq7#SEE-Ydz) WYKStN*e&uJB;)Do=d#Wzp$P!nus3f2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..835bb096a7aa1b2304b302ec5752040a6e6021c3 GIT binary patch literal 508 zcmVPx$oJmAMR9Hvtls`)YK@i2?5r_yjB3xxSu~4xRu1Fykf`x*90f~r+rIn?n_yNSy zN(}a5Axa2=tNarYn_wdxSX~nk(HIEI>^kN=gv^GMAnY`kT`v26`{vC#=y5qc)`tbK z4p;~NuLHX)_(*<3wvWum+SmaWUY!H7?hG;mp5l0WEaI>Pm_ir3gg5RZtY@^^7eM762qV4ax%x?KNgg@^(CtZ_ zdp)$b`RzAnfE-xg*Ar0O($kST044tJI)Fc0P>JUvajHKB*jU!%Mk&821xoO}*$!S( zJaq>MfT|g3aVqY6yw9fg(>bCH5I|g<{+Jv!7B{)Q2!LLqATIcTJE(7;mUveHQC-hD z6^|UZMVkC}dIT-tm)Qkg$07I|AesBPxY&U>MDhSycO%T_bPVBdf@$tq0PBEtpyv*J y0!-zrAzuj!#sB~S4rN$LW=%~1DgXcg2mk;800000(o>TF0000tm^m$Dz=fB@yEG4c| z@Ac{LVa6E^PdIllon-u=_<{>a3m33XVt%l`LHhxhivIyo559)|OukwMa}DM1>)X6D zPmnp3z2WP$EA403YKNTVQx}n0CV5@3BF+gYdacg+*}u8+_JqbKBi98~to-ShQ7z;4Op?O2h{tqKfGzSIcMG+$o^Eg+i%h(X{| Q@MI9>>FVdQ&MBb@0B!-95dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..061632172046f4d642854e3a2199ff5aff51731e GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4Lw~PLn`9l z&fLg*$U%VR{MGx<5Ihy9&UjNc?3YJ_(v-b^Oq;CN ze3{7Ls!=_cC8a##r7~mJh5Wm<_2vKXSM8n8@cHlFtqSG#(ha}=y)(N~wU;*`??PpL zzV3;;@AVnpsoAb)cR2rU%Zpx?Eeq~^mQz`fULN%&%#Jbt8@q=iL!NdeFeLd>BRtc5 aeHpZXYz`m>flI-YL6oPfpUXO@geCxud7AtH literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json new file mode 100644 index 00000000000..88c5a64c8c5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:KING_DICE#4881", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-left.png b/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b362d95d67a242de3fae25fab269cf418fe7878f GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ztvy{FLn`9l z&N|3>$U(q$vYklI0U@0Oo6T=;;Jf|d*-fUPCSHzP?VB1~6^=}}%Q?SrUijHRbN}D( zY0tUM@_)<0-}wd%Oik7YI9S*lR8MdiFddXlU}<7Lu%AI0C|2Ge7{S$W_uB`*t-F73 zy^+!_75rCJ{$2RP$N#RF|F5xK#T&8SZ10t)WpPi|JaaAne2q;fm5I&g?1?+?Ki_%w zT&JwTb?rvGGn_NBXZ-puvB1w^EkENcmMgymC}6&y)bQ~4@mb~lCu_E|J*j41**R-B zbA6)2SyvvO0R4qRf44BVDGN+$$balLec@?AjfH7%BzZQJTu#>I_%LJE)0v6~F8TIv vJtX{rv4T6u@tI?x6);TsQX@Rme0>?TfNTyR27yb#lR=cHtDnm{r-UW|V~DFv literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-right.png b/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a52519967a70e4beb829aa805faf5cc835796549 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zjXhl)Ln`9l z&N|53?V`WK{lT){JbucY#F=xZho|1*K+>N?3qtD zTnYWKns47fE(R3^3q~yg8-|>wkOnRmbqCfa_J;Kgq6?S~at1W+W5~I-JG}URmG$jL zsnvVS6VFa~nsn93Dz?u|;M;BI>^qMuWm%n5p_!l<=Luh_GpJ6LP3 zii7L5R6WjuLa(KhSyr6bbw-s@&u?YPBnHvQ={w_96>Qt3t(vt(PoyyHJbs~`RpD=8 z(i=+~1};^Dl}suRK7S6$%G%+(;et#0=~*F-Z?=p4VPN1gOBc&jNf0~3y1#`*BOTN?y&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>|z_m)!sW literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-open.png b/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-open.png new file mode 100644 index 0000000000000000000000000000000000000000..b5216584b10380be4541a87e0f3f21d0e8481b80 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zdcb?Umu?{JnQf8 zNwKJ@)b&i8v_#?wgQsWaoYd=|pZjONXNZ(!ox@l0=LzFm8HP``?9%23C;dLYe!Yri z(+dp-%Y=Ko_}aGT-#60G)NGV3dVkMWWZQ-f2F^hNtU&dfL`1kQhh1rs{qW(TGh1b4 zrGd5fqM3|Oss$8O6(@->EmC^KBO^11XMOzMV;x+9hJkJJ_WLH!5%wr!Sm@%A6{d2F zQK8%MCBrj@CoG)YRYA@2OXjJt3w*M*{Ir-)g17Oa0E}SdXJqhP9ie#j0E<2_82C~n dJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCIE-BdF}uJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box.png b/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box.png new file mode 100644 index 0000000000000000000000000000000000000000..b10467923657593c95eeda0187ddf5c5e4437101 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pfi@Ln7Rh zQzQ}&SRD9f++&qs!s6x(B-+9_ZoFdquO3n)w{Ooh6@S6C5-FDK(&o(k{N{eEDn4#?y*WRVR3T?6Ado}I!w}j@M~?GK7VQ6OV26H&s>fF_@6OIPY~FWGUL8o zqhhA!R~g4G%u}97O1#mPlz6s2LBfK4g_e=Q8ykZLJ^`_W1dG~21{sIbX3T+^30D{w zD;h{K!H6}^3=Dk7B^0HyUrzu!g)cS2GtJkRK?}&{0Adih6g(M3dAjEDn4#?y*WRVR3T?6Ado}I!w}j@M~?GK7VQ6OV26H&s>fF_@6OIPY~FWGUL8o zqhhA!R~g4G%u}97O1#mPlz6s2LBfK4g_e=Q8ykZLJ^`_W1dG~21{sIbX3T+^30D{w zD;h{K!H6}^3=Dk7B^0HyUrzu!g)cS2GtJkRK?}&{0Adih6g(M3dAjEDn4#?y*WRVR3T?6Ado}I!w}j@M~?GK7VQ6OV26H&s>fF_@6OIPY~FWGUL8o zqhhA!R~g4G%u}97O1#mPlz6s2LBfK4g_e=Q8ykZLJ^`_W1dG~21{sIbX3T+^30D{w zD;h{K!H6}^3=Dk7B^0HyUrzu!g)cS2GtJkRK?}&{0Adih6g(M3dAj Date: Mon, 9 Sep 2024 22:52:26 +0400 Subject: [PATCH 05/11] Update cargo_fun.yml --- Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index 491e4f9b542..16a86771b29 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -1,7 +1,7 @@ - type: cargoProduct id: ADTFunCrateWedding icon: - sprite: ADT\Objects\Weapons\Melee\white_bouquet.rsi + sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi state: icon product: ADTCrateWedding cost: 1500 From 24da5fbbd0dc236c4eb431de8a01acea42887197 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:11:46 +0400 Subject: [PATCH 06/11] Update bouquets.yml --- .../Entities/Objects/Specific/Service/bouquets.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml index b9d26ccc8d1..b5b82d65caf 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml @@ -4,7 +4,7 @@ name: White bouquet description: Bouquet of white roses. Classic! components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi state: icon @@ -24,7 +24,7 @@ name: Rose bouquet description: Delicate bouquet of pink hibiscus flowers. Especialy for her! components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi state: icon @@ -44,7 +44,7 @@ name: Yellow bouquet description: This is a bouquet of yellow peonies. Especially for connoisseurs of peonies components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi state: icon @@ -64,7 +64,7 @@ name: Bouquet with beer description: Be unique! GIve a bouquet that you can eat, at the same time knocking over a bottle of beer components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi state: icon @@ -84,7 +84,7 @@ name: Black bouquet description: This roses are difinietly not colored, thay have always been like thah components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi state: icon @@ -104,7 +104,7 @@ name: liliac roses bouquet description: This roses are difinietly not colored, thay have always been like thah components: - - type: Sharp + # - type: Sharp - type: Sprite sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi state: icon From bfaaee23b09fe4e3e43cbaf1feb7b88f5a3c3beb Mon Sep 17 00:00:00 2001 From: AnderFan <162018629+AnderFan@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:49:55 +0300 Subject: [PATCH 07/11] Delete Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl --- .../ADT/prototypes/Entities/Structures/Furniture/furniture.ftl | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl deleted file mode 100644 index f943e51ce5d..00000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/furniture.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ADTDeckChair = деревянный шезлонг - .desc = Шезлонг для приобретения ровного загара под светом ближайшей звезды. From 85dc4688763c59a8b7d28ae38e3f0113d1bfdbb6 Mon Sep 17 00:00:00 2001 From: AnderFan <162018629+AnderFan@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:08:36 +0300 Subject: [PATCH 08/11] Delete Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml --- .../Entities/Structures/Furniture/chairs.yml | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml deleted file mode 100644 index d88213085a7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - parent: Bed - id: ADTDeckChair - name: deckchair - description: A deckchair for the acquisition of an even tan under the light of the nearest star. - components: - - type: Sprite - sprite: ADT/Structures/Furniture/deckchair.rsi - state: deckchair - - type: Construction - graph: bed - node: adtdeckchair - - type: Damageable - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 75 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - MaterialWoodPlank: - min: 1 - max: 5 From 8bd2c4ed3ebbc03efdc52929e145d18eb6bc7cb2 Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Thu, 3 Oct 2024 01:47:37 +0400 Subject: [PATCH 09/11] Update cargo_fun.yml --- Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index 574c16d13d1..127effefc90 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -1,11 +1,3 @@ -- type: cargoProduct - id: ADTFunCrateWedding - icon: - sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi - state: icon - product: ADTCrateWedding - cost: 1500 - - type: cargoProduct id: ADTFunOktoberfestClothes icon: @@ -32,6 +24,7 @@ sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi state: icon product: ADTCrateWedding + category: cargoproduct-category-name-fun cost: 1500 - type: cargoProduct @@ -40,4 +33,5 @@ sprite: ADT/Objects/Misc/RingBox.rsi state: box product: RingBox - cost: 8000 \ No newline at end of file + category: cargoproduct-category-name-fun + cost: 8000 From ec942d29fc7ae92f9efe35f959d8d146bb89b376 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Thu, 3 Oct 2024 02:54:09 +0400 Subject: [PATCH 10/11] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=B5=D1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Hand/gloves.ftl | 10 ++++---- .../ADT/Catalog/Cargo/cargo_fun.yml | 2 +- .../Clothing/Hands/{gloves.yml => rings.yml} | 22 +++++++++--------- .../ADT/Entities/Objects/Misc/ring_box.yml | 10 ++++---- .../RingBlood.rsi/equipped-HAND.png | Bin .../Hands/{ => Rings}/RingBlood.rsi/icon.png | Bin .../{ => Rings}/RingBlood.rsi/inhand-left.png | Bin .../RingBlood.rsi/inhand-right.png | Bin .../Hands/{ => Rings}/RingBlood.rsi/meta.json | 0 .../RingEmerald.rsi/equipped-HAND.png | Bin .../{ => Rings}/RingEmerald.rsi/icon.png | Bin .../RingEmerald.rsi/inhand-left.png | Bin .../RingEmerald.rsi/inhand-right.png | Bin .../{ => Rings}/RingEmerald.rsi/meta.json | 0 .../RingPlazma.rsi/equipped-HAND.png | Bin .../Hands/{ => Rings}/RingPlazma.rsi/icon.png | Bin .../RingPlazma.rsi/inhand-left.png | Bin .../RingPlazma.rsi/inhand-right.png | Bin .../{ => Rings}/RingPlazma.rsi/meta.json | 0 .../RingTurk.rsi/equipped-HAND.png | Bin .../Hands/{ => Rings}/RingTurk.rsi/icon.png | Bin .../{ => Rings}/RingTurk.rsi/inhand-left.png | Bin .../{ => Rings}/RingTurk.rsi/inhand-right.png | Bin .../Hands/{ => Rings}/RingTurk.rsi/meta.json | 0 24 files changed, 22 insertions(+), 22 deletions(-) rename Resources/Prototypes/ADT/Entities/Clothing/Hands/{gloves.yml => rings.yml} (64%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingBlood.rsi/equipped-HAND.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingBlood.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingBlood.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingBlood.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingBlood.rsi/meta.json (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingEmerald.rsi/equipped-HAND.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingEmerald.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingEmerald.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingEmerald.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingEmerald.rsi/meta.json (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingPlazma.rsi/equipped-HAND.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingPlazma.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingPlazma.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingPlazma.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingPlazma.rsi/meta.json (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingTurk.rsi/equipped-HAND.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingTurk.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingTurk.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingTurk.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Hands/{ => Rings}/RingTurk.rsi/meta.json (100%) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl index 727b900ac8c..c632a749dff 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl @@ -1,15 +1,15 @@ -ent-ClothingHandsRingPlazma = кольцо с плазмой +ent-ADTClothingHandsRingPlazma = кольцо с плазмой .desc = Очень элегантное кольцо только истинные ценители моды могут оценить ваше превосходное кольцо, с твердым ионизированным газа по центре. если вы зададите вопрос "Откуда достали твердый плазму", мы скажем - "Потому что". На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". .suffix = { "" } -ent-ClothingHandsRingEmerald = кольцо с изумрудом +ent-ADTClothingHandsRingEmerald = кольцо с изумрудом .desc = Золотая классика в мире колец аккуратный, модный и стильный идеальный подарок для любви всей вашей жизни. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". .suffix = { "" } -ent-ClothingHandsRingBlood = кольцо с кровавым алмазом +ent-ADTClothingHandsRingBlood = кольцо с кровавым алмазом .desc = Кольцо из чистого золота, в центре которого находится красивый алмаз кроваво-красного оттенка. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". .suffix = { "" } -ent-ClothingHandsRingTurk = кольцо с туркенитом +ent-ADTClothingHandsRingTurk = кольцо с туркенитом .desc = Красивый кольцо ничем особенным не выделяется, но для своих цен они вполне приемлемы. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". .suffix = { "" } -ent-RingBox = коробка с кольцами +ent-ADTRingBox = коробка с кольцами .desc = Коробка, дороже чем твоя жизнь. .suffix = { "" } diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index 127effefc90..c7185f34031 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -32,6 +32,6 @@ icon: sprite: ADT/Objects/Misc/RingBox.rsi state: box - product: RingBox + product: ADTRingBox category: cargoproduct-category-name-fun cost: 8000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/rings.yml similarity index 64% rename from Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml rename to Resources/Prototypes/ADT/Entities/Clothing/Hands/rings.yml index 23e5d92ee6c..dfeb8f90bb8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/rings.yml @@ -1,11 +1,11 @@ - type: entity parent: ClothingHandsBase - id: ClothingHandsRingBlood + id: ADTClothingHandsRingBlood name: blood ring description: Good ring. components: - type: Sprite - sprite: ADT/Clothing/Hands/RingBlood.rsi + sprite: ADT/Clothing/Hands/Rings/RingBlood.rsi - type: Clothing sprite: ADT/Clothing/Hands/RingBlood.rsi - type: Item @@ -15,14 +15,14 @@ - type: entity parent: ClothingHandsBase - id: ClothingHandsRingEmerald + id: ADTClothingHandsRingEmerald name: emerald ring description: Good ring. components: - type: Sprite - sprite: ADT/Clothing/Hands/RingEmerald.rsi + sprite: ADT/Clothing/Hands/Rings/RingEmerald.rsi - type: Clothing - sprite: ADT/Clothing/Hands/RingEmerald.rsi + sprite: ADT/Clothing/Hands/Rings/RingEmerald.rsi - type: Item size: Tiny - type: StaticPrice @@ -30,14 +30,14 @@ - type: entity parent: ClothingHandsBase - id: ClothingHandsRingPlazma + id: ADTClothingHandsRingPlazma name: plazma ring description: Good ring. components: - type: Sprite - sprite: ADT/Clothing/Hands/RingPlazma.rsi + sprite: ADT/Clothing/Hands/Rings/RingPlazma.rsi - type: Clothing - sprite: ADT/Clothing/Hands/RingPlazma.rsi + sprite: ADT/Clothing/Hands/Rings/RingPlazma.rsi - type: Item size: Tiny - type: StaticPrice @@ -45,14 +45,14 @@ - type: entity parent: ClothingHandsBase - id: ClothingHandsRingTurk + id: ADTClothingHandsRingTurk name: turk ring description: Good ring. components: - type: Sprite - sprite: ADT/Clothing/Hands/RingTurk.rsi + sprite: ADT/Clothing/Hands/Rings/RingTurk.rsi - type: Clothing - sprite: ADT/Clothing/Hands/RingTurk.rsi + sprite: ADT/Clothing/Hands/Rings/RingTurk.rsi - type: Item size: Tiny - type: StaticPrice diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml index 0dd3aeae865..9e87141b819 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml @@ -1,6 +1,6 @@ - type: entity parent: [ BoxCardboard, BaseBagOpenClose ] - id: RingBox + id: ADTRingBox name: ring box description: very good. components: @@ -20,13 +20,13 @@ heldPrefix: box - type: StorageFill contents: - - id: ClothingHandsRingPlazma + - id: ADTClothingHandsRingPlazma amount: 1 - - id: ClothingHandsRingEmerald + - id: ADTClothingHandsRingEmerald amount: 1 - - id: ClothingHandsRingBlood + - id: ADTClothingHandsRingBlood amount: 1 - - id: ClothingHandsRingTurk + - id: ADTClothingHandsRingTurk amount: 1 - type: StaticPrice price: 500 diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/equipped-HAND.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/equipped-HAND.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingBlood.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingBlood.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/equipped-HAND.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/equipped-HAND.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingEmerald.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingEmerald.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/equipped-HAND.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/equipped-HAND.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingPlazma.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingPlazma.rsi/meta.json diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/equipped-HAND.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/equipped-HAND.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Hands/RingTurk.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Hands/Rings/RingTurk.rsi/meta.json From 156b13359d1093290ddb2e538bc894f8f45385f3 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Thu, 3 Oct 2024 03:33:35 +0400 Subject: [PATCH 11/11] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D0=BC?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl | 1 - .../Catalog/cargo/cargo_service.ftl | 2 - .../{Hand/gloves.ftl => Hands/rings.ftl} | 3 -- .../Entities/Clothing/Uniforms/jumpskirts.ftl | 2 +- .../Objects/Specific/Service/Bouquets.ftl | 12 +++--- .../Objects/Specific/Service/Ring_box.ftl | 3 ++ .../ADT/Catalog/Cargo/cargo_fun.yml | 4 +- .../ADT/Catalog/Fills/Crates/fun.yml | 12 +++--- .../Objects/Specific/Service/bouquets.yml | 36 +++++++++--------- .../{Misc => Specific/Service}/ring_box.yml | 4 +- .../Construction/Graphs/furniture/bed.yml | 18 --------- .../Service}/RingBox.rsi/box-inhand-left.png | Bin .../Service}/RingBox.rsi/box-inhand-right.png | Bin .../Service}/RingBox.rsi/box-open.png | Bin .../Service}/RingBox.rsi/box.png | Bin .../Service}/RingBox.rsi/box2.png | Bin .../Service}/RingBox.rsi/box4.png | Bin .../Service}/RingBox.rsi/box6.png | Bin .../Service}/RingBox.rsi/meta.json | 0 .../Service}/black_bouquet.rsi/icon.png | Bin .../black_bouquet.rsi/inhand-left.png | Bin .../black_bouquet.rsi/inhand-right.png | Bin .../Service}/black_bouquet.rsi/meta.json | 0 .../Service}/bouquet_with_beer.rsi/icon.png | Bin .../bouquet_with_beer.rsi/inhand-left.png | Bin .../bouquet_with_beer.rsi/inhand-right.png | Bin .../Service}/bouquet_with_beer.rsi/meta.json | 0 .../Service}/liliac_bouquet.rsi/icon.png | Bin .../liliac_bouquet.rsi/inhand-left.png | Bin .../liliac_bouquet.rsi/inhand-right.png | Bin .../Service}/liliac_bouquet.rsi/meta.json | 0 .../Service}/rose_bouquet.rsi/icon.png | Bin .../Service}/rose_bouquet.rsi/inhand-left.png | Bin .../rose_bouquet.rsi/inhand-right.png | Bin .../Service}/rose_bouquet.rsi/meta.json | 0 .../Service}/white_bouquet.rsi/icon.png | Bin .../white_bouquet.rsi/inhand-left.png | Bin .../white_bouquet.rsi/inhand-right.png | Bin .../Service}/white_bouquet.rsi/meta.json | 0 .../Service}/yellow_bouquet.rsi/icon.png | Bin .../yellow_bouquet.rsi/inhand-left.png | Bin .../yellow_bouquet.rsi/inhand-right.png | Bin .../Service}/yellow_bouquet.rsi/meta.json | 0 43 files changed, 38 insertions(+), 59 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl rename Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/{Hand/gloves.ftl => Hands/rings.ftl} (92%) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Ring_box.ftl rename Resources/Prototypes/ADT/Entities/Objects/{Misc => Specific/Service}/ring_box.yml (85%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box-inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box-inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box-open.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box2.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box4.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/box6.png (100%) rename Resources/Textures/ADT/Objects/{Misc => Specific/Service}/RingBox.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/black_bouquet.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/black_bouquet.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/black_bouquet.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/black_bouquet.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/bouquet_with_beer.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/bouquet_with_beer.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/bouquet_with_beer.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/bouquet_with_beer.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/liliac_bouquet.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/liliac_bouquet.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/liliac_bouquet.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/liliac_bouquet.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/rose_bouquet.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/rose_bouquet.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/rose_bouquet.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/rose_bouquet.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/white_bouquet.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/white_bouquet.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/white_bouquet.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/white_bouquet.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/yellow_bouquet.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/yellow_bouquet.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/yellow_bouquet.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Objects/{Weapons/Melee => Specific/Service}/yellow_bouquet.rsi/meta.json (100%) diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl deleted file mode 100644 index ddbf858a4b2..00000000000 --- a/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_fun.ftl +++ /dev/null @@ -1 +0,0 @@ -ent-ADTFunCrateWedding = { ent-ADTCrateWedding } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl deleted file mode 100644 index 9489e1779c3..00000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/cargo/cargo_service.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-FunRingBox = { ent-RingBox } - .desc = Коробка с кольцами для проведения свадьбы. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/rings.ftl similarity index 92% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/rings.ftl index c632a749dff..79221948b9f 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hand/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/rings.ftl @@ -10,6 +10,3 @@ ent-ADTClothingHandsRingBlood = кольцо с кровавым алмазом ent-ADTClothingHandsRingTurk = кольцо с туркенитом .desc = Красивый кольцо ничем особенным не выделяется, но для своих цен они вполне приемлемы. На кольце виднеется торговый марка производителя "brothers S&K - jewelry factory". .suffix = { "" } -ent-ADTRingBox = коробка с кольцами - .desc = Коробка, дороже чем твоя жизнь. - .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index 6830cfbacd7..4b5c619dc16 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -111,7 +111,7 @@ ent-ClothingUniformJumpskirtBlueshieldTurtleneck = юбка-водолазка ent-ADTClothingUniformWhiteShortWeddingDress = бело-золотое короткое свадебное платье .desc = Белое платье с золотыми блестками. Для тех кто устал от платьев в пол! -ent-ent-ADTClothingUniformShortDressBlackGold = черно-золотое короткое свадебное платье +ent-ADTClothingUniformShortDressBlackGold = черно-золотое короткое свадебное платье .desc = Специально для принцессы! ent-ADTClothingUniformBlackGhoticWeddingDress = чёрное готическое платье .desc = Мортиша Аддамс ставит лайк. Лучше этого сексуального платья вы не найдете. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl index 26900dfb23f..5b115d6a640 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl @@ -1,12 +1,12 @@ -ent-ADTObjectWeaponsMeleeWhiteBouquet = белый букет +ent-ADTObjectWhiteBouquet = белый букет .desc = Букет из белых роз. Классика. -ent-ADTObjectWeaponsMeleeRoseBouquet = розовый букет +ent-ADTObjectRoseBouquet = розовый букет .desc = Нежный букет из розовых цветов гибискуса. Специально для нее. -ent-ADTObjectWeaponsMeleeYellowBouquet = желтый букет +ent-ADTObjectYellowBouquet = желтый букет .desc = Это букет из желтых пионов. Специально для ценителей пионов. -ent-ADTObjectWeaponsMeleeBlackBouquet = чёрный букет +ent-ADTObjectBlackBouquet = чёрный букет .desc = Эти розы точно не окрашены. Они такие были всегда. -ent-ADTObjectWeaponsMeleeBouquetWithBeer = пивной букет +ent-ADTObjectBouquetWithBeer = пивной букет .desc = Будьте уникальным! Подарите букет который можно съесть, заодно опрокинув по бутылочке пивасика. -ent-ADTObjectWeaponsMeleeLiliacBouquet = сиреневый букет +ent-ADTObjectLiliacBouquet = сиреневый букет .desc = Маленький шедевр генетики - розы сорта "Флидефарбен Розен". Приобрели не только цвет, но и запах сирени diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Ring_box.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Ring_box.ftl new file mode 100644 index 00000000000..9544f95ec5a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Ring_box.ftl @@ -0,0 +1,3 @@ +ent-ADTRingBox = коробка с кольцами + .desc = Коробка, дороже чем твоя жизнь. + .suffix = { "" } diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index c7185f34031..427cc030ff8 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -21,7 +21,7 @@ - type: cargoProduct id: ADTFunCrateWedding icon: - sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi + sprite: ADT/Objects/Specific/Service/white_bouquet.rsi state: icon product: ADTCrateWedding category: cargoproduct-category-name-fun @@ -30,7 +30,7 @@ - type: cargoProduct id: FunRingBox icon: - sprite: ADT/Objects/Misc/RingBox.rsi + sprite: ADT/Objects/Specific/Service/RingBox.rsi state: box product: ADTRingBox category: cargoproduct-category-name-fun diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml index 1cad9d02409..6fec5255939 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml @@ -19,12 +19,12 @@ - id: ADTClothingUniformBlackWeddingWomenSuit - id: ADTClothingUniformAiryBlackSuit - id: ADTClothingUniformAiryWhiteSuit - - id: ADTObjectWeaponsMeleeWhiteBouquet - - id: ADTObjectWeaponsMeleeRoseBouquet - - id: ADTObjectWeaponsMeleeYellowBouquet - - id: ADTObjectWeaponsMeleeBlackBouquet - - id: ADTObjectWeaponsMeleeBouquetWithBeer - - id: ADTObjectWeaponsMeleeLiliacBouquet + - id: ADTObjectWhiteBouquet + - id: ADTObjectRoseBouquet + - id: ADTObjectYellowBouquet + - id: ADTObjectBlackBouquet + - id: ADTObjectBouquetWithBeer + - id: ADTObjectLiliacBouquet - type: entity id: ADTCrateFunOktoberfestClothes diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml index b5b82d65caf..165978c1bb5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml @@ -1,12 +1,12 @@ - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeWhiteBouquet + id: ADTObjectWhiteBouquet name: White bouquet description: Bouquet of white roses. Classic! components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi + sprite: ADT/Objects/Specific/Service/white_bouquet.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -15,18 +15,18 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi + sprite: ADT/Objects/Specific/Service/white_bouquet.rsi - type: DisarmMalus - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeRoseBouquet + id: ADTObjectRoseBouquet name: Rose bouquet description: Delicate bouquet of pink hibiscus flowers. Especialy for her! components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi + sprite: ADT/Objects/Specific/Service/rose_bouquet.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -35,18 +35,18 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi + sprite: ADT/Objects/Specific/Service/rose_bouquet.rsi - type: DisarmMalus - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeYellowBouquet + id: ADTObjectYellowBouquet name: Yellow bouquet description: This is a bouquet of yellow peonies. Especially for connoisseurs of peonies components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi + sprite: ADT/Objects/Specific/Service/yellow_bouquet.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -55,18 +55,18 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi + sprite: ADT/Objects/Specific/Service/yellow_bouquet.rsi - type: DisarmMalus - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeBouquetWithBeer + id: ADTObjectBouquetWithBeer name: Bouquet with beer description: Be unique! GIve a bouquet that you can eat, at the same time knocking over a bottle of beer components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi + sprite: ADT/Objects/Specific/Service/bouquet_with_beer.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -75,18 +75,18 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi + sprite: ADT/Objects/Specific/Service/bouquet_with_beer.rsi - type: DisarmMalus - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeBlackBouquet + id: ADTObjectBlackBouquet name: Black bouquet description: This roses are difinietly not colored, thay have always been like thah components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi + sprite: ADT/Objects/Specific/Service/black_bouquet.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -95,18 +95,18 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi + sprite: ADT/Objects/Specific/Service/black_bouquet.rsi - type: DisarmMalus - type: entity parent: BaseItem - id: ADTObjectWeaponsMeleeLiliacBouquet + id: ADTObjectLiliacBouquet name: liliac roses bouquet description: This roses are difinietly not colored, thay have always been like thah components: # - type: Sharp - type: Sprite - sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi + sprite: ADT/Objects/Specific/Service/liliac_bouquet.rsi state: icon - type: MeleeWeapon attackRate: 1.0 @@ -115,5 +115,5 @@ Slash: 1 - type: Item size: Normal - sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi + sprite: ADT/Objects/Specific/Service/liliac_bouquet.rsi - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/ring_box.yml similarity index 85% rename from Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Service/ring_box.yml index 9e87141b819..d2128cf1278 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/ring_box.yml @@ -6,7 +6,7 @@ components: - type: Sprite netsync: false - sprite: ADT/Objects/Misc/RingBox.rsi + sprite: ADT/Objects/Specific/Service/RingBox.rsi state: box layers: - state: box @@ -15,7 +15,7 @@ - type: Storage maxItemSize: Small - type: Item - sprite: ADT/Objects/Misc/RingBox.rsi + sprite: ADT/Objects/Specific/Service/RingBox.rsi size: Small heldPrefix: box - type: StorageFill diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml index 37b470ab080..3a6150bb5b1 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml @@ -33,13 +33,6 @@ - material: Durathread amount: 2 doAfter: 1 - - to: adtdeckchair - completed: - - !type:SnapToGrid { } - steps: - - material: WoodPlank - amount: 5 - doAfter: 1 - node: bed entity: Bed edges: @@ -79,14 +72,3 @@ steps: - tool: Screwing doAfter: 1 - - node: adtdeckchair - entity: ADTDeckChair - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 5 - steps: - - tool: Screwing - doAfter: 1 diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-open.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-open.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box-open.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box-open.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box2.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box2.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box2.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box2.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box4.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box4.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box4.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box4.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box6.png b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box6.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/box6.png rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/box6.png diff --git a/Resources/Textures/ADT/Objects/Misc/RingBox.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/RingBox.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/RingBox.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/black_bouquet.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/black_bouquet.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/bouquet_with_beer.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/liliac_bouquet.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/liliac_bouquet.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/rose_bouquet.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/rose_bouquet.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/white_bouquet.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/white_bouquet.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/icon.png rename to Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-left.png rename to Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/inhand-right.png rename to Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Weapons/Melee/yellow_bouquet.rsi/meta.json rename to Resources/Textures/ADT/Objects/Specific/Service/yellow_bouquet.rsi/meta.json