Jack Edge 5da579b7c4 Merge branch 'master' into random-space ...

Conflicts:
	_maps/asteroidstation.dm

2016-06-20 13:06:08 +01:00

..

effects

Merge branch 'master' into random-space

2016-06-20 13:06:08 +01:00

items

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

structures

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

buckling.dm

Fixes infinite buckling, removes unnecessary list init.

2016-06-12 14:35:14 +01:00

empulse.dm

…

explosion.dm

…

items.dm

Merge pull request #18668 from coiax/dropdel

2016-06-20 11:08:31 +12:00

objs.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

radiation.dm

…

structures.dm

…

weapons.dm

…