Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -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

Randomized Plant Update (#1805)

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

_hydro_setup.dm

…

grown_inedible.dm

…

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

…

seed_datums_vr.dm

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

2016-05-08 23:11:03 -04: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

…

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

Randomized Plant Update (#1805)

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