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

Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm

2015-06-30 08:59:34 +02:00

..

admin

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

2015-06-26 20:28:47 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-06-26 20:28:47 +02:00

clothing

Compilation fixes.

2015-06-26 20:33:55 +02:00

customitems

…

detectivework

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

economy

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

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

events

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

examine

…

ext_scripts

(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly

2015-06-28 11:43:53 +01:00

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

…

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-06-26 20:28:47 +02:00

mining

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

mob

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

2015-06-30 08:59:34 +02:00

nano

Fixes antags being able to see the appearance changer.

2015-06-21 21:12:28 +02:00

organs

Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead

2015-06-28 20:20:49 +09:30

overmap

…

paperwork

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

2015-06-26 20:28:47 +02:00

power

Merge resolution.

2015-06-28 06:13:24 +09:30

projectiles

Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct

2015-06-21 13:16:23 +01:00

random_map

…

reagents

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

2015-06-26 20:28:47 +02:00

recycling

Fixes disposal bins filling instantly

2015-06-24 22:09:47 -04:00

research

…

scripting

…

security levels

…

shieldgen

…

shuttles

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

2015-06-26 20:28:47 +02:00

spells

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

supermatter

…

surgery

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

2015-06-26 20:28:47 +02:00

tables

…

vehicles

…

virus2

…

xgm

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

2015-06-26 20:28:47 +02:00