Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -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

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

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

_hydro_setup.dm

Fixes #9620

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

grown_inedible.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

grown_predefined.dm

…

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_vr.dm

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

seed_datums.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_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

Better formatting.

2016-05-25 17:45:48 -07:00

seed.dm

Semi-final stage of Xenobio2 Initial Implementation

2016-05-25 03:50:23 -04:00