Merge branch 'master' into Cargo_MKII

code/modules/hydroponics/grown/corn.dm

@@ -40,7 +40,7 @@
 	throw_range = 7
 
 /obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params)
-	if(W.is_sharp())
+	if(W.get_sharpness())
 		to_chat(user, "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>")
 		new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
 		qdel(src)

code/modules/hydroponics/grown/potato.dm

@@ -38,7 +38,7 @@
 
 
 /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
-	if(W.is_sharp())
+	if(W.get_sharpness())
 		to_chat(user, "<span class='notice'>You cut the potato into wedges with [W].</span>")
 		var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
 		remove_item_from_storage(user)

code/modules/hydroponics/grown/pumpkin.dm

@@ -28,7 +28,7 @@
 	wine_power = 20
 
 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(W.is_sharp())
+	if(W.get_sharpness())
 		user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
 		new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc)
 		qdel(src)

code/modules/hydroponics/grown/root.dm

@@ -26,7 +26,7 @@
 	wine_power = 30
 
 /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
-	if(I.is_sharp())
+	if(I.get_sharpness())
 		to_chat(user, "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>")
 		var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv
 		remove_item_from_storage(user)

code/modules/hydroponics/grown/tea_coffee.dm

@@ -51,7 +51,6 @@
 	desc = "Long stocks with flowering tips that has a chemical to make feline attracted to it."
 	species = "catnip"
 	plantname = "Catnip Plant"
-	growthstages = 3
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
 	reagents_add = list("catnip" = 0.1, "vitamin" = 0.06, "teapowder" = 0.3)
 	rarity = 50
@@ -59,7 +58,7 @@
 /obj/item/reagent_containers/food/snacks/grown/tea/catnip
 	seed = /obj/item/seeds/tea/catnip
 	name = "Catnip buds"
-	icon_state = "catnip_leaves"
+	icon_state = "catnip"
 	filling_color = "#4582B4"
 	grind_results = list("catnp" = 2, "water" = 1)
 

code/modules/hydroponics/grown/towercap.dm

@@ -120,7 +120,7 @@
 /obj/structure/bonfire/prelit/Initialize()
 	. = ..()
 	StartBurning()
-	
+
 /obj/structure/bonfire/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && (mover.pass_flags & PASSTABLE))
 		return TRUE
@@ -148,7 +148,7 @@
 				add_overlay("bonfire_grill")
 			else
 				return ..()
-	if(W.is_hot())
+	if(W.get_temperature())
 		StartBurning()
 	if(grill)
 		if(user.a_intent != INTENT_HARM && !(W.item_flags & ABSTRACT))