juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Hatening / Hide hair when hats are equipped (#36818)

Browse Source 
* changed HideLayerClothing on some entities YAML

* Use HideLayerClothing with slots, layers does not work for some reason

* Hattened again

* Mooore ! I touched the clown mask, beware

* Fix typo from "Slide" to "Side"

* Build issue, test with commenting out error part

* Trying again...

* Trying for fix
This commit is contained in:
Banedon
2025-05-17 07:05:43 +02:00
committed by GitHub
parent c49a28889f
commit a39d3334d6
7 changed files with 216 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
View File

@@ -65,6 +65,11 @@
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadHatHardhatBase

6
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -16,12 +16,6 @@
sprite: Clothing/Head/Hardsuits/basic.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/basic.rsi
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Atmospherics Hardsuit
- type: entity

76
Resources/Prototypes/Entities/Clothing/Head/hats.yml
View File

@@ -433,10 +433,10 @@
- ClothMade
- Recyclable
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadHatWizardBase
@@ -458,6 +458,12 @@
- type: Clothing
sprite: Clothing/Head/Hats/santahat.rsi
- type: Appearance
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
slots: []
- type: Foldable
canFoldInsideContainer: true
- type: FoldableClothing
@@ -471,6 +477,7 @@
- state: icon-nobeard
map: [ "foldedLayer" ]
visible: true
- type: entity
@@ -502,6 +509,11 @@
- Recyclable
- HamsterWearable
- WhitelistChameleon
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -513,6 +525,11 @@
sprite: Clothing/Head/Hats/surgcap_green.rsi
- type: Clothing
sprite: Clothing/Head/Hats/surgcap_green.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -524,6 +541,12 @@
sprite: Clothing/Head/Hats/surgcap_purple.rsi
- type: Clothing
sprite: Clothing/Head/Hats/surgcap_purple.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -659,6 +682,11 @@
sprite: Clothing/Head/Hats/wizard_fake.rsi
- type: Clothing
sprite: Clothing/Head/Hats/wizard_fake.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
abstract: true
@@ -716,6 +744,11 @@
sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: [ ClothingHeadBase, BaseSyndicateContraband ]
@@ -727,6 +760,11 @@
sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: [ ClothingHeadBase, BaseSyndicateContraband ]
@@ -738,6 +776,11 @@
sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
- type: Clothing
sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -750,6 +793,11 @@
- type: Clothing
sprite: Clothing/Head/Hats/papersack.rsi
- type: IdentityBlocker
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -762,6 +810,11 @@
- type: Clothing
sprite: Clothing/Head/Hats/papersacksmile.rsi
- type: IdentityBlocker
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -812,6 +865,11 @@
sprite: Clothing/Head/Hats/rasta.rsi
- type: Clothing
sprite: Clothing/Head/Hats/rasta.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase
@@ -843,6 +901,11 @@
sprite: Clothing/Head/Hats/jester2.rsi
- type: Clothing
sprite: Clothing/Head/Hats/jester2.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: [ClothingHeadBase, BaseCommandContraband]
@@ -1032,6 +1095,11 @@
sprite: Clothing/Head/Hats/gladiator.rsi
- type: Clothing
sprite: Clothing/Head/Hats/gladiator.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadBase

100
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View File

@@ -10,9 +10,9 @@
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
layers:
HeadTop : HEAD
HeadSide : HEAD
- type: entity
parent: ClothingHeadHelmetBase
@@ -42,6 +42,9 @@
tags:
- WhitelistChameleon
- SecurityHelmet
- type: HideLayerClothing
layers:
Hair: HEAD
#Mercenary Helmet
- type: entity
@@ -54,6 +57,9 @@
sprite: Clothing/Head/Helmets/merc_helmet.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/merc_helmet.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#SWAT Helmet
- type: entity
@@ -77,6 +83,9 @@
Caustic: 0.95
- type: ExplosionResistance
damageCoefficient: 0.75
- type: HideLayerClothing
layers:
Hair: HEAD
#Syndicate SWAT Helmet
- type: entity
@@ -90,6 +99,9 @@
sprite: Clothing/Head/Helmets/swat_syndicate.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/swat_syndicate.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#Light Riot Helmet
- type: entity
@@ -109,6 +121,9 @@
Blunt: 0.8
Slash: 0.8
Piercing: 0.95
- type: HideLayerClothing
layers:
Hair: HEAD
#Bombsuit Helmet
- type: entity
@@ -131,11 +146,9 @@
Slash: 0.95
Piercing: 0.95
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
layers:
Hair: HEAD
Snout: HEAD
#Janitorial Bombsuit Helmet
- type: entity
@@ -149,6 +162,9 @@
sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#Cult Helmet
- type: entity
@@ -169,6 +185,9 @@
Slash: 0.8
Piercing: 0.9
Heat: 0.9
- type: HideLayerClothing
layers:
Hair: HEAD
#Space Ninja Helmet
- type: entity
@@ -187,11 +206,9 @@
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
layers:
Hair: HEAD
Snout: HEAD
#Knight Helmet
- type: entity
@@ -206,6 +223,9 @@
sprite: Clothing/Head/Helmets/templar.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
layers:
Hair: HEAD
#Thunderdome Helmet
- type: entity
@@ -218,6 +238,9 @@
sprite: Clothing/Head/Helmets/thunderdome.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/thunderdome.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#Wizard Helmet
- type: entity
@@ -232,6 +255,9 @@
sprite: Clothing/Head/Helmets/wizardhelm.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
layers:
Hair: HEAD
#Fire Helmet
- type: entity
@@ -257,11 +283,9 @@
- WhitelistChameleon
- FireHelmet
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
layers:
Hair: HEAD
Snout: HEAD
#Atmos Fire Helmet
- type: entity
@@ -290,11 +314,9 @@
- WhitelistChameleon
- FireHelmet
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
layers:
Hair: HEAD
Snout: HEAD
- type: BreathMask
#Chitinous Helmet
@@ -315,6 +337,9 @@
Slash: 0.5
Piercing: 0.5
Heat: 0.9
- type: HideLayerClothing
layers:
Hair: HEAD
#ERT HELMETS
#ERT Leader Helmet
@@ -328,6 +353,9 @@
sprite: Clothing/Head/Helmets/ert_leader.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ert_leader.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#ERT Security Helmet
- type: entity
@@ -340,6 +368,9 @@
sprite: Clothing/Head/Helmets/ert_security.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ert_security.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#ERT Medic Helmet
- type: entity
@@ -352,6 +383,9 @@
sprite: Clothing/Head/Helmets/ert_medic.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ert_medic.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#ERT Engineer Helmet
- type: entity
@@ -364,6 +398,9 @@
sprite: Clothing/Head/Helmets/ert_engineer.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ert_engineer.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#ERT Janitor Helmet
- type: entity
@@ -376,6 +413,9 @@
sprite: Clothing/Head/Helmets/ert_janitor.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ert_janitor.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
- type: entity
parent: [ BaseSyndicateContraband, ClothingHeadHelmetBase ]
@@ -394,8 +434,12 @@
Slash: 0.85
Piercing: 0.85
Heat: 0.85
- type: HideLayerClothing
layers:
Hair: HEAD
#Bone Helmet
#No need to hide the hair on this one
- type: entity
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetBone
@@ -410,6 +454,7 @@
graph: BoneHelmet
node: helmet
#Ironclad II Helmet
- type: entity
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetPodWars
@@ -420,6 +465,9 @@
sprite: Clothing/Head/Helmets/podwars_helmet.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/podwars_helmet.rsi
- type: HideLayerClothing
layers:
Hair: HEAD
#Justice Helmet
- type: entity
@@ -490,6 +538,9 @@
- type: Construction
graph: HelmetJustice
node: helmet
- type: HideLayerClothing
layers:
Hair: HEAD
- type: entity
parent: ClothingHeadHelmetJustice
@@ -500,6 +551,9 @@
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
- type: HideLayerClothing
layers:
Hair: HEAD
- type: entity
id: ActionToggleJusticeHelm

10
Resources/Prototypes/Entities/Clothing/Head/hoods.yml
View File

@@ -20,11 +20,11 @@
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
layers:
Hair: HEAD
Snout: HEAD
HeadTop: HEAD
HeadSide: HEAD
- type: entity
parent: ClothingHeadHatHoodBioGeneral

44
Resources/Prototypes/Entities/Clothing/Head/misc.yml
View File

@@ -32,6 +32,11 @@
sprite: Clothing/Head/Misc/chickenhead.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadBase
@@ -74,6 +79,12 @@
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- FacialHair
- type: entity
parent: ClothingHeadBase
@@ -85,6 +96,9 @@
sprite: Clothing/Head/Misc/pwig.rsi
- type: Clothing
sprite: Clothing/Head/Misc/pwig.rsi
- type: HideLayerClothing
slots:
- HeadTop
- type: entity
parent: ClothingHeadBase
@@ -109,6 +123,12 @@
sprite: Clothing/Head/Misc/richard.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- FacialHair
- type: entity
parent: ClothingHeadBase
@@ -122,6 +142,11 @@
sprite: Clothing/Head/Misc/skubhead.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadBase
@@ -137,6 +162,11 @@
tags:
- HamsterWearable
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadBase
@@ -244,6 +274,12 @@
sprite: Clothing/Head/Misc/squiddy.rsi
- type: IngestionBlocker
- type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- FacialHair
- type: entity
parent: ClothingHeadBase
@@ -255,6 +291,12 @@
sprite: Clothing/Head/Misc/red_racoon.rsi
- type: Clothing
sprite: Clothing/Head/Misc/red_racoon.rsi
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- FacialHair
- type: entity
parent: Clothing
@@ -338,3 +380,5 @@
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide

13
Resources/Prototypes/Entities/Clothing/Masks/masks.yml
View File

@@ -206,7 +206,10 @@
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
parent: ClothingMaskClownBase
@@ -219,7 +222,10 @@
- WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
parent: ClothingMaskClown
@@ -378,6 +384,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
hideOnToggle: true
- type: Armor
modifiers:
@@ -443,6 +451,11 @@
sprite: Clothing/Mask/squadron.rsi
- type: Clothing
sprite: Clothing/Mask/squadron.rsi
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide
- type: Armor
modifiers:
coefficients: