Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

robot_items.dm

Cyborg hud modules now have proper icons

2014-05-04 16:06:10 +03:00

robot_parts.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

robot_upgrades.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00