create a proper way to define torpedos

fixes #3252 and closes #2097