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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme

2017-02-03 21:35:22 -05:00

..

drilling

Fixes some things that should make mining more interesting

2017-01-28 19:35:48 -06: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

…

alloys.dm

AI Core Update

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

coins.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

…

machine_stacking.dm

…

machine_unloading.dm

…

mine_items.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

mine_turfs.dm

Fixes some things that should make mining more interesting

2017-01-28 19:35:48 -06:00

mineral_effect.dm

…

mint.dm

…

money_bag.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

ore_datum.dm

Borosilicate glass alloying should no longer produce slag

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

ore.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

reward_yw.dm

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

2017-02-03 21:35:22 -05:00

satchel_ore_boxdm.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00