From 67c63ceeffdf82d2cdb933614d604cc9ba466bce Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 00:47:19 +0000 Subject: [PATCH 1/5] =?UTF-8?q?Christmas=20=D1=82=D1=80=D1=83=D1=81=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_sunrise/entities/clothing/bra/bra.ftl | 2 ++ .../entities/clothing/pants/pants.ftl | 4 +++ .../_sunrise/entities/clothing/bra/bra.ftl | 3 ++ .../entities/clothing/pants/pants.ftl | 4 +++ .../_Sunrise/Entities/Clothing/Bra/bra.yml | 13 +++++++++ .../Entities/Clothing/Pants/pants.yml | 26 ++++++++++++++++++ .../_Sunrise/Loadouts/Miscellaneous/bra.yml | 9 ++++++ .../_Sunrise/Loadouts/Miscellaneous/pants.yml | 9 ++++++ .../Clothing/Bra/bra.rsi/female_christmas.png | Bin 0 -> 3199 bytes .../Bra/bra.rsi/female_christmas_Icon.png | Bin 0 -> 2951 bytes .../_Sunrise/Clothing/Bra/bra.rsi/meta.json | 9 +++++- .../Man/pants.rsi/male_christmas_boxers.png | Bin 0 -> 610 bytes .../pants.rsi/male_christmas_boxers_Icon.png | Bin 0 -> 363 bytes .../Clothing/Pants/Man/pants.rsi/meta.json | 9 +++++- .../pants.rsi/female_\321\201hristmas.png" | Bin 0 -> 653 bytes .../female_\321\201hristmas_Icon.png" | Bin 0 -> 527 bytes .../Clothing/Pants/Woman/pants.rsi/meta.json | 9 +++++- 17 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas_Icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers_Icon.png create mode 100644 "Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas.png" create mode 100644 "Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas_Icon.png" diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/bra/bra.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/bra/bra.ftl index ed2973583d1..beb35f79bf9 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/bra/bra.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/bra/bra.ftl @@ -22,3 +22,5 @@ ent-ClothingBraUk = women's bra "Great Britain" .desc = A bra with a design symbolizing Great Britain. ent-ClothingBraStrapless = women's strapless bra .desc = Strapless bra for invisibility under clothing. +ent-ClothingBraChristmas = women's bra "Christmas" + .desc = A bra with a design symbolizing Christmas. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/pants/pants.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/pants/pants.ftl index f2d5a7eadbb..eb0799577c5 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/pants/pants.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/pants/pants.ftl @@ -18,6 +18,8 @@ ent-ClothingPantsManStripe = men's striped underpants .desc = underpants with a striped design for men. ent-ClothingPantsManUk = men's underpants with the British flag .desc = UK flag underpants for men. +ent-ClothingPantsManChristmas = men's Christmas underpants. + .desc = Christmas underpants for men. ent-ClothingPantsWomanNekoWhite = women's white kitty underpants .desc = white panties with a picture of SEALs on them for women. ent-ClothingPantsWomanNekoBlack = women's black kitty underpants @@ -42,3 +44,5 @@ ent-ClothingPantsWomanUk = women's underpants with the British flag .desc = UK flag underpants for women. ent-ClothingPantsWomanStrapless = women's strapless underpants .desc = strapless underpants for women. +ent-ClothingPantsWomanChristmas = women's underpants with the Christmas + .desc = Christmas underpants for women. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/bra/bra.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/bra/bra.ftl index de9912df86b..f90a5c4ff13 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/bra/bra.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/bra/bra.ftl @@ -22,3 +22,6 @@ ent-ClothingBraUk = женский бюстгальтер "Великобрит .desc = Бюстгальтер с дизайном, символизирующим Великобританию. ent-ClothingBraStrapless = женский бюстгальтер без бретелек .desc = Бюстгальтер без бретелек для невидимости под одеждой. +ent-ClothingBraChristmas = женский бюстгальтер "Рождество" + .desc = Бюстгальтер с дизайном, символизирующим Рождество. + diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/pants/pants.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/pants/pants.ftl index 2135c436072..84adf203299 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/pants/pants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/pants/pants.ftl @@ -18,6 +18,8 @@ ent-ClothingPantsManStripe = мужские полосатые трусы .desc = Трусы с полосатым дизайном для мужчин. ent-ClothingPantsManUk = мужские трусы с флагом Великобритании .desc = Трусы с флагом Великобритании для мужчин. +ent-ClothingPantsManChristmas = мужские Рождественские трусы. + .desc = Трусы Рождественские для мужчин. ent-ClothingPantsWomanNekoWhite = женские белые трусы с котиками .desc = Трусы с белым цветом и изображением котиков для женщин. ent-ClothingPantsWomanNekoBlack = женские чёрные трусы с котиками @@ -42,3 +44,5 @@ ent-ClothingPantsWomanUk = женские трусы с флагом Велик .desc = Трусы с флагом Великобритании для женщин. ent-ClothingPantsWomanStrapless = женские трусы без лямок .desc = Трусы без лямок для женщин. +ent-ClothingPantsWomanChristmas = Рождественские женские трусы + .desc = Рождественские трусы для женщин. diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Bra/bra.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Bra/bra.yml index 07acb446ec5..f54d288af89 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Bra/bra.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Bra/bra.yml @@ -153,3 +153,16 @@ - type: Clothing sprite: _Sunrise/Clothing/Bra/bra.rsi equippedState: female_strapless + +- type: entity + parent: ClothingBraStorageBase + id: ClothingBraChristmas + name: women's christmas bra + description: A bra with a design symbolizing Christmas. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Bra/bra.rsi + state: female_christmas_icon + - type: Clothing + sprite: _Sunrise/Clothing/Bra/bra.rsi + equippedState: female_christmas diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml index 0db4c0d37de..6bf8768665b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml @@ -130,6 +130,19 @@ sprite: _Sunrise/Clothing/Pants/Man/pants.rsi equippedState: male_uk +- type: entity + parent: ClothingPantsStorageBase + id: ClothingPantsManChristmas + name: men's underpants Christmas + description: Christmas underpants for men. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Pants/Man/pants.rsi + state: male_christmas_boxers_Icon + - type: Clothing + sprite: _Sunrise/Clothing/Pants/Man/pants.rsi + equippedState: male_christmas_boxers + # Женщина - type: entity @@ -287,3 +300,16 @@ - type: Clothing sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi equippedState: female_strapless + +- type: entity + parent: ClothingPantsStorageBase + id: ClothingPantsWomanChristmas + name: women's Christmas underpants + description: Christmas underpants for women. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi + state: female_christmas_Icon + - type: Clothing + sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi + equippedState: female_christmas diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml index 05d07f0ff41..f700d06386b 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml @@ -104,3 +104,12 @@ proto: WomanMoment equipment: bra: ClothingBraUk + +- type: loadout + id: ChristmasBra + sponsorOnly: true + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + equipment: + bra: ClothingBraChristmas diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml index a769ac290c8..ffba1c509f6 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/pants.yml @@ -106,6 +106,15 @@ equipment: pants: ClothingPantsWomanUk +- type: loadout + id: ChristmasWomanPants + sponsorOnly: true + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + equipment: + pants: ClothingPantsWomanChristmas + # Для мужиков - type: loadout id: BoxersManPants diff --git a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas.png b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas.png new file mode 100644 index 0000000000000000000000000000000000000000..eac76bc74854f140b96c0f079057e9e2fba6bb03 GIT binary patch literal 3199 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json index 36591081220..66776f9b9c5 100644 --- a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "", + "copyright": "BoyBoyevich made (female_christmas,female_christmas_Icon) for SunRise", "size": { "x": 32, "y": 32 @@ -43,6 +43,13 @@ { "name": "female_uk_icon" }, + { + "name": "female_christmas_Icon" + }, + { + "name": "female_christmas", + "directions": 4 + }, { "name": "female_uk", "directions": 4 diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png new file mode 100644 index 0000000000000000000000000000000000000000..0a031708be77738af0f6cae7a85c19b836a2e6ae GIT binary patch literal 610 zcmV-o0-gPdP)Px%97#k$RCt{2+COL$VHgJRr_$pLoRWjY;VeZy&>l9+!gHA zYACtxPgek#znfAmcVwN~UJ$?w0+d`AUJ#%#oH$lpz(P7L2a97e zJG~JpAQ9kGB_Hcri&&R%VHXg$B!fhZh&vUp$D(Sh?9*{s8-i3p7v0fSY3GxaX&!R+`&PaA8?g9)TJd{{C;F-QVap@n&Y%GHv@+_iMhr{D;#3XqWv#M**G9 z^SxsG-8TJ;FP1-ddeZH~Cy(v?pZJeuMn1&(K(awnJK%VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3A4x<(RCt{2+ObN* zKpe;MU!;QBoE%*Q4}1Za;#!2#ho}$GK@cB71P31=eF!O(uBA&~pwNPgqmx?-3V#Pl zs5TWZTnwe(4+O%I{O^}bhH!Th00000004GNVLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3-rt1voyR<(rF`azFc(Hx?QdzepZjhUv;lSd_J6d_do7i;NL|*fUliE zn`55W-C6B6MKNfP(QiQX0~q`SKG|nkIFDUf{-l@aHz4`}000000000);RS$f6%Yq3 R=F0#8002ovPDHLkV1kVI$fy7S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json index 36591081220..0d247e13d3f 100644 --- a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "", + "copyright": "BoyBoyevich made (female_christmas, female_christmas_Icon) for SunRise", "size": { "x": 32, "y": 32 @@ -43,6 +43,13 @@ { "name": "female_uk_icon" }, + { + "name": "female_christmas_Icon" + }, + { + "name": "female_christmas", + "directions": 4 + }, { "name": "female_uk", "directions": 4 From 5dbeb515bd3430efe4a908326580da2081ba0622 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 12:40:41 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=D0=A0=D0=BE=D0=B6=D0=B4=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/hands/gloves.ftl | 5 ++++ .../_sunrise/entities/clothing/head/hats.ftl | 2 ++ .../entities/clothing/outerclothing/coats.ftl | 2 ++ .../entities/clothing/socks/socks.ftl | 2 ++ .../entities/clothing/uniforms/jumpsuits.ftl | 2 ++ .../entities/clothing/hands/gloves.ftl | 4 +++ .../_sunrise/entities/clothing/head/hats.ftl | 2 ++ .../entities/clothing/outerclothing/coats.ftl | 2 ++ .../entities/clothing/socks/socks.ftl | 2 ++ .../entities/clothing/uniforms/jumpsuits.ftl | 2 ++ .../Inventories/clothesmate.yml | 1 + .../Inventories/winterdrobe.yml | 3 ++ .../Entities/Clothing/Hands/gloves.yml | 22 +++++++++++++++ .../_Sunrise/Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Entities/Clothing/OuterClothing/coats.yml | 11 ++++++++ .../Entities/Clothing/Socks/socks.yml | 13 +++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../_Sunrise/Loadouts/Miscellaneous/socks.yml | 9 ++++++ .../Gloves/christmas_gloves.rsi/Icon.png | Bin 0 -> 302 bytes .../christmas_gloves.rsi/equipped-HAND.png | Bin 0 -> 459 bytes .../christmas_gloves.rsi/inhand-left.png | Bin 0 -> 251 bytes .../christmas_gloves.rsi/inhand-right.png | Bin 0 -> 260 bytes .../Gloves/christmas_gloves.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-HAND.png | Bin 0 -> 458 bytes .../Gloves/christmas_gloves_long.rsi/icon.png | Bin 0 -> 288 bytes .../christmas_gloves_long.rsi/inhand-left.png | Bin 0 -> 277 bytes .../inhand-right.png | Bin 0 -> 287 bytes .../christmas_gloves_long.rsi/meta.json | 26 ++++++++++++++++++ .../Hats/deer_horns.rsi/equipped-HELMET.png | Bin 0 -> 316 bytes .../Head/Hats/deer_horns.rsi/icon.png | Bin 0 -> 270 bytes .../Head/Hats/deer_horns.rsi/meta.json | 18 ++++++++++++ .../Coats/coatchristmas.rsi/Icon.png | Bin 0 -> 458 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 952 bytes .../Coats/coatchristmas.rsi/inhand-left.png | Bin 0 -> 469 bytes .../Coats/coatchristmas.rsi/inhand-right.png | Bin 0 -> 474 bytes .../Coats/coatchristmas.rsi/meta.json | 26 ++++++++++++++++++ .../christmas_stockings.png | Bin 0 -> 540 bytes .../Socks/stockings_chrismas.rsi/icon.png | Bin 0 -> 408 bytes .../stockings_chrismas.rsi/inhand-left.png | Bin 0 -> 316 bytes .../stockings_chrismas.rsi/inhand-right.png | Bin 0 -> 325 bytes .../Socks/stockings_chrismas.rsi/meta.json | 26 ++++++++++++++++++ .../Jumpsuit/christmas_jumpsuit.rsi/Icon.png | Bin 0 -> 608 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1500 bytes .../christmas_jumpsuit.rsi/inhand-left.png | Bin 0 -> 656 bytes .../christmas_jumpsuit.rsi/inhand-right.png | Bin 0 -> 641 bytes .../Jumpsuit/christmas_jumpsuit.rsi/meta.json | 26 ++++++++++++++++++ 46 files changed, 254 insertions(+) create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/christmas_stockings.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/meta.json diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl index f399f533147..37065770b84 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl @@ -4,3 +4,8 @@ ent-ClothingHandsGlovesCentcomNaval = nanotrasen naval gloves .desc = A high quality pair of thick gloves covered in gold stitching, given to Nanotrasen's Naval Commanders. ent-ClothingHandsGlovesLeatherHoS = leather gloves .desc = Stylish black leather gloves. +ent-ClothingHandsGlovesChristmas = christmas gloves + .desc = Stylish Christmas gloves. +ent-ClothingHandsGlovesChristmasLong = christmas gloves long + .desc = Stylish Christmas gloves. + diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hats.ftl index 62ae255fc9c..c7e299116ce 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hats.ftl @@ -52,3 +52,5 @@ ent-ClothingHeadHatWithPaces = Hat with paces .desc = A black hat with paces, usually worn by Jews. ent-ClothingHeadHatSingulo = Singulo Crown .desc = The greatest achievement of engineers and scientists - a compact singularity installation that allows the owner to demonstrate their status and uniqueness on the station. +ent-ClothingHeadHatDeerHorns = Hat with deer horns + .desc = a Horns, usually worn deer. \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl index 45ac0e45845..0dec392e0fd 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl @@ -50,3 +50,5 @@ ent-ClothingOuterCoatUSSPOvercoatBlack = USSP armored overcoat .desc = Old stuff, straight out of USSP. ent-ClothingOuterAtmosianBomberJacket = atmosian bomber jacket .desc = Tight, worn atmosian bomber jacket. +ent-ClothingOuterChristmasSweeter = Christmas Sweeter + .desc = Pretty old stuff for these times, bringing back old memories... diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/socks/socks.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/socks/socks.ftl index eebb573ee19..52738350061 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/socks/socks.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/socks/socks.ftl @@ -72,3 +72,5 @@ ent-ClothingThighTrans = thigh-high stockings with a transflag .desc = thigh-high stockings with a transflag - elegant thigh-high stockings with an added the transgender pride flag at the top, for women, and maybe even men? ent-ClothingThighUk = thigh-high stockings with the british flag .desc = thigh-high stockings with a transflag - elegant thigh-high stockings with the British flag at the top, for women, and maybe even men? +ent-ClothingThighChristmas = thigh-high Christmas stockings + .desc = thigh-high stockings made for Christmas time \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl index 04dff181486..1c07049cbf4 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl @@ -36,3 +36,5 @@ ent-ClothingUniformJumpsuitAdidasBlack = black USSP sweatshirt .desc = Greatly tailored set of pants, t-shirt and windbreaker. Features a distinctive two stripe, name print "Red Sickle". ent-ClothingUniformJumpsuitAdidasWhite = white USSP sweatshirt .desc = White version of the popular USSP Olympians sports uniform, has two black stripes on each part of the set. Fashionable, stylish and bright! +ent-ClothingUniformJumpskirtChristmas = christmas female jumpsuit + .desc = Pretty old stuff for these times, bringing back old memories..... diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl index 4610f4b7d39..d2891744f95 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/hands/gloves.ftl @@ -4,3 +4,7 @@ ent-ClothingHandsGlovesCentcomNaval = перчатки флота Nanotrasen .desc = Пара высококачественных плотных перчаток, украшенных золотым шитьём, которые выдаются командующим флотом Nanotrasen. ent-ClothingHandsGlovesLeatherHoS = кожаные перчатки .desc = Стильные чёрные кожаные перчатки. +ent-ClothingHandsGlovesChristmas = Рождественские перчатки + .desc = Стильные Рождественские вязаные перчатки. +ent-ClothingHandsGlovesChristmasLong = Рождественские длинные перчатки + .desc = Стильные Рождественские вязаные перчатки. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hats.ftl index 67dea2cbfcf..0fa921fac6a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hats.ftl @@ -54,3 +54,5 @@ ent-ClothingHeadHatPatologonatHat = шапочка патологоаната .desc = Черная шапочка пропитанная запахом гнили ent-ClothingHeadHatSingulo = корона Сингуло .desc = Величайшее достижение инженеров и ученых - компактная установка сингулярности, позволяющая владельцу продемонстрировать свой статус и уникальность на станции. +ent-ClothingHeadHatDeerHorns = Оленьи рога + .desc = Рожки что обычно носят Олени. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl index 213e749ad18..d9f2add76cc 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/coats.ftl @@ -52,3 +52,5 @@ ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосиа .desc = Плотная, поношенная куртка-бомбер атмосианина. ent-ClothingOuterCoatPatologoanatom = Халат патологоанатома .desc = Стерильный чёрный халат патологоанатома для работы с трупами. Немного защищает от проливов кислот. +ent-ClothingOuterChristmasSweeter = Рождественский Свитер + .desc = Старый вязаный свитер так и напоминает об Рождестве. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/socks/socks.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/socks/socks.ftl index 3239371c453..945eeb7da4e 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/socks/socks.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/socks/socks.ftl @@ -72,3 +72,5 @@ ent-ClothingThighTrans = чулки до бедра с трансфлагом .desc = { ent-ClothingSocksBaseButcherable.desc } ent-ClothingThighUk = чулки до бедра с изображением британского флага .desc = { ent-ClothingSocksBaseButcherable.desc } +ent-ClothingThighChristmas = рождественские чулки до бедра + .desc = { ent-ClothingSocksBaseButcherable.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl index 3385ef442ea..78e389880a5 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl @@ -44,3 +44,5 @@ ent-ClothingUniformJumpsuitBarber = костюм парикмахера .desc = Как же он хорош. ent-ClothingUniformJumpsuitAdjutant = комбинезон адъютанта .desc = Сшито на совесть из дышащей ткани, что позволит вам быть на ногах всю смену. +ent-ClothingUniformJumpskirtChristmas = Рождественский женский комбинезон + .desc = Украшен в тонах рождества, ушит специально для красивой части станции. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index a069833759d..f6c9b15e582 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -15,6 +15,7 @@ ClothingHeadBandSkull: 2 ClothingHeadHatGreyFlatcap: 3 ClothingHeadHatBrownFlatcap: 3 + ClothingUniformJumpskirtChristmas: 3 #sunrise-edit ClothingUniformJumpsuitColorGrey: 8 ClothingUniformJumpskirtColorGrey: 8 ClothingUniformJumpsuitColorWhite: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml index 0f8c73dac30..96e2d143c53 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -18,6 +18,9 @@ ClothingOuterCoatBomber: 3 ClothingHeadHatSantahat: 2 ClothingHeadHatXmasCrown: 2 + ClothingOuterChristmasSweeter: 3 #sunrise-edit + ClothingHandsGlovesChristmas: 3 #sunrise-edit + ClothingHandsGlovesChristmasLong: 3 #sunrise-edit emaggedInventory: ClothingNeckScarfStripedSyndieGreen: 3 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml index 27f260ce943..cf370a439c2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml @@ -32,3 +32,25 @@ sprite: _Sunrise/Clothing/Hands/Gloves/hos.rsi - type: Clothing sprite: _Sunrise/Clothing/Hands/Gloves/hos.rsi + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesChristmas + name: christmas gloves + description: Stylish Christmas leather gloves. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesChristmasLong + name: christmas gloves long + description: Stylish Christmas long leather gloves. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml index a7a5a3d0924..a4d76e4872f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml @@ -311,3 +311,14 @@ sprite: _Sunrise/Clothing/Head/Hats/crown_singulo_icon.rsi - type: Clothing sprite: _Sunrise/Clothing/Head/Hats/crown_singulo.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatDeerHorns + name: Deer Horns + description: a Horns, usually worn deer. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Hats/deer_horns.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Hats/deer_horns.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml index f265e7d059f..91cc2063f09 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml @@ -360,3 +360,14 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/atmosian.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/atmosian.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterChristmasSweeter + name: Christmas Sweeter + description: Pretty old stuff for these times, bringing back old memories... + components: + - type: Sprite + sprite: _Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi + - type: Clothing + sprite: _Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Socks/socks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Socks/socks.yml index a5f3e7bbbd2..060a470c61c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Socks/socks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Socks/socks.yml @@ -478,3 +478,16 @@ - type: Clothing sprite: _Sunrise/Clothing/Socks/thigh.rsi equippedState: uk_thigh + +- type: entity + parent: ClothingSocksBaseButcherable + id: ClothingThighChristmas + name: thigh-high Christmas stockings + description: thigh-high stockings made for Christmas time + components: + - type: Sprite + sprite: _Sunrise/Clothing/Socks/stockings_chrismas.rsi + state: icon + - type: Clothing + sprite: _Sunrise/Clothing/Socks/stockings_chrismas.rsi + equippedState: christmas_stockings diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index 831e4fdfbdd..4ca1d86be8c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -207,3 +207,14 @@ - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtChristmas + name: christmas female jumpsuit + description: Pretty old stuff for these times, bringing back old memories..... + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi + diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml index ad64d04731c..97a7ef738e0 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/socks.yml @@ -181,6 +181,15 @@ equipment: socks: ClothingThighUk +- type: loadout + id: ThighChristmasSocks + sponsorOnly: true + effects: + - !type:GroupLoadoutEffect + proto: WomanMoment + equipment: + socks: ClothingThighChristmas + # Для мужиков - type: loadout id: ShortWhiteSocks diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..375b7c172482bb09e33b7c3773a1d25f8e819b54 GIT binary patch literal 302 zcmV+}0nz@6P)Px#=t)FDR9J=WlRXN;KoCZsqD6{;NwE+JmO(7NgIDkhp2;hC6C1%sf~81=AV!Iu z5-oIB<4;r+M3`3%`+c)ByR!>|APB;bDHVxv9Pa_rG&O6sZRb2nsgm|-?)jBccWag3 z>-YOqUNPxYBuPRPMGt*ivn&e$$8kPuKwn$G)!GAivzgIWo@e4gyA42XJ_kS#VC4IB zhQq=!|HlY+>$Qo;t_wgt%g&peVy!io%bUE98c3^E05(BDb27;l1DI~Nxx$+uIOZ)D zPxt=$2nrv_HN8f|{P%7c-sE2Dk351P2!e3U0a*7(04%8r3jhEB07*qoM6N<$g3Vod AegFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..aaa3d5c259090dcc5337fe2ecb49fd36d70ffa07 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zTRmMILn`LH zy|po~$w7ks!~R|#K8d{#g@n_cWNO*j;}@(>o_{j@MR3X6fXRBtZc2GbEMPO|C{a52 z?SS=#Y1{taKk>2l|L2t5{0d57@TtLL2meDWa!L&bcbEmC&+ zViG^?k{H%s)_i9!y|{kA@3-4osdH+>x6hF4XJ}X}@FIQYHML)nZEFS6zxvjMm%U{? zGOcy;;{>s`8|s~5hifMRSr(RjNvAKZdKvX?=GNEGvag@bkG;G#2jX0)qqEo5<;$}; z=2`JCn7#HC)2*{gSI)7oh}pH>|MHbBOT|L(t9@peFDctFWz+VuyES5M3|GE?(?6ZM zxHo3etLS;`6+%q>yXStK9$sx5cT|dxkwN+X|4qxP%6Lm7kJin~C}D8TFzg9fW_>o% v>uR~S%WC=i5!2s2*u6y@Wc{M}C(Kh{T@aw``njxgN@xNAtI@?; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..020dc628008dffe5b73294aaa7efa10b23eca188 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtBiahE&XX zdut)@VFQ8Ihu%L0o1+itd~%UA=uT<(V0BAl-_z91)KtAP0KRbciK;VG* zo!T=~q)**Fo@n-Mj&uLrV!8I46^mNJLniF*FV`$uCL&r{yiDbN(4lyz2*$K+CZUnl z{at$^tEVs1O55i0tWC5abJeD+QdLjFUSA4PR%V143nYEgy6zqbR{F;AaR1@`LR;Nu oY-?CyduR)5%)A@Q3=ALC?WTyh9eZ=NmdKI;Vst0D`$-T>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..07ea83a333b7288d28a2438507555c81dcd41448 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_IbKEhE&XX zdut7wdU=fHCxi_Zx;HQju}v!8&Q#oBno?xw znH-C`@7U7JQbHxYElbz0Y{}#68c6zIeZAy|nEy@5A4@82 v>Xv+;+b9+Px$gh@m}RCt{2*)dDQKoke?rwCq(QaT8klFbiL$3ljXNyK~(=X{AQ&fWSUtYj*F zfPzC;$8@ncgy4_}g>&fAA>h07?o8zWTYLBJ-`BJ>c|-sJ000009l|`7F8A52sl2~P zBDtGQrJu!08~rSnyV+D0No2GMMH0y{Pqp%ddD@xhlv7}_*{htVyk5n6xz)RGE`>_F~7*SAH#J!x0B$7d0Q7J~hPv;;H>k4RuprEc;0fV}tMhMngT_*Fe8sN1p zmE#HPz;ZkxuWeatbveybB$4v3xz3)U<^ccz003~{?fJ=g&A~knFx>3c~gS#CzO{)Q_BWhQ4M)TTNfXay4 z6`j$%b^}yK)ULP~%@a|-$IX4t1^@s6007V%-)TC!(`OLn2y} z6C_v{CoExhixK)H`|p3^n|4v@!c~XaI}DpUWtvxVvfW|SIJoKTQ9ikpWB2zTIQmtW z<-r^Ay}v)WwYzK-zSGmKZg=45`Jzt-AW-qvvSm^I0q2ARvIm@c7FCM>KX5ZnWrZpm zPX$Mh6;QOnSkUg#gQm?-?e?{Ao_LxoVxF6rbJ*{W{`m`-+44CQn%~RF6qs$|-`J_R z8mxZzj2XEZ}G)a6qk)(0);4!}oZy5O*=Y(n(U2|f4aaD8aFE$$%pi37g di11i2FoY!8)W=VbZ!iD= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..74163ef7de4f7c02a83232a96a55476d017ce332 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&U?BzhE&XX zdut2F;$nNPk0tP2OX%}yoYE$HX#>-uV%N#1v@Kkhc&x1KOL_U9&EidS z-(;X}5O~m3C+F?GbJ?#-ooJ4yf{R}!${SA8Z3$Z3GCMTDzCSg#O!i*1>pzP<*LS^n z7T*-fxc>L%&8L1nFFwOHVaa7nUdw2=I$q1yCFg9eZ((>Dd}zv~m(jC=US-9^tqOqH z03rk2g?Beb>3rij`%ikyEoGDFhO2%HZZfINwspG9>T&%$$60X(h8+)h*-zO1X0=Y` P1?lm0^>bP0l+XkKo7rl$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8dc373df55869da259508cb2a0ba89c3d8961a8a GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ZhE>nhE&XX zdutoP_=^52 z3z=*f`1}Z?&b;sLV%5($qMr+~2UM+3Tf2SFV}s4tR(-L1)uYjHYp2fF{`fOdt8ZC; z%*6n*cJ9Ee*xd)OSThU7NA@kdB{|`S=mAM9=4>F&FIzkAl;s>elF{r5}E*{S8ucc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/meta.json new file mode 100644 index 00000000000..35df324a987 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BoyBoyevich made for SunRise", + "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/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..934bcc9a3402ea08c36a4cc11a13042627cbf632 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zInPhhE&XX zd&`io$w1`T$7`J}uIn6}JZ4DDm{BFh_bhVG9Elk|9i6L_V`Ek}A8gpgu+-zne>aaG za{4yY!WG%HK3(D2nRi*{rnPkIj*6cp^X*YP*&olYsd zDBa7$^f-$pC!Jr8@oI(An+MYip`= z21WI17e z;K}M=y4woh>@9BoSaz@d=g!jO6Z{)$n7ia#`o6pGxVP=?gR1Mh_|DJ2w)%-2`$DFS z16QPH%=+nBa9?+F;koMj=Kt?3-G4Ui$~n8qAZ-xKL1ab+<2O~^y`5J}i$GjYS3j3^ HP6Px$gh@m}R9J=Wmc2^DP#A_^8#`DqC{l+Yokb{wT!0W9dKqFsI%dipxMj-VP=tUt z;O-y+FF-O$=OP&@!J=S?(8M7<`OnFT6e@Tg2sufc7bzx_rPNW}(0LtlT?_tAG1(>P? zKMa$D1;g=RI9_fZiAoiv6cqDL9KWwtIPG>TMOM|sGzica1OWL|7VBZ_DWJAtR_)Dj z7)^r!0CJHiem$`P(t;~Sl`6o#I7!9_gJVFC7ni;uV2`0I25WK4OwBx8DOk+rsgav5 zSX)m)tG$3k;I^jl0N{IlUQ!mHEWe6CopV~dZB)P}VHRL1B6 z13VJX5;rvN{0Ek|b;t2?<$^ZZW07*qoM6N<$g6ihL Ar2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5e996874e4e20494ca018d80b5a34f4bd7c810dd GIT binary patch literal 952 zcmV;p14sOcP)Px&a!Eu%RCt{2n$JrcK@`WoiHS4`{=zoURdOu^4@r6up`>g*c=6n;ZAvS&P!Ezr z!T(_K;6cF_LwhaasTU76;HibS2}DYJ70p4rXq1=|H@iJ#XWdQnV}E4h!S}f&nc1E1 zn>Q~r!@L0qf*=TjxT$!q+W@OfF3u{$k+AmrbpHrnmp|F=hou+SV=)B)RuY5wnc3Ce zji!>y!jCfmzYR zbtf=wf#;CU7XPbf<)SQG);9I9zVoe&&|}9CGuoZ7GXNc1ZZx1(=LMeAzK?pnhLE)j z(-zebZ>7gb?HpLvHsxA@=OD^*Q$rXm1lv7h2Z85sT&rnqi?WOhRqp~Ylpoh>mfLUZ z05$?_)EfmFM?qhonI3l(1+BCLUN3^`GePyY6Kzuwp#M+*y1dlN^?wIeKA+EfL|N`Q zPnboNWh@m69-!XIpsr5fIRtUl`K3a^vbL{XWoCLD05BX00}FZF>Fd)x-blpn*OsHL zrwN?yAJr@JdDF(|Y1T%>?>9`s>@(u`V_zMBMw>ffc^?q)da>GMC1C5ZoBIHL_;*X& z-1^c$W9OUA$i2d;wj~FwBnF#~KssAQP_1_hx3n#XOf;2L21W+axF0`1IWugJ-QYU4 z34$O9f*=TjAP9mW2!go5L{mw}iO+80#2(8hsjCwc3IJr1WAFw1+6nFB_c=VvL9XNC5TDkEp4!e&1DAP2f4a_*^%_O($%`;|c)0 zeKclB&Qv7{0B|D9mYrZLGt}?%p(;rbOC}u~b4;k_>}k6;aHU}hzy0MPCav3tVzU(P6%zZJSCKoA5$5ClOG a=J*GiB(Dr}FuvRX00009T5bCWsYn~=}d31`lR>TWib*rao_ zV9A}%cY3@5*X-LhUbDG( zFf2)xSs>#;#;eR|O`T)43k`HIAqNJw5BbwWot$17LFYb$iPXUMfwEeYUJ}(YvI* zj{83zk5d2R>|0sYT=)3-RP%&r5st|`aWXajUmiJ}yDYP9#hjwjZ2~ivS85i|NVy^A z`gYHyETCD*r>{uC?2@!6tkH!pramA8uR>cv2H$3XEIU-ycA z^=sx-^J=}%veL@E@jCDNjO}HD-q)wTsQls?$Q?H?(lPGSATW0-n%;Xx?28Y zKdXuVAHVzopr0GG|x`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/meta.json new file mode 100644 index 00000000000..15d94a41d88 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BoyBoyevich made for SunRise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/christmas_stockings.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/christmas_stockings.png new file mode 100644 index 0000000000000000000000000000000000000000..1226835c1b63013016dfb12270ca993798ab8d5e GIT binary patch literal 540 zcmV+%0^|LOP)Px$)=5M`RCt{2*}qHUa2Ut&cdqAA94rpKMb4pzjt6#9I_Th}r<2@zyQBYvi?|5) zN65iR>FBN?C@9=eutUY6I+hY>)UU(&BMsI|(r=oUeqLjnJkOISAz$)+Ktx1DL_|bH zL`0;Eg`JMXdBB~>0Z_;|G)l$3EQPk}3Dp39ka~6;fV)p={HFu}j^l7NKlhTfU(4X2)zdfCN||bsJNb0c{5fKp)5fK@2)+f2PzTs!TuZM~oJT9up(_sMr2pV2T)7=WP zy|EF@@m@Xu6RQCoBj|g>Rd$>oaROPg{nzEo={bdr(=jR!V`w);ZBYZ#E+B1cK%A3; zBj`oXWq+xZ$|n8(QpqfOF2PZGSg{)L)(AR{COlvKGykYOtXRvSKZ$4B?)RD;CU7XlrV= zvJ6?GRX8CoTBvIlcl(|H=CaeD?454z-xkIMw1a`6A)e_r>*Bw?TekO=`>nb9{_57q z;7P}F#D4d$QCHxTR%5*V+I!|}|C7y;_vPbfd=@tk5B8iDJLCM?>Vhg|&#qb5RSu}V zXAjWa{Nv}%wUPGa_fi%Di! zCtc9XxFhd?DcgfxjMu?}pX(T|)kWK{(^@4Bt>pFx_zeg^q^AA|2*m#m%ZV!nceJYD@<);T3K0RUDfvuFSS literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e08492e34ce86f56fac4a11edf805b719710f78a GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zInPhhE&XX zd&`jPkb{KFL(c%kCEGlgns2;h)jIFAw(8chrmb;K7ancje9>t$r}Kx}gxz~&w{;5v zwSs_37f0;2+ZJoC3krJuH1!ppzU$wsIeMSwz1Q=!$}=-OTYUDk(aSm8a+5dSU%g`0 zyi@mhjT%&J-8`gFHYrn4GI+oPgg&ebxsLQ01kG7`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6e5987f507b70f0ca40969289ca4bb574d0f7a81 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{(HJOhE&XX zdvhaSlYvOZr?JhYvA>Jd&^p!qR-{7%-h&s#~RRJ)gZ-sq$=>Y whgC_<+({X%HN`4(C#{%&V7dDxpz9m%iB@0TbDfnT{{_f1p00i_>zopr0L1Q&zyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/meta.json new file mode 100644 index 00000000000..df5e484cc37 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BoyBoyevich made for SunRise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "christmas_stockings", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bc88ca87fd38fb55224061f4c6c4fdc8be2d2f39 GIT binary patch literal 608 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f0e4d28e5fb46167cd93ea8d468e34f582fd467b GIT binary patch literal 641 zcmV-{0)G98P)Px%J4r-ARCt{2+COibKo|z_$5tl`3p^z9{37fv+@zLI;tvV?&vXJ!QJu& zQYn|AL!>T@UNVHilAFmLl1Rw;!|3aD6*Zg-?O}oX{Fajs1269#Ebj{t5fKp)5fKp) z5db)jBlG5j5SjV9DiUuyZ*sX@YESZgA5BWapW@9;Koms?!|=CV;5d#9!?21NjZ!fe zjW?43A%ygOA5j$HHc9Yc+w#G-|)-D5I+iw$85phHXX@utQI9_)K~HZ++`_ z<=tk}m@>LzECI3W0ssc7xhft$-M;|ndl-t|+t@4MUR>bgYK6xn!Q|uwKhDlfT{k?e{T_V~Cp@1jomi_WL-!zu$iXE{8)oczMBNw+l5c zS}lB9t&AtYWdDM(Z@|~LH=x}HQezdXzqr1_<>?2ErNnl^)d Date: Sun, 29 Dec 2024 16:38:33 +0000 Subject: [PATCH 3/5] Fix Sprite --- .../Bra/bra.rsi/female_christmas_Icon.png | Bin 2951 -> 234 bytes .../Gloves/christmas_gloves.rsi/Icon.png | Bin 302 -> 428 bytes .../christmas_gloves.rsi/equipped-HAND.png | Bin 459 -> 464 bytes .../equipped-HAND.png | Bin 458 -> 424 bytes .../Gloves/christmas_gloves_long.rsi/icon.png | Bin 288 -> 499 bytes .../Hats/deer_horns.rsi/equipped-HELMET.png | Bin 316 -> 312 bytes .../Head/Hats/deer_horns.rsi/icon.png | Bin 270 -> 2786 bytes .../Coats/coatchristmas.rsi/Icon.png | Bin 458 -> 389 bytes .../equipped-OUTERCLOTHING.png | Bin 952 -> 955 bytes .../Man/pants.rsi/male_christmas_boxers.png | Bin 610 -> 608 bytes .../pants.rsi/male_christmas_boxers_Icon.png | Bin 363 -> 2876 bytes .../christmas_stockings.png | Bin 540 -> 455 bytes .../Socks/stockings_chrismas.rsi/icon.png | Bin 408 -> 302 bytes .../Jumpsuit/christmas_jumpsuit.rsi/Icon.png | Bin 608 -> 572 bytes .../equipped-INNERCLOTHING.png | Bin 1500 -> 1528 bytes 15 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas_Icon.png b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas_Icon.png index 61c53b49c1a5685ac91978034e45ad9d4f1a9cca..4641acaa566e0aab1da7d2c416126e9f407fad87 100644 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFUg1Ln2z= zUNYo5Y{0{M;k{a`L{Vd$Vmn9Vp3<|dMf2`x3%n_=;G6hy1)uNkEwUlOyIwS^bG}w) z(O5b~=*6;mtCt;Ge%;sB`@fCntlZ@8S4SDMs`XZhv(LEBn^=&4U54%W=Usoz7z~sB zU#hxD$h_BVjHqE+p?X%5VMe2}i^`#;xgRCw9evy?E%7(W=-uoNmmR;3x-5GB;iCSt iZXPeqrBi;bm;Uz3@o}R2iBO<>89ZJ6T-G@yGywpiS6wjx literal 2951 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 diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png index 375b7c172482bb09e33b7c3773a1d25f8e819b54..b5c9cc51367998ca1c27b70cb58413c625dc2360 100644 GIT binary patch delta 389 zcmV;00eb$f0;~g&Fn1sx5JkU3T&i&?NaaSPGCqXP;9K}CzK*+; zX@aXoy+O@_n`zuR#by+(EID2Xgn&LQ$g`vQPs2z+R#sNlAFKGSLen&Dyl$H2blryl zQYOXEDFMr~nGBjsdYe8D04fglO zL_3mf6K`yn#l^%pLQ3hri3mglDJ876x0u$^dLLC4g@^(SN^QQeFENe)04b#dc<(yA zCh`Gb76LCsQHb3Pu=yOcn?+iKw7#{P2mr7i7z4nyEHMj#c3BY4#T|feel5$pBB9>8 zZZ{K0#wiE~5Pq7U1>x()|MQ-hF|U&yh?)Cq-vj{ay57wY1JeP7KL-w=H>OCL(^pY0 z9us+hy)ng_fC#l4!kGDr?|bY6#UT6xF~p^++yM@60e1laE>*QN4^2X|FgJ{+9;2vI jPwCkwHY+PD>)+@TYFYOuz%vhw00000NkvXXu0mjfzAvYr delta 262 zcmV+h0r~!{1Fiy)Fn<8(NklP_)!GAivzgIWo@e4g zyA42XJ_kS#VC4IBhQq=!|HlY+>$Qo;t_wgt%g&peVy!io%bUE98c3^E05(BDb27;l z1DI~Nxx$+uIOZ)DPxt=$2nrv_HN8f|{P%7c-sE2Dk351P2!e3U0a*7(04%8r3jhEB M07*qoM6N<$g65TTMF0Q* diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png index aaa3d5c259090dcc5337fe2ecb49fd36d70ffa07..850883443c0128b409a65ff95d19c7ab8f391a93 100644 GIT binary patch delta 425 zcmV;a0apIY1JDDIF@K6lL_t(|obB4bPQp+W$MG+Q4h$vGp$Q2a2_cL;02>1@;L3CH z3NF5atAiviY%EAh(xFJo2B9vJAhz}1ii-OCjJ-X7dOMy2A|fIpA|fL4-;}Zr!Z1wY zI0nFVT>yOF&wT$l4&XS}B<`o`m-CXjuFGn*A_xNG#sPvLpnp=SP_Ngm;?7b3@UCh7 z%nR^+zjV{jNpCdQ}TS5ae+j z0|0E>1^`GYE8j2I0YJG{r|ze+`*n-9Z6k^zc%G-V@q*`h7=H`~7>~zBb#1eYcTKV@ z4?s%Udz{bn$>9J1c%MwP8a^);82LV80I$<2?l&8wf4@!k+iGQ;eOI@b9*+Qktq|yE znbs!yS%$3;XZ1~dS9a|I#FmAV<6sts*e8ir!+nxq7KS)E4r0sFs_9zxnYHWYYuC+h zUDLH}A|fIpB7Y(xA|fIpBKm8tes3QHL2fz^pqs7A0@}?Y)XoQ}T)MYU)6}%37FFLS z^8lY29e|Xww|3op7KQ-S_x3N#WuuK;qUu|o2Y3g{BA|fK9U*rRo=+TIzob;do O0000R#F@Iu7L_t(|obB4NYQj(y#_`iqXp|OlC^*G;u%nPcGIhywbk0j; z>Fnl92$`f0Aaw8*;!^1lLWiUv+zyT&iOePI z&e@~!3~3mc-E?9`@yx2xD4vHz+-lLwG_eesK2wAVQe1LGIDWM04dbQj21-GI{b#4mDHL%+zS^gPwK zT5aa54xm?6k`0EchS^{!y{b|V(E0o{46Og=E;U`v2LJ#7000000RPxI_Wo^gneE25 zV7|)bIf=~I$9bo`zr0@A*0*64&&=(^z06m+JXzLSAArbVXaCl_vkq&^VzZaW@-UMv z-Uql89oyNrxsyT^A?mv`>>2q$%I|K7EE e0002+8+-%#)UnWNf&%sc0000^1Ls!Riu{ea_kO+ly=+YtJyYuc$#tDL92 zUd4L3)ylJ8ZaZINHQ+z{u>qwRQBYUJy_}0Al0jWjDMr6f=O7R33TT9&psrW}gSw(d z2-aF%CiAcw;I%E4;|c4)ay%igZCPt|In7ffk@By(&Yq#>0RR910C3>#`N??A!95Q! z-2^KQu<=P9*MBrw|HN1&%Z}gl_1(RjL#4zW3c~gS#CzO{)Q_ zBWhQ4M)TTNfXay46`j$%b^}yK)ULP~%@a|-$IX4t1{?qY0002c8{cU7xV6h^;P1_>5~q6{#UIa@MzK^>S_nEMQ! zEAcHV2put4gl~D$5KY6K;XLtU_P}DPI0;&(KVBZQGmds ze$Oapf}1{%PJcox5cqCU237^sQ=6ibxcU_kJUN{!1=N(mlhYZaeou5(De_{X{5^H>$aWBCxtLc^ ztcuDK-r;Cf{VQH1@ZDlFn-=Q)W;WH%w`tR+&A-hjgq3qvYqbJf00000NkvXXu0mjf DZQ#@W delta 248 zcmey&yntzfK|RAQPZ!6Kh}Pr;3D(64OPJkagg(js`=9uxT~xYo)nWDy!{$zz=9Qdm zcNjGeZaRCEPcG%y{rv}ye${1p@J4*^?+BFMp~}Wn!O>#{6m2jTw0rcRY4g)UyM67OC!XetnCB+u9QM1T zfBphywtNnS=Jzr(1!kN0H+Cwn25aNl!Q9csbWYy>!5jBKO%k6@Bxzhcc+Bs@8%BP{ wIicD`*PPg1T-99qi_L}w=+wmtB0Lrh3?WH2^)U_#T?|0r>FVdQ&MBb@0I|DiA^-pY diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png index 934bcc9a3402ea08c36a4cc11a13042627cbf632..5ddb0aecf4f25fd6ffae751710aa3b12c284fa53 100644 GIT binary patch delta 272 zcmdnPw1a7aVf`mh7srr_Id5-j^EEq&v_4$e#ljq|ps1q3!eyGBm>BCFD#~=V#bo8$ zCCjF*Y~u0NmXKq9_+Le3&S~CeOQ(c6O8!@8ypBF^f7b9wl>UB~eaS*K`@;NWkJo0z zT<@zpUovCu^Y6}691U(%NU~&|RW?Zf_d;1AIy}YK_(st+lfL?#*vWq`<~(O+fPx1T zx@U0?N{u?z$|t#f-J$ozHZhsgs59h6_2l`-XGyRJ2<^+VlTH{lt$^ zf2J$>hl;jc>vJ$~-umJFyt;m4pMUIc?k-`qxm~u-a?RO-ANnx!8Dx&L@2^d_d4BN6 RO`sSjgQu&X%Q~loCIDclbEN

