Apply suggestions from code review

Co-authored-by: Remuchi <[email protected]> Signed-off-by: Timfa <[email protected]>
Simple-Station · Feb 2, 2025 · 81ab8d5 · 81ab8d5
1 parent dc30b08
commit 81ab8d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyWeldableOperator.cs
@@ -24,18 +24,18 @@ public sealed partial class PickNearbyWeldableOperator : HTNOperator
     private PathfindingSystem _pathfinding = default!;
     private TagSystem _tagSystem = default!;
 
-    [DataField("rangeKey")] public string RangeKey = NPCBlackboard.WeldbotWeldRange;
+    [DataField] public string RangeKey = NPCBlackboard.WeldbotWeldRange;
 
     /// <summary>
     /// Target entity to weld
     /// </summary>
-    [DataField("targetKey", required: true)]
+    [DataField(required: true)]
     public string TargetKey = string.Empty;
 
     /// <summary>
     /// Target entitycoordinates to move to.
     /// </summary>
-    [DataField("targetMoveKey", required: true)]
+    [DataField(required: true)]
     public string TargetMoveKey = string.Empty;
 
     public override void Initialize(IEntitySystemManager sysManager)
@@ -59,7 +59,7 @@ public override void Initialize(IEntitySystemManager sysManager)
             return (false, null);
 
         var damageQuery = _entManager.GetEntityQuery<DamageableComponent>();
-        bool emagged = _entManager.HasComponent<EmaggedComponent>(owner);
+        var emagged = _entManager.HasComponent<EmaggedComponent>(owner);
 
         foreach (var target in _lookup.GetEntitiesInRange(owner, range))
         {

diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
@@ -28,7 +28,7 @@ public sealed partial class WeldbotWeldOperator : HTNOperator
     /// <summary>
     /// Target entity to inject.
     /// </summary>
-    [DataField("targetKey", required: true)]
+    [DataField(required: true)]
     public string TargetKey = string.Empty;
 
     public override void Initialize(IEntitySystemManager sysManager)
@@ -78,18 +78,14 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         if (botComp.IsEmagged)
         {
             if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Burn", out var prototype))
-            {
                 return HTNOperatorStatus.Failed;
-            }
 
             _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, 10), true, false, damage);
         }
         else
         {
             if (!_prototypeManager.TryIndex<DamageGroupPrototype>("Brute", out var prototype))
-            {
                 return HTNOperatorStatus.Failed;
-            }
 
             _damageableSystem.TryChangeDamage(target, new DamageSpecifier(prototype, -50), true, false, damage);
         }

diff --git a/Content.Shared/Silicons/Bots/WeldbotComponent.cs b/Content.Shared/Silicons/Bots/WeldbotComponent.cs
@@ -13,7 +13,7 @@ public sealed partial class WeldbotComponent : Component
     /// <summary>
     /// Sound played after welding a patient.
     /// </summary>
-    [DataField("weldSound")]
+    [DataField]
     public SoundSpecifier WeldSound = new SoundPathSpecifier("/Audio/Items/welder2.ogg");
 
     public bool IsEmagged = false;

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/weldbot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/weldbot.yml
@@ -14,7 +14,7 @@
         doAfter: 2
       - tag: WeldingMask
         icon:
-          sprite: Clothing\Head\Welding\welding.rsi
+          sprite: Clothing/Head/Welding/welding.rsi
           state: icon
         name: welding mask
         doAfter: 2