cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons.

Browse Source
This commit is contained in:
TZK13
2015-02-10 06:26:03 -06:00
parent 3afdaabbb2
commit edf3364765
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/kitchen machinery/juicer.dm
+1
View File
@@ -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",
)
code/modules/hydroponics/growninedible.dm
+4 -3
View File
@@ -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 << "<span class='danger'>You are heated by the warmth of the of the [name]!</span>"
M.bodytemperature += potency / 2 * TEMPERATURE_DAMAGE_COEFFICIENT
M << "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>"
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
code/modules/reagents/Chemistry-Machinery.dm
+1
View File
@@ -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),
)