izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update ...

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

2020-01-31 18:23:50 +01:00

..

drilling

Mining Expansion, the Diggening.

2019-07-13 03:48:38 -04:00

ore_redemption_machine

Adds bar shelter capsule to vendors

2019-09-15 21:03:58 -04:00

abandonedcrates_vr.dm

…

abandonedcrates.dm

…

alloys.dm

…

coins.dm

Moar descriptions for things

2020-01-20 22:50:39 -05:00

fulton.dm

Exploration Expansion 1: Or, How I Learned To Love The Tree

2019-08-21 17:23:07 -04:00

machine_input_output_plates.dm

…

machine_processing.dm

Merge pull request #6080 from Mechoid/FixAccidentalAlchemy

2019-04-14 02:48:40 -04:00

machine_stacking.dm

Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix

2020-01-28 14:14:06 -05:00

machine_unloading.dm

…

mine_items_vr.dm

Moves destroy_artefact vars to _vr file

2019-04-08 07:37:48 +10:00

mine_items.dm

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

mine_outcrops.dm

The great rock update.

2019-07-13 18:21:45 -04:00

mine_turfs_vr.dm

Adds a bunch new PoIs to Underdark

2019-04-30 08:20:42 +10:00

mine_turfs.dm

Proper syntax and commenting

2020-01-05 11:21:34 -05:00

mineral_effect.dm

…

mint.dm

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04:00

money_bag.dm

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

ore_datum_vr.dm

Allows to compress coal into carbon sheets

2019-07-07 08:01:31 +10:00

ore_datum.dm

Merge pull request #6116 from Mechoid/WhyAmIStupid

2019-04-22 00:27:50 -04:00

ore.dm

Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev

2019-04-22 14:30:03 -04:00

resonator_vr.dm

Sorts out this PR

2019-03-26 21:43:56 -04:00

resonator.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

reward_yw.dm

…

satchel_ore_boxdm.dm

Oops, only did smacking with a rock, not satchels too

2019-07-07 13:50:21 -04:00

shelter_atoms.dm

Fixes shelter lighting when deployed in lighting-unsimulated area

2019-09-26 10:15:19 +10:00

shelters.dm

Fixes shelter lighting when deployed in lighting-unsimulated area

2019-09-26 10:15:19 +10:00