Zuhayr e80d294aa5 Compile issues with the merge. PDA tapping may be broken for pAIs.

2014-11-10 13:17:17 +10:30

..

closets

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

effects

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

items

Compile issues with the merge. PDA tapping may be broken for pAIs.

2014-11-10 13:17:17 +10:30

random

Cables are now stacks

2014-08-25 18:54:35 +04:00

structures

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

objs.dm

AI and Topic fixes.

2014-11-07 11:10:32 +01:00

structures.dm

Fixes #6660

2014-11-01 21:38:04 -04:00

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00