Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

drilling

…

orm_vr

Implements the Mining Equipment Vendor

2018-04-24 18:18:54 -04:00

abandonedcrates_vr.dm

…

abandonedcrates.dm

…

alloys.dm

…

coins.dm

…

fulton.dm

Ports /tg/ fulton system

2018-04-24 12:59:26 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

Implements the Mining Equipment Vendor

2018-04-24 18:18:54 -04:00

machine_stacking.dm

Implements the Mining Equipment Vendor

2018-04-24 18:18:54 -04:00

machine_unloading.dm

Implements the Mining Equipment Vendor

2018-04-24 18:18:54 -04:00

mine_items_vr.dm

…

mine_items.dm

…

mine_turfs.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-23 17:53:13 -04:00

mineral_effect.dm

…

mint.dm

…

money_bag.dm

…

ore_datum.dm

Fixes Durasteel Producing Slag

2018-03-12 15:01:28 -05:00

ore.dm

…

resonator_vr.dm

Adds the Resonator

2018-04-24 12:57:50 -04:00

reward_yw.dm

…

satchel_ore_boxdm.dm

…

shelter_atoms.dm

Set a fake ID on shelter buttons to avoid messing with every door

2018-05-18 10:14:27 -04:00

shelters.dm

Capsule shelter QOL

2018-05-14 22:31:09 -04:00