LetterJay 54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728

2017-06-05 23:07:52 -05:00

..

equipment

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728

2017-06-05 23:07:52 -05:00

laborcamp

…

lavaland

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728

2017-06-05 23:07:52 -05:00

abandoned_crates.dm

…

aux_base_camera.dm

…

aux_base.dm

Aux Base Fixes (#1067)

2017-05-20 23:20:45 -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

Adds marker beacons to mining as a vendible item

2017-05-24 16:32:43 -05:00

mine_items.dm

shit always breaks somehow.

2017-05-30 18:37:28 -05:00

minebot.dm

Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls

2017-05-22 22:21:20 -05:00

mint.dm

…

money_bag.dm

…

ores_coins.dm

This doesn't do anything (#1390)

2017-06-04 09:05:28 -07:00

satchel_ore_boxdm.dm

…

shelters.dm

…