PsiOmegaDelta 2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml

2015-06-02 13:35:02 +02:00

..

admin

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

2015-06-02 13:13:40 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-05-26 08:35:32 +02:00

clothing

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

customitems

…

detectivework

…

economy

…

events

APC event tweak.

2015-06-01 18:13:05 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

holodeck

…

hydroponics

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

2015-05-30 16:11:57 +02:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-06-01 09:07:03 +02:00

mining

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

mob

Minor refactor to reduce calls to handle_actions().

2015-06-02 18:30:13 +09:30

nano

Merge pull request #9554 from GinjaNinja32/nano_template

2015-05-30 02:16:32 +09:30

organs

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

2015-06-01 09:07:03 +02:00

overmap

…

paperwork

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

2015-05-30 16:11:57 +02:00

power

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

2015-06-01 09:07:03 +02:00

projectiles

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

random_map

…

reagents

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

2015-06-02 13:35:02 +02:00

recycling

…

research

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

2015-05-30 16:11:57 +02:00

scripting

…

security levels

…

shieldgen

Implements github suggestions

2015-05-23 22:22:38 +02:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

…

supermatter

Merge pull request #9408 from mwerezak/sm-eject

2015-05-28 11:35:39 +09:30

surgery

Additional IPC tweaks.

2015-05-31 02:30:57 +09:30

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

vehicles

…

virus2

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30