LetterJay 408182758f Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

..

combat

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

equipment

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

medical

Update odysseus.dm

2017-11-16 23:32:17 -05:00

working

Defines math, take 2

2017-12-17 10:02:43 -06:00

mech_bay.dm

Merge pull request #32209 from YPOQ/mechrechargerfix

2017-10-30 14:41:08 -05:00

mech_fabricator.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

mecha_actions.dm

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06:00

mecha_construction_paths.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mecha_control_console.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

mecha_defense.dm

Mechs now require fuel to repair (#33225)

2017-12-04 04:55:25 -06:00

mecha_parts.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

mecha_topic.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mecha_wreckage.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mecha.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00