LetterJay a57190b9c5 Merge pull request #694 from Citadel-Station-13/upstream-merge-26708 ...

[MIRROR] Ore redemption machine cleanup

2017-05-02 12:26:28 -05:00

..

laborcamp

…

lavaland

woo

2017-05-02 11:19:14 -05:00

abandoned_crates.dm

…

aux_base_camera.dm

…

aux_base.dm

Unorphans the blackbox

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

equipment.dm

manual merge

2017-04-29 11:42:28 -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

Ore redemption machine cleanup

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

machine_stacking.dm

…

machine_unloading.dm

…

machine_vending.dm

Unorphans the blackbox

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

mine_items.dm

…

minebot.dm

…

mint.dm

…

money_bag.dm

…

ores_coins.dm

Replaces /image with /mutable_appearance (#556)

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

satchel_ore_boxdm.dm

…

shelters.dm

…