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

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

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

..

chemistry

Merge pull request #21866 from Mervill/slashes_deux

2016-12-03 15:56:10 +11:00

reagent_containers

w_class now uses defines

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

chem_splash.dm

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

reagent_containers.dm

w_class now uses defines

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

reagent_dispenser.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00