mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Added growing and rolling your own weed, tobacco, tea, coffee
This commit is contained in:
@@ -897,6 +897,12 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium = list("plasticide" = 5),
|
||||
|
||||
//Grinder stuff, but only if dry
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica = list("coffeepowder" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta = list("coffeepowder" = 0, "hyperzine" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera = list("teapowder" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra = list("teapowder" = 0, "kelotane" = 0),
|
||||
|
||||
|
||||
//archaeology!
|
||||
/obj/item/weapon/rocksliver = list("ground_rock" = 50),
|
||||
@@ -923,6 +929,16 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0),
|
||||
)
|
||||
|
||||
var/list/dried_items = list(
|
||||
|
||||
//Grinder stuff, but only if dry
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica = list("coffeepowder" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta = list("coffeepowder" = 0, "hyperzine" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera = list("teapowder" = 0),
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra = list("teapowder" = 0, "kelotane" = 0),
|
||||
)
|
||||
|
||||
|
||||
|
||||
var/list/holdingitems = list()
|
||||
|
||||
@@ -974,6 +990,12 @@
|
||||
src.updateUsrDialog()
|
||||
return 0
|
||||
|
||||
if(is_type_in_list(O, dried_items))
|
||||
if(!O:dry)
|
||||
user << "You must dry that first!"
|
||||
return 1
|
||||
|
||||
|
||||
if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
|
||||
user << "Cannot refine into a reagent."
|
||||
return 1
|
||||
|
||||
@@ -2465,6 +2465,21 @@ datum
|
||||
..()
|
||||
return
|
||||
|
||||
toxin/coffeepowder
|
||||
name = "Coffee Grounds"
|
||||
id = "coffeepowder"
|
||||
description = "Finely ground coffee beans, used to make coffee."
|
||||
reagent_state = SOLID
|
||||
color = "#5B2E0D" // rgb: 91, 46, 13
|
||||
|
||||
toxin/teapowder
|
||||
name = "Ground Tea Leaves"
|
||||
id = "teapowder"
|
||||
description = "Finely shredded tea leaves, used for making tea."
|
||||
reagent_state = SOLID
|
||||
color = "#7F8400" // rgb: 127, 132, 0
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -1365,6 +1365,21 @@ datum
|
||||
required_reagents = list("water" = 5, "coco" = 1)
|
||||
result_amount = 5
|
||||
|
||||
coffee
|
||||
name = "Coffee"
|
||||
id = "coffee"
|
||||
result = "coffee"
|
||||
required_reagents = list("coffeepowder" = 1, "water" = 5)
|
||||
result_amount = 5
|
||||
|
||||
tea
|
||||
name = "Tea"
|
||||
id = "tea"
|
||||
result = "tea"
|
||||
required_reagents = list("teapowder" = 1, "water" = 5)
|
||||
result_amount = 5
|
||||
|
||||
|
||||
soysauce
|
||||
name = "Soy Sauce"
|
||||
id = "soysauce"
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
var/yield = 0
|
||||
var/potency = -1
|
||||
var/plant_type = 0
|
||||
var/dry = 0
|
||||
icon = 'icons/obj/harvest.dmi'
|
||||
New(newloc,newpotency)
|
||||
if (!isnull(newpotency))
|
||||
@@ -340,6 +341,23 @@
|
||||
reagents.add_reagent("toxin", 1+round(potency / 10, 1))
|
||||
bitesize = 1+round(reagents.total_volume / 2, 1)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris/attackby(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/rollingpaper))
|
||||
if(src.dry == 1)
|
||||
user.u_equip(W)
|
||||
var/obj/item/clothing/mask/cigarette/joint/J = new /obj/item/clothing/mask/cigarette/joint(user.loc)
|
||||
J.chem_volume = src.reagents.total_volume
|
||||
src.reagents.trans_to(J, J.chem_volume)
|
||||
del(W)
|
||||
user.put_in_active_hand(J)
|
||||
user << "\blue You roll the ambrosia vulgaris into a rolling paper."
|
||||
del(src)
|
||||
else
|
||||
user << "\red You need to dry this first."
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
|
||||
seed = "/obj/item/seeds/ambrosiadeus"
|
||||
name = "ambrosia deus branch"
|
||||
@@ -357,6 +375,22 @@
|
||||
reagents.add_reagent("space_drugs", 1+round(potency / 10, 1))
|
||||
bitesize = 1+round(reagents.total_volume / 2, 1)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus/attackby(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/rollingpaper))
|
||||
if(src.dry == 1)
|
||||
user.u_equip(W)
|
||||
var/obj/item/clothing/mask/cigarette/joint/deus/J = new /obj/item/clothing/mask/cigarette/joint/deus(user.loc)
|
||||
J.chem_volume = src.reagents.total_volume
|
||||
src.reagents.trans_to(J, J.chem_volume)
|
||||
del(W)
|
||||
user.put_in_active_hand(J)
|
||||
user << "\blue You roll the ambrosia deus into a rolling paper."
|
||||
del(src)
|
||||
else
|
||||
user << "\red You need to dry this first."
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
|
||||
seed = "/obj/item/seeds/appleseed"
|
||||
name = "apple"
|
||||
@@ -1040,3 +1074,100 @@
|
||||
src.visible_message("<span class='notice'>The [src.name] has been squashed, causing a distortion in space-time.</span>","<span class='moderate'>You hear a splat and a crackle.</span>")
|
||||
del(src)
|
||||
return
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica
|
||||
seed = "/obj/item/seeds/coffee_arabica_seed"
|
||||
name = "coffee arabica beans"
|
||||
desc = "Dry them out to make coffee."
|
||||
icon_state = "coffee_arabica"
|
||||
potency = 20
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.add_reagent("coffeepowder", 1+round((potency / 10), 2))
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta
|
||||
seed = "/obj/item/seeds/coffee_robusta_seed"
|
||||
name = "coffee robusta beans"
|
||||
desc = "Dry them out to make coffee."
|
||||
icon_state = "coffee_robusta"
|
||||
potency = 20
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.add_reagent("coffeepowder", 1+round((potency / 10), 2))
|
||||
reagents.add_reagent("hyperzine", 1+round((potency / 20), 1))
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco
|
||||
seed = "/obj/item/seeds/tobacco_seed"
|
||||
name = "tobacco leaves"
|
||||
desc = "Dry them out to make some smokes."
|
||||
icon_state = "tobacco_leaves"
|
||||
potency = 20
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/attackby(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/rollingpaper))
|
||||
if(src.dry == 1)
|
||||
user.u_equip(W)
|
||||
var/obj/item/clothing/mask/cigarette/J = new /obj/item/clothing/mask/cigarette(user.loc)
|
||||
src.reagents.trans_to(J, J.chem_volume)
|
||||
del(W)
|
||||
user.put_in_active_hand(J)
|
||||
user << "\blue You roll the tobacco into a rolling paper."
|
||||
del(src)
|
||||
else
|
||||
user << "\red You need to dry this first."
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco_space
|
||||
seed = "/obj/item/seeds/tobacco_space_seed"
|
||||
name = "space tobacco leaves"
|
||||
desc = "Dry them out to make some space-smokes."
|
||||
icon_state = "stobacco_leaves"
|
||||
potency = 20
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.add_reagent("dexalin", 1+round((potency / 20), 1))
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco_space/attackby(var/obj/item/W as obj, var/mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/rollingpaper))
|
||||
if(src.dry == 1)
|
||||
user.u_equip(W)
|
||||
var/obj/item/clothing/mask/cigarette/J = new /obj/item/clothing/mask/cigarette(user.loc)
|
||||
src.reagents.trans_to(J, J.chem_volume)
|
||||
del(W)
|
||||
user.put_in_active_hand(J)
|
||||
user << "\blue You roll the space tobacco into a rolling paper."
|
||||
del(src)
|
||||
else
|
||||
user << "\red You need to dry this first."
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera
|
||||
seed = "/obj/item/seeds/tea_aspera_seed"
|
||||
name = "Tea Aspera tips"
|
||||
desc = "These aromatic tips of the tea plant can be dried to make tea."
|
||||
icon_state = "tea_aspera_leaves"
|
||||
potency = 20
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.add_reagent("teapowder", 1+round((potency / 10), 2))
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra
|
||||
seed = "/obj/item/seeds/tea_astra_seed"
|
||||
name = "Tea Astra tips"
|
||||
desc = "These aromatic tips of the tea plant can be dried to make tea."
|
||||
icon_state = "tea_astra_leaves"
|
||||
potency = 20
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.add_reagent("teapowder", 1+round((potency / 10), 2))
|
||||
reagents.add_reagent("kelotane", 1+round((potency / 20), 1))
|
||||
Reference in New Issue
Block a user