tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lizard snouts disappearing when wearing masks (#25716)

Browse Source 
* fixes it

* Snout fix

* Partway commit

* Partway commit

* Update masks and helmets to use the new system
This commit is contained in:
SlamBamActionman
2024-04-19 07:39:47 +02:00
committed by GitHub
parent 94f296f9d6
commit 7aa4beede6
14 changed files with 206 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/Clothing/Components/HideLayerClothingComponent.cs Normal file
View File

@@ -0,0 +1,24 @@
using Content.Shared.Humanoid;
using Robust.Shared.GameStates;
namespace Content.Shared.Clothing.Components;
/// <summary>
/// This is used for a clothing item that hides an appearance layer.
/// The entity's HumanoidAppearance component must have the corresponding hideLayerOnEquip value.
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed partial class HideLayerClothingComponent : Component
{
/// <summary>
/// The appearance layer to hide.
/// </summary>
[DataField]
public HashSet<HumanoidVisualLayers> Slots = new();
/// <summary>
/// If true, the layer will only hide when the item is in a toggled state (e.g. masks)
/// </summary>
[DataField]
public bool HideOnToggle = false;
}

66
Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
View File

@@ -6,26 +6,19 @@ using Content.Shared.Interaction.Events;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Inventory.Events; using Content.Shared.Inventory.Events;
using Content.Shared.Item; using Content.Shared.Item;
using Content.Shared.Tag; using Robust.Shared.Containers;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using System.Linq;
namespace Content.Shared.Clothing.EntitySystems; namespace Content.Shared.Clothing.EntitySystems;
public abstract class ClothingSystem : EntitySystem public abstract class ClothingSystem : EntitySystem
{ {
[Dependency] private readonly SharedItemSystem _itemSys = default!; [Dependency] private readonly SharedItemSystem _itemSys = default!;
[Dependency] private readonly SharedContainerSystem _containerSys = default!;
[Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidSystem = default!; [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidSystem = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly InventorySystem _invSystem = default!; [Dependency] private readonly InventorySystem _invSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[ValidatePrototypeId<TagPrototype>]
private const string HairTag = "HidesHair";
[ValidatePrototypeId<TagPrototype>]
private const string NoseTag = "HidesNose";
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -89,18 +82,22 @@ public abstract class ClothingSystem : EntitySystem
} }
} }
private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag) private void ToggleVisualLayers(EntityUid equipee, HashSet<HumanoidVisualLayers> layers, HashSet<HumanoidVisualLayers> appearanceLayers)
{ {
InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee, SlotFlags.HEAD ^ SlotFlags.MASK); foreach (HumanoidVisualLayers layer in layers)
bool shouldLayerShow = true;
while (enumerator.NextItem(out EntityUid item))
{ {
if (_tagSystem.HasTag(item, tag)) if (!appearanceLayers.Contains(layer))
break;
InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
bool shouldLayerShow = true;
while (enumerator.NextItem(out EntityUid item))
{ {
if (tag == NoseTag) //Special check needs to be made for NoseTag, due to masks being toggleable if (TryComp(item, out HideLayerClothingComponent? comp))
{ {
if (TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing)) //Checks for mask toggling. TODO: Make a generic system for this
if (comp.HideOnToggle && TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing))
{ {
if (clothing.EquippedPrefix != mask.EquippedPrefix) if (clothing.EquippedPrefix != mask.EquippedPrefix)
{ {
@@ -114,50 +111,49 @@ public abstract class ClothingSystem : EntitySystem
break; break;
} }
} }
else
{
shouldLayerShow = false;
break;
}
} }
_humanoidSystem.SetLayerVisibility(equipee, layer, shouldLayerShow);
} }
_humanoidSystem.SetLayerVisibility(equipee, layer, shouldLayerShow);
} }
protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component, GotEquippedEvent args) protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component, GotEquippedEvent args)
{ {
component.InSlot = args.Slot; component.InSlot = args.Slot;
if ((new string[] { "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, HairTag)) CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
} }
protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent component, GotUnequippedEvent args) protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent component, GotUnequippedEvent args)
{ {
component.InSlot = null; component.InSlot = null;
if ((new string[] { "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, HairTag)) CheckEquipmentForLayerHide(args.Equipment, args.Equipee);
ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
} }
private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args) private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
{ {
args.State = new ClothingComponentState(component.EquippedPrefix); args.State = new ClothingComponentState(component.EquippedPrefix);
if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container))
{
CheckEquipmentForLayerHide(uid, container.Owner);
}
} }
private void OnHandleState(EntityUid uid, ClothingComponent component, ref ComponentHandleState args) private void OnHandleState(EntityUid uid, ClothingComponent component, ref ComponentHandleState args)
{ {
if (args.Current is ClothingComponentState state) if (args.Current is ClothingComponentState state)
{
SetEquippedPrefix(uid, state.EquippedPrefix, component); SetEquippedPrefix(uid, state.EquippedPrefix, component);
if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container))
{
CheckEquipmentForLayerHide(uid, container.Owner);
}
}
} }
private void OnMaskToggled(Entity<ClothingComponent> ent, ref ItemMaskToggledEvent args) private void OnMaskToggled(Entity<ClothingComponent> ent, ref ItemMaskToggledEvent args)
{ {
//TODO: sprites for 'pulled down' state. defaults to invisible due to no sprite with this prefix //TODO: sprites for 'pulled down' state. defaults to invisible due to no sprite with this prefix
SetEquippedPrefix(ent, args.IsToggled ? args.equippedPrefix : null, ent); SetEquippedPrefix(ent, args.IsToggled ? args.equippedPrefix : null, ent);
ToggleVisualLayer(args.Wearer, HumanoidVisualLayers.Snout, NoseTag); CheckEquipmentForLayerHide(ent.Owner, args.Wearer);
} }
private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAfterEvent args) private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAfterEvent args)
@@ -176,6 +172,12 @@ public abstract class ClothingSystem : EntitySystem
_handsSystem.TryPickup(args.User, ent); _handsSystem.TryPickup(args.User, ent);
} }
private void CheckEquipmentForLayerHide(EntityUid equipment, EntityUid equipee)
{
if (TryComp(equipment, out HideLayerClothingComponent? clothesComp) && TryComp(equipee, out HumanoidAppearanceComponent? appearanceComp))
ToggleVisualLayers(equipee, clothesComp.Slots, appearanceComp.HideLayersOnEquip);
}
#region Public API #region Public API
public void SetEquippedPrefix(EntityUid uid, string? prefix, ClothingComponent? clothing = null) public void SetEquippedPrefix(EntityUid uid, string? prefix, ClothingComponent? clothing = null)

