PsiOmega f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm

2015-08-01 19:45:42 +02:00

..

admin

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

2015-08-01 19:45:42 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-08-01 19:45:42 +02:00

clothing

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

2015-08-01 19:45:42 +02:00

customitems

…

detectivework

…

economy

…

events

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

2015-07-14 08:21:12 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

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

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

holodeck

…

hydroponics

…

icon generation

…

library

…

lighting

some dview tweaks & fixes

2015-07-30 19:50:32 +01:00

liquid

…

maps

…

materials

…

mining

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

2015-07-31 10:00:16 +02:00

mob

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

2015-08-01 19:45:42 +02:00

nano

Fixes crew monitor runtime and removes dead code.

2015-07-28 21:33:14 +02:00

organs

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

2015-07-31 10:00:16 +02:00

overmap

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

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

paperwork

…

power

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

2015-07-20 08:28:32 +02:00

projectiles

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

2015-07-30 10:49:37 +02:00

random_map

…

reagents

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

2015-07-30 10:49:37 +02:00

recycling

Fix for invisible tagger pipes

2015-07-30 12:37:10 +03:00

research

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

2015-07-20 08:28:32 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge with dev.

2015-07-15 16:20:39 +09:30

spells

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

2015-07-27 10:20:20 +02:00

supermatter

…

surgery

…

tables

Fixes #8161

2015-07-15 16:34:05 +03:00

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

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

2015-07-11 10:58:49 +02:00

xgm

…