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

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

admin

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-06-26 19:22:31 +02:00

clothing

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

2015-06-26 19:22:31 +02:00

customitems

…

detectivework

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

economy

Fixes #9847

2015-06-20 22:15:38 +09:30

events

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +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

…

holodeck

…

hydroponics

Merge pull request #9723 from atlantiscze/plant-fix

2015-06-13 01:38:47 +09:30

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Adds 'melting' and ignition points for various materials

2015-06-26 00:41:19 -04:00

mining

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

mob

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

2015-06-30 08:24:43 +02:00

nano

Fixes antags being able to see the appearance changer.

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

organs

Fixes #9913

2015-06-25 23:51:58 +03:00

overmap

…

paperwork

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

2015-06-26 19:22:31 +02:00

power

Merge resolution with master.

2015-06-28 06:02:52 +09:30

projectiles

Merge pull request #9872 from mwerezak/earslot

2015-06-21 09:03:00 +02:00

random_map

…

reagents

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +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/master' into dev-freeze

2015-06-26 19:22:31 +02:00

spells

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

supermatter

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

2015-06-07 10:30:27 +02:00

surgery

Fixes #9933

2015-06-25 23:59:12 +03:00

tables

Makes standard tables plastic

2015-06-14 13:38:56 -04:00

vehicles

…

virus2

…