SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi

2016-07-13 17:07:52 -04:00

..

beekeeping

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

spreading

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

trays

item_state cleanup

2016-07-11 22:31:32 -04:00

_hydro_setup.dm

Fixes #9620

2015-06-10 23:14:33 +09:30

grown_inedible.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

grown_predefined.dm

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

grown.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

seed_controller.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

seed_datums.dm

Ported and rewrote several cooking machines from Apollo by request.

2016-06-29 13:59:24 -04:00

seed_machines.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

seed_mobs.dm

Fixes #10054, fixes some mushroom issues.

2015-07-09 04:25:36 +09:30

seed_packets.dm

Adds in lavender. Doesn't need much nutrient or water (assuming i did the numbers right, feel free to fix them if i did a dumb), contains a small amount of bicard, and is purple. What more could one want from a flower?

2016-05-25 13:08:33 -07:00

seed_storage.dm

Properly alphabetizes lavender in the vending machines.

2016-07-11 20:16:56 -07:00

seed.dm

Randomized Plant Update (#1805)

2016-05-31 15:08:42 +01:00