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

..

robot_items.dm

Adds corresponding icons to cyborg thermal goggles, cyborg meson goggles, cyborg medical HUD and cyborg security HUD.

2014-02-13 15:37:55 +01:00

robot_parts.dm

u_equip is now called unEquip PANIC

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

robot_upgrades.dm

Added the SetEmagged proc, for cyborgs, and replaced code to use it.

2014-01-22 20:00:39 +00:00