Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
loadouts:
- HoPHead
- ClothingHeadHatHopHat # Adventure
- ClothingHeadHatHopBeret # Adventure

- type: loadoutGroup
id: HoPJumpsuit
Expand Down Expand Up @@ -480,6 +481,7 @@
loadouts:
- JanitorJumpsuit
- JanitorJumpskirt
- BlueJani #adventure

- type: loadoutGroup
id: JanitorGloves
Expand Down Expand Up @@ -676,6 +678,7 @@
loadouts:
- MusicianJumpsuit
- MusicianJumpskirt
- BardJumpsuit #adventure

- type: loadoutGroup
id: MusicianOuterClothing
Expand Down Expand Up @@ -788,6 +791,7 @@
loadouts:
- CargoTechnicianJumpsuit
- CargoTechnicianJumpskirt
- CargoTechWorkJumpsuit #Adventure

- type: loadoutGroup
id: CargoTechnicianBackpack
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 @@ -176,6 +176,7 @@
- JanitorGloves
- CommonBackpack
- JanitorOuterClothing
- JanitorShoes
- Glasses
- Survival
- Trinkets
Expand Down Expand Up @@ -245,6 +246,7 @@
groups:
- GroupPlasManSuitMusician #Adventure
- GroupTankHarness
- MusicianHead
- MusicianJumpsuit
- CommonBackpack
- MusicianOuterClothing
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- type: startingGear
id: JanitorGear
equipment:
shoes: ClothingShoesGaloshes
#shoes: ClothingShoesGaloshes
id: JanitorPDA
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,17 @@
minLimit: 0
loadouts:
- NeckMining

- type: loadoutGroup
id: MusicianHead
name: Музыкант, голова
minLimit: 0
loadouts:
- BardHat

- type: loadoutGroup
id: JanitorShoes
name: Уборщик, обувь
loadouts:
- Galoshes
- BlueJaniShoes
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#рабочий комбинезон грузчика
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCargoTechWork
name: рабочий комбинезон грузчика
description: Таскать тяжеленные ящики с металлом удобнее всего в толстом комбинезоне.
suffix: AdvClothing
components:
- type: Sprite
sprite: _Adventure/Objects/Clothing/cargo/cargotech.rsi
- type: Clothing
sprite: _Adventure/Objects/Clothing/cargo/cargotech.rsi
femaleMask: UniformTop

- type: loadout
id: CargoTechWorkJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitCargoTechWork
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#синий комбинезон уборщика
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBlueJani
name: синий комбинезон уборщика
description: И снова всю ночь я просто драил полы в компании швабры. Да, это карма.
suffix: AdvClothing
components:
- type: Sprite
sprite: _Adventure/Objects/Clothing/janitor/bluejani.rsi
- type: Clothing
sprite: _Adventure/Objects/Clothing/janitor/bluejani.rsi
femaleMask: UniformTop

- type: loadout
id: BlueJani
equipment:
jumpsuit: ClothingUniformJumpsuitBlueJani

- type: entity
parent: [ ClothingShoesBase, BaseJanitorContraband ]
id: ClothingShoesBlueJani
name: галоши-шлёпанцы
description: Очень важно задеть лужу какой-нибудь гадости пяткой.
components:
- type: Sprite
sprite: _Adventure/Objects/Clothing/janitor/bluejanislippers.rsi
- type: Clothing
sprite: _Adventure/Objects/Clothing/janitor/bluejanislippers.rsi
- type: NoSlip
- type: SlowedOverSlippery
slowdownModifier: 0.7
- type: SpeedModifierContactCapClothing
maxContactSprintSlowdown: 0.7
maxContactWalkSlowdown: 0.7

- type: loadout
id: BlueJaniShoes
equipment:
shoes: ClothingShoesBlueJani

- type: loadout
id: Galoshes
equipment:
shoes: ClothingShoesGaloshes
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,46 @@
storage:
back:
- SuperSynthesizerInstrument

#комбинезон барда
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBard
name: комбинезон барда
description: Бля, ну хайп
suffix: AdvClothing
components:
- type: Sprite
sprite: _Adventure/Objects/Clothing/musician/Bard/suit.rsi
- type: Clothing
sprite: _Adventure/Objects/Clothing/musician/Bard/suit.rsi
femaleMask: UniformTop

- type: loadout
id: BardJumpsuit
effects:
- !type:GroupLoadoutEffect
proto: FamousMusician
equipment:
jumpsuit: ClothingUniformJumpsuitBard

#шляпа барда
- type: entity
parent: ClothingHeadBase
id: ClothingHeadBard
name: шляпа барда
description: Просто фак ми
suffix: AdvClothing
components:
- type: Sprite
sprite: _Adventure/Objects/Clothing/musician/Bard/hat.rsi
- type: Clothing
sprite: _Adventure/Objects/Clothing/musician/Bard/hat.rsi

- type: loadout
id: BardHat
equipment:
head: ClothingHeadBard
effects:
- !type:GroupLoadoutEffect
proto: FamousMusician
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.
Binary file modified Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png
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.
Binary file modified Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
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.
Binary file modified Resources/Textures/Clothing/Back/Duffels/duffel.rsi/icon.png
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.
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.
Binary file modified Resources/Textures/Clothing/Back/Duffels/hydroponics.rsi/icon.png
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.
Binary file modified Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png
Binary file modified Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png
Binary file modified Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png
Binary file modified Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By Xaunto",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By Xaunto",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By Xaunto",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "equipped-FEET-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By hatlesshatman",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By hatlesshatman",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file modified Resources/Textures/_Corvax/Back/Duffels/ce.rsi/icon.png
Binary file modified Resources/Textures/_Corvax/Back/Duffels/ce.rsi/inhand-left.png
Loading