Skip to content

Commit

Permalink
Tail Protection 101! and Lizard Helmets!
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxxoTrystan committed Jan 9, 2024
1 parent f53ea0e commit 5f9c47c
Show file tree
Hide file tree
Showing 320 changed files with 897 additions and 25 deletions.
21 changes: 21 additions & 0 deletions Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ public abstract class ClothingSystem : EntitySystem

[ValidatePrototypeId<TagPrototype>]
private const string HairTag = "HidesHair";
private const string HeadTopTag = "HidesHeadTop"; // Frontier
private const string TailTag = "HidesTail"; // Frontier
private const string SnoutTag = "HidesSnout"; // Frontier

public override void Initialize()
{
Expand All @@ -32,13 +35,31 @@ protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component,
component.InSlot = args.Slot;
if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HairTag))
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Hair, false);

if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HeadTopTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.HeadTop, false); // Frontier

if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, SnoutTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Snout, false); // Frontier

if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, TailTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, false); // Frontier
}

protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent component, GotUnequippedEvent args)
{
component.InSlot = null;
if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HairTag))
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Hair, true);

if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HeadTopTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.HeadTop, true); // Frontier

if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, SnoutTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Snout, true); // Frontier

if (args.Slot == "outerClothing" && _tagSystem.HasTag(args.Equipment, TailTag)) // Frontier
_humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Tail, true); // Frontier
}

private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
- HidesHair
- WhitelistChameleon
- HelmetEVA
- HidesHeadTop # Frontier
- type: IdentityBlocker

- type: entity
Expand Down Expand Up @@ -167,6 +168,7 @@
tags:
- HidesHair
- WhitelistChameleon
- HidesHeadTop # Frontier
- type: IdentityBlocker

- type: entity
Expand Down Expand Up @@ -241,4 +243,4 @@
- type: GroupExamine
- type: Tag
tags:
- HidesHair
- HidesHair
24 changes: 24 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@
- type: PressureProtection
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: Tag
tags:
- HidesHair
- WhitelistChameleon
- HelmetEVA
- HidesSnout # Frontier

#Warden's Hardsuit
- type: entity
Expand Down Expand Up @@ -221,6 +227,12 @@
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: Tag
tags:
- HidesHair
- WhitelistChameleon
- HelmetEVA
- HidesSnout # Frontier

#Chief Engineer's Hardsuit
- type: entity
Expand Down Expand Up @@ -486,6 +498,12 @@
- type: PressureProtection
highPressureMultiplier: 0.225
lowPressureMultiplier: 1000
- type: Tag
tags:
- HidesHair
- WhitelistChameleon
- HelmetEVA
- HidesSnout # Frontier

#Pirate EVA Suit (Deep Space EVA Suit)
- type: entity
Expand Down Expand Up @@ -677,6 +695,12 @@
Heat: 0.80
Radiation: 0.80
Caustic: 0.95
- type: Tag
tags:
- HidesHair
- WhitelistChameleon
- HelmetEVA
- HidesSnout # Frontier

#MISC. HARDSUITS
#Clown Hardsuit
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
Blunt: 0.95
Slash: 0.95
Piercing: 0.95
- type: Tag # Frontier
tags: # Frontier
- HidesSnout # Frontier

#Cult Helmet
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
tags:
- Hardsuit
- WhitelistChameleon
- HidesTail # Frontier


- type: entity
Expand All @@ -109,6 +110,9 @@
sprintModifier: 0.8
- type: Item
size: 80
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBase
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
Caustic: 0.5
- type: VendPrice
price: 400
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBioGeneral
Expand Down
24 changes: 24 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
walkModifier: 0.8
sprintModifier: 0.7
- type: GroupExamine
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBaseLarge
Expand All @@ -73,6 +76,9 @@
walkModifier: 0.8
sprintModifier: 0.8
- type: GroupExamine
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: [ClothingOuterBaseLarge, GeigerCounterClothing]
Expand All @@ -90,6 +96,9 @@
- type: Clothing
sprite: Clothing/OuterClothing/Suits/rad.rsi
- type: GroupExamine
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBaseLarge
Expand Down Expand Up @@ -130,6 +139,9 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellSmall
disableEject: true
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -141,6 +153,9 @@
sprite: Clothing/OuterClothing/Suits/chicken.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Suits/chicken.rsi
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -166,6 +181,9 @@
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -187,6 +205,9 @@
- type: Construction
graph: ClothingOuterSuitIan
node: suit
- type: Tag
tags:
- HidesTail # Frontier

- type: entity
parent: ClothingOuterBase
Expand All @@ -205,3 +226,6 @@
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
- type: Tag
tags:
- HidesTail # Frontier
9 changes: 9 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1112,3 +1112,12 @@

- type: Tag # Frontier
id: WeaponMelee # Frontier

- type: Tag # Frontier
id: HidesTail # Frontier

- type: Tag # Frontier
id: HidesHeadTop # Frontier

- type: Tag # Frontier
id: HidesSnout # Frontier
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
Expand All @@ -29,6 +37,14 @@
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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
Expand Up @@ -17,6 +17,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
Expand All @@ -29,6 +37,14 @@
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
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
Expand Up @@ -17,6 +17,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
Expand All @@ -29,6 +37,14 @@
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
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
Expand Up @@ -17,6 +17,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
Expand All @@ -29,6 +37,14 @@
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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
Expand Up @@ -17,6 +17,14 @@
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "off-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
Expand All @@ -29,6 +37,14 @@
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-reptilian",
"directions": 4
},
{
"name": "on-equipped-HELMET-vulpkanin",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5f9c47c

Please sign in to comment.