LaharlMontogmmery 9591d2255d Hoping this solves the merge conflict

2015-06-27 19:23:13 +02:00

..

effects

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

items

Hoping this solves the merge conflict

2015-06-27 19:23:13 +02:00

structures

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

buckling.dm

Squashed Commits

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

empulse.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

explosion.dm

Explosions no longer throw anchored items.

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

items.dm

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

objs.dm

Burning objects are processed every tick now instead of using a spawn() check

2015-06-27 09:22:14 -06:00

structures.dm

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

weapons.dm

…