Bug fix for deconstructing tiles and lattice with RCDs (#26863)

* Fixed mixed deconstruction times for tiles and lattice

* Lattice and power cables can be deconstructed instantly

diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index bf312ee6fc35a101d39ea044c3d07c94fc6d7645..f172060dedb321f5b8fd6af70a3a6d00d856cd17 100644 (file)
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -175,7 +175,7 @@ public class RCDSystem : EntitySystem
                 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
index 2e8f047c214b97432455f8d4c73fc821c6d09575..cc3379117427ab67aa4230911e3d6afedb045e3e 100644 (file)
--- 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
index a81c89de0fb3ef3bb40de07244c23cf5fbfe3bbb..d064cc187c467f36462fb863d52fbb6756c32057 100644 (file)
--- 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
index bc1aa91d28007ff0b99dd9ab2d28976724e2cf60..500b5f59bf9d7af65da35679345f8d1ba1dd180d 100644 (file)
--- 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