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

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

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

..

staff.dm

Remove slash from end of type refs/defs

2016-11-30 19:23:15 -08:00

wand.dm

Merge branch 'master' into w_class

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