Ferner 188544b748 Merge branch 'master' into 191217-sprites_mecha ...

# Conflicts:
#	code/game/objects/items/paintkit.dm

2019-12-21 23:26:22 +01:00

..

drilling

…

abandonedcrates.dm

…

alloys.dm

…

coins.dm

…

gemstones.dm

…

machine_input_output_plates.dm

Enforces Lineendings and adds Editorconfig (#7657)

2019-12-21 16:19:24 +01:00

machine_processing.dm

…

machine_rigpress.dm

…

machine_stacking.dm

…

machine_unloading.dm

…

machine_vending.dm

Removes the non-functional paint kits

2019-12-20 21:37:04 +01:00

mine_items.dm

Many vore improvements. (#7686)

2019-12-19 20:06:14 +01:00

mine_turf_types.dm

…

mine_turfs.dm

…

minebot.dm

…

mineral_effect.dm

Enforces Lineendings and adds Editorconfig (#7657)

2019-12-21 16:19:24 +01:00

mint.dm

New money sprites (#7576)

2019-12-08 11:44:39 +01:00

ore_datum.dm

…

ore.dm

…

satchel_ore_boxdm.dm

…