Merge branch 'master' into develop
Separated warned type to extrinsic and intrinsic, fixed a bug where wielding and unwielding Disrupter makes undead slayers lose their undead detection intrinsic (and other potential bugs)
Merge branch 'develop' into tidying