Merge branch 'next' into egg-capsule

# Conflicts:
#	extras/conf/SRB2-22.cfg
This commit is contained in:
MascaraSnake 2020-05-03 16:00:05 +02:00
commit f7bcc759b6

View file

@ -1908,6 +1908,27 @@ linedeftypes
prefix = "(333)";
}
334
{
title = "Object Dye - Continuous";
flags64text = "[6] Disable for this color";
prefix = "(334)";
}
335
{
title = "Object Dye - Each Time";
flags64text = "[6] Disable for this color";
prefix = "(335)";
}
336
{
title = "Object Dye - Once";
flags64text = "[6] Disable for this color";
prefix = "(336)";
}
399
{
title = "Level Load";
@ -2219,6 +2240,12 @@ linedeftypes
flags8text = "[3] Set delay by backside sector";
}
463
{
title = "Dye Object";
prefix = "(463)";
}
464
{
title = "Trigger Egg Capsule";