Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/organs/organ.dm

@@ -5,6 +5,7 @@ var/list/organ_cache = list()
 	icon = 'icons/obj/surgery.dmi'
 	germ_level = 0
 	drop_sound = 'sound/items/drop/flesh.ogg'
+	pickup_sound = 'sound/items/pickup/flesh.ogg'
 
 	// Strings.
 	var/organ_tag = "organ"				// Unique identifier.

code/modules/organs/subtypes/diona.dm

@@ -3,7 +3,7 @@
 		return 0
 
 	//This is a terrible hack and I should be ashamed.
-	var/datum/seed/diona = plant_controller.seeds["diona"]
+	var/datum/seed/diona = SSplants.seeds["diona"]
 	if(!diona)
 		return 0