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

# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm

2018-03-23 20:25:18 -04:00

..

drilling

Drill grammar

2018-03-07 19:55:02 -06:00

abandonedcrates_vr.dm

…

abandonedcrates.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

alloys.dm

…

coins.dm

…

machine_input_output_plates.dm

…

machine_processing.dm

…

machine_stacking.dm

fix for stacks out of stacking machine (#5020)

2018-03-08 13:29:03 -06:00

machine_unloading.dm

…

mine_items_vr.dm

Making mining drills faster. (fix)

2018-02-02 10:05:03 +01:00

mine_items.dm

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

2018-02-24 22:51:59 -05:00

mine_turfs.dm

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

2018-03-06 18:11:39 -05:00

mineral_effect.dm

…

mint.dm

…

money_bag.dm

…

ore_datum.dm

Fixes Durasteel Producing Slag

2018-03-12 15:01:28 -05:00

ore.dm

…

reward_yw.dm

…

satchel_ore_boxdm.dm

Makes Mining Satchels brute-force their way out of lagging, minerborg prodding.

2018-02-20 12:58:13 -08:00