cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

garlic reagent

Browse Source
This commit is contained in:
Fox McCloud
2019-09-11 06:33:03 -04:00
parent 5e4521bc82
commit 91d08fb1f6
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/recipes_microwave.dm
+1 -1
View File
@@ -237,7 +237,7 @@
/datum/recipe/microwave/nettlesoup
reagents = list("water" = 10)
items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
result = /obj/item/reagent_containers/food/snacks/nettlesoup
/datum/recipe/microwave/wishsoup
code/modules/hydroponics/grown/nettle.dm
+12 -13
View File
@@ -4,7 +4,7 @@
icon_state = "seed-nettle"
species = "nettle"
plantname = "Nettles"
product = /obj/item/reagent_containers/food/snacks/grown/nettle
product = /obj/item/grown/nettle/basic
lifespan = 30
endurance = 40 // tuff like a toiger
yield = 4
@@ -19,7 +19,7 @@
icon_state = "seed-deathnettle"
species = "deathnettle"
plantname = "Death Nettles"
product = /obj/item/reagent_containers/food/snacks/grown/nettle/death
product = /obj/item/grown/nettle/death
endurance = 25
maturation = 8
yield = 2
@@ -28,8 +28,7 @@
reagents_add = list("facid" = 0.5, "sacid" = 0.5)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/nettle // "snack"
seed = /obj/item/seeds/nettle
/obj/item/grown/nettle //abstract type
name = "nettle"
desc = "It's probably <B>not</B> wise to touch it with bare hands..."
icon = 'icons/obj/items.dmi'
@@ -44,11 +43,11 @@
origin_tech = "combat=3"
attack_verb = list("stung")
/obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user)
/obj/item/grown/nettle/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return BRUTELOSS|TOXLOSS
/obj/item/reagent_containers/food/snacks/grown/nettle/pickup(mob/living/user)
/obj/item/grown/nettle/pickup(mob/living/user)
..()
if(!ishuman(user))
return TRUE
@@ -65,7 +64,7 @@
/obj/item/reagent_containers/food/snacks/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
/obj/item/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity)
return
if(force > 0)
@@ -75,14 +74,14 @@
usr.unEquip(src)
qdel(src)
/obj/item/reagent_containers/food/snacks/grown/nettle/basic
/obj/item/grown/nettle/basic
seed = /obj/item/seeds/nettle
/obj/item/reagent_containers/food/snacks/grown/nettle/basic/add_juice()
/obj/item/grown/nettle/basic/add_juice()
..()
force = round((5 + seed.potency / 5), 1)
/obj/item/reagent_containers/food/snacks/grown/nettle/death
/obj/item/grown/nettle/death
seed = /obj/item/seeds/nettle/death
name = "deathnettle"
desc = "The <span class='danger'>glowing</span> nettle incites <span class='boldannounce'>rage</span> in you just from looking at it!"
@@ -91,11 +90,11 @@
throwforce = 15
origin_tech = "combat=5"
/obj/item/reagent_containers/food/snacks/grown/nettle/death/add_juice()
/obj/item/grown/nettle/death/add_juice()
..()
force = round((5 + seed.potency / 2.5), 1)
/obj/item/reagent_containers/food/snacks/grown/nettle/death/pickup(mob/living/carbon/user)
/obj/item/grown/nettle/death/pickup(mob/living/carbon/user)
. = ..()
if(. && ishuman(user)) // If the pickup succeeded and is humanoid
var/mob/living/carbon/human/H = user
@@ -103,7 +102,7 @@
user.Paralyse(5)
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle when you try picking it up!</span>")
/obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
/obj/item/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
..()
if(isliving(M))
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+2 -2
View File
@@ -29,8 +29,8 @@
/obj/item/stack/sheet/mineral/tranquillite = list("nothing" = 20),
/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
/obj/item/reagent_containers/food/snacks/grown/nettle/basic = list("sacid" = 0),
/obj/item/reagent_containers/food/snacks/grown/nettle/death = list("facid" = 0, "sacid" = 0),
/obj/item/grown/nettle/basic = list("sacid" = 0),
/obj/item/grown/nettle/death = list("facid" = 0, "sacid" = 0),
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
//Blender Stuff
code/modules/reagents/chemistry/reagents/food.dm
+25
View File
@@ -336,6 +336,31 @@
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
return ..()
/datum/reagent/consumable/garlic
name = "Garlic Juice"
id = "garlic"
description = "Crushed garlic. Chefs love it, but it can make you smell bad."
color = "#FEFEFE"
taste_description = "garlic"
metabolization_rate = 0.15 * REAGENTS_METABOLISM
/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.mind && H.mind.vampire && !H.mind.vampire.get_ability(/datum/vampire_passive/full)) //incapacitating but not lethal.
if(prob(min(25, current_cycle)))
to_chat(H, "<span class='danger'>You can't get the scent of garlic out of your nose! You can barely think...</span>")
H.Weaken(1)
H.Jitter(10)
H.fakevomit()
else
if(H.job == "Chef")
if(prob(20)) //stays in the system much longer than sprinkles/banana juice, so heals slower to partially compensate
update_flags |= H.adjustBruteLoss(-1, FALSE)
update_flags |= H.adjustFireLoss(-1, FALSE)
return ..() | update_flags
/datum/reagent/consumable/sprinkles
name = "Sprinkles"
id = "sprinkles"