LetterJay abbacd2c89 Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

..

laborcamp

April sync (#360)

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

lavaland

i'll fix this in another PR

2017-05-22 12:27:59 -05:00

abandoned_crates.dm

…

aux_base_camera.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

aux_base.dm

Aux Base Fixes (#1067)

2017-05-20 23:20:45 -05:00

equipment.dm

Update equipment.dm

2017-05-22 13:13:16 -05:00

fulton.dm

Replaces /image with /mutable_appearance (#556)

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

machine_input_output_plates.dm

Old ore processor cleanup

2017-04-29 03:46:03 -05:00

machine_processing.dm

Ore redemption machine cleanup

2017-05-01 11:54:33 -05:00

machine_redemption.dm

Adds a disk slot to the ORM, to allow the uploading of new smelter designs (#980)

2017-05-18 11:53:47 -05:00

machine_stacking.dm

Proximity sensing refactor (#425)

2017-04-16 18:15:29 -04:00

machine_unloading.dm

…

machine_vending.dm

Free Golems can purchase their own royal capes

2017-05-13 21:17:37 -05:00

mine_items.dm

Survival pod doors will properly turn if on shuttles (#1070)

2017-05-21 17:43:53 -07:00

minebot.dm

Two more types of Legion and makes environment_smash levels into defines

2017-05-21 02:52:23 -05:00

mint.dm

…

money_bag.dm

…

ores_coins.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

satchel_ore_boxdm.dm

…

shelters.dm

…