Skip to content

Commit

Permalink
#FEELTHEGOOF Election PR: This is what the local conservative radio s…
Browse files Browse the repository at this point in the history
…aid all sanders voters wanted (tgstation#19105)

Added a new plant to the game to encourage the Chef to be a more relevant job, alongside a recipe for a food related to it. Throw a cannabis leaf on a table and check the recipes list to find it.
  • Loading branch information
Iamgoofball authored and optimumtact committed Jul 9, 2016
1 parent dcdafc1 commit 5755a41
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3,
/obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3)
contraband = list(/obj/item/seeds/amanita = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/liberty = 2,/obj/item/seeds/nettle = 2,
/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2)
/obj/item/seeds/plump = 2,/obj/item/seeds/reishi = 2,/obj/item/seeds/cannabis = 3)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)


Expand Down
7 changes: 7 additions & 0 deletions code/modules/food_and_drinks/food/snacks_pastry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,13 @@
bonus_reagents = list("omnizine" = 3)
list_reagents = list("nutriment" = 4, "omnizine" = 3)

/obj/item/weapon/reagent_containers/food/snacks/dankpocket
name = "\improper Dank-pocket"
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4)
filling_color = "#00FF00"

/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
category = CAT_FOOD

/datum/crafting_recipe/food/dankpocket
time = 15
name = "Dankpocket"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/dankpocket
category = CAT_FOOD

////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////

Expand Down
115 changes: 115 additions & 0 deletions code/modules/hydroponics/grown/cannabis.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
// Cannabis
/obj/item/seeds/cannabis
name = "pack of cannabis seeds"
desc = "Taxable."
icon = 'goon/icons/obj/hydroponics.dmi'
icon_state = "seed-cannabis"
species = "cannabis"
plantname = "Cannabis Plant"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis
maturation = 8
oneharvest = 0
potency = 20
growthstages = 1
growing_icon = 'goon/icons/obj/hydroponics.dmi'
icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes
icon_dead = "cannabis-dead" // Same for the dead icon
mutatelist = list(/obj/item/seeds/cannabis/rainbow,
/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/white,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("space_drugs" = 0.15, "lipolicide" = 0.35) // gives u the munchies


/obj/item/seeds/cannabis/rainbow
name = "pack of rainbow weed seeds"
desc = "These seeds grow into rainbow weed. Groovy."
icon_state = "seed-megacannabis"
species = "megacannabis"
plantname = "Rainbow Weed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
mutatelist = list()
reagents_add = list("mindbreaker" = 0.15, "lipolicide" = 0.35)
rarity = 40

/obj/item/seeds/cannabis/death
name = "pack of deathweed seeds"
desc = "These seeds grow into deathweed. Not groovy."
icon_state = "seed-blackcannabis"
species = "blackcannabis"
plantname = "Deathweed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
rarity = 40

/obj/item/seeds/cannabis/white
name = "pack of lifeweed seeds"
desc = "I will give unto him that is munchies of the fountain of the cravings of life, freely."
icon_state = "seed-whitecannabis"
species = "whitecannabis"
plantname = "Lifeweed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
mutatelist = list()
reagents_add = list("omnizine" = 0.35, "space_drugs" = 0.15, "lipolicide" = 0.15)
rarity = 40


/obj/item/seeds/cannabis/ultimate
name = "pack of omega weed seeds"
desc = "These seeds grow into omega weed."
icon_state = "seed-ocannabis"
species = "ocannabis"
plantname = "Omega Weed"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
mutatelist = list()
reagents_add = list("space_drugs" = 0.03,
"mindbreaker" = 0.03,
"mercury" = 0.015,
"lithium" = 0.015,
"atropine" = 0.015,
"haloperidol" = 0.015,
"methamphetamine" = 0.015,
"capsaicin" = 0.015,
"barbers_aid" = 0.015,
"bath_salts" = 0.015,
"itching_powder" = 0.015,
"crank" = 0.015,
"krokodil" = 0.015,
"histamine" = 0.015,
"lipolicide" = 0.015)
rarity = 69


// ---------------------------------------------------------------

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis
seed = /obj/item/seeds/cannabis
icon = 'goon/icons/obj/hydroponics.dmi'
name = "cannabis leaf"
desc = "Recently legalized in most galaxies."
icon_state = "cannabis"
filling_color = "#00FF00"
bitesize_mod = 2


/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/rainbow
seed = /obj/item/seeds/cannabis/rainbow
desc = "Is it supposed to be glowing like that...?"
icon_state = "megacannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/death
seed = /obj/item/seeds/cannabis/death
desc = "Looks a bit dark. Oh well."
icon_state = "blackcannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/white
seed = /obj/item/seeds/cannabis/white
desc = "It feels smooth and nice to the touch."
icon_state = "whitecannabis"

/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis/ultimate
seed = /obj/item/seeds/cannabis/ultimate
desc = "You feel dizzy looking at it. What the fuck?"
icon_state = "ocannabis"
volume = 69
4 changes: 2 additions & 2 deletions code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,9 @@
toxpwr = 0.5

/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M)
if(!holder.has_reagent("nutriment"))
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(0.5*REM, 0)
M.nutrition = max( M.nutrition - 5 * REAGENTS_METABOLISM, 0)
M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time
M.overeatduration = 0
return ..()

Expand Down
Binary file added goon/icons/obj/hydroponics.dmi
Binary file not shown.
Binary file modified icons/obj/food/food.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,7 @@
#include "code\modules\hydroponics\grown\banana.dm"
#include "code\modules\hydroponics\grown\beans.dm"
#include "code\modules\hydroponics\grown\berries.dm"
#include "code\modules\hydroponics\grown\cannabis.dm"
#include "code\modules\hydroponics\grown\cereals.dm"
#include "code\modules\hydroponics\grown\chili.dm"
#include "code\modules\hydroponics\grown\citrus.dm"
Expand Down

0 comments on commit 5755a41

Please sign in to comment.