Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/Objectives/Conditions/DieCondition.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.Objectives.Conditions
public string Description => Loc.GetString("objective-condition-die-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Mobs/Ghosts/ghost_human.rsi"), "icon");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Mobs/Ghosts/ghost_human.rsi"), "icon");
public float Progress => (_mind?.CharacterDeadIC ?? true) ? 1f : 0f;

2
Content.Server/Objectives/Conditions/EscapeShuttleCondition.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Objectives.Conditions
public string Description => Loc.GetString("objective-condition-escape-shuttle-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Structures/Furniture/chairs.rsi"), "shuttle");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Structures/Furniture/chairs.rsi"), "shuttle");
private bool IsAgentOnShuttle(TransformComponent agentXform, EntityUid? shuttle)
{

2
Content.Server/Objectives/Conditions/KillPersonCondition.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Objectives.Conditions
public string Description => Loc.GetString("objective-condition-kill-person-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Objects/Weapons/Guns/Pistols/viper.rsi"), "icon");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Weapons/Guns/Pistols/viper.rsi"), "icon");
public float Progress => (Target?.CharacterDeadIC ?? true) ? 1f : 0f;

2
Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.Objectives.Conditions
public string Description => Loc.GetString("objective-condition-other-traitor-alive-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Objects/Misc/bureaucracy.rsi"), "folder-white");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/bureaucracy.rsi"), "folder-white");
public float Progress => (!_target?.CharacterDeadIC ?? true) ? 1f : 0f;

2
Content.Server/Objectives/Conditions/RandomTraitorProgressCondition.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.Objectives.Conditions
public string Description => Loc.GetString("objective-condition-other-traitor-progress-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Objects/Misc/bureaucracy.rsi"), "folder-white");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/bureaucracy.rsi"), "folder-white");
public float Progress
{