skull132 d536d9f4aa Merge branch 'fake-master' into development ...

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

2017-12-09 00:08:21 +02:00

..

drilling

Restore old machinery init behavior (#3380)

2017-08-31 22:56:05 -05:00

abandonedcrates.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

alloys.dm

…

coins.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

machine_input_output_plates.dm

…

machine_processing.dm

Restore old machinery init behavior (#3380)

2017-08-31 22:56:05 -05:00

machine_rigpress.dm

…

machine_stacking.dm

Stacker fixes (#3903)

2017-11-25 21:30:21 -06:00

machine_unloading.dm

…

machine_vending.dm

Reduces the income of the working classes (#3608)

2017-10-13 17:38:49 +03:00

mine_items.dm

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

mine_turfs.dm

Add map laceholder objects for mine turfs (#3828)

2017-11-18 18:46:59 +02:00

minebot.dm

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

mineral_effect.dm

Singulo cannot eat ores. (#3594)

2017-10-10 10:32:26 +02:00

mint.dm

Kill processing_objects (#3398)

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

money_bag.dm

…

ore_datum.dm

…

ore.dm

…

satchel_ore_boxdm.dm

Mining performance fixes (#3387)

2017-09-03 00:47:01 +03:00