Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

drilling

Drill grammar

2018-03-07 19:55:02 -06:00

orm_vr

Implements the Mining Equipment Vendor

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

abandonedcrates_vr.dm

…

abandonedcrates.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

alloys.dm

…

coins.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

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

Making mining drills faster. (fix)

2018-02-02 10:05:03 +01:00

mine_items.dm

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

2018-02-24 22:51:59 -05:00

mine_turfs.dm

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

2018-06-02 18:33:44 -04:00

mineral_effect.dm

…

mint.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

money_bag.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

ore_datum.dm

Fixes Durasteel Producing Slag

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

ore.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

resonator_vr.dm

Adds the Resonator

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

reward_yw.dm

Interserver shipping update and other changes

2017-03-03 19:13:06 -05:00

satchel_ore_boxdm.dm

Makes Mining Satchels brute-force their way out of lagging, minerborg prodding.

2018-02-20 12:58:13 -08:00

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