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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -05:00

..

drilling

Updates Tools

2017-08-03 04:49:23 -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

machine_input_output_plates.dm

…

machine_processing.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

machine_stacking.dm

…

machine_unloading.dm

…

mine_items_vr.dm

Making mining drills faster. (fix)

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

mine_items.dm

All my changes so far.

2018-02-02 04:57:01 -05:00

mine_turfs.dm

All my changes so far.

2018-02-02 04:57:01 -05: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

…

ore.dm

Adds Modifier System, Changes Some Ling Stuff

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

reward_yw.dm

…

satchel_ore_boxdm.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00