PsiOmega 8c8480cb26 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/computer/crew.dm

2014-12-11 08:18:58 +01:00

..

admin

Merged master/dev config.txt.

2014-12-10 16:35:39 +10:30

assembly

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

awaymissions

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

client

Adds image for cult talismans

2014-12-08 20:45:15 -05:00

clothing

Namefix.

2014-12-11 05:00:31 +03:00

customitems

…

destilery

…

detectivework

…

economy

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

2014-11-26 22:10:09 +01:00

events

Fixes #7356.

2014-12-10 20:11:00 +01:00

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

food

…

games

…

genetics

…

hydroponics

Bunch of diona nymph tweaks/fixes.

2014-12-09 20:52:41 +10:30

icon generation

…

library

…

liquid

…

maps

Fixes Map Loader issues.

2014-11-28 08:37:23 +01:00

mining

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

mob

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

2014-12-11 08:18:58 +01:00

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

organs

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

paperwork

Duct Tape

2014-12-02 23:17:45 +13:00

power

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

projectiles

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

2014-12-09 09:07:38 +01:00

reagents

Fixes diona and simple_animals eating snacks.

2014-12-09 22:14:41 +10:30

recycling

Merge pull request #7347 from Baystation12/master

2014-12-10 03:21:56 +10:30

research

Merge resolution.

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

scripting

…

security levels

…

shieldgen

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

shuttles

Merge resolution.

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

supermatter

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Fixes #7238

2014-12-07 11:52:29 +10:30

vehicles

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

virus2

…