PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm

2015-07-11 10:58:49 +02:00

..

cargo_train.dm

Cargo train vs projectiles

2015-07-11 02:16:17 +12:00

train.dm

More cargo train fixes

2015-01-03 01:27:10 +13:00

vehicle.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