Misc small stuff, merge from master

- Beepsky attacks hostile mobs, vice versa (might need balance testing?)
- #2327 (plus some other already closed issues)
- More info for adminwho/modwho
- Carp actually migrate away when the random event ends
- Merge from master

Some of the fixes could go into master, but I intended this to go with the weekly merge (even though it's too late now).