Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

combat

Changed the Step battery drain, from 1 to 3.

2014-01-17 18:59:23 +01:00

equipment

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

medical

code/game/mecha/* lowercase & improper pass

2013-11-18 23:32:10 +01:00

working

code/game/mecha/* lowercase & improper pass

2013-11-18 23:32:10 +01:00

mech_bay.dm

A bunch of fixes

2014-01-24 23:17:14 +04:00

mech_fabricator.dm

A bunch of fixes of using old type of proc

2014-01-26 11:56:14 +04:00

mecha_construction_paths.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

mecha_control_console.dm

code/game/mecha/* lowercase & improper pass

2013-11-18 23:32:10 +01:00

mecha_parts.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

mecha_wreckage.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

mecha.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00