# Conflicts:
#	src/p_map.c

Fix the sky on the intro cutscene not scrolling.

Closes #220

See merge request STJr/SRB2Internal!353

Headbumps and associated

Closes #242

See merge request STJr/SRB2Internal!360

Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.

Closes #246

See merge request STJr/SRB2Internal!365

ACZ touchups

Closes #209, #208, and #158

See merge request STJr/SRB2Internal!359

Don't deplete special stage timer in water if you have water protection

See merge request STJr/SRB2Internal!364

Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound)

# Conflicts:
#	src/p_mobj.c

Springs and gas jets are exempt because all hell might break loose otherwise.

* Implement MS's temp bodge-fix for the TNT getting stuck on the player.

Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.)

# Conflicts:
#	src/p_enemy.c

There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.)

Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.

Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why).

Fully resolves #209, in any case.

* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.