Erthilo edd6f3ad88 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm

2012-06-19 22:09:30 +01:00

..

artifacts.dm

- Ported ISaidNo's artifact code. Will look into adding xenoarchaelogy [anomaly] base near RnD at some point.

2012-06-18 22:37:56 +10: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

Huge commit! Standardizes var definitions in most places.

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

destructive_analyzer.dm

Huge commit! Standardizes var definitions in most places.

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

message_server.dm

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

2012-06-19 21:37:44 +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

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

2012-06-19 21:37:44 +01: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.dm

Huge commit! Standardizes var definitions in most places.

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

server.dm

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

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