skull132 b6e8ae4d53 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm

2018-08-05 20:29:03 +03:00

..

drilling

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

abandonedcrates.dm

Kinetic Accelerator Additions (#4965)

2018-08-03 00:15:55 +02:00

alloys.dm

…

coins.dm

Convert a bunch of legacy overlay calls to SSoverlays (#4015)

2018-01-07 00:34:47 +02:00

machine_input_output_plates.dm

Up-hint and UI cleanup (#3773)

2018-01-27 12:11:22 -06:00

machine_processing.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

machine_rigpress.dm

Custom Kinetic Accelerators (#4802)

2018-06-17 23:02:42 +03:00

machine_stacking.dm

Fixed the Stack Machine from eating Materials (#4688)

2018-05-06 17:21:05 +03:00

machine_unloading.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

machine_vending.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

mine_items.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

mine_turf_types.dm

it was a mistake (#4913)

2018-06-26 17:01:41 +02:00

mine_turfs.dm

July update: vaurca and mining fixes (#5047)

2018-07-29 02:31:33 +03:00

minebot.dm

Fixes "3" (#4993)

2018-07-21 14:07:12 +02:00

mineral_effect.dm

Basalt turfs (#3985)

2017-12-24 22:30:36 +02:00

mint.dm

Kill processing_objects (#3398)

2017-09-09 15:22:58 -05:00

money_bag.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

ore_datum.dm

…

ore.dm

…

satchel_ore_boxdm.dm

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00