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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-01-24 19:52:12 -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.dm

Surface Map Work (#4557)

2018-01-17 13:46:19 -06:00

mine_turfs.dm

Optimization/Rewrite of Radiation Controller

2017-05-25 18:43:56 -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

…

ore.dm

Adds Modifier System, Changes Some Ling Stuff

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

reward_yw.dm

Interserver shipping update and other changes

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

satchel_ore_boxdm.dm

Macro Replacements. (#3574)

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