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

..

ai

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

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

decoy

Refactors a lot of reused/redundant death code, fixes #7224

2014-12-07 17:18:56 +10:30

pai

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

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

robot

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

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

death.dm

Fixes and tweaks to the previous.

2014-12-23 22:03:02 +10:30

laws.dm

Moves silicon law logging to a more all-catching location.

2015-03-22 14:11:44 +01:00

login.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

say.dm

Allows all synths to view the alternative law sets.

2015-06-02 14:48:08 +02:00

silicon.dm

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

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

subystems.dm

Station alarm monitor changes.

2015-05-08 11:22:29 +02:00