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

..

dead/observer

Fixed a few runtimes.

2011-10-22 11:32:08 +00:00

living

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

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

new_player

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

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

organ

Organs:

2011-10-08 10:38:01 +00:00

login.dm

Fixed a few runtimes.

2011-10-22 11:32:08 +00:00

logout.dm

Update by Lagius:

2011-05-11 19:31:59 +00:00

mob_grab.dm

Hair and Facial Hair Overhaul:

2011-10-29 17:06:37 +00:00

mob_helpers.dm

Fixed some runtimes

2011-10-26 23:15:34 +00:00

mob_movement.dm

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

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

mob.dm

Forgot to call makejson()

2011-11-29 18:15:49 +01:00

say.dm

Speech Bubbles.

2011-11-20 01:23:55 -05:00

screen.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

transform_procs.dm

Nanotrasen laws, nobody likes you asimov

2011-11-30 19:23:37 -05:00