Merge branch 'master' into upstream-merge-33498

code/modules/research/experimentor.dm

@@ -219,8 +219,8 @@
 			return
 		var/turf/dropturf = get_turf(pick(view(1,src)))
 		if(!dropturf) //Failsafe to prevent the object being lost in the void forever.
-			dropturf = get_turf(src)
-		loaded_item.loc = dropturf
+			dropturf = drop_location()
+		loaded_item.forceMove(dropturf)
 		if(delete)
 			qdel(loaded_item)
 		loaded_item = null
@@ -510,7 +510,7 @@
 			throwSmoke(loc)
 			if(trackedRuntime)
 				throwSmoke(trackedRuntime.loc)
-				trackedRuntime.loc = loc
+				trackedRuntime.forceMove(drop_location())
 				investigate_log("Experimentor has stolen Runtime!", INVESTIGATE_EXPERIMENTOR)
 			else
 				new /mob/living/simple_animal/pet/cat(loc)

code/modules/research/xenobiology/xenobiology.dm

@@ -12,6 +12,7 @@
 	throw_speed = 3
 	throw_range = 6
 	container_type = INJECTABLE_1
+	grind_results = list()
 	var/Uses = 1 // uses before it goes inert
 	var/qdel_timer = null // deletion timer, for delayed reactions
 
@@ -29,6 +30,10 @@
 	. = ..()
 	create_reagents(100)
 
+/obj/item/slime_extract/on_grind()
+	if(Uses)
+		grind_results["slimejelly"] = 20
+
 /obj/item/slime_extract/grey
 	name = "grey slime extract"
 	icon_state = "grey slime extract"