skull132 cdd4772177 Merge branch 'master' into merge/level_dev_master ...

# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm

2016-12-19 00:23:19 +02:00

..

ai

Creates a new process for AI handling.

2016-01-24 13:01:52 +01:00

diseases

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

expansions

Creates a new process for AI handling.

2016-01-24 13:01:52 +01:00

helper_datums

Scheduler, observation, and New() tweaks.

2015-12-27 17:44:53 +01:00

observation

The moved event again returns the correct result from parent.

2016-02-03 21:54:30 +01:00

repositories

Camera fixes and performance tweaks.

2016-01-30 17:41:12 +01:00

uplink

More bay merge fixes (#1243)

2016-12-18 22:13:42 +02:00

wires

Logging tweaks.

2016-01-08 15:22:43 +01:00

ai_law_sets.dm

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

api.dm

Fix API whitelist (#1061)

2016-10-17 12:22:27 +03:00

browser.dm

…

category.dm

Character setup refactoring.

2015-10-18 17:34:35 +02:00

computerfiles.dm

…

datacore.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

discord_bot.dm

BOREALIS 2 Implementation (#938)

2016-09-18 23:28:01 +03:00

disease.dm

…

mind.dm

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

server_greeting.dm

Saving + Updating + ALL THE THINGS

2016-12-11 21:44:35 +02:00

sun.dm

…

supplypacks.dm

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00