skull132 9b094ad0eb Merge branch 'upstream/development' into development ...

# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm

2016-12-18 01:06:45 +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

Compile errors round 2 by Alberyk (#3)

2016-10-15 21:53:09 +03: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

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30

mind.dm

Merge branch 'development-2' into development

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

mixed.dm

…

modules.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

organs.dm

…

recipe.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

server_greeting.dm

Saving + Updating + ALL THE THINGS

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

sun.dm

…

supplypacks.dm

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00