Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
@@ -29,5 +29,5 @@
 	slices_num = 3
 	filling_color = "#F6CB0B"
 	w_class = WEIGHT_CLASS_NORMAL
-	foodtype = FRUIT
+	foodtype = FRUIT | PINEAPPLE
 	tastes = list("pineapple" = 1)
@@ -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)