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

# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-04-20 09:03:58 -04:00

..

drilling

Drill grammar

2018-03-07 19:55:02 -06: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

fix for stacks out of stacking machine (#5020)

2018-03-08 13:29:03 -06:00

machine_unloading.dm

…

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-04-20 09:03:58 -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

reward_yw.dm

…

satchel_ore_boxdm.dm

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

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