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

..

areas.dm

…

atmospherics.dm

…

datum_pool.dm

…

files.dm

…

functional.dm

…

game.dm

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

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

global_lists.dm

Merge branch 'development-2' into development

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

icons.dm

Final merge

2016-11-12 00:10:21 +02:00

lists.dm

Final merge

2016-11-12 00:10:21 +02:00

logging.dm

Merge branch 'development-2' into development

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

maths.dm

…

matrices.dm

…

mobs.dm

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

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

names.dm

Fixing compile errors (#9)

2016-11-18 18:03:27 +02:00

sanitize_values.dm

…

spawn_sync.dm

…

text.dm

Merge branch 'development-2' into development

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

time.dm

Merge branch 'upstream/development' into development

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

turfs.dm

Final merge

2016-11-12 00:10:21 +02:00

type2type.dm

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

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

unsorted.dm

Dview fixes (#19)

2016-11-21 12:57:34 +02:00

vector.dm

…