PsiOmegaDelta 0bba4e6f68 Merge pull request #7441 from sabiram/dev-freeze ...

Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.

2014-12-13 14:59:41 +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

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

client

Fixes #7290

2014-12-13 23:04:13 +10:30

clothing

Fixes #7345

2014-12-13 22:37:22 +10:30

customitems

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

destilery

…

detectivework

…

economy

Fixes #7427.

2014-12-12 15:43:29 +01:00

events

Drastically reduces radiation storm duration.

2014-12-11 10:36:15 +01:00

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

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

food

Fixes pretzels being unmakable (use a poppy instead of the seeds)

2014-12-13 22:46:55 +10:30

games

…

genetics

…

hydroponics

Fixes pretzels being unmakable (use a poppy instead of the seeds)

2014-12-13 22:46:55 +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

Fixes #7371

2014-12-13 22:32:35 +10:30

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

Fixes #7366.

2014-12-10 21:54:57 +01:00

power

Revert updateicon changes

2014-12-13 00:10:30 +13:00

projectiles

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

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

reagents

Merge pull request #7441 from sabiram/dev-freeze

2014-12-13 14:59:41 +01:00

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

…