Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

carbonpaper.dm

disregard failure. I made a silly.

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

clipboard.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

filingcabinet.dm

Added ability to put paper bundles into folders and cabinets

2014-05-08 00:56:32 +02:00

folders.dm

Added ability to put paper bundles into folders and cabinets

2014-05-08 00:56:32 +02:00

handlabeler.dm

Massive click code rework by SuperSayu, ported from TG.

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

paper_bundle.dm

dynamic description and fixes

2014-05-08 20:15:25 +02:00

paper.dm

Adds functionalities for viewing, writing, stamping and adding photos

2014-05-07 22:50:15 +02:00

paperbin.dm

Paperbin fix, now doesn't silently fail if it has papers shoved into it.

2014-04-27 08:54:31 -05:00

pen.dm

Fixes #3993

2014-05-10 10:26:05 +09:30

photocopier.dm

Photocopiers now copy stamped papers, also minor bugfix

2014-04-30 05:46:51 +02:00

photography.dm

die monkey emergency DIE

2014-04-06 12:05:41 -07:00

stamps.dm

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00