Merge pull request #69624 from Fris0uman/dude_whers_my_car

Fix vehicle being mergeable into powergrids

src/action.cpp

@@ -1189,5 +1189,10 @@ std::optional<tripoint> choose_adjacent_highlight( const tripoint &pos, const st
         g->add_draw_callback( hilite_cb );
     }
 
-    return choose_adjacent( pos, message, allow_vertical );
+    const std::optional<tripoint> chosen = choose_adjacent( pos, message, allow_vertical );
+    if( std::find( valid.begin(), valid.end(), chosen ) != valid.end() ) {
+        return chosen;
+    }
+
+    return std::nullopt;
 }

src/veh_appliance.cpp

@@ -527,7 +527,7 @@ void veh_app_interact::merge()
             return false;
         }
         vehicle &target_veh = target_vp->vehicle();
-        if( !target_veh.has_tag( flag_APPLIANCE ) || !target_veh.is_powergrid() ) {
+        if( !target_veh.is_powergrid() ) {
             return false;
         }
         return true;