Chinsky ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience ...

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm

2015-04-05 05:23:14 +03:00

..

rig

Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience

2015-04-05 05:23:14 +03:00

void

Fixes suit breach_threshold not being applied.

2015-02-21 13:15:02 -05:00

alien.dm

Removes the vox armalis.

2015-03-27 16:41:32 +10:30

breaches.dm

Fixes suit breach_threshold not being applied.

2015-02-21 13:15:02 -05:00

captain.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

miscellaneous.dm

Gear again

2015-02-18 15:35:37 -05:00

spacesuits.dm

Camera coverage fixes.

2015-02-26 11:39:41 +01:00

syndi.dm

Merge resolution.

2014-11-22 07:31:44 +10:30