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

..

overmap

Added caching of zlevels.

2014-08-19 19:05:18 +04:00

ashtray.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

guestpass.dm

Fixes guest terminals only allowing 29 minute passes.

2014-07-02 06:46:42 +09:30