Zuhayr 40e3ea33f6 Merge resolution.

2014-11-13 16:07:16 +10:30

..

admin

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

2014-11-08 10:26:45 +01:00

assembly

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

awaymissions

…

client

Merge conflict resolution.

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

clothing

Merge conflict resolution.

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

customitems

Adds Bromuzl's custom item to item_defines.dm.

2014-11-10 19:51:08 -06:00

destilery

…

detectivework

All the relevant examine changes.

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

economy

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

events

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

ext_scripts

…

flufftext

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

food

…

games

All the relevant examine changes.

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

genetics

…

hydroponics

Merge resolution.

2014-11-13 16:07:16 +10:30

icon generation

…

library

…

liquid

…

maps

…

mining

Merge pull request #6963 from mwerezak/sliceable

2014-11-08 11:07:34 +03:00

mob

Merge resolution.

2014-11-13 16:07:16 +10:30

nano

…

organs

Cleans up human stance code

2014-11-12 22:56:55 -05:00

paperwork

Merge conflict resolution.

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

power

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

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

projectiles

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

reagents

Merge pull request #6980 from MagmaRam/drinks

2014-11-12 23:45:07 +03:00

recycling

All the relevant examine changes.

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

research

Merge resolution.

2014-11-13 16:07:16 +10:30

scripting

…

security levels

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

shieldgen

Merge conflict resolution.

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

shuttles

…

supermatter

…

surgery

…

vehicles

All the relevant examine changes.

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

virus2

All the relevant examine changes.

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