Move disarming last to remove blackboxing, fix drinking with hands
Merge pull request #606 from Catacstone/disarming_query

Move disarming last to remove blackboxing, fix drinking with hands