14 Commits

Author	SHA1	Message	Date
PsiOmega	f760d44127	Merge remote-tracking branch 'upstream/master' into dev ... Conflicts: code/game/objects/items/weapons/candle.dm code/modules/paperwork/paper.dm	2015-04-28 08:43:31 +02:00
Kelenius	159ad76fab	Fixes #8998	2015-04-27 08:06:21 +03:00
PsiOmega	1ae0ad6d92	Updates the atom_pool, now datum_pool, to handle any datum object. ... Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.	2015-04-24 09:59:05 +02:00
mwerezak	01ce8d4a1f	Fixes #8696 ... Fixes #8696, and updates other usages of drop_item() where appropriate.	2015-03-31 20:30:06 -04:00
Zuhayr	7cbe2c94fb	Fixes #8388	2015-03-17 19:19:28 +10:30
Zuhayr	0b2ca42600	Tweaks.	2015-02-21 20:56:55 +10:30
Zuhayr	8fb5836e4f	Generalized fruit products properly.	2015-02-13 03:52:46 +10:30
Zuhayr	c5e2feb5f1	Merge with dev.	2015-02-05 20:24:06 +10:30
Zuhayr	5a1980aabd	Updated seed storage to use trait procs.	2015-02-04 22:19:37 +10:30
Zuhayr	09b9500486	Compile fixes. Seed storage is still broken.	2015-02-04 22:00:07 +10:30
Kelenius	9edb5751fb	Adds tobacco and maps in drying racks	2015-02-03 22:24:49 +03:00
Kelenius	746e1acf8d	Added variety (uid) field to seed vendors	2015-01-17 20:52:06 +03:00
Kelenius	31768af22f	Removes the now useless New()	2015-01-12 09:43:18 +03:00
Kelenius	d66857757a	Replaces seed vendors with seed storages	2015-01-12 09:36:04 +03:00