mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine ...

Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm

2014-11-20 14:57:35 -05:00

..

carbonpaper.dm

disregard failure. I made a silly.

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

clipboard.dm

refining the clipboard topic checks

2014-07-31 08:57:56 +02:00

faxmachine.dm

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-20 14:57:35 -05:00

filingcabinet.dm

filing cabinet exploit fix

2014-07-31 10:03:22 +02:00

folders.dm

folder exploit fixes

2014-07-31 04:08:34 +02:00

handlabeler.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

paper_bundle.dm

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-20 14:57:35 -05:00

paper.dm

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-20 14:57:35 -05:00

paperbin.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

pen.dm

Merge with dev.

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

photocopier.dm

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-20 14:57:35 -05:00

photography.dm

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00

silicon_photography.dm

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00

stamps.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30