Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01: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

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

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

paper.dm

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

2014-09-10 22:14:37 +01:00

paperbin.dm

Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping

2014-07-21 12:08:51 +02:00

pen.dm

Merge with dev.

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

photocopier.dm

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

2014-07-29 15:45:22 +02:00

photography.dm

Added ability to pick photo size.

2014-08-19 21:19:23 +04:00

silicon_photography.dm

One can now update crew record photos using a security console.

2014-08-22 19:39:35 +02:00

stamps.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30