Merge branch 'master' into upstream-merge-37476

code/modules/hydroponics/biogenerator.dm

@@ -83,9 +83,6 @@
 		update_icon()
 		return
 
-	if(exchange_parts(user, O))
-		return
-
 	if(default_deconstruction_crowbar(O))
 		return
 

code/modules/hydroponics/gene_modder.dm

@@ -69,8 +69,6 @@
 	if(default_deconstruction_screwdriver(user, "dnamod", "dnamod", I))
 		update_icon()
 		return
-	if(exchange_parts(user, I))
-		return
 	if(default_deconstruction_crowbar(I))
 		return
 	if(iscyborg(user))

code/modules/hydroponics/grown.dm

@@ -60,7 +60,7 @@
 
 /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
 	..()
-	if (istype(O, /obj/item/device/plant_analyzer))
+	if (istype(O, /obj/item/plant_analyzer))
 		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.\n"
 		if(seed)
 			msg += seed.get_analyzer_text()

code/modules/hydroponics/grown/pineapple.dm

@@ -29,5 +29,5 @@
 	slices_num = 3
 	filling_color = "#F6CB0B"
 	w_class = WEIGHT_CLASS_NORMAL
-	foodtype = FRUIT
+	foodtype = FRUIT | PINEAPPLE
 	tastes = list("pineapple" = 1)

code/modules/hydroponics/grown/towercap.dm

@@ -68,7 +68,7 @@
 		var/obj/item/reagent_containers/food/snacks/grown/leaf = W
 		if(leaf.dry)
 			user.show_message("<span class='notice'>You wrap \the [W] around the log, turning it into a torch!</span>")
-			var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
+			var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
 			usr.dropItemToGround(W)
 			usr.put_in_active_hand(T)
 			qdel(leaf)

code/modules/hydroponics/growninedible.dm

@@ -34,7 +34,7 @@
 
 /obj/item/grown/attackby(obj/item/O, mob/user, params)
 	..()
-	if (istype(O, /obj/item/device/plant_analyzer))
+	if (istype(O, /obj/item/plant_analyzer))
 		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>\n"
 		if(seed)
 			msg += seed.get_analyzer_text()

code/modules/hydroponics/hydroitemdefines.dm

@@ -1,5 +1,5 @@
 // Plant analyzer
-/obj/item/device/plant_analyzer
+/obj/item/plant_analyzer
 	name = "plant analyzer"
 	desc = "A scanner used to evaluate a plant's various areas of growth."
 	icon = 'icons/obj/device.dmi'

code/modules/hydroponics/hydroponics.dm

@@ -59,9 +59,6 @@
 	if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I))
 		return
 
-	if(exchange_parts(user, I))
-		return
-
 	if(default_pry_open(I))
 		return
 
@@ -761,7 +758,7 @@
 		else
 			to_chat(user, "<span class='warning'>[src] already has seeds in it!</span>")
 
-	else if(istype(O, /obj/item/device/plant_analyzer))
+	else if(istype(O, /obj/item/plant_analyzer))
 		if(myseed)
 			to_chat(user, "*** <B>[myseed.plantname]</B> ***" )
 			to_chat(user, "- Plant Age: <span class='notice'>[age]</span>")

code/modules/hydroponics/seed_extractor.dm

@@ -62,9 +62,6 @@
 	if(default_deconstruction_screwdriver(user, "sextractor_open", "sextractor", O))
 		return
 
-	if(exchange_parts(user, O))
-		return
-
 	if(default_pry_open(O))
 		return
 

code/modules/hydroponics/seeds.dm

@@ -311,7 +311,7 @@
 	return
 
 /obj/item/seeds/attackby(obj/item/O, mob/user, params)
-	if (istype(O, /obj/item/device/plant_analyzer))
+	if (istype(O, /obj/item/plant_analyzer))
 		to_chat(user, "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.</span>")
 		var/text = get_analyzer_text()
 		if(text)