Albert Iordache dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm

2012-07-13 20:58:48 +03:00

..

xenoarchaeology

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-07-13 20:58:48 +03:00

circuitprinter.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

designs.dm

shielding circuitboards should be buildable now

2012-07-06 11:17:58 +10:00

destructive_analyzer.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

message_server.dm

TG: Fixes a pesky compile error in my last commit.

2012-06-23 15:10:49 +01:00

protolathe.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

rd-readme.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

rdconsole.dm

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00

rdmachines.dm

TG: Sieve stuff, this is a stupidly big commit, I'm sorry, I really am.

2012-06-19 21:37:44 +01:00

research_shuttle.dm

artifact files moved to new folder to avoid clutter, mining north outpost repurposed as research outpost, shuttle dock added to research wing (both shuttle dock and outpost require standard research access), modified layout of the anomaly lab slightly

2012-07-05 23:47:35 +10:00

research.dm

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

server.dm

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00