M4: RIDDLE: Item duplication and broken logic in Baron's Lab (Puzzle 2)

[afreickmann]

What happens:
In the Baron’s Lab (Puzzle 2), when assembling the parts directly in the scene (not in inventory), a duplication bug occurs:

• Connect the surgical tube directly to the faucet stem.
• Then connect the garden hose to the surgical stem.

The result:
The full setup (hose + pipe + tube) appears in the sink. But both the garden hose and faucet pipe also stay in your inventory — duplicated and still usable (e.g. at the glass jar).
The puzzle is still solvable!

After that:

• You can’t combine the hose and pipe in the inventory anymore.
• You also can’t pick up the fully assembled version from the sink.

Related bug:
A similar duplication issue happens if you use the hose/pipe combo on the surgical tube in the scene.

Expected behavior:
Items should be removed from the inventory once used in the puzzle.

[afreickmann]

As too small to open an individual bug report yet:
In original, you can pickup the pipe again after it was connected to the faucet. But you can't pick up the hose then (original game bug!), but also not the surgical tube. In the original code, Ripley picks up the tube and hose.

[Strangerke <arnaud.boutonne@…>]

In b5862a67:

M4: RIDDLE: Fix for one of the bugs related to #16086 in room 407 (Wrong setup appearing in the lab sink) + fix missing control disable

[Strangerke]

I didn't manage to reproduce the second case. The first issue is fixed.

Could you please recheck? Thanks in advance!