shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tada

Browse Source
This commit is contained in:
TrilbySpaceClone
2019-08-18 01:01:00 -04:00
parent 43b1d0405e
commit 4dae36869c
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/hydroponics/grown/berries.dm
View File

@@ -217,9 +217,9 @@
distill_reagent = "cognac"
// Strawberry
/obj/item/seeds/strawberries
name = "pack of strawberrie seeds"
desc = "These seeds grow into strawberries vines."
/obj/item/seeds/strawberry
name = "pack of strawberry seeds"
desc = "These seeds grow into strawberry vines."
icon_state = "seed-strawberry"
species = "strawberry"
plantname = "Strawberry Vine"
@@ -227,10 +227,10 @@
reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2)
mutatelist = list()
/obj/item/reagent_containers/food/snacks/grown/strawberries
/obj/item/reagent_containers/food/snacks/grown/strawberry
seed = /obj/item/seeds/strawberries
name = "strawberry"
icon_state = "strawberries"
icon_state = "strawberry"
filling_color = "#7FFF00"
tastes = list("strawberries" = 1)
wine_power = 20

18
code/modules/hydroponics/grown/flowers.dm
View File

@@ -102,7 +102,7 @@
icon_state = "seed-sunflower"
species = "sunflower"
plantname = "Sunflowers"
product = /obj/item/reagent_containers/food/snacks/grown/sunflower
product = /obj/item/grown/sunflower
endurance = 20
production = 2
yield = 2
@@ -113,7 +113,7 @@
mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower)
reagents_add = list("cornoil" = 0.08, "nutriment" = 0.04)
/obj/item/reagent_containers/food/snacks/grown/sunflower // FLOWER POWER!
/obj/item/grown/sunflower // FLOWER POWER!
seed = /obj/item/seeds/sunflower
name = "sunflower"
desc = "It's beautiful! A certain person might beat you to death if you trample these."
@@ -129,7 +129,7 @@
throw_range = 3
tastes = list("seeds" = 1)
/obj/item/reagent_containers/food/snacks/grown/sunflower/attack(mob/M, mob/user)
/obj/item/grown/sunflower/attack(mob/M, mob/user)
to_chat(M, "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>")
to_chat(user, "<font color='green'>Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'>strikes [M]</font>")
@@ -169,12 +169,12 @@
plantname = "Novaflowers"
icon_grow = "novaflower-grow"
icon_dead = "sunflower-dead"
product = /obj/item/reagent_containers/food/snacks/grown/novaflower
product = /obj/item/grown/novaflower
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "nutriment" = 0)
rarity = 20
/obj/item/reagent_containers/food/snacks/grown/novaflower
/obj/item/grown/grown/novaflower
seed = /obj/item/seeds/sunflower/novaflower
name = "novaflower"
desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire."
@@ -192,11 +192,11 @@
grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0)
tastes = list("cooked sunflower" = 1)
/obj/item/reagent_containers/food/snacks/grown/novaflower/add_juice()
/obj/item/grown/novaflower/add_juice()
..()
force = round((5 + seed.potency / 5), 1)
/obj/item/reagent_containers/food/snacks/grown/novaflower/attack(mob/living/carbon/M, mob/user)
/obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user)
if(!..())
return
if(isliving(M))
@@ -206,7 +206,7 @@
message_admins("[ADMIN_LOOKUPFLW(user)] set [ADMIN_LOOKUPFLW(M)] on fire with [src] at [AREACOORD(user)]")
log_game("[key_name(user)] set [key_name(M)] on fire with [src] at [AREACOORD(user)]")
/obj/item/reagent_containers/food/snacks/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
/obj/item/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
. = ..()
if(!proximity)
return
@@ -216,7 +216,7 @@
to_chat(usr, "<span class='warning'>All the petals have fallen off the [name] from violent whacking!</span>")
qdel(src)
/obj/item/reagent_containers/food/snacks/grown/novaflower/pickup(mob/living/carbon/human/user)
/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user)
..()
if(!user.gloves)
to_chat(user, "<span class='danger'>The [name] burns your bare hand!</span>")

1
code/modules/hydroponics/growninedible.dm
View File

@@ -7,6 +7,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
resistance_flags = FLAMMABLE
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
var/tastes = list("indescribable" = 1) //Stops runtimes. Grown are un-eatable anyways so if you do then its a bug
/obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed)
. = ..()