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

..

construction_datum.dm

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

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

events.dm

- Added Exosuit Jetpack

2012-02-08 18:47:04 +00:00

getrev.dm

Further improves the server revision verb.

2015-07-13 12:18:09 +02:00

global_iterator.dm

code/datums

2015-05-29 20:13:42 +01:00

teleport.dm

Teleport cleanup.

2015-05-05 09:55:19 +02:00

topic_input.dm

- Fixed Issue 185

2011-10-21 02:49:37 +00:00