xxalpha 1746e86ed8 Merge remote-tracking branch 'upstream/master' into smoothballs

2015-07-10 19:19:43 +01:00

..

effects

Resolved Conflicts:

2015-07-09 08:51:39 -06:00

items

Merge pull request #10487 from MrStonedOne/attacklogcleanup

2015-07-10 18:42:08 +01:00

structures

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

2015-07-10 19:19:43 +01:00

buckling.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

empulse.dm

…

explosion.dm

Explosions no longer throw anchored items.

2015-06-14 00:46:54 +02:00

items.dm

Merge pull request #10487 from MrStonedOne/attacklogcleanup

2015-07-10 18:42:08 +01:00

objs.dm

Items have a variable burn time

2015-06-30 22:44:29 -06:00

structures.dm

Transformed the datum into isolated procs.

2015-07-09 02:38:30 +01:00

weapons.dm

…