Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync ...

Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme

2015-06-25 18:50:18 -04:00

..

xenoarchaeology

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

circuitprinter.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

designs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

destructive_analyzer.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

message_server.dm

Request Console NanoUI and fixes

2015-06-11 21:43:27 -04:00

protolathe.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

rd-readme.dm

Updates to science

2015-04-04 13:38:03 +03:00

rdconsole.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

rdmachines.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

research.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

server.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00