6
Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
View File

@@ -82,6 +82,12 @@ public sealed partial class HumanoidAppearanceComponent : Component
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
public Color? CachedFacialHairColor; public Color? CachedFacialHairColor;
/// <summary>
/// Which layers of this humanoid that should be hidden on equipping a corresponding item..
/// </summary>
[DataField]
public HashSet<HumanoidVisualLayers> HideLayersOnEquip = [HumanoidVisualLayers.Hair];
} }
[DataDefinition] [DataDefinition]

18
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
View File

@@ -133,11 +133,13 @@
unequipSound: /Audio/Mecha/mechmove03.ogg unequipSound: /Audio/Mecha/mechmove03.ogg
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- HelmetEVA - HelmetEVA
- HidesNose
- type: IdentityBlocker - type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- Snout
- type: entity - type: entity
abstract: true abstract: true
@@ -173,10 +175,12 @@
- type: IngestionBlocker - type: IngestionBlocker
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- HidesNose
- type: IdentityBlocker - type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- Snout
- type: entity - type: entity
abstract: true abstract: true
@@ -248,6 +252,6 @@
- type: TemperatureProtection - type: TemperatureProtection
coefficient: 0.7 coefficient: 0.7
- type: GroupExamine - type: GroupExamine
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesHair - Hair

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

@@ -17,9 +17,9 @@
sprite: Clothing/Head/Hardsuits/basic.rsi sprite: Clothing/Head/Hardsuits/basic.rsi
- type: Clothing - type: Clothing
sprite: Clothing/Head/Hardsuits/basic.rsi sprite: Clothing/Head/Hardsuits/basic.rsi
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
#Atmospherics Hardsuit #Atmospherics Hardsuit
- type: entity - type: entity

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

@@ -382,9 +382,12 @@
sprite: Clothing/Head/Hats/plaguedoctor.rsi sprite: Clothing/Head/Hats/plaguedoctor.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- ClothMade - ClothMade
- type: HideLayerClothing
slots:
- Hair
- Snout
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -537,9 +540,11 @@
sprite: Clothing/Head/Hats/witch.rsi sprite: Clothing/Head/Hats/witch.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- ClothMade - ClothMade
- type: HideLayerClothing
slots:
- Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase

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

