Shadowlight213 86cbe14d15 Conflict fixes

2016-05-19 20:42:26 -07:00

..

effects

Adds healy glows to cult pylons and the medbeam gun

2016-05-09 19:37:15 -04:00

items

Merge pull request #17445 from bgobandit/ayygentb

2016-05-19 18:14:18 -05:00

structures

Conflict fixes

2016-05-19 20:42:26 -07:00

buckling.dm

…

empulse.dm

t&a

2016-04-20 16:38:55 -04:00

explosion.dm

…

items.dm

Makes dismemberment more adjustable (#17587)

2016-05-13 20:27:06 +02:00

objs.dm

…

radiation.dm

…

structures.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

weapons.dm

…