6 commits

Author	SHA1	Message	Date
Morb	fac3c2e4c5	Revert "Revert "Upstream sync""	2022-08-15 14:19:44 -07:00
Morb	105ee80f09	Revert "Upstream sync"	2022-08-13 08:05:52 -07:00
Nemanja	1783dd82e7	disallow stacking polymorphs by default (#9845) ... Co-authored-by: Kara <lunarautomaton6@gmail.com>	2022-08-08 11:34:20 +10:00
Paul Ritter	f77aff7b94	prototype composition (#9979) & updates submodule ... * prototype composition * a * fixes build * fixes test * updates submodule Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>	2022-08-01 14:39:37 +02:00
EmoGarbage404	63fd01f3bb	Zombie Rework & Polymorph Expansion (#8413) ... Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>	2022-06-12 15:53:13 +10:00
EmoGarbage404	2697bbf8c7	Polymorphs and Transformation (#8185)	2022-05-18 14:05:22 +10:00