PsiOmega e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm

2015-08-08 15:34:51 +02:00

..

glass.dm

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

leather.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

light.dm

Fixes #10314

2015-08-02 00:01:10 -04:00