Tigercat2000 0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean ...

Conflicts:
	paradise.dme

2015-05-16 05:38:40 -07:00

..

closets

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

effects

Merge pull request #1061 from FalseIncarnate/wizard

2015-05-16 07:34:22 -04:00

items

Merge remote-tracking branch 'upstream/master' into fluffclean

2015-05-16 05:38:40 -07:00

random

Crayons and Gloves

2015-03-06 21:40:57 -05:00

structures

Merge pull request #1061 from FalseIncarnate/wizard

2015-05-16 07:34:22 -04:00

empulse.dm

…

explosion.dm

Fixes Check Bomb Impact runtime

2015-05-14 06:50:29 -04:00

items.dm

Fixes eye stabbing runtime

2015-05-16 05:46:53 -04:00

objs.dm

…

structures.dm

Squish Squash

2015-04-04 14:27:53 -04:00

weapons.dm

…