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

..

particle_accelerator

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

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

collector.dm

TG: Fixes a derp I made with the PA in a recent commit.

2012-06-02 01:12:34 +01:00

containment_field.dm

Working UL

2012-06-18 15:02:34 -07:00

emitter.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

field_generator.dm

TG: Welding tool: Mostly code-related, the players won't notice much.

2012-06-07 03:30:13 +01:00

generator.dm

Huge commit! Standardizes var definitions in most places.

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

investigate.dm

TG: Added a new logging system that can be used for various things in the game (such

2012-05-29 01:45:03 +01:00

singularity.dm

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

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