Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

areas.dm

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

atmospherics.dm

…

datum_pool.dm

…

files.dm

…

functional.dm

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

game.dm

…

global_lists.dm

Adds socks.

2015-10-11 00:13:33 -04:00

icons.dm

…

lists.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

logging.dm

…

maths.dm

…

matrices.dm

…

mobs.dm

Attempts to improve mob in view acquirement.

2015-09-13 14:32:49 +02:00

names.dm

…

sanitize_values.dm

…

text.dm

…

time.dm

…

turfs.dm

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

type2type.dm

…

unsorted.dm

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

2015-10-27 13:08:33 +01:00

vector.dm

…