Zuhayr cf68ad7c87 Master to dev merge.

2014-08-27 20:24:07 +09:30

..

closets

…

effects

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

items

Merge pull request #6167 from PsiOmegaDelta/PDATime

2014-08-27 01:32:47 +04:00

random

Cables are now stacks

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

structures

Master to dev merge.

2014-08-27 20:24:07 +09:30

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

fixes nullpointer caused by broken organ list pt 2

2014-07-26 13:08:25 +02:00

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 22:16:04 +09:30

weapons.dm

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

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