mwerezak 1a74db2110 Merge remote-tracking branch 'upstream/dev' into train-cleanup ...

Resolved merge conflicts, and added some more user feedback to attach/unattach procs.

Conflicts:
	code/modules/vehicles/cargo_train.dm

2014-06-21 11:29:10 -04:00

..

cargo_train.dm

Merge remote-tracking branch 'upstream/dev' into train-cleanup

2014-06-21 11:29:10 -04:00

train.dm

Merge remote-tracking branch 'upstream/dev' into train-cleanup

2014-06-21 11:29:10 -04:00

vehicle.dm

Vehicle layer tweak

2014-06-21 17:56:07 +12:00