Skip to content

Commit

Permalink
Christmas clothing (#971)
Browse files Browse the repository at this point in the history
* Christmas труселя

* Рождество

* Fix Sprite

* Fix

* мг
  • Loading branch information
KaiserMaus authored Dec 29, 2024
1 parent 274d1fe commit b9dd80c
Show file tree
Hide file tree
Showing 63 changed files with 349 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.....
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ ent-ClothingBraUk = женский бюстгальтер "Великобрит
.desc = Бюстгальтер с дизайном, символизирующим Великобританию.
ent-ClothingBraStrapless = женский бюстгальтер без бретелек
.desc = Бюстгальтер без бретелек для невидимости под одеждой.
ent-ClothingBraChristmas = женский бюстгальтер "Рождество"
.desc = Бюстгальтер с дизайном, символизирующим Рождество.
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ ent-ClothingHandsGlovesCentcomNaval = перчатки флота Nanotrasen
.desc = Пара высококачественных плотных перчаток, украшенных золотым шитьём, которые выдаются командующим флотом Nanotrasen.
ent-ClothingHandsGlovesLeatherHoS = кожаные перчатки
.desc = Стильные чёрные кожаные перчатки.
ent-ClothingHandsGlovesChristmas = Рождественские перчатки
.desc = Стильные Рождественские вязаные перчатки.
ent-ClothingHandsGlovesChristmasLong = Рождественские длинные перчатки
.desc = Стильные Рождественские вязаные перчатки.
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ ent-ClothingHeadHatPatologonatHat = шапочка патологоаната
.desc = Черная шапочка пропитанная запахом гнили
ent-ClothingHeadHatSingulo = корона Сингуло
.desc = Величайшее достижение инженеров и ученых - компактная установка сингулярности, позволяющая владельцу продемонстрировать свой статус и уникальность на станции.
ent-ClothingHeadHatDeerHorns = Оленьи рога
.desc = Рожки что обычно носят Олени.
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ ent-ClothingOuterAtmosianBomberJacket = куртка-бомбер атмосиа
.desc = Плотная, поношенная куртка-бомбер атмосианина.
ent-ClothingOuterCoatPatologoanatom = Халат патологоанатома
.desc = Стерильный чёрный халат патологоанатома для работы с трупами. Немного защищает от проливов кислот.
ent-ClothingOuterChristmasSweeter = Рождественский Свитер
.desc = Старый вязаный свитер так и напоминает об Рождестве.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ent-ClothingPantsManStripe = мужские полосатые трусы
.desc = Трусы с полосатым дизайном для мужчин.
ent-ClothingPantsManUk = мужские трусы с флагом Великобритании
.desc = Трусы с флагом Великобритании для мужчин.
ent-ClothingPantsManChristmas = мужские Рождественские трусы.
.desc = Трусы Рождественские для мужчин.
ent-ClothingPantsWomanNekoWhite = женские белые трусы с котиками
.desc = Трусы с белым цветом и изображением котиков для женщин.
ent-ClothingPantsWomanNekoBlack = женские чёрные трусы с котиками
Expand All @@ -42,3 +44,5 @@ ent-ClothingPantsWomanUk = женские трусы с флагом Велик
.desc = Трусы с флагом Великобритании для женщин.
ent-ClothingPantsWomanStrapless = женские трусы без лямок
.desc = Трусы без лямок для женщин.
ent-ClothingPantsWomanChristmas = Рождественские женские трусы
.desc = Рождественские трусы для женщин.
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ ent-ClothingThighTrans = чулки до бедра с трансфлагом
.desc = { ent-ClothingSocksBaseButcherable.desc }
ent-ClothingThighUk = чулки до бедра с изображением британского флага
.desc = { ent-ClothingSocksBaseButcherable.desc }
ent-ClothingThighChristmas = рождественские чулки до бедра
.desc = { ent-ClothingSocksBaseButcherable.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ ent-ClothingUniformJumpsuitBarber = костюм парикмахера
.desc = Как же он хорош.
ent-ClothingUniformJumpsuitAdjutant = комбинезон адъютанта
.desc = Сшито на совесть из дышащей ткани, что позволит вам быть на ногах всю смену.
ent-ClothingUniformJumpskirtChristmas = Рождественский женский комбинезон
.desc = Украшен в тонах рождества, ушит специально для красивой части станции.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ClothingHeadBandSkull: 2
ClothingHeadHatGreyFlatcap: 3
ClothingHeadHatBrownFlatcap: 3
ClothingUniformJumpskirtChristmas: 3 #sunrise-edit
ClothingUniformJumpsuitColorGrey: 8
ClothingUniformJumpskirtColorGrey: 8
ClothingUniformJumpsuitColorWhite: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Bra/bra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 22 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 27 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Pants/pants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -287,3 +313,4 @@
- type: Clothing
sprite: _Sunrise/Clothing/Pants/Woman/pants.rsi
equippedState: female_strapless

13 changes: 13 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Socks/socks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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

9 changes: 9 additions & 0 deletions Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/bra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,12 @@
proto: WomanMoment
equipment:
bra: ClothingBraUk

- type: loadout
id: ChristmasBra
sponsorOnly: true
effects:
- !type:GroupLoadoutEffect
proto: WomanMoment
equipment:
bra: ClothingBraChristmas
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion Resources/Textures/_Sunrise/Clothing/Bra/bra.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -43,6 +43,13 @@
{
"name": "female_uk_icon"
},
{
"name": "female_christmas_icon"
},
{
"name": "female_christmas",
"directions": 4
},
{
"name": "female_uk",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b9dd80c

Please sign in to comment.