Bug fix for deconstructing tiles and lattice with RCDs (space-wizards…

…#26863) * Fixed mixed deconstruction times for tiles and lattice * Lattice and power cables can be deconstructed instantly
SnowyFoxxo · Apr 11, 2024 · fc5a90b · fc5a90b
1 parent 00dc997
commit fc5a90b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -175,7 +175,7 @@ private void OnAfterInteract(EntityUid uid, RCDComponent component, AfterInterac
                 else
                 {
                     var deconstructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
-                    var protoName = deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
+                    var protoName = !deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
 
                     if (_protoManager.TryIndex(protoName, out var deconProto))
                     {

diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -19,8 +19,8 @@
       damageModifierSet: Metallic
     - type: RCDDeconstructable
       cost: 2
-      delay: 2
-      fx: EffectRCDDeconstruct2  
+      delay: 0
+      fx: EffectRCDConstruct0  
     - type: Destructible
       thresholds:
         - trigger:

diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -45,8 +45,8 @@
     node: power
   - type: RCDDeconstructable
     cost: 2
-    delay: 2
-    fx: EffectRCDDeconstruct2  
+    delay: 0
+    fx: EffectRCDConstruct0  
 
 - type: entity
   parent: CableBase

diff --git a/Resources/Prototypes/RCD/rcd.yml b/Resources/Prototypes/RCD/rcd.yml
@@ -17,9 +17,9 @@
   name: rcd-component-deconstruct
   mode: Deconstruct
   cost: 2
-  delay: 1
+  delay: 0
   rotation: Camera
-  fx: EffectRCDDeconstruct2
+  fx: EffectRCDConstruct0
 
 - type: rcd
   id: DeconstructTile      # Hidden prototype - do not add to RCDs