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

Revert "Replace ResourcePath with ResPath (#15308)" (#15551)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-20 11:43:54 +10:00
committed by GitHub
parent 9b99fcbcef
commit acf79a8209
124 changed files with 273 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Client.Preferences.UI
private readonly IEntityManager _entMan;
private readonly IConfigurationManager _configurationManager;
private readonly MarkingManager _markingManager;
private LineEdit _ageEdit => CAgeEdit;
private LineEdit _nameEdit => CNameEdit;
private LineEdit _flavorTextEdit = null!;
@@ -1060,7 +1060,7 @@ namespace Content.Client.Preferences.UI
{
return;
}
// facial hair color
Color? facialHairColor = null;
if ( Profile.Appearance.FacialHairStyleId != HairStyles.DefaultFacialHairStyle &&
@@ -1213,7 +1213,7 @@ namespace Content.Client.Preferences.UI
if (job.Icon != null)
{
var specifier = new SpriteSpecifier.Rsi(new ("/Textures/Interface/Misc/job_icons.rsi"),
var specifier = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/Interface/Misc/job_icons.rsi"),
job.Icon);
icon.Texture = specifier.Frame0();
}