Merge pull request #3547 from Zuhayr/master

Borer prompt, dionaea fix
Fix for #3549.
Inertia fix.
Merge pull request #3551 from Segrain/master

Pulling fixes.
Fix for #3552.
Merge pull request #3556 from Segrain/master

Smallfix.
Two fixes for dismemberment.

Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #3559 from Mloc/master

Two fixes for dismemberment.
More dismemberment fixes

More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3560 from Mloc/master

More dismemberment fixes
Merge branch 'master' into dev