Merge branch 'master' into upstream-merge-30079

code/modules/hydroponics/beekeeping/beebox.dm

@@ -25,7 +25,7 @@
 
 /obj/structure/beebox
 	name = "apiary"
-	desc = "Dr Miles Manners is just your average wasp-themed super hero by day, but by night he becomes DR BEES!"
+	desc = "Dr. Miles Manners is just your average wasp-themed super hero by day, but by night he becomes DR. BEES!"
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "beebox"
 	anchored = TRUE
@@ -45,9 +45,7 @@
 /obj/structure/beebox/Destroy()
 	STOP_PROCESSING(SSobj, src)
 	bees.Cut()
-	bees = null
 	honeycombs.Cut()
-	honeycombs = null
 	queen_bee = null
 	return ..()
 
@@ -151,7 +149,7 @@
 			honey_frames += HF
 		else
 			to_chat(user, "<span class='warning'>There's no room for any more frames in the apiary!</span>")
-
+		return
 	if(istype(I, /obj/item/wrench))
 		if(default_unfasten_wrench(user, I, time = 20))
 			return
@@ -187,6 +185,9 @@
 			to_chat(user, "<span class='warning'>The queen bee disappeared! Disappearing bees have been in the news lately...</span>")
 
 		qdel(qb)
+		return
+
+	..()
 
 
 /obj/structure/beebox/attack_hand(mob/user)
@@ -203,8 +204,10 @@
 			bees = TRUE
 		if(bees)
 			visible_message("<span class='danger'>[user] disturbs the bees!</span>")
+		else
+			visible_message("<span class='danger'>[user] disturbs the [name] to no effect!</span>")
 	else
-		var/option = alert(user, "What action do you wish to perform?","Apiary","Remove a Honey Frame","Remove the Queen Bee")
+		var/option = alert(user, "What action do you wish to perform?","Apiary","Remove a Honey Frame","Remove the Queen Bee", "Cancel")
 		if(!Adjacent(user))
 			return
 		switch(option)
@@ -244,3 +247,13 @@
 					QB.loc = get_turf(src)
 				visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
 				queen_bee = null
+
+/obj/structure/beebox/deconstruct(disassembled = TRUE)
+	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)
+	for(var/obj/item/honey_frame/HF in honey_frames)
+		if(HF.loc == src)
+			HF.loc = get_turf(src)
+	qdel(src)

code/modules/hydroponics/grown/cannabis.dm

@@ -113,7 +113,7 @@
 
 /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
 	seed = /obj/item/seeds/cannabis/ultimate
-	name = "omega cannibas leaf"
+	name = "omega cannabis leaf"
 	desc = "You feel dizzy looking at it. What the fuck?"
 	icon_state = "ocannabis"
 	volume = 420

code/modules/hydroponics/grown/kudzu.dm

@@ -42,8 +42,10 @@
 	qdel(src)
 
 /obj/item/seeds/kudzu/attack_self(mob/user)
-	plant(user)
-	to_chat(user, "<span class='notice'>You plant the kudzu. You monster.</span>")
+	user.visible_message("<span class='danger'>[user] begins throwing seeds on the ground...</span>")
+	if(do_after(user, 50, needhand = TRUE, target = user.drop_location(), progress = TRUE))
+		plant(user)
+		to_chat(user, "<span class='notice'>You plant the kudzu. You monster.</span>")
 
 /obj/item/seeds/kudzu/get_analyzer_text()
 	var/text = ..()

code/modules/hydroponics/hydroponics.dm

@@ -915,9 +915,11 @@
 	name = "soil"
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "soil"
+	circuit = null
 	density = FALSE
 	use_power = NO_POWER_USE
-	unwrenchable = 0
+	flags_1 = NODECONSTRUCT_1
+	unwrenchable = FALSE
 
 /obj/machinery/hydroponics/soil/update_icon_hoses()
 	return // Has no hoses