PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/Sleeper.dm

2015-08-17 13:05:58 +02:00

..

carbonpaper.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

clipboard.dm

Make papers in a clipboard renameable without removing

2015-04-23 08:48:52 -04:00

faxmachine.dm

Admin JMP now includes a link to EYE or BDY if any.

2015-06-10 11:08:31 +02:00

filingcabinet.dm

Fixes medical record cabinet runtime

2015-03-09 03:18:38 -04:00

folders.dm

Add renaming of things (papers, etc.) in folders

2015-04-23 21:49:56 -04:00

handlabeler.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

paper_bundle.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

paper.dm

Changelog + scrambled paper

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

paperbin.dm

Paperbin

2015-07-26 18:58:29 -05:00

pen.dm

Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.

2015-06-11 23:31:25 -04:00

photocopier.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

photography.dm

Qdels the photo dummy.

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

silicon_photography.dm

Fixes #7366.

2014-12-10 21:54:57 +01:00

stamps.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30