Merge branch 'master' into upstream-merge-33498

code/modules/hydroponics/beekeeping/beebox.dm

@@ -178,7 +178,7 @@
 					bees -= B
 					B.beehome = null
 					if(B.loc == src)
-						B.loc = get_turf(src)
+						B.forceMove(drop_location())
 					relocated++
 			if(relocated)
 				to_chat(user, "<span class='warning'>This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!</span>")
@@ -201,7 +201,7 @@
 			if(B.isqueen)
 				continue
 			if(B.loc == src)
-				B.loc = get_turf(src)
+				B.forceMove(drop_location())
 			B.target = user
 			bees = TRUE
 		if(bees)
@@ -221,7 +221,7 @@
 				var/obj/item/honey_frame/HF = pick_n_take(honey_frames)
 				if(HF)
 					if(!user.put_in_active_hand(HF))
-						HF.loc = get_turf(src)
+						HF.forceMove(drop_location())
 					visible_message("<span class='notice'>[user] removes a frame from the apiary.</span>")
 
 					var/amtH = HF.honeycomb_capacity
@@ -229,7 +229,7 @@
 					while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
 						var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
 						if(HC)
-							HC.loc = get_turf(user)
+							HC.forceMove(drop_location())
 							amtH--
 							fallen++
 					if(fallen)
@@ -241,12 +241,12 @@
 					to_chat(user, "<span class='warning'>There is no queen bee to remove!</span>")
 					return
 				var/obj/item/queen_bee/QB = new()
-				queen_bee.loc = QB
+				queen_bee.forceMove(QB)
 				bees -= queen_bee
 				QB.queen = queen_bee
 				QB.name = queen_bee.name
 				if(!user.put_in_active_hand(QB))
-					QB.loc = get_turf(src)
+					QB.forceMove(drop_location())
 				visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
 				queen_bee = null
 
@@ -254,8 +254,8 @@
 	new /obj/item/stack/sheet/mineral/wood (loc, 20)
 	for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
 		if(B.loc == src)
-			B.loc = get_turf(src)
+			B.forceMove(drop_location())
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		if(HF.loc == src)
-			HF.loc = get_turf(src)
-	qdel(src)
+			HF.forceMove(drop_location())
+	qdel(src)

code/modules/hydroponics/beekeeping/honeycomb.dm

@@ -10,6 +10,7 @@
 	volume = 10
 	amount_per_transfer_from_this = 0
 	list_reagents = list("honey" = 5)
+	grind_results = list()
 	var/honey_color = ""
 
 /obj/item/reagent_containers/honeycomb/New()

code/modules/hydroponics/biogenerator.dm

@@ -78,7 +78,7 @@
 	if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
 		if(beaker)
 			var/obj/item/reagent_containers/glass/B = beaker
-			B.loc = loc
+			B.forceMove(drop_location())
 			beaker = null
 		update_icon()
 		return

code/modules/hydroponics/gene_modder.dm

@@ -260,7 +260,7 @@
 
 	if(href_list["eject_seed"] && !operation)
 		if (seed)
-			seed.loc = src.loc
+			seed.forceMove(drop_location())
 			seed.verb_pickup()
 			seed = null
 			update_genes()
@@ -275,7 +275,7 @@
 		update_icon()
 	else if(href_list["eject_disk"] && !operation)
 		if (disk)
-			disk.loc = src.loc
+			disk.forceMove(drop_location())
 			disk.verb_pickup()
 			disk = null
 			update_genes()
@@ -368,7 +368,7 @@
 /obj/machinery/plantgenes/proc/insert_seed(obj/item/seeds/S)
 	if(!istype(S) || seed)
 		return
-	S.loc = src
+	S.forceMove(src)
 	seed = S
 	update_genes()
 	update_icon()

code/modules/hydroponics/grown.dm

@@ -15,6 +15,7 @@
 	// Saves us from having to define each stupid grown's dried_type as itself.
 	// If you don't want a plant to be driable (watermelons) set this to null in the time definition.
 	resistance_flags = FLAMMABLE
