PsiOmega 3ad8f4ca24 Merge branch 'dev' into Pics ...

Conflicts:
	code/modules/paperwork/photography.dm

2014-07-29 16:45:55 +02:00

..

carbonpaper.dm

…

clipboard.dm

…

filingcabinet.dm

…

folders.dm

…

handlabeler.dm

…

paper_bundle.dm

Fixes #5339

2014-06-24 11:35:08 +09:30

paper.dm

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

paperbin.dm

Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping

2014-07-21 12:08:51 +02:00

pen.dm

Merge with dev.

2014-06-12 01:14:40 +09:30

photocopier.dm

Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

2014-07-29 15:45:22 +02:00

photography.dm

Merge branch 'dev' into Pics

2014-07-29 16:45:55 +02:00

silicon_photography.dm

Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.

2014-07-29 15:45:22 +02:00

stamps.dm

…