LetterJayandGitHub 42368581c5 Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

..

combat

April sync (#360)

2017-04-13 23:37:00 -05:00

equipment

Ports Goonchat

2017-06-08 16:27:56 -05:00

medical

April sync (#360)

2017-04-13 23:37:00 -05:00

working

Ripleys will collect all ore in front of them when they move with a clamp and stored ore box

2017-05-22 11:44:54 -05:00

mech_bay.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

mech_fabricator.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

mecha_actions.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

mecha_construction_paths.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

mecha_control_console.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

mecha_defense.dm

Mechs now take the correct amount of charge from inserted cells

2017-05-22 11:45:59 -05:00

mecha_parts.dm

Overhauls and 2/28 sync (#244)

2017-02-28 09:30:49 -06:00

mecha_topic.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

mecha_wreckage.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

mecha.dm

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00