+	var/dry_grind = FALSE //If TRUE, this object needs to be dry to be ground up
 
 /obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed)
 	. = ..()
@@ -137,6 +138,28 @@
 		return
 	return ..()
 
+/obj/item/reagent_containers/food/snacks/grown/grind_requirements()
+	if(dry_grind && !dry)
+		to_chat(usr, "<span class='warning'>[src] needs to be dry before it can be ground up!</span>")
+		return
+	return TRUE
+
+/obj/item/reagent_containers/food/snacks/grown/on_grind()
+	var/nutriment = reagents.get_reagent_amount("nutriment")
+	if(grind_results.len)
+		for(var/i in 1 to grind_results.len)
+			grind_results[grind_results[i]] = nutriment
+		reagents.del_reagent("nutriment")
+		reagents.del_reagent("vitamin")
+
+/obj/item/reagent_containers/food/snacks/grown/on_juice()
+	var/nutriment = reagents.get_reagent_amount("nutriment")
+	if(juice_results.len)
+		for(var/i in 1 to juice_results.len)
+			juice_results[juice_results[i]] = nutriment
+		reagents.del_reagent("nutriment")
+		reagents.del_reagent("vitamin")
+
 // For item-containing growns such as eggy or gatfruit
 /obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
 	var/obj/item/T

code/modules/hydroponics/grown/apple.dm

