Kelenius 3b1b8a33c6 Merge branch 'dev' into ofSleepersAndNano ...

Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-3.dmm

2015-08-13 09:49:34 +03:00

..

admin

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

2015-08-11 18:47:05 +01:00

alarm

…

assembly

…

awaymissions

…

client

Merge pull request #10030 from GinjaNinja32/languages

2015-08-13 07:23:44 +03:00

clothing

Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor

2015-08-13 07:23:27 +03:00

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

…

economy

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

2015-08-11 08:34:46 +02:00

events

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

2015-08-11 18:47:05 +01:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

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

2015-08-12 21:18:18 +02:00

hydroponics

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

2015-08-12 21:18:18 +02:00

icon generation

…

library

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

2015-08-11 18:47:05 +01:00

lighting

Merge pull request #9883 from mwerezak/ert-lights

2015-08-13 07:22:45 +03:00

liquid

…

maps

…

materials

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

2015-08-08 15:34:51 +02:00

mining

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

2015-08-08 15:34:51 +02:00

mob

Merge pull request #10030 from GinjaNinja32/languages

2015-08-13 07:23:44 +03:00

nano

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

organs

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

2015-08-12 21:18:18 +02:00

overmap

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

2015-07-28 07:59:49 +02:00

paperwork

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

2015-08-12 21:18:18 +02:00

power

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

2015-08-12 21:18:18 +02:00

projectiles

Merge pull request #10184 from mwerezak/projectile-cleanup

2015-08-13 07:26:58 +03:00

random_map

…

reagents

Fixes #10021

2015-08-08 11:38:27 -04:00

recycling

Merge branch 'dev' into ofSleepersAndNano

2015-08-13 09:20:51 +03:00

research

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

2015-08-08 15:34:51 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Macro count update, fixes span tag

2015-08-11 18:52:24 +01:00

supermatter

…

surgery

…

tables

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

2015-08-13 05:55:05 +01:00

vehicles

…

virus2

…

xgm

…