Neerti 4fcd9e6924 Resolves conflicts, I hope.

2014-12-08 20:46:55 -05:00

..

closets

No more sleeping in closets

2014-11-11 11:07:05 +01:00

effects

Remaps the nuke ops shuttle for station docking

2014-12-05 01:17:17 -05:00

items

Resolves conflicts, I hope.

2014-12-08 20:46:55 -05:00

random

…

structures

Merge resolution.

2014-12-08 13:01:04 +10:30

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixes #7253

2014-12-07 18:51:20 +10:30

objs.dm

Fixes AI cards/mechs, with least bad method.

2014-12-08 20:14:55 -05:00

structures.dm

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

2014-11-29 10:09:03 +01:00

weapons.dm

…