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

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

..

equipment

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

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

laborcamp

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

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

lavaland

Merge branch 'master' into upstream-merge-33498

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

abandoned_crates.dm

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

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

aux_base_camera.dm

[MIRROR] Fixes to more Initialize procs (#2733)

2017-09-13 22:54:12 -05:00

aux_base.dm

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

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

fulton.dm

Clean up some loc assignments (#33157)

2017-12-02 09:44:20 -06:00

machine_input_output_plates.dm

Removes a great amount of machinery copypasta with circuitboards.

2017-08-09 19:24:19 -05:00

machine_processing.dm

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

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

machine_redemption.dm

Defines math, take 2

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

machine_stacking.dm

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

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

machine_unloading.dm

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

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

machine_vending.dm

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

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

mine_items.dm

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

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

minebot.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

mint.dm

Defines math, take 2

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

money_bag.dm

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

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

ores_coins.dm

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

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

satchel_ore_boxdm.dm

Player Z-tracking, again

2017-12-14 17:35:35 -06:00

shelters.dm

Spellchecking

2017-08-01 08:46:20 -05:00