Miauw 3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP ...

Conflicts:
	code/modules/mob/transform_procs.dm

2014-02-18 18:22:40 +01:00

..

bscrystal.dm

* Tidied up the code.

2013-11-12 19:49:36 +00:00

gps.dm

Machine overhaul 2: Constructable Revolution

2014-01-10 18:53:26 +04:00

telepad.dm

second pass

2014-02-15 20:11:12 -08:00

telesci_computer.dm

u_equip is now called unEquip PANIC

2014-02-13 20:58:33 +01:00