@@ -15,6 +15,7 @@
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/apple/gold)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	juice_results = list("applejuice" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/apple
 	seed = /obj/item/seeds/apple

code/modules/hydroponics/grown/banana.dm

@@ -13,6 +13,7 @@
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
 	reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
+	juice_results = list("banana" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/banana
 	seed = /obj/item/seeds/banana

code/modules/hydroponics/grown/beans.dm

@@ -26,6 +26,7 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	grind_results = list("soymilk" = 0)
 
 // Koibean
 /obj/item/seeds/soya/koi

code/modules/hydroponics/grown/berries.dm

@@ -26,6 +26,7 @@
 	filling_color = "#FF00FF"
 	bitesize_mod = 2
 	foodtype = FRUIT
+	juice_results = list("berryjuice" = 0)
 
 // Poison Berries
 /obj/item/seeds/berry/poison
@@ -46,6 +47,7 @@
 	icon_state = "poisonberrypile"
 	filling_color = "#C71585"
 	foodtype = FRUIT | TOXIC
+	juice_results = list("poisonberryjuice" = 0)
 
 // Death Berries
 /obj/item/seeds/berry/death
@@ -121,6 +123,7 @@
 	filling_color = "#FF0000"
 	bitesize_mod = 2
 	foodtype = FRUIT
+	grind_results = list("cherryjelly" = 0)
 
 // Blue Cherries
 /obj/item/seeds/cherry/blue
@@ -142,6 +145,7 @@
 	filling_color = "#6495ED"
 	bitesize_mod = 2
 	foodtype = FRUIT
+	grind_results = list("bluecherryjelly" = 0)
 
 // Grapes
 /obj/item/seeds/grape
@@ -173,6 +177,7 @@
 	filling_color = "#FF1493"
 	bitesize_mod = 2
 	foodtype = FRUIT
+	juice_results = list("grapejuice" = 0)
 
 // Green Grapes
 /obj/item/seeds/grape/green

code/modules/hydroponics/grown/cereals.dm

@@ -22,6 +22,7 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = GRAIN
+	grind_results = list("flour" = 0)
 
 // Oat
 /obj/item/seeds/wheat/oat
@@ -42,6 +43,7 @@
 	filling_color = "#556B2F"
 	bitesize_mod = 2
 	foodtype = GRAIN
+	grind_results = list("flour" = 0)
 
 // Rice
 /obj/item/seeds/wheat/rice
@@ -63,6 +65,7 @@
 	filling_color = "#FAFAD2"
 	bitesize_mod = 2
 	foodtype = GRAIN
+	grind_results = list("rice" = 0)
 
 //Meatwheat - grows into synthetic meat
 /obj/item/seeds/wheat/meat
@@ -83,6 +86,7 @@
 	bitesize_mod = 2
 	seed = /obj/item/seeds/wheat/meat
 	foodtype = MEAT | GRAIN
+	grind_results = list("flour" = 0, "blood" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
 	user.visible_message("<span class='notice'>[user] crushes [src] into meat.</span>", "<span class='notice'>You crush [src] into something that resembles meat.</span>")

code/modules/hydroponics/grown/citrus.dm

@@ -30,6 +30,7 @@
 	desc = "It's so sour, your face will twist."
 	icon_state = "lime"
 	filling_color = "#00FF00"
+	juice_results = list("limejuice" = 0)
 
 // Orange
 /obj/item/seeds/orange
@@ -56,6 +57,7 @@
 	desc = "It's a tangy fruit."
 	icon_state = "orange"
 	filling_color = "#FFA500"
+	juice_results = list("orangejuice" = 0)
 
 // Lemon
 /obj/item/seeds/lemon
@@ -81,6 +83,7 @@
 	desc = "When life gives you lemons, make lemonade."
 	icon_state = "lemon"
 	filling_color = "#FFD700"
+	juice_results = list("lemonjuice" = 0)
 
 // Combustible lemon
 /obj/item/seeds/firelemon //combustible lemon is too long so firelemon

code/modules/hydroponics/grown/corn.dm

@@ -25,6 +25,7 @@
 	trash = /obj/item/grown/corncob
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	juice_results = list("corn_starch" = 0)
 
 /obj/item/grown/corncob
 	name = "corn cob"

code/modules/hydroponics/grown/flowers.dm

@@ -182,6 +182,7 @@
 	throw_speed = 1
 	throw_range = 3
 	attack_verb = list("roasted", "scorched", "burned")
+	grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0)
 
 /obj/item/grown/novaflower/add_juice()
 	..()

code/modules/hydroponics/grown/melon.dm

@@ -33,6 +33,7 @@
 	filling_color = "#008000"
 	bitesize_mod = 3
 	foodtype = FRUIT
+	juice_results = list("watermelonjuice" = 0)
 
 // Holymelon
 /obj/item/seeds/watermelon/holy

code/modules/hydroponics/grown/nettle.dm

@@ -43,6 +43,7 @@
 	throw_speed = 1
 	throw_range = 3
 	attack_verb = list("stung")
+	grind_results = list("sacid" = 0)
 
 /obj/item/grown/nettle/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -91,6 +92,7 @@
 	icon_state = "deathnettle"
 	force = 30
 	throwforce = 15
+	grind_results = list("facid" = 1, "sacid" = 1)
 
 /obj/item/grown/nettle/death/add_juice()
 	..()

code/modules/hydroponics/grown/potato.dm

@@ -17,6 +17,7 @@
 	genes = list(/datum/plant_gene/trait/battery)
 	mutatelist = list(/obj/item/seeds/potato/sweet)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
+	juice_results = list("potato" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/potato
 	seed = /obj/item/seeds/potato

code/modules/hydroponics/grown/pumpkin.dm

@@ -24,6 +24,7 @@
 	filling_color = "#FFA500"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	juice_results = list("pumpkinjuice" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(W.is_sharp())
@@ -53,4 +54,5 @@
 	icon_state = "blumpkin"
 	filling_color = "#87CEFA"
 	bitesize_mod = 2
-	foodtype = VEGETABLES
+	foodtype = VEGETABLES
+	juice_results = list("blumpkinjuice" = 0)

code/modules/hydroponics/grown/root.dm

@@ -22,6 +22,7 @@
 	filling_color = "#FFA500"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	juice_results = list("carrotjuice" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
 	if(I.is_sharp())

code/modules/hydroponics/grown/tea_coffee.dm

@@ -14,7 +14,6 @@
 	icon_dead = "tea-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/tea/astra)
-	reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/tea
 	seed = /obj/item/seeds/tea
@@ -22,6 +21,8 @@
 	desc = "These aromatic tips of the tea plant can be dried to make tea."
 	icon_state = "tea_aspera_leaves"
 	filling_color = "#008000"
+	grind_results = list("teapowder" = 0)
+	dry_grind = TRUE
 
 // Tea Astra
 /obj/item/seeds/tea/astra
@@ -39,6 +40,7 @@
 	name = "Tea Astra tips"
 	icon_state = "tea_astra_leaves"
 	filling_color = "#4582B4"
+	grind_results = list("teapowder" = 0, "salglu_solution" = 0)
 
 
 // Coffee
@@ -67,6 +69,8 @@
 	icon_state = "coffee_arabica"
 	filling_color = "#DC143C"
 	bitesize_mod = 2
+	dry_grind = TRUE
+	grind_results = list("coffeepowder" = 0)
 
 // Coffee Robusta
 /obj/item/seeds/coffee/robusta
@@ -84,4 +88,5 @@
 	seed = /obj/item/seeds/coffee/robusta
 	name = "coffee robusta beans"
 	desc = "Increases robustness by 37 percent!"
-	icon_state = "coffee_robusta"
+	icon_state = "coffee_robusta"
+	grind_results = list("coffeepowder" = 0, "morphine" = 0)

code/modules/hydroponics/grown/tomato.dm

@@ -23,6 +23,8 @@
 	filling_color = "#FF6347"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	grind_results = list("ketchup" = 0)
+	juice_results = list("tomatojuice" = 0)
 
 // Blood Tomato
 /obj/item/seeds/tomato/blood
@@ -44,6 +46,7 @@
 	splat_type = /obj/effect/gibspawner/generic
 	filling_color = "#FF0000"
 	foodtype = VEGETABLES | GROSS
+	grind_results = list("ketchup" = 0, "blood" = 0)
 
 
 // Blue Tomato

code/modules/hydroponics/growninedible.dm

@@ -62,3 +62,7 @@
 
 /obj/item/grown/microwave_act(obj/machine/microwave/M)
 	return
+
+/obj/item/grown/on_grind()
+	for(var/i in 1 to grind_results.len)
+		grind_results[grind_results[i]] = round(seed.potency)

code/modules/hydroponics/hydroponics.dm

@@ -108,7 +108,7 @@
 	var/needs_update = 0 // Checks if the icon needs updating so we don't redraw empty trays every time
 
 	if(myseed && (myseed.loc != src))
-		myseed.loc = src
+		myseed.forceMove(src)
 
 	if(self_sustaining)
 		adjustNutri(1)

code/modules/hydroponics/seed_extractor.dm

@@ -17,7 +17,7 @@
 				return
 			while(t_amount < t_max)
 				var/obj/item/seeds/t_prod = F.seed.Copy()
-				t_prod.loc = seedloc
+				t_prod.forceMove(seedloc)
 				t_amount++
 			qdel(O)
 			return 1
@@ -29,7 +29,7 @@
 				return
 			while(t_amount < t_max)
 				var/obj/item/seeds/t_prod = F.seed.Copy()
-				t_prod.loc = seedloc
+				t_prod.forceMove(seedloc)
 				t_amount++
 			qdel(O)
 		return 1
@@ -168,7 +168,7 @@
 	for (var/obj/T in contents)//Now we find the seed we need to vend
 		var/obj/item/seeds/O = T
 		if (O.plantname == href_list["name"] && O.lifespan == href_list["li"] && O.endurance == href_list["en"] && O.maturation == href_list["ma"] && O.production == href_list["pr"] && O.yield == href_list["yi"] && O.potency == href_list["pot"])
-			O.loc = src.loc
+			O.forceMove(drop_location())
 			break
 
 	src.updateUsrDialog()