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

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

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

..

clipboard.dm

w_class now uses defines

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

contract.dm

Remove slash from end of type refs/defs

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

filingcabinet.dm

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

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

folders.dm

w_class now uses defines

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

handlabeler.dm

w_class now uses defines

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

paper_cutter.dm

w_class now uses defines

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

paper.dm

w_class now uses defines

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

paperbin.dm

w_class now uses defines

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

paperplane.dm

w_class now uses defines

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

pen.dm

w_class now uses defines

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

photocopier.dm

Revert "Makes drag/drop that dont have any use call click"

2016-10-16 12:41:42 -07:00

photography.dm

w_class now uses defines

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

stamps.dm

w_class now uses defines

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