Files
Aurora.3/code/modules/research/xenoarchaeology
PsiOmegaDelta 388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
2015-07-20 08:28:32 +02:00
..

//coming soon
//there'll probably be some stuff on the wiki at some point

//original code from alfie275 / lunacode, artifacts are from isaidno