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

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

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

..

computers

w_class now uses defines

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

file_system

Remove slash from end of type refs/defs

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

hardware

w_class now uses defines

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

NTNet

Remove slash from end of type refs/defs

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

documentation.md

Changes to modular computer sanitization and documentation (#20453)

2016-09-15 11:59:28 +12:00

laptop_vendor.dm

corrects some defs without leading slash (#21843)

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