Skip to content

Commit

Permalink
Added bard loadout (#1674)
Browse files Browse the repository at this point in the history
* Added bard loadout

* removed empty lines

* removed empty lines

* removed empty lines

---------

Co-authored-by: Dexler <[email protected]>
  • Loading branch information
chell4592 and DexlerXD authored Aug 28, 2024
1 parent b9dcf1c commit 1677950
Show file tree
Hide file tree
Showing 36 changed files with 241 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ ent-ClothingHeadHatSalvage = кепка утилизатора
.desc = Зачем они носят кепки, если работают в пещерах?
ent-ClothingHeadHatSalvageFlipped = кепка утилизатора
.desc = Зачем они носят кепки, если работают в пещерах?
ent-ClothingHeadHatBeretBard = берет с пером
.desc = Добавит атмосферы!
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Jumpsuit/jumpsuit.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ ent-ClothingUniformJumpsuitFlannelSalvage = одежда пустотного т
.desc = Рубашка в стиле кантри для опытного снабженца. Несмотря на то, что она не соответствует корпоративной форме, руководство закрывает на это глаза из-за высокой производительности её носителя.
ent-ClothingUniformJumpsuitJanitorBlue = синий костюм уборщика
.desc = Костюм таинственного уборщика.
ent-ClothingUniformJumpsuitBard = костюм барда
.desc = Комфортная одежда для длительных концертов.
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/ss220/clothing/Outerclothing/misc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ ent-ClothingOuterApronBotanistBrown = коричневый фартук
.desc = Толстый коричневый фартук, идеально подходящий для защиты вашей нежной плоти от пятен, грязи и колючек.
.suffix = Ботанический
ent-ClothingOuterHoodieChaplainWhite = белое одеяние священника
.desc = Белое и строгое одеяние с капюшоном для священника.
.desc = Белое и строгое одеяние с капюшоном для священника.
ent-ClothingOuterApronBard = накидка барда
.desc = Подчеркивает стиль владельца.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/clothing/Shoes/shoes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingShoesBootsBard = ботинки барда
.desc = Не слишком удобны, но вы ведь надели их не ради удобства, не так ли?
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss220/loadout-groups/musician.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
loadout-group-musician-head = Музыкант, головной убор
loadout-group-musician-shoes = Музыкант, обувь
6 changes: 6 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@
id: MusicianWintercoat
equipment:
outerClothing: ClothingOuterWinterMusician

#Shoes SS220 loadout
- type: loadout
id: MusicianBootsLaceup
equipment:
shoes: ClothingShoesBootsLaceup
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,15 @@
loadouts:
- MusicianJumpsuit
- MusicianJumpskirt
- BardUniform #SS220 bard loadout

- type: loadoutGroup
id: MusicianOuterClothing
name: loadout-group-musician-outerclothing
minLimit: 0
loadouts:
- MusicianWintercoat
- BardApron #SS220 bard loadout

- type: loadoutGroup
id: Instruments
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,11 @@
id: JobMusician
groups:
- GroupTankHarness
- MusicianHead #SS220 bard loadout
- MusicianJumpsuit
- CommonBackpack
- MusicianOuterClothing
- MusicianShoes #SS220 bard loadout
- Glasses
- Survival
- Trinkets
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
id: MusicianGear
equipment:
eyes: ClothingEyesGlassesSunglasses
shoes: ClothingShoesBootsLaceup
#shoes: ClothingShoesBootsLaceup #SS220 to do bard loadout
id: MusicianPDA
ears: ClothingHeadsetService
#storage:
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/beret_bard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretBard #SS220 bard loadout
name: beret with feather
description: Will add atmosphere!
components:
- type: Sprite
sprite: SS220/Clothing/Head/Hats/beret_bard.rsi
- type: Clothing
sprite: SS220/Clothing/Head/Hats/beret_bard.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterApronBard #SS220 bard loadout
name: bard cape
description: Emphasizes the owner's style.
components:
- type: Sprite
sprite: SS220/Clothing/OuterClothing/Misc/apronbard.rsi
- type: Clothing
sprite: SS220/Clothing/OuterClothing/Misc/apronbard.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Shoes/bard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesBootsBard #SS220 bard loadout
name: bard shoes
description: Shoes for true music lovers!
components:
- type: Sprite
sprite: SS220/Clothing/Shoes/Boots/bardboots.rsi
- type: Clothing
sprite: SS220/Clothing/Shoes/Boots/bardboots.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBard #SS220 bard loadout
name: bard jumpsuit
description: Comfortable clothes for long concerts.
components:
- type: Sprite
sprite: SS220/Clothing/Uniforms/bard.rsi
- type: Clothing
sprite: SS220/Clothing/Uniforms/bard.rsi
52 changes: 52 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/Jobs/Civilian/musician.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# SS220 bard loadout

# Bard Time

- type: loadoutEffectGroup
id: MusicianBard
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobMusician
time: 108000 #30 часов

# Head

- type: loadout
id: BardHead
effects:
- !type:GroupLoadoutEffect
proto: MusicianBard
equipment:
head: ClothingHeadHatBeretBard

# Jumpsuit

- type: loadout
id: BardUniform
effects:
- !type:GroupLoadoutEffect
proto: MusicianBard
equipment:
jumpsuit: ClothingUniformJumpsuitBard

# Outer clothing

- type: loadout
id: BardApron
effects:
- !type:GroupLoadoutEffect
proto: MusicianBard
equipment:
outerClothing: ClothingOuterApronBard

# Shoes

- type: loadout
id: BardShoes
effects:
- !type:GroupLoadoutEffect
proto: MusicianBard
equipment:
shoes: ClothingShoesBootsBard
20 changes: 19 additions & 1 deletion Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,25 @@
- ChefBeltApronBlack
- ChefBeltApronRed
- ChefBeltApronSenior
# Шеф-повар (Начало)
# Шеф-повар (Конец)

# Музыкант (начало)
- type: loadoutGroup
id: MusicianHead
name: loadout-group-musician-head
minLimit: 0
loadouts:
- BardHead

- type: loadoutGroup
id: MusicianShoes
name: loadout-group-musician-shoes
minLimit: 0
loadouts:
- MusicianBootsLaceup
- BardShoes
# Музыкант (конец)

#! Сервис

#! Разное
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": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by funny_mushroom (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by funny_mushroom (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by funny_mushroom (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/SS220/Clothing/Uniforms/bard.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by funny_mushroom (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 1677950

Please sign in to comment.