PJB3005 8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

..

laborcamp

[READY]Makes addtimer use callbacks (#22660)

2017-01-04 16:02:56 +13:00

lavaland

FUCK (#23695)

2017-02-05 13:20:11 +01:00

abandoned_crates.dm

…

equipment.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

fulton.dm

Makes qdeleted and qdestroying macros (#23666)

2017-02-06 00:59:27 +13:00

machine_input_output_plates.dm

…

machine_processing.dm

Removes some stale comments (#21700)

2016-11-24 13:27:41 -06:00

machine_redemption.dm

Changes the names of Circuit Boards so they are easier on players. (#22688)

2017-01-04 17:20:53 -05:00

machine_stacking.dm

Removes some stale comments (#21700)

2016-11-24 13:27:41 -06:00

machine_unloading.dm

…

machine_vending.dm

Makes qdeleted and qdestroying macros (#23666)

2017-02-06 00:59:27 +13:00

mine_items.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

minebot.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

mint.dm

Removes some stale comments (#21700)

2016-11-24 13:27:41 -06:00

money_bag.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

ores_coins.dm

Ore satchel auto empties into ore box when dragged (#22228)

2016-12-18 19:53:27 +13:00

satchel_ore_boxdm.dm

Abductor tools and tool sound refactor. (#22125)

2016-12-14 18:09:41 +13:00

shelters.dm

…