Firecage 7f96592b87 Merge Conflict Fix

2016-01-27 13:29:38 +02:00

..

easter.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

halloween.dm

Slimes can no longer feed on simple animals that are immune to clone and toxin damage

2016-01-20 15:38:58 -05:00

holidays.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00