MrSnapwalk 0ff612aea6 Adds Bromuzl's custom item to item_defines.dm.

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

..

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 remote-tracking branch 'upstream/dev' into TheGreatEvents

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

events

Completes the basic random event manager.

2014-11-08 18:22:31 +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 conflict resolution.

2014-11-10 13:00:06 +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 conflict resolution.

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

nano

…

organs

Nasty voices and now noises

2014-10-31 14:56:09 +01: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 conflict resolution.

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

recycling

All the relevant examine changes.

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

research

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

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