6Nj zb#iRX%I1R&yBL;w{P^$Y@k37EW?Hx+o7Sf*JUjC)%iOe(%IjK}; zfAiyA)9zLWbNxF0X1&uXg%_oJd6*t&vE-!l%Q0T9P`bS9`b(ee`jt}oIlQY+ura{E zwlyb$7f(8IGi#5x>cpw7Z&rL}jD2`deBJB?lTNf$-#@k4?fvE3@8aL{7uv)>yMMa= zh1tQAI~(G=Y)nHX^o*Et{{`K2>bU-}W$SbQf9z}SE@8Vf>sXj<_tX4;+%PK`ZhvIS X_Di=Bsj=s60ttG$`njxgN@xNA{tbYs diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png index 5a82667f024660db522dabaa080862170efb67e8..c5f4369d30ee42537ccabcc0e8dacb50c2e3308d 100644 GIT binary patch literal 2786 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 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PI$UFhE&XX zdrgt=kb%gtkB$O2<}%!TAfO?V?pUPogr(h4v0%w0;Wuo|*SEB6Y}=crc>n+MYip`= z21WI17e z;K}M=y4woh>@9BoSaz@d=g!jO6Z{)$n7ia#`o6pGxVP=?gR1Mh_|DJ2w)%-2`$DFS z16QPH%=+nBa9?+F;koMj=Kt?3-G4Ui$~n8qAZ-xKL1ab+<2O~^y`5J}i$GjYS3j3^ HP6}=Z63Y*_}%l~MKE~S0MHjgD`#o(#BqWX%Zi_;mw!&YzMcsHMx7?TyJsyE zrG&}DN1Z0a`7&4UOIg}Pp(tH>7HMN;O%!L2lKWEPOPQ$|&X?+a1!r7WBi#X(-s>$U(mYM;SCa9XWW&zOgHt;RNL z|Lv8_da()vLRRD&(7p%imc`9Cf5JPk)tG)osZWq5eRz5ne$BwxwP|D+YD95ewAuyX vwR?DMhjS6JUaWX~-F&*94F-e3@Nf7405pJU0lg$h00000NkvXXu0mjfySTHD3hajCrD1=;q5FC0LVn8}( z${o06%HU9hfH&aoAOSBxGD+tm87je|V29AeAwBue$%zyycpeBjNxqZs&G&Oo01k)q z-`Qa`oXB!S#+D-D)qXC`J=4x3{pB;c9=mSi`x_02-9A&@UR3!j_;drf__+eNZh02?CVP~OEq#uR= z%IRqDVZ%@bn5qOn43mQe!|`A^UTz+VN)@FP6!T6Tzpqv}?RG0gR@KBb2+$V<0QpoF z>tX9DptfOF?SIX17)^r!0CJHiem$`P(t;~Sl`6o#I7!9_gJVFC7ni;uV2`0I25WK4 zOwBx8DOk+rsgav5SX)m)tG$3k;I^jl0N{IlUQ!mHEWe6CopV~dZB)P}VHRL1B613KuQ8!{Pi%egKGGli~>os>%QW N002ovPDHLkV1l47y8QqE diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png index 5e996874e4e20494ca018d80b5a34f4bd7c810dd..d7cd238f02e248ca1c0a9340707c1bf97a5c0646 100644 GIT binary patch delta 920 zcmV;J184lW2fGK5F@JSQL_t(|ob8&=OB+EH$G=$*?REe zxmVkiR%oFfB!`0k!Q#P#f-Q#jTEtT?9&Er<3vCmKl=do`gEnZCm=ZU;J!E&?-R9S9 zvg^V3xg?p{%=gWkw==`M0SJO12!bGPD4y#!zz&m(v&wKdq<{ZD-9N(DVo( zFABW=eU#%&;eXlX09+NfI_w~m0ZK0Q6&brdwy_j4Qq>N5fLw_W{?BEa}g|GK=? z%Z;ytRz9E0d5W^!cAj9ND9c#N=RH8ZlL14WDDVj2s(^S91Z~s zIo#>%)4gpa?DOeM(bm&APWO-M6}enThBTs4J7J&CG!bi`VV@8C>L6I{ZUyr`z|V15 zZLkt(Yq8V&0Au*~Lcg=M#e%i-jb>vv=|-Q)0W0yrhTczQ3J9q6PU3_>ObmJ4JCYyr zc=XN}OC?k#$uuA=*m8g<@Hj7*F%S&e673}e!644dW!veou5*K;z@sWjdI-9Krf2N5 z-E_RYxG|8*6aY2+DvCRcgBI?oOaav{+hTUW@`Jm$eQyi^Ft_o|RJS%20IB$pJ*LGwl1wQ6TYh|B+x7tUJG%h%-Qe~@+Lg_~%t}%Lpx+sVbg|-PqN_!Q}LAz*_m=ZU;J!EIyP4i=a zWaGj2xg?p{o$s4BFEhiu0SJO12!gn&c&^(3t4uD=D#MYm_J8|y{|H}~KiTewr5D#@ zF$Dlt5`*}e+11{Srjp9Sk23(kd_M1rQ<*jZjC#FV`2~QAEZf#L{la=Irs##=&Be6u z&p+e=00Pe;wR6yQCopY+=a9}8|Ep)^qAXk1HubQ+^R0}~W5*CP+MTd703BOyG@w=I z1)kHsk9xg^kbkuc(-zebZ>7gb?HpLvHsxA@=OD^*Q$rXm1lv7h2Z85sT&rnqi?WOh zRqp~Ylpoh>mfLUZ05$?_)EfmFM?qhonI3l(1+BCLUN3^`GePyY6Kzuwp#M+*y1dlN z^?wIeKA+EfL|N`QPnboNWh@m69-!XIpsr5fIRtUl`G2KC!LqimU1er^8~`vJ2?Gmx z-0ADnJl;se@7I>2t)~f`?jO}F@_Ez7=xNqQ#P2su!t68R_hVljfJU1;VR;`A@OrV@ zWF=thv77q(aGI<*OcAP9mW2!bF8f*=TjxWPnINymxLZsNoq%O|O;6B7ymWRhd> z1^n6x?c?`3Jj>-=KbhT#$CZyy;sEL=!cyfDsog^Wz^lDI_bx~P_0Er|sj+_FRaQ;l zIlTB>H^NOPY{cUV0K9!PW=PIdB?$m?s0#E_>q$MQoS zkJfpyR6?l3vI5#Np9IBF}g`wLpEq$k* zq~h(zj$T|1!HVMk;=sZ^oh_o;h4w5vVEMsa+`cyk0GQkOW~f`63In+=Sk;2HsW9Gr zIe#{kZM}X70QmF!P+JXLgDru2HWLYDa&cDKOeA`;H)yBV%)U<8ngjGyC8=xIVa$@w z7P~g*IGzIl^lSojL(9_Q9Ze;bz^wqjuWfsP`n_EM+HP=rA>;aHU}hzy0MPCav3tVz rU(P6%zZJSCKoA5$5ClOG=J*GiB(Dr}Fb=-l00000NkvXXu0mjfdqudT diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png index 0a031708be77738af0f6cae7a85c19b836a2e6ae..e0966c11d801706a2a6cbe9e4aad540cf2848ee6 100644 GIT binary patch delta 539 zcmV+$0_6ST1mFaaF&r96L_t(|obB2_XcJK!2k>vD#~C;!2Z_U3iae1`B7Y!45$)pK z#UT+KjuPq{JfYV}lN<>=hbD*rD!!wsh~Lk0+`GHq@5|%1_XCKCh=_=Yh=_>je=?x+ za;7+@62}u5Oc+QGpNiIl+9!0HZ8Td=RF~dr)%@H2wO)3GP$Q0W;PZ-EEeo<<$L-fOz%=)NH`Bz8XPYQrOv1LTSbrgO`_ElUl2I9+BvjNhi5%+ zAV0r>(ejj9$z~M*lyt^Z(R{#B+G{kTxqy{yR*jaYRDOO#dq5)Aui^@!&Lop~cx@OD z-hA%+WXM4oMjQwCucUDIMGad)5G%uAoaVM=VYk!4%&G?opw%5yIZCbWT)@m~9lPC3 dL_|cSf&19r4ggk8RNzU+N-_G-q+3`p-D4h;Z zI!;e^dIN*SF}aXVOLhP#3@5^Tz-ig5)xuoBLOLx6i(@i7y%8xO5$Siag^-uxaXi1% zk7w&&yP6C+sQ-Xv;pwde9xqq0<@=HQ_eNP{8U}V-EleyrZ~-*hQI*ruXy*bZ7OU88 f&qG8+M5O9F+_c-t$|x^A00000NkvXXu0mjfF_;FU diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers_Icon.png b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers_Icon.png index 7cc8a878377b96ed2711cabc9dd6094a44b475f7..933f954d69a9f0b405ae4d24a7894863037921ce 100644 GIT binary patch literal 2876 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 KMNUMnLSTZ}R>Fq> delta 501 zcmVF`}pQe}pZL?926D8r%{G8d^_y)jD?SGofUx&`u&1LhsFa^Nw z?{gN8&mzU_g^hYXMooI~=Yrd|M?E*m3b0pgGktPO{?iz>7#Gp2UhDagbb*6T4M@9y zw5b7M4{Vf*rjYsfLUku{p={HFu}j^l7NKlhTfU(4X2)zdfCN||bsJNb0c{5fKp)5fK@2)+f2PzTs!TuZM~oJT9up z(_sMr2pV2T)7=WPy|EF@@m@Xu6RQCoBj|g>Rd$>oac%-xvi;ZP%jr3VjMFhH4`XOI zMQu?7(k>uvYCxQmf+Off&t-q9l*%Uk{!+;-dM?3Hd04R;@YV=AjV3%_{4@WkJgivD rpg)O!1l`1o8!ncn=XD*Gi%2MsHyHC?11rb400000NkvXXu0mjfnm+bI diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png index 1aa066677718969257e6b9b3730067ee429ba227..36d4359f014aa6a49e88bb98e360cc0d95ceee6b 100644 GIT binary patch literal 302 zcmV+}0nz@6P)Px#=t)FDR9J=W(=ltpKp4jH|21t92ZKYp6dWS11)U68JGFFkckkHGAufWSLQqOa zcZGt5x&@jc;E;9>0kvKSi`XL6i!O!tH|E|v_YC)f5JCuHz-u-2A?Ld&li^XlsvjCx z0KA7Y-nv6ozQ5KN?j->2-Yeet#VGUCWEf!3pYkzZ5ZOg;fKD){^gO{iKO-~^15Psh zb5v5`{}hP*ns%-A15XP!j$RQwJ>uvUX~71-wG^>mGg`&H3T%f)xjX>NB%yM9$1+KN zeE&WFm%Y|7{M^d>z7Rku#i(B0l*qD%LI@$g0LCjqE}nt<;Q#;t07*qoM6N<$f;hf@ AvH$=8 literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zgFIavLn`LH zy4B?)RD;CU7XlrV= zvJ6?GRX8CoTBvIlcl(|H=CaeD?454z-xkIMw1a`6A)e_r>*Bw?TekO=`>nb9{_57q z;7P}F#D4d$QCHxTR%5*V+I!|}|C7y;_vPbfd=@tk5B8iDJLCM?>Vhg|&#qb5RSu}V zXAjWa{Nv}%wUPGa_fi%Di! zCtc9XxFhd?DcgfxjMu?}pX(T|)kWK{(^@4Bt>pFx_zeg^q^AA|2*m#m%ZV!nceJYD@<);T3K0RUDfvuFSS diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png index bc88ca87fd38fb55224061f4c6c4fdc8be2d2f39..b34375c7438dc38e60e48b2ad14223e2acd8b2bd 100644 GIT binary patch delta 535 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 Date: Sun, 29 Dec 2024 17:43:24 +0000 Subject: [PATCH 4/5] Fix --- .../Entities/Clothing/Pants/pants.yml | 21 +++++++++--------- .../_Sunrise/Clothing/Bra/bra.rsi/meta.json | 4 ++-- .../Head/Hats/deer_horns.rsi/icon.png | Bin 2786 -> 2940 bytes .../Woman/pants.rsi/female_christmas.png | Bin .../Woman/pants.rsi/female_christmas_icon.png | Bin 0 -> 197 bytes .../female_\321\201hristmas_Icon.png" | Bin 527 -> 0 bytes .../Clothing/Pants/Woman/pants.rsi/meta.json | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) rename "Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas.png" => Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas.png (100%) create mode 100644 Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas_icon.png delete mode 100644 "Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas_Icon.png" diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml index 6bf8768665b..780a39fca5e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml @@ -290,26 +290,27 @@ - type: entity parent: ClothingPantsStorageBase - id: ClothingPantsWomanStrapless - name: women's strapless underpants - description: strapless underpants for women. + id: ClothingPantsWomanChristmas + name: women's Christmas underpants + description: Christmas underpants for women. components: - type: Sprite sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi - state: female_strapless_icon + state: female_christmas_icon - type: Clothing sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi - equippedState: female_strapless + equippedState: female_christmas - type: entity parent: ClothingPantsStorageBase - id: ClothingPantsWomanChristmas - name: women's Christmas underpants - description: Christmas underpants for women. + id: ClothingPantsWomanStrapless + name: women's strapless underpants + description: strapless underpants for women. components: - type: Sprite sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi - state: female_christmas_Icon + state: female_strapless_icon - type: Clothing sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi - equippedState: female_christmas + equippedState: female_strapless + diff --git a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json index 66776f9b9c5..734405ef35b 100644 --- a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "BoyBoyevich made (female_christmas,female_christmas_Icon) for SunRise", + "copyright": "BoyBoyevich made (female_christmas,female_christmas_icon) for SunRise", "size": { "x": 32, "y": 32 @@ -44,7 +44,7 @@ "name": "female_uk_icon" }, { - "name": "female_christmas_Icon" + "name": "female_christmas_icon" }, { "name": "female_christmas", diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png index c5f4369d30ee42537ccabcc0e8dacb50c2e3308d..78fac464f8ca2e4f6a42e7bcac28217ffcc22828 100644 GIT binary patch delta 293 zcmV+=0owlJ75o;kVG4ijNklN9e7yN7Ao-QicxQI(0D(Z@Ur3Xf(j=y~be5r1c)8x51^}?# zA0lpC*0mmh2a$gF5&0zrtHqoEV0S!yJ!5s#$r!+EQygytb*q1s>b(Iz4Ki9g4^126 zZ0c*uQuzwj=Q{u(C-MooZ=_LxvN<>AWJ*z$5Ccg7 zsX0(I!>^|iMr*S5Rv}Z0_(Oe%xPe}%yS+uyLhlXyb^z(W-1Uq=AQ0%32i-Vt;M_nD r|ErOP2ru literal 0 HcmV?d00001 diff --git "a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas_Icon.png" "b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_\321\201hristmas_Icon.png" deleted file mode 100644 index 00573975acb6107ee431d4382b2cd4a2408489d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmV+q0`UEbP)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3-rt1voyR<(rF`azFc(Hx?QdzepZjhUv;lSd_J6d_do7i;NL|*fUliE zn`55W-C6B6MKNfP(QiQX0~q`SKG|nkIFDUf{-l@aHz4`}000000000);RS$f6%Yq3 R=F0#8002ovPDHLkV1kVI$fy7S diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json index 0d247e13d3f..1c3a9113874 100644 --- a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "BoyBoyevich made (female_christmas, female_christmas_Icon) for SunRise", + "copyright": "BoyBoyevich made (female_christmas, female_christmas_icon) for SunRise", "size": { "x": 32, "y": 32 @@ -44,7 +44,7 @@ "name": "female_uk_icon" }, { - "name": "female_christmas_Icon" + "name": "female_christmas_icon" }, { "name": "female_christmas", From 531aabddc082747fa5eac25816583426a23b23f3 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 17:55:22 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BC=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/meta.json index 97fcc5cd5b9..dfd2d1b9b0c 100644 --- a/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "BoyBoyevich made () for SunRise", + "copyright": "BoyBoyevich made (male_christmas_boxers, male_christmas_boxers_Icon) for SunRise", "size": { "x": 32, "y": 32