Merge pull request #82285 from RoyBerube/aftershock_powergrid_deletion

[Aftershock] Power grid moves with the ship without deletion

Author: Maleclypse

src/teleport.cpp

@@ -35,6 +35,7 @@
 #include "translations.h"
 #include "type_id.h"
 #include "units.h"
+#include "veh_type.h"
 #include "vehicle.h"
 #include "viewer.h"
 #include "ui_manager.h"
@@ -47,6 +48,10 @@ static const flag_id json_flag_DIMENSIONAL_ANCHOR( "DIMENSIONAL_ANCHOR" );
 static const flag_id json_flag_GRAB( "GRAB" );
 static const flag_id json_flag_TELEPORT_LOCK( "TELEPORT_LOCK" );
 
+static const itype_id itype_wall_wiring( "wall_wiring" );
+static const itype_id itype_power_cord( "power_cord" );
+
+const std::string flag_WIRING( "WIRING" );
 
 static bool TestForVehicleTeleportCollision( vehicle &veh, map &here, map *dest,
         const tripoint_abs_ms &dp )
@@ -57,6 +62,11 @@ static bool TestForVehicleTeleportCollision( vehicle &veh, map &here, map *dest,
             dest->load( project_to<coords::sm>( dp + rel_pos ), false );
         }
 
+        if( part.info().has_flag( flag_WIRING ) ||
+            part.info().base_item == itype_power_cord
+          ) {
+            continue;
+        }
         veh_collision coll = veh.part_collision( *dest, part.part_index(), dp + rel_pos, true, false );
         if( coll.type != veh_coll_nothing ) {
             tripoint_abs_ms point = dp + rel_pos;