Merge pull request #6148 from Verkister/patch-22

Removes melee damage from snacks.

code/modules/food/food/snacks.dm

@@ -16,7 +16,7 @@
 	var/list/nutriment_desc = list("food" = 1)
 	center_of_mass = list("x"=16, "y"=16)
 	w_class = ITEMSIZE_SMALL
-	force = 1
+	force = 0
 
 /obj/item/weapon/reagent_containers/food/snacks/Initialize()
 	. = ..()
@@ -3878,4 +3878,4 @@
 	. = ..()
 	reagents.add_reagent("nutriment", 6)
 	reagents.add_reagent("protein", 4)
-	bitesize = 3
+	bitesize = 3

code/modules/hydroponics/grown.dm

@@ -62,6 +62,8 @@
 	update_desc()
 	if(reagents.total_volume > 0)
 		bitesize = 1+round(reagents.total_volume / 2, 1)
+	if(seed.get_trait(TRAIT_STINGS))
+		force = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_desc()
 

code/modules/hydroponics/seed.dm

@@ -728,6 +728,9 @@
 					clr = get_trait(TRAIT_BIOLUM_COLOUR)
 				product.set_light(get_trait(TRAIT_BIOLUM), l_color = clr)
 
+			if(get_trait(TRAIT_STINGS))
+				product.force = 1
+
 			//Handle spawning in living, mobile products (like dionaea).
 			if(istype(product,/mob/living))
 				product.visible_message("<span class='notice'>The pod disgorges [product]!</span>")