SKREEEEEE (#3706)
* Import bird sprites and define basic mob. * SKREEEEEEEEE * Move hair styles to new sprite accessory prototypes. Basic stuff, no multi-species stuff yet. * Vox hair styles and clothes * Make HumanoidCharacterProfile.Default() a static default to fix tests. Usages that wanted the previous random behavior now call Random(). * Remove names from hair style prototypes. (They're in localization files) * Update Content.Shared/Actions/ActionType.cs (sk)reeee github Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
5ed935f30a
commit
0ac4c0e85c
19
Resources/Prototypes/HairStyles/common.yml
Normal file
19
Resources/Prototypes/HairStyles/common.yml
Normal file
@@ -0,0 +1,19 @@
|
||||
# Bald and shaved are used for multiple species.
|
||||
|
||||
- categories: [HumanHair, VoxHair]
|
||||
id: HairBald
|
||||
# Bald is always on top
|
||||
priority: 1
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_hair.rsi
|
||||
state: bald
|
||||
type: spriteAccessory
|
||||
|
||||
- categories: [HumanFacialHair, VoxFacialHair]
|
||||
id: FacialHairShaved
|
||||
# Shaved is always on top
|
||||
priority: 1
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: shaved
|
||||
type: spriteAccessory
|
||||
210
Resources/Prototypes/HairStyles/human_facial_hair.yml
Normal file
210
Resources/Prototypes/HairStyles/human_facial_hair.yml
Normal file
@@ -0,0 +1,210 @@
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairAbe
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: abe
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairBrokenman
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: brokenman
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairChin
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: chin
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairDwarf
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: dwarf
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairFullbeard
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: fullbeard
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairCroppedfullbeard
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: croppedfullbeard
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairGt
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: gt
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairHip
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: hip
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairJensen
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: jensen
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairNeckbeard
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: neckbeard
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairWise
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: wise
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairMuttonmus
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: muttonmus
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairMartialartist
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: martialartist
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairChinlessbeard
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: chinlessbeard
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairMoonshiner
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: moonshiner
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairLongbeard
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: longbeard
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairVolaju
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: volaju
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHair3oclock
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: 3oclock
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairFiveoclock
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: fiveoclock
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHair5oclockmoustache
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: 5oclockmoustache
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHair7oclock
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: 7oclock
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHair7oclockmoustache
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: 7oclockmoustache
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairMoustache
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: moustache
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairPencilstache
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: pencilstache
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairSmallstache
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: smallstache
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairWalrus
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: walrus
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairFumanchu
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: fumanchu
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairHogan
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: hogan
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairSelleck
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: selleck
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairChaplin
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: chaplin
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairVandyke
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: vandyke
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairWatson
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: watson
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairElvis
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: elvis
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairMutton
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: mutton
|
||||
type: spriteAccessory
|
||||
- categories: HumanFacialHair
|
||||
id: HumanFacialHairSideburn
|
||||
sprite:
|
||||
sprite: Mobs/Customization/human_facial_hair.rsi
|
||||
state: sideburn
|
||||
type: spriteAccessory
|
||||
1044
Resources/Prototypes/HairStyles/human_hair.yml
Normal file
1044
Resources/Prototypes/HairStyles/human_hair.yml
Normal file
File diff suppressed because it is too large
Load Diff
34
Resources/Prototypes/HairStyles/vox_facial_hair.yml
Normal file
34
Resources/Prototypes/HairStyles/vox_facial_hair.yml
Normal file
@@ -0,0 +1,34 @@
|
||||
- type: spriteAccessory
|
||||
id: VoxFacialHairColonel
|
||||
categories: VoxFacialHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_facial_hair.rsi
|
||||
state: vox_colonel_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxFacialHairFu
|
||||
categories: VoxFacialHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_facial_hair.rsi
|
||||
state: vox_fu_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxFacialHairNeck
|
||||
categories: VoxFacialHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_facial_hair.rsi
|
||||
state: vox_neck_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxFacialHairBeard
|
||||
categories: VoxFacialHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_facial_hair.rsi
|
||||
state: vox_beard_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxFacialHairRuffBeard
|
||||
categories: VoxFacialHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_facial_hair.rsi
|
||||
state: vox_ruff_beard_s
|
||||
91
Resources/Prototypes/HairStyles/vox_hair.yml
Normal file
91
Resources/Prototypes/HairStyles/vox_hair.yml
Normal file
@@ -0,0 +1,91 @@
|
||||
- type: spriteAccessory
|
||||
id: VoxHairShortQuills
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_shortquills_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairKingly
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_kingly_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairAfro
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_afro_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairMohawk
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_mohawk_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairYasuhiro
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_yasu_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairHorns
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_horns_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairNights
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_nights_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairSurf
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_surf_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairCropped
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_cropped_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairRuffhawk
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_ruff_hawk_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairRows
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_rows_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairMange
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_mange_s
|
||||
|
||||
- type: spriteAccessory
|
||||
id: VoxHairPony
|
||||
categories: VoxHair
|
||||
sprite:
|
||||
sprite: Mobs/Customization/vox_hair.rsi
|
||||
state: vox_pony_s
|
||||
|
||||
Reference in New Issue
Block a user