Zuhayr edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/admin/topic.dm

2015-08-22 02:30:14 +09:30

..

carbonpaper.dm

…

clipboard.dm

…

faxmachine.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

filingcabinet.dm

…

folders.dm

…

handlabeler.dm

…

paper_bundle.dm

…

paper.dm

Changelog + scrambled paper

2015-08-13 01:16:00 -05:00

paperbin.dm

…

papershredder.dm

Added paper shredders from Minijar.

2015-08-22 02:00:08 +09:30

pen.dm

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

photocopier.dm

…

photography.dm

Qdels the photo dummy.

2015-08-12 09:14:36 +02:00

silicon_photography.dm

…

stamps.dm

…