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

# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt

2017-04-29 10:13:45 -04:00

..

drilling

if you don't rename all of something, bad things happen m'kay kids

2017-02-04 15:46:03 +00: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

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

Fix mining turfs permenently unlit.

2017-04-16 14:46:09 -04: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

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

Reverts the second mob clean up because of incomplete implementation.

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