diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm index 94696028027..7006fb779a5 100644 --- a/code/modules/food&drinks/kitchen machinery/juicer.dm +++ b/code/modules/food&drinks/kitchen machinery/juicer.dm @@ -20,6 +20,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = "lemonjuice", /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = "orangejuice", /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = "limejuice", + /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = "watermelonjuice", /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = "watermelonjuice", /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison = "poisonberryjuice", ) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index b1eab4fc945..3c9f0ad8c6c 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -126,7 +126,7 @@ throw_speed = 1 throw_range = 3 plant_type = 0 - attack_verb = list("seared", "heated", "whacked", "steamed") + attack_verb = list("roasted", "scorched", "burned") /obj/item/weapon/grown/novaflower/add_juice() if(..()) @@ -138,8 +138,9 @@ /obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) if(!..()) return if(istype(M, /mob/living)) - M << "You are heated by the warmth of the of the [name]!" - M.bodytemperature += potency / 2 * TEMPERATURE_DAMAGE_COEFFICIENT + M << "You are lit on fire from the intense heat of the [name]!" + M.adjust_fire_stacks(potency / 5) + M.IgniteMob() /obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user as mob,proximity) if(!proximity) return diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 97d07b4d732..3b6aa7d5d7b 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -926,6 +926,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = list("orangejuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = list("limejuice" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = list("watermelonjuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0), )