DZD 212ca5f5bd MERGE CONFLIIIIIICTS

2015-02-19 20:26:36 -05:00

..

carbonpaper.dm

disregard failure. I made a silly.

2014-04-19 16:44:45 -04:00

clipboard.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

fax.dm

Move Fax Panel to Event tab since it's IC info

2015-02-17 15:13:07 -05:00

faxmachine.dm

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

filingcabinet.dm

Ports Antag Objectives from TG

2015-01-30 23:40:41 -05:00

folders.dm

Ports Antag Objectives from TG

2015-01-30 23:40:41 -05:00

handlabeler.dm

…

paper_bundle.dm

Merge with upstream/master

2015-02-18 13:41:32 -05:00

paper.dm

Merge with upstream/master

2015-02-18 13:41:32 -05:00

paperbin.dm

Shit catches on fire now

2014-07-18 06:32:15 -04:00

pen.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

photocopier.dm

Bug fixes, implements new copying/faxing system from Bay

2014-11-27 21:00:58 +01:00

photography.dm

Merge with upstream/master

2015-02-18 13:41:32 -05:00

silicon_photography.dm

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

2014-07-31 17:38:14 -04:00

stamps.dm

Merge with upstream/master

2015-02-18 13:41:32 -05:00