# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c

Separate thinkers into different lists

See merge request STJr/SRB2Internal!219

# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c

# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c

# Conflicts:
#	src/p_mobj.c

correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code

Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).

Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.

Will upload map to fight the new battle in on the MR.

# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c

Wood debris fix

See merge request STJr/SRB2Internal!240

# Conflicts:
#	src/r_data.c

unfuck awayview

See merge request STJr/SRB2!493

Fade out music at end of level, before intermission

See merge request !472

Pk3 folders are not textures!

See merge request !502

More Memory Shenanigans

See merge request STJr/SRB2!501

Console color shenanigans

Closes #156

See merge request STJr/SRB2Internal!238

Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228

Give MT_WOODDEBRIS the MF_SCENERY flag, so it can be made to join its MT_ROCKCRUMBLEn friends in dying after hitting the ground.

(Untested)

This also adds support for using such colors in a text prompt

Some small tweaks to level select

See merge request STJr/SRB2Internal!230

Startrings level header option

Closes #155

See merge request STJr/SRB2Internal!237

Boss fixes

See merge request STJr/SRB2Internal!235

HUD fixes

See merge request STJr/SRB2Internal!234

The amount of rings you start with also applies when you respawn from a starpost.

Startrings counts the ring total requirement for a perfect bonus.

Rain fixes and associated

See merge request STJr/SRB2Internal!233

Drawangle fixes

Closes #153

See merge request STJr/SRB2Internal!236

# Conflicts:
#	src/r_data.c

Keep the warning though.

A lower size could technically be valid, but could easily run into strange issues.

As far as I know it's basically unused, and the strstr is inherently unsafe because there's no guarantee that a patch's contents are NULL terminated.

Could this be changed to only read the first so many bytes?