cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-28 15:40:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-11-02 13:33:47 +01:00
parent 5d75fa9ed8 4e447985f5
commit ff37a7ac7b
82 changed files with 1122 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_packets.dm
+3
View File
@@ -118,6 +118,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
/obj/item/seeds/glowberryseed
seed_type = "glowberries"
/obj/item/seeds/peppercornseed
seed_type = "peppercorns"
/obj/item/seeds/bananaseed
seed_type = "banana"
code/modules/hydroponics/seed_storage_vr.dm
+2
View File
@@ -24,6 +24,7 @@
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/onionseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/peppercornseed = 2,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
/obj/item/seeds/potatoseed = 3,
@@ -80,6 +81,7 @@
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/peppercornseed = 2,
/obj/item/seeds/plastiseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
code/modules/hydroponics/seedtypes/berries.dm
+13 -1
View File
@@ -67,4 +67,16 @@
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,50)
set_trait(TRAIT_PRODUCT_COLOUR,"#7A5454")
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35)
/datum/seed/berry/peppercorn
name = "peppercorns"
seed_name = "peppercorn berry"
kitchen_tag = "peppercorns"
display_name = "peppercorn bush"
chems = list("blackpepper" = list(5,10))
/datum/seed/berry/peppercorn/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#303030")
set_trait(TRAIT_WATER_CONSUMPTION, 2)