Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

beekeeping

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

spreading

Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.

2017-04-11 22:36:48 -04:00

trays

Adds Gene Targetting mode to Floral Somatoray

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

_hydro_setup.dm

Adds cryogenic stasis to hydroponics trays

2016-11-19 02:26:39 +00:00

grown_inedible.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

grown_predefined.dm

…

grown.dm

Buffs Space Vines

2017-02-20 14:22:18 -06:00

seed_controller.dm

Removes a stray world log

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

seed_datums_vr.dm

Makes mushroom sprites show up correctly when harvested (#788)

2016-12-30 23:06:57 -05:00

seed_datums.dm

Arokha SA Rework (Polaris)

2017-03-22 19:32:19 -04: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

Adds mega/shrink shrooms to vendors

2016-12-04 21:07:53 -05:00

seed_packets.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

seed_storage_vr.dm

Adds mega/shrink shrooms to vendors

2016-12-04 21:07:53 -05:00

seed_storage.dm

Eris Vending Machine Sprites

2017-04-23 17:56:43 -04:00

seed.dm

Replace direct access of lighting overlays with T.get_lumcount()

2017-04-12 19:11:53 -04:00