Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

laborcamp

Moving shit around and APC repair bugfix (#20912)

2016-10-12 09:48:47 +02:00

lavaland

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

abandoned_crates.dm

Make energy guns able to use burst fire. (#21005)

2016-11-02 16:16:21 +13:00

equipment.dm

w_class now uses defines

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

fulton.dm

w_class now uses defines

2016-12-01 21:33:14 -08: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

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

machine_stacking.dm

Removes some stale comments (#21700)

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

machine_unloading.dm

…

machine_vending.dm

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

mine_items.dm

w_class now uses defines

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

minebot.dm

Lint (#21393)

2016-11-08 13:55:30 +13: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

w_class now uses defines

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

satchel_ore_boxdm.dm

Removes some stale comments (#21700)

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

shelters.dm

Bluespace shelters use templates

2016-06-07 02:11:35 +01:00