Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hair error #168

Open
wants to merge 2 commits into
base: upstream-may
Choose a base branch
from
Open

Fix hair error #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb16f64
Merge pull request #133 from 13lackHawk/upstream-may
Lemirda Jun 16, 2024
39b15b4
fix sponsor hair
Lemirda Jun 16, 2024
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
7 changes: 0 additions & 7 deletions Content.Client/Humanoid/MarkingPicker.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,6 @@ public void Populate(string filter)

var item = CMarkingsUnused.AddItem($"{GetMarkingName(marking)}", marking.Sprites[0].Frame0());
item.Metadata = marking;

// A-13 Sponsor service start
if (marking.SponsorOnly)
{
item.Disabled = false;
}
// A-13 Sponsor service end
}

CMarkingPoints.Visible = _currentMarkings.PointsLeft(_selectedMarkingCategory) != -1;
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/human_hair.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
id: HumanHairCotton
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: cotton
Expand Down Expand Up @@ -155,7 +155,7 @@
id: HumanHairFingerwave
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: fingerwave
Expand All @@ -172,7 +172,7 @@
id: HumanHairFortuneteller
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: fortuneteller
Expand All @@ -181,7 +181,7 @@
id: HumanHairFortunetellerAlt
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: fortuneteller_alt
Expand Down Expand Up @@ -326,7 +326,7 @@
id: HumanHairLongdtails
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: longdtails
Expand Down Expand Up @@ -359,7 +359,7 @@
id: HumanHairLooseSlicked
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: loose_slicked
Expand Down Expand Up @@ -408,7 +408,7 @@
id: HumanHairQuadcurls
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: quadcurls
Expand Down Expand Up @@ -441,7 +441,7 @@
id: HumanHairShy
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: shy
Expand Down Expand Up @@ -514,7 +514,7 @@
id: HumanHairSpicy
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: spicy
Expand Down Expand Up @@ -555,7 +555,7 @@
id: HumanHairWife
bodyPart: Hair
markingCategory: Hair
sponsorOnly: true # Corvax-Sponsors
#sponsorOnly: true # Corvax-Sponsors
sprites:
- sprite: Corvax/Mobs/Customization/human_hair.rsi
state: wife
Expand Down
Loading