mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-16 17:11:33 +00:00
Merge branch 'next' into egg-capsule
# Conflicts: # extras/conf/SRB2-22.cfg
This commit is contained in:
commit
f7bcc759b6
1 changed files with 27 additions and 0 deletions
|
@ -1908,6 +1908,27 @@ linedeftypes
|
||||||
prefix = "(333)";
|
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
|
399
|
||||||
{
|
{
|
||||||
title = "Level Load";
|
title = "Level Load";
|
||||||
|
@ -2219,6 +2240,12 @@ linedeftypes
|
||||||
flags8text = "[3] Set delay by backside sector";
|
flags8text = "[3] Set delay by backside sector";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
463
|
||||||
|
{
|
||||||
|
title = "Dye Object";
|
||||||
|
prefix = "(463)";
|
||||||
|
}
|
||||||
|
|
||||||
464
|
464
|
||||||
{
|
{
|
||||||
title = "Trigger Egg Capsule";
|
title = "Trigger Egg Capsule";
|
||||||
|
|
Loading…
Reference in a new issue