PsiOmegaDelta 34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm

2015-07-14 08:21:12 +02:00

..

datum_pool.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade

2015-06-05 13:24:03 +03:00

files.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

game.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

global_lists.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

icons.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

lists.dm

Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03:00

logging.dm

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

2015-06-07 10:51:41 +02:00

maths.dm

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

2015-07-11 10:58:49 +02:00

matrices.dm

Adds spinning animation for meteors.

2015-06-05 15:55:39 +02:00

mobs.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

names.dm

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

2015-07-14 08:21:12 +02:00

sanitize_values.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

text.dm

Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03:00

time.dm

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

2015-06-30 08:59:34 +02:00

turfs.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

type2type.dm

Better num2hex

2015-07-09 22:51:21 -04:00

unsorted.dm

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

2015-07-11 10:58:49 +02:00

vector.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00