@@ -110,6 +110,10 @@
Blunt: 0.95 Blunt: 0.95
Slash: 0.95 Slash: 0.95
Piercing: 0.95 Piercing: 0.95
- type: HideLayerClothing
slots:
- Hair
- Snout
#Janitorial Bombsuit Helmet #Janitorial Bombsuit Helmet
- type: entity - type: entity
@@ -157,10 +161,13 @@
sprite: Clothing/Head/Helmets/spaceninja.rsi sprite: Clothing/Head/Helmets/spaceninja.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: IngestionBlocker - type: IngestionBlocker
- type: IdentityBlocker - type: IdentityBlocker
- type: HideLayerClothing
slots:
- Hair
- Snout
#Templar Helmet #Templar Helmet
- type: entity - type: entity
@@ -220,8 +227,11 @@
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
#Atmos Fire Helmet #Atmos Fire Helmet
- type: entity - type: entity
@@ -244,8 +254,11 @@
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
#Chitinous Helmet #Chitinous Helmet
- type: entity - type: entity

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

@@ -13,8 +13,11 @@
- type: IngestionBlocker - type: IngestionBlocker
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
- type: entity - type: entity
parent: ClothingHeadHatHoodBioGeneral parent: ClothingHeadHatHoodBioGeneral
@@ -94,9 +97,11 @@
sprite: Clothing/Head/Hoods/chaplain.rsi sprite: Clothing/Head/Hoods/chaplain.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -110,8 +115,10 @@
sprite: Clothing/Head/Hoods/cult.rsi sprite: Clothing/Head/Hoods/cult.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -125,9 +132,11 @@
sprite: Clothing/Head/Hoods/nun.rsi sprite: Clothing/Head/Hoods/nun.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -145,9 +154,10 @@
Heat: 0.95 Heat: 0.95
Radiation: 0.65 Radiation: 0.65
- type: BreathMask - type: BreathMask
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesHair - Hair
- Snout
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -161,8 +171,10 @@
sprite: Clothing/Head/Hoods/goliathcloak.rsi sprite: Clothing/Head/Hoods/goliathcloak.rsi
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -175,9 +187,9 @@
sprite: Clothing/Head/Hoods/iansuit.rsi sprite: Clothing/Head/Hoods/iansuit.rsi
- type: Clothing - type: Clothing
sprite: Clothing/Head/Hoods/iansuit.rsi sprite: Clothing/Head/Hoods/iansuit.rsi
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesHair - Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -190,9 +202,9 @@
sprite: Clothing/Head/Hoods/carpsuit.rsi sprite: Clothing/Head/Hoods/carpsuit.rsi
- type: Clothing - type: Clothing
sprite: Clothing/Head/Hoods/carpsuit.rsi sprite: Clothing/Head/Hoods/carpsuit.rsi
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesHair - Hair
- type: entity - type: entity
parent: ClothingHeadBase parent: ClothingHeadBase
@@ -207,8 +219,11 @@
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: Tag
tags: tags:
- HidesHair
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Hair
- Snout
#Winter Coat Hoods #Winter Coat Hoods
- type: entity - type: entity

3
Resources/Prototypes/Entities/Clothing/Head/welding.yml
View File

@@ -19,6 +19,9 @@
- type: Tag - type: Tag
tags: tags:
- WhitelistChameleon - WhitelistChameleon
- type: HideLayerClothing
slots:
- Snout
- type: entity - type: entity
parent: WeldingMaskBase parent: WeldingMaskBase

5
Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
View File

@@ -25,7 +25,10 @@
- type: Tag - type: Tag
tags: tags:
- Bandana - Bandana
- HidesNose - type: HideLayerClothing
slots:
- Snout
hideOnToggle: true
- type: entity - type: entity
parent: ClothingMaskBandanaBase parent: ClothingMaskBandanaBase

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

@@ -15,7 +15,10 @@
tags: tags:
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- HidesNose - type: HideLayerClothing
slots:
- Snout
hideOnToggle: true
- type: entity - type: entity
parent: ClothingMaskGas parent: ClothingMaskGas
@@ -197,7 +200,9 @@
tags: tags:
- ClownMask - ClownMask
- WhitelistChameleon - WhitelistChameleon
- HidesNose - type: HideLayerClothing
slots:
- Snout
- type: entity - type: entity
parent: ClothingMaskClownBase parent: ClothingMaskClownBase
@@ -208,7 +213,9 @@
- ClownMask - ClownMask
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- HidesNose - type: HideLayerClothing
slots:
- Snout
- type: entity - type: entity
parent: ClothingMaskClown parent: ClothingMaskClown
@@ -235,9 +242,9 @@
sprite: Clothing/Mask/joy.rsi sprite: Clothing/Mask/joy.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -255,7 +262,9 @@
tags: tags:
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- HidesNose - type: HideLayerClothing
slots:
- Snout
- type: entity - type: entity
parent: ClothingMaskPullableBase parent: ClothingMaskPullableBase
@@ -306,9 +315,10 @@
- type: BreathMask - type: BreathMask
- type: IngestionBlocker - type: IngestionBlocker
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
hideOnToggle: true
- type: entity - type: entity
parent: ClothingMaskClownBase parent: ClothingMaskClownBase
@@ -338,8 +348,11 @@
- type: Tag - type: Tag
tags: tags:
- WhitelistChameleon - WhitelistChameleon
- HidesHair - type: HideLayerClothing
- HidesNose slots:
- Hair
- Snout
hideOnToggle: true
- type: entity - type: entity
parent: ClothingMaskGasExplorer parent: ClothingMaskGasExplorer
@@ -365,8 +378,11 @@
- type: Tag - type: Tag
tags: tags:
- WhitelistChameleon - WhitelistChameleon
- HidesHair - type: HideLayerClothing
- HidesNose slots:
- Hair
- Snout
hideOnToggle: true
- type: entity - type: entity
parent: ClothingMaskGasERT parent: ClothingMaskGasERT
@@ -401,7 +417,9 @@
tags: tags:
- HamsterWearable - HamsterWearable
- WhitelistChameleon - WhitelistChameleon
- HidesNose - type: HideLayerClothing
slots:
- Snout
- type: IdentityBlocker - type: IdentityBlocker
- type: entity - type: entity
@@ -416,9 +434,9 @@
sprite: Clothing/Mask/fox.rsi sprite: Clothing/Mask/fox.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -432,9 +450,9 @@
sprite: Clothing/Mask/bee.rsi sprite: Clothing/Mask/bee.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -448,9 +466,9 @@
sprite: Clothing/Mask/bear.rsi sprite: Clothing/Mask/bear.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -464,9 +482,9 @@
sprite: Clothing/Mask/raven.rsi sprite: Clothing/Mask/raven.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -480,9 +498,9 @@
sprite: Clothing/Mask/jackal.rsi sprite: Clothing/Mask/jackal.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase
@@ -496,9 +514,9 @@
sprite: Clothing/Mask/bat.rsi sprite: Clothing/Mask/bat.rsi
- type: BreathMask - type: BreathMask
- type: IdentityBlocker - type: IdentityBlocker
- type: Tag - type: HideLayerClothing
tags: slots:
- HidesNose - Snout
- type: entity - type: entity
parent: ClothingMaskBase parent: ClothingMaskBase

9
Resources/Prototypes/Entities/Clothing/Masks/specific.yml
View File

@@ -6,8 +6,7 @@
suffix: Chameleon suffix: Chameleon
components: components:
- type: Tag - type: Tag
tags: # ignore "WhitelistChameleon" tag tags: [] # ignore "WhitelistChameleon" tag
- HidesNose
- type: Sprite - type: Sprite
sprite: Clothing/Mask/gas.rsi sprite: Clothing/Mask/gas.rsi
- type: Clothing - type: Clothing
@@ -21,6 +20,9 @@
interfaces: interfaces:
- key: enum.ChameleonUiKey.Key - key: enum.ChameleonUiKey.Key
type: ChameleonBoundUserInterface type: ChameleonBoundUserInterface
- type: HideLayerClothing
slots:
- Snout
- type: entity - type: entity
parent: ClothingMaskGasChameleon parent: ClothingMaskGasChameleon
@@ -28,3 +30,6 @@
suffix: Voice Mask, Chameleon suffix: Voice Mask, Chameleon
components: components:
- type: VoiceMasker - type: VoiceMasker
- type: HideLayerClothing
slots:
- Snout

5
Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
View File

@@ -51,6 +51,11 @@
accent: dwarf accent: dwarf
- type: Speech - type: Speech
speechSounds: Bass speechSounds: Bass
- type: HumanoidAppearance
species: Human
hideLayersOnEquip:
- Hair
- Snout
- type: entity - type: entity
parent: BaseSpeciesDummy parent: BaseSpeciesDummy

5
Resources/Prototypes/Entities/Mobs/Species/human.yml
View File

@@ -15,6 +15,11 @@
spawned: spawned:
- id: FoodMeatHuman - id: FoodMeatHuman
amount: 5 amount: 5
- type: HumanoidAppearance
species: Human
hideLayersOnEquip:
- Hair
- Snout
- type: entity - type: entity
parent: BaseSpeciesDummy parent: BaseSpeciesDummy