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/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/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/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/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/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/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/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/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/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/Pants/pants.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml index 0db4c0d37de..780a39fca5e 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 @@ -275,6 +288,19 @@ sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi equippedState: female_uk +- 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 + - type: entity parent: ClothingPantsStorageBase id: ClothingPantsWomanStrapless @@ -287,3 +313,4 @@ - type: Clothing sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi equippedState: female_strapless + 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/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/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/Bra/bra.rsi/female_christmas.png b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas.png new file mode 100644 index 00000000000..eac76bc7485 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas.png differ 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 new file mode 100644 index 00000000000..4641acaa566 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/female_christmas_Icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json index 36591081220..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": "", + "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/Hands/Gloves/christmas_gloves.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png new file mode 100644 index 00000000000..b5c9cc51367 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/Icon.png differ 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 00000000000..850883443c0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/equipped-HAND.png differ 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 00000000000..020dc628008 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-left.png differ 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 00000000000..07ea83a333b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.rsi/meta.json new file mode 100644 index 00000000000..35df324a987 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves.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/Hands/Gloves/christmas_gloves_long.rsi/equipped-HAND.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/equipped-HAND.png new file mode 100644 index 00000000000..d6b55c3b022 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/icon.png new file mode 100644 index 00000000000..56a5c7bf5b6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/icon.png differ 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 00000000000..74163ef7de4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-left.png differ 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 00000000000..8dc373df558 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Hands/Gloves/christmas_gloves_long.rsi/inhand-right.png differ 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 00000000000..5ddb0aecf4f Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png differ 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 new file mode 100644 index 00000000000..78fac464f8c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/meta.json new file mode 100644 index 00000000000..1b509807055 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Hats/deer_horns.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BoyBoyevich made for SunRise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png new file mode 100644 index 00000000000..535c32d74ec Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/Icon.png differ 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 00000000000..d7cd238f02e Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-left.png new file mode 100644 index 00000000000..e08fbbd7af1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-right.png new file mode 100644 index 00000000000..7a0351821d1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/coatchristmas.rsi/inhand-right.png differ 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/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 00000000000..e0966c11d80 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers.png differ 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 new file mode 100644 index 00000000000..933f954d69a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Pants/Man/pants.rsi/male_christmas_boxers_Icon.png differ 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 252b9c96c38..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": "", + "copyright": "BoyBoyevich made (male_christmas_boxers, male_christmas_boxers_Icon) for SunRise", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "male_stripe_icon" }, + { + "name": "male_christmas_boxers_Icon" + }, { "name": "male_uk_icon" }, @@ -44,6 +47,10 @@ "name": "male_stripe", "directions": 4 }, + { + "name": "male_christmas_boxers", + "directions": 4 + }, { "name": "male_uk", "directions": 4 diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas.png b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas.png new file mode 100644 index 00000000000..86c8a47a5e8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas_icon.png b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas_icon.png new file mode 100644 index 00000000000..51ba87ca3d4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Pants/Woman/pants.rsi/female_christmas_icon.png differ 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..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": "", + "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/Socks/stockings_chrismas.rsi/christmas_stockings.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/christmas_stockings.png new file mode 100644 index 00000000000..c18c377e674 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/christmas_stockings.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png new file mode 100644 index 00000000000..36d4359f014 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/icon.png differ 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 00000000000..e08492e34ce Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-left.png differ 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 00000000000..6e5987f507b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Socks/stockings_chrismas.rsi/inhand-right.png differ 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 00000000000..b34375c7438 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/Icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..d4223ab2bbc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..92b525a2edc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-left.png differ 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 00000000000..f0e4d28e5fb Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.rsi/meta.json new file mode 100644 index 00000000000..7ee8e3504f5 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/christmas_jumpsuit.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-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}