Revert "Revert "Replace ResourcePath with ResPath (#15308)" (new-…

…frontiers-14#155… (#15566)
rbertoche · Aug 30, 2023 · 6cd6f21 · 6cd6f21
1 parent 3b9f6bc
commit 6cd6f21
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/Content.Client/EntityHealthBar/EntityHealthBarOverlay.cs b/Content.Client/EntityHealthBar/EntityHealthBarOverlay.cs
@@ -33,7 +33,7 @@ public EntityHealthBarOverlay(IEntityManager entManager, IPrototypeManager proto
         _mobStateSystem = _entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
         _mobThresholdSystem = _entManager.EntitySysManager.GetEntitySystem<MobThresholdSystem>();
 
-        var sprite = new SpriteSpecifier.Rsi(new ResourcePath("/Textures/Interface/Misc/health_bar.rsi"), "icon");
+        var sprite = new SpriteSpecifier.Rsi(new ("/Textures/Interface/Misc/health_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
 
         _shader = protoManager.Index<ShaderPrototype>("unshaded").Instance();

diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -37,11 +37,11 @@ public PdaMenu()
 
             ViewContainer.OnChildAdded += control => control.Visible = false;
 
-            HomeButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/home.png"));
-            FlashLightToggleButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/light.png"));
-            EjectPenButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/pencil.png"));
-            EjectIdButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/eject.png"));
-            ProgramCloseButton.IconTexture = new SpriteSpecifier.Texture(new("/Textures/Interface/Nano/cross.svg.png"));
+            HomeButton.IconTexture = new SpriteSpecifier.Texture(new ("/Textures/Interface/home.png"));
+            FlashLightToggleButton.IconTexture = new SpriteSpecifier.Texture(new ("/Textures/Interface/light.png"));
+            EjectPenButton.IconTexture = new SpriteSpecifier.Texture(new ("/Textures/Interface/pencil.png"));
+            EjectIdButton.IconTexture = new SpriteSpecifier.Texture(new ("/Textures/Interface/eject.png"));
+            ProgramCloseButton.IconTexture = new SpriteSpecifier.Texture(new ("/Textures/Interface/Nano/cross.svg.png"));
 
 
             HomeButton.OnPressed += _ => ToHomeScreen();

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -541,7 +541,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
             {
                 Text = "Cluwne",
                 Category = VerbCategory.Smite,
-
+                Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/bikehorn.rsi"), "icon"),
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Mask/cluwne.rsi"), "icon"),
 
                 Act = () =>

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -74,8 +74,8 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                     Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
                     Category = VerbCategory.Tricks,
                     Icon = bolts.BoltsDown
-                        ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
-                        : new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bolt.png")),
+                        ? new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/unbolt.png"))
+                        : new SpriteSpecifier.Texture(new ("/Textures/Interface/AdminActions/bolt.png")),
                     Act = () =>
                     {
                         _boltsSystem.SetBoltsWithAudio(args.Target, bolts, !bolts.BoltsDown);

diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -333,6 +333,8 @@ private void OnAddInteractVerb(EntityUid uid, NetworkConfiguratorComponent confi
         var verb = new UtilityVerb
         {
             Act = () => OnUsed(uid, configurator, args.Target, args.User),
+                new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")) :
+                new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/in.svg.192dpi.png")),
             Impact = LogImpact.Low
         };
 
@@ -371,7 +373,7 @@ private void OnAddAlternativeSaveDeviceVerb(EntityUid uid, DeviceNetworkComponen
             AlternativeVerb verb = new()
             {
                 Text = Loc.GetString("network-configurator-save-device"),
-                Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/in.svg.192dpi.png")),
+            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/in.svg.192dpi.png")),
                 Act = () => TryAddNetworkDevice(args.Target, args.Using.Value, args.User),
                 Impact = LogImpact.Low
             };

diff --git a/Content.Server/Salvage/SalvageMapPrototype.cs b/Content.Server/Salvage/SalvageMapPrototype.cs
@@ -12,6 +12,7 @@ public sealed class SalvageMapPrototype : IPrototype
     /// Relative directory path to the given map, i.e. `Maps/Salvage/template.yml`
     /// </summary>
     [DataField("mapPath", required: true)] public ResPath MapPath;
+        public ResPath MapPath { get; } = default!;
 
     /// <summary>
     /// Name for admin use

diff --git a/Content.Shared/Vehicle/Components/VehicleComponent.cs b/Content.Shared/Vehicle/Components/VehicleComponent.cs
@@ -57,7 +57,7 @@ public sealed partial class VehicleComponent : Component
     public InstantAction HornAction = new()
     {
         UseDelay = TimeSpan.FromSeconds(3.4),
-        Icon = new SpriteSpecifier.Texture(new("Objects/Fun/bikehorn.rsi/icon.png")),
+        Icon = new SpriteSpecifier.Texture(new ("Objects/Fun/bikehorn.rsi/icon.png")),
         DisplayName = "action-name-honk",
         Description = "action-desc-honk",
         Event = new HonkActionEvent(),