PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm

2015-05-30 15:59:54 +02:00

..

modules

Rig Icon Fixes

2015-05-27 23:32:27 -04:00

suits

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-05-30 15:59:54 +02:00

rig_attackby.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-05-22 08:26:13 +02:00

rig_pieces.dm

Tweaks rig emp effect, breach_threshold

2015-03-23 02:49:34 -04:00

rig_verbs.dm

EMP briefly blocks switching/engaging modules

2015-02-26 00:05:04 -05:00

rig_wiring.dm

…

rig.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-05-30 15:59:54 +02:00