PsiOmega 6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm

2015-06-26 19:22:31 +02:00

..

carbonpaper.dm

disregard failure. I made a silly.

2014-04-06 18:29:50 -07:00

clipboard.dm

Make papers in a clipboard renameable without removing

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

faxmachine.dm

Add random access inserting into paper bundles

2015-04-23 21:49:56 -04: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

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

paper.dm

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

2015-06-26 19:22:31 +02:00

paperbin.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

pen.dm

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

photocopier.dm

Merge branch 'dev' into paper-functionality

2015-04-27 12:37:31 -04:00

photography.dm

Changed steel material name to a define.

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

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