Miniature f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git ...

Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm

2011-12-03 19:28:10 +10:30

..

skin.dmf

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30