PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm

2015-09-27 13:36:56 +02:00

..

carbonpaper.dm

…

clipboard.dm

…

faxmachine.dm

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

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

filingcabinet.dm

…

folders.dm

…

handlabeler.dm

…

paper_bundle.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-27 13:36:56 +02:00

paper.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-27 13:36:56 +02:00

paperbin.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02: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

…

photography.dm

Qdels the photo dummy.

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

silicon_photography.dm

…

stamps.dm

Changed steel material name to a define.

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