Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] donate

Browse Source 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
This commit is contained in:
rhailrake
2023-04-25 19:46:20 +06:00
committed by Remuchi
parent 0cbb69d0a1
commit 4e85539ec6
29 changed files with 809 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -350,7 +350,7 @@ namespace Content.Shared.Preferences
return Appearance.MemberwiseEquals(other.Appearance);
}
public void EnsureValid()
public void EnsureValid(string[] sponsorMarkings) //WD-EDIT
{
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
@@ -433,7 +433,9 @@ namespace Content.Shared.Preferences
flavortext = FormattedMessage.RemoveMarkup(FlavorText);
}
var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, Sex);
// WD-EDIT
var appearance = HumanoidCharacterAppearance.EnsureValid(Appearance, Species, sponsorMarkings);
// WD-EDIT
var prefsUnavailableMode = PreferenceUnavailable switch
{

2
Content.Shared/Preferences/ICharacterProfile.cs
View File

@@ -13,6 +13,6 @@ namespace Content.Shared.Preferences
/// <summary>
/// Makes this profile valid so there's no bad data like negative ages.
/// </summary>
void EnsureValid();
void EnsureValid(string[] sponsorMarkings); //WD-EDIT
}
}