mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
Turn Nettles into reagent_containers (#39763)
* Turns nettle into a "snack" * fixes nettle mentions
This commit is contained in:
@@ -172,7 +172,7 @@
|
||||
|
||||
/datum/bounty/item/botany/nettles_death
|
||||
name = "Death Nettles"
|
||||
wanted_types = list(/obj/item/grown/nettle/death)
|
||||
wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/nettle/death)
|
||||
multiplier = 2
|
||||
bonus_desc = "Wear protection when handling them."
|
||||
foodtype = "cheese"
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
reqs = list(
|
||||
/datum/reagent/water = 10,
|
||||
/obj/item/reagent_containers/glass/bowl = 1,
|
||||
/obj/item/grown/nettle = 1,
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle = 1,
|
||||
/obj/item/reagent_containers/food/snacks/grown/potato = 1,
|
||||
/obj/item/reagent_containers/food/snacks/boiledegg = 1
|
||||
)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "seed-nettle"
|
||||
species = "nettle"
|
||||
plantname = "Nettles"
|
||||
product = /obj/item/grown/nettle/basic
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/nettle
|
||||
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/grown/nettle/death
|
||||
product = /obj/item/reagent_containers/food/snacks/grown/nettle/death
|
||||
endurance = 25
|
||||
maturation = 8
|
||||
yield = 2
|
||||
@@ -28,7 +28,8 @@
|
||||
reagents_add = list("facid" = 0.5, "sacid" = 0.5)
|
||||
rarity = 20
|
||||
|
||||
/obj/item/grown/nettle //abstract type
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle // "snack"
|
||||
seed = /obj/item/seeds/nettle
|
||||
name = "nettle"
|
||||
desc = "It's probably <B>not</B> wise to touch it with bare hands..."
|
||||
icon = 'icons/obj/items_and_weapons.dmi'
|
||||
@@ -43,13 +44,12 @@
|
||||
throw_speed = 1
|
||||
throw_range = 3
|
||||
attack_verb = list("stung")
|
||||
grind_results = list("sacid" = 0)
|
||||
|
||||
/obj/item/grown/nettle/suicide_act(mob/user)
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
return (BRUTELOSS|TOXLOSS)
|
||||
|
||||
/obj/item/grown/nettle/pickup(mob/living/user)
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/pickup(mob/living/user)
|
||||
..()
|
||||
if(!iscarbon(user))
|
||||
return FALSE
|
||||
@@ -66,7 +66,7 @@
|
||||
to_chat(C, "<span class='userdanger'>The nettle burns your bare hand!</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/item/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
|
||||
. = ..()
|
||||
if(!proximity)
|
||||
return
|
||||
@@ -76,33 +76,32 @@
|
||||
to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/grown/nettle/basic
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/basic
|
||||
seed = /obj/item/seeds/nettle
|
||||
|
||||
/obj/item/grown/nettle/basic/add_juice()
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/basic/add_juice()
|
||||
..()
|
||||
force = round((5 + seed.potency / 5), 1)
|
||||
|
||||
/obj/item/grown/nettle/death
|
||||
/obj/item/reagent_containers/food/snacks/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!"
|
||||
icon_state = "deathnettle"
|
||||
force = 30
|
||||
throwforce = 15
|
||||
grind_results = list("facid" = 1, "sacid" = 1)
|
||||
|
||||
/obj/item/grown/nettle/death/add_juice()
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/death/add_juice()
|
||||
..()
|
||||
force = round((5 + seed.potency / 2.5), 1)
|
||||
|
||||
/obj/item/grown/nettle/death/pickup(mob/living/carbon/user)
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/death/pickup(mob/living/carbon/user)
|
||||
if(..())
|
||||
if(prob(50))
|
||||
user.Knockdown(100)
|
||||
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle as you try picking it up!</span>")
|
||||
|
||||
/obj/item/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
|
||||
/obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
|
||||
if(!..())
|
||||
return
|
||||
if(isliving(M))
|
||||
|
||||
Reference in New Issue
Block a user