9 Commits

Author	SHA1	Message	Date
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
Whitellama	f5c9586153	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
Zuhayr	4ef8a08310	Added portable_atmospherics to hydroponics machine path, couple of other tweaks.	2014-07-27 03:20:16 +09:30
SkyMarshal	efcad9f527	Removal of Telescience.	2014-04-16 20:23:56 -07:00
Segrain	cba6dac062	Fix for unlocking exploit.	2014-02-09 13:34:40 +03:00
Zuhayr	37d96ebc80	Nerfs abandoned crates to be less fucking moronic.	2014-01-02 00:42:11 +10:30
Zuhayr	f638f1db96	Prevented the ability to open locked crates with random items.	2014-01-01 21:33:23 +10:30
Iamgoofball	7dcb47ec2a	R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.	2013-11-20 15:19:24 -08:00
Iamgoofball	7fa80e799a	made head PDA carts be in lockboxes. Added Abandoned Crates!	2013-11-20 14:57:22 -08:00