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

# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-08-18 08:14:12 -04:00

..

drilling

Updates Tools

2017-08-03 04:49:23 -04:00

abandonedcrates_vr.dm

Adds anti-tamper to crates and adds anti-tamper 1 to abandoned ones.

2016-05-12 14:14:01 -04:00

abandonedcrates.dm

QoL on abandoned crate puzzle

2017-02-10 00:14:10 +00:00

alloys.dm

AI Core Update

2016-07-05 17:33:34 -04:00

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

Removes machinedir on in machine_processing.dm and machine_stacking.dm

2015-07-07 18:43:59 -04:00

machine_unloading.dm

…

mine_items.dm

Modifies Illegal Equipment Module

2017-07-29 17:32:33 -05: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

Borosilicate glass alloying should no longer produce slag

2016-07-05 20:20:01 -05:00

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