Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

beekeeping

Updates Tools

2017-08-03 04:49:23 -04:00

spreading

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

trays

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

_hydro_setup.dm

…

grown_inedible.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

grown_predefined.dm

…

grown.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

seed_controller.dm

Removes a stray world log

2017-05-03 14:29:43 +01:00

seed_datums_vr.dm

…

seed_datums.dm

Adds Apple Juice.

2018-01-17 07:29:40 +00:00

seed_gene_mut.dm

Adds Gene Targetting mode to Floral Somatoray

2017-05-03 13:33:58 +01:00

seed_machines.dm

Adds Gene Targetting mode to Floral Somatoray

2017-05-03 13:33:58 +01:00

seed_mobs.dm

…

seed_packets_vr.dm

…

seed_packets.dm

Fixes runtime in seed_packets.dm (#4549)

2018-01-16 21:07:38 -06:00

seed_storage_vr.dm

…

seed_storage.dm

Polaris sync

2017-08-06 19:07:17 -04:00

seed.dm

Fixes for nettles (#3854)

2017-09-17 23:45:29 -05:00