Removed mutliple qualities repairing. Applicator now replaces welding for most objects.

2026-07-05 14:26:55 -05:00 · 2026-07-05 14:26:55 -05:00 · fceafff79f
parent 33b12db031
commit fceafff79f
17 changed files with 22 additions and 29 deletions
--- a/Content.Shared/Repairable/RepairableComponent.cs
+++ b/Content.Shared/Repairable/RepairableComponent.cs
@ -42,7 +42,7 @@ public sealed partial class RepairableComponent : Component
    /// Tool quality necessary to repair this device.
    /// </summary>
    [DataField, AutoNetworkedField]
-    public List<ProtoId<ToolQualityPrototype>> QualityNeeded = new() { "Welding", "Applicating" }; // Monolith - Nanite Applicator
+    public ProtoId<ToolQualityPrototype> QualityNeeded = "Applicating"; // Monolith - Nanite Applicator

    /// <summary>
    /// The base tool use delay (seconds). This will be modified by the tool's quality
--- a/Content.Shared/Repairable/RepairableSystem.cs
+++ b/Content.Shared/Repairable/RepairableSystem.cs
@ -130,14 +130,11 @@ public sealed partial class RepairableSystem : EntitySystem
        // BEGIN Monolith - Nanite Applicators
        if (!TryComp<ToolComponent>(args.Used, out var tool))
            return;
-
-        // Run the repairing doafter
-        foreach (var quality in ent.Comp.QualityNeeded)
-        {
-            if (_toolSystem.HasQuality(args.Used, quality, tool))
-                args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, quality, new RepairDoAfterEvent(), ent.Comp.FuelCost);
-        }
        // END Monolith
+        
+        // Run the repairing doafter
+        args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairDoAfterEvent(), ent.Comp.FuelCost);
+        

    }
 }
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@ -118,6 +118,7 @@
    damageValue: -10 # 10 seconds to repair from crit
    doAfterDelay: 1
    fuelCost: 0.5
+    qualityNeeded: Welding # DeltaV - for now
    allowSelfRepair: true # DeltaV - was false
  - type: BorgChassis
  - type: LockingWhitelist
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@ -20,6 +20,7 @@
    damageValue: -15 # 8 seconds to repair from dead
    doAfterDelay: 1
    fuelCost: 0.5
+    qualityNeeded: Welding # DeltaV - for now
  - type: Pullable
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@ -82,6 +82,7 @@
          temperature: 373.15
  - type: Repairable
    doAfterDelay: 30 # you can heal the mothership core, but it takes a while
+    qualityNeeded: Welding # DeltaV
  - type: DamagedSiliconAccent
    enableChargeCorruption: false
  # TODO: make it explosive again once until issue https://github.com/space-wizards/space-station-14/issues/40606 is fixed
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@ -89,7 +89,7 @@
    fuelCost: 10 # 1/2 of a Welder for a full repair
    doAfterDelay: 5
    allowSelfRepair: false
-
+    qualityNeeded: Welding # DeltaV
 #Security Shields

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
@ -45,8 +45,7 @@
    graph: WeaponTurretSyndicateDisposable
    node: disposableTurret
  - type: Repairable
-    qualityNeeded: # Monolith - Converted to Array
-    - Anchoring
+    qualityNeeded: Anchoring
    doAfterDelay: 3
  - type: TriggerOnEmptyGunshot
  - type: ExplodeOnTrigger
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@ -56,9 +56,6 @@
      - !type:EjectVendorItems
  - type: Repairable
    doAfterDelay: 8
-    qualityNeeded: # DeltaV - Nanite Applicators
-    - Welding
-    - Applicating
  - type: ActivatableUI
    key: enum.VendingMachineUiKey.Key
  - type: ActivatableUIRequiresPower
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@ -84,6 +84,7 @@
  - type: ExaminableDamage
    messages: WindowMessages
  - type: Repairable
+    qualityNeeded: Welding # DeltaV
  - type: DamageVisuals
    thresholds: [8, 16, 25]
    damageDivisor: 3.333
@ -177,6 +178,7 @@
  - type: ExaminableDamage
    messages: WindowMessages
  - type: Repairable
+    qualityNeeded: Welding # DeltaV
  - type: Damageable
    damageContainer: StructuralInorganic
  - type: DamageVisuals
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@ -61,6 +61,7 @@
  - type: Repairable
    fuelCost: 15
    doAfterDelay: 5
+    qualityNeeded: Welding # DeltaV
  - type: Lock
  - type: LockVisuals
  - type: DamageVisuals
--- a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
@ -12,6 +12,7 @@
  - type: Repairable
    fuelCost: 10
    doAfterDelay: 2
+    qualityNeeded: Welding # DeltaV
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@ -11,6 +11,7 @@
  - type: Repairable
    fuelCost: 15
    doAfterDelay: 3
+    qualityNeeded: Welding # DeltaV
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@ -120,9 +120,7 @@
  - type: Repairable
    fuelCost: 15
    doAfterDelay: 3
-    qualityNeeded: # DeltaV - Nanite Applicators
-    - Welding
-    - Applicating
+    qualityNeeded: Welding
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
@ -218,9 +216,7 @@
  - type: Repairable
    fuelCost: 15
    doAfterDelay: 3
-    qualityNeeded: # DeltaV - Nanite Applicators
-    - Welding
-    - Applicating
+    qualityNeeded: Welding
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@ -11,6 +11,7 @@
  - type: Repairable
    fuelCost: 10
    doAfterDelay: 2
+    qualityNeeded: Welding # DeltaV
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@ -11,6 +11,7 @@
  - type: Repairable
    fuelCost: 15
    doAfterDelay: 3
+    qualityNeeded: Welding # DeltaV
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: RGlass
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@ -46,9 +46,7 @@
    messages: WindowMessages
  - type: Repairable
    doAfterDelay: 2 # DeltaV
-    qualityNeeded: # Monolith - Nanite Applicators
-    - Welding
-    - Applicating
+    qualityNeeded: Welding
  - type: RCDDeconstructable
    cost: 6
    delay: 4
@ -176,9 +174,7 @@
        - GlassLayer
  - type: Repairable
    doAfterDelay: 2 # DeltaV
-    qualityNeeded: # Monolith - Added qualities to override base
-    - Welding
-    - Applicating
+    qualityNeeded: Welding
  - type: Damageable
    damageContainer: StructuralInorganic
    damageModifierSet: Glass
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@ -26,13 +26,11 @@
  - type: Tag
    tags:
      - Structure
-  
  - type: ExaminableDamage # DeltaV
    messages: BaseStructureMessages
  - type: Repairable # Monolith - Nanite Applicator
    doAfterDelay: 3
-    qualityNeeded:
-    - Applicating
+    qualityNeeded: Applicating

 - type: entity
  # This means that it's not anchored on spawn.