Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

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

..

carbonpaper.dm

…

clipboard.dm

…

fax.dm

…

faxmachine.dm

…

filingcabinet.dm

…

folders.dm

…

handlabeler.dm

…

paper_bundle.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

paper.dm

Syndicate Ship Update

2015-09-17 08:22:50 -04:00

paperbin.dm

Implement remove_item_from_storage properly, syndi toolbox tool color update

2015-09-16 01:54:34 +02:00

pen.dm

…

photocopier.dm

…

photography.dm

Photo image fix

2015-09-21 22:49:49 +02:00

silicon_photography.dm

…

stamps.dm

…