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

Splits organs into organ/internal (#7441)

2019-11-20 23:07:10 +01:00

abandonedcrates.dm

Splits organs into organ/internal (#7441)

2019-11-20 23:07:10 +01:00

alloys.dm

…

coins.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

gemstones.dm

Mixed Gems Bugfix (#7597)

2019-12-05 22:42:47 +02:00

machine_input_output_plates.dm

Enforces Lineendings and adds Editorconfig (#7657)

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

machine_processing.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

machine_rigpress.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

machine_stacking.dm

…

machine_unloading.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

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

gemspawning fix (#7546)

2019-12-01 15:42:21 +01:00

minebot.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

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

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

ore.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00

satchel_ore_boxdm.dm

Removes Weapons (#7415)

2019-11-16 18:36:13 +01:00