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

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

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

..

sheets

w_class now uses defines

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

tiles

w_class now uses defines

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

cash.dm

w_class now uses defines

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

medical.dm

Merge branch 'master' into w_class

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

rods.dm

Merge branch 'master' into w_class

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

stack.dm

Allows more things to be put in the microwave (#21650)

2016-11-22 11:56:02 +13:00

telecrystal.dm

w_class now uses defines

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

wrap.dm

w_class now uses defines

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