Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds cinnamon, both as plant and associated chem #15192

Merged
merged 2 commits into from Aug 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions code/WorkInProgress/Particles.dm
Expand Up @@ -816,7 +816,6 @@ var/matrix/MS0101 = matrix(0.1, 0, 0, 0, 0.1, 0)
par.pixel_x += 5
if (src.blow_direction == WEST)
par.pixel_x -= 5
par.color = "#DBDBDB"

first.Turn(rand(-90, 90))
first.Scale(0.1, 0.1)
Expand Down Expand Up @@ -1450,7 +1449,7 @@ var/matrix/MS0101 = matrix(0.1, 0, 0, 0, 0.1, 0)
Sleep(1)

/datum/particleSystem/blow_cig_smoke
New(var/atom/location = null, var/blow_dir = null)
New(var/atom/location = null, var/blow_dir = null, var/color = "#DBDBDB")
var/dir_append = "_n"
switch(blow_dir)
if (EAST)
Expand All @@ -1460,7 +1459,7 @@ var/matrix/MS0101 = matrix(0.1, 0, 0, 0, 0.1, 0)
if(SOUTH)
dir_append = "_s"

..(location, "blow_cig_smoke[dir_append]", 25, "#DBDBDB")
..(location, "blow_cig_smoke[dir_append]", 25, color)
SpawnParticle() //want this particle system to display asap - needs to show up at the same time as its flavor text, not after


Expand Down
62 changes: 62 additions & 0 deletions code/modules/chemistry/Reagents-FoodDrink.dm
Expand Up @@ -3698,6 +3698,68 @@ datum
boutput(M,"<span class= 'notice'>You feel a little less sickly.</span>")
..()

fooddrink/cinnamon
name = "cinnamon"
id = "cinnamon"
description = "With a sweet and aromatic scent, it is commonly used in various culinary applications. Consuming large quantities may be a challenge."
reagent_state = SOLID
fluid_r = 197
fluid_g = 140
fluid_b = 102
transparency = 255
overdose = 20
taste = list("sweet", "aromatic")

do_overdose(var/severity, var/mob/M, var/mult = 1)
if(!M) M = holder.my_atom

if (prob(80))
M.losebreath += (2 * mult)
volume -= overdose
M.changeStatus("stunned", 3 SECONDS)
particleMaster.SpawnSystem(new /datum/particleSystem/blow_cig_smoke(M.loc, M.dir, "#C58C66"))

switch(rand(1, 6))
if (1) M.emote("cough")
if (2) M.emote("wheeze")
if (3) M.emote("gasp")
if (4) M.emote("sputter")
if (5) M.emote("groan")
if (6) M.emote("choke")

var/mob/living/target
var/check_loc = get_step(M, M.dir)
for (var/mob/living/L in check_loc)
target = L
break

if (target)
var/message_append = ""
if (prob(60))
switch(rand(1, 9))
if (1) message_append = " Ouch!"
if (2) message_append = " Looks painful."
if (3) message_append = " Whoa!"
if (4) message_append = " What an idiot."
if (5) message_append = " That's so stupid."
if (6) message_append = " Careless."
if (7) message_append = " Huh."
if (8) message_append = " Why?"
if (9) message_append = " Wow!"
M.visible_message("<span class='alert'><B>[M]</B> blows cinnamon right into <B>[target]</B>'s face![message_append]</span>", group = "[M]_blow_smoke_at_[target]")

if (target)
SPAWN(0) target.emote("cough")
else
var/message
switch(rand(1, 4))
if (1) message = "<B>[M]</B> puffs out a cinnamon cloud!"
if (2) message = "<B>[M]</B> exhales a huge cloud of cinnamon!"
if (3) message = "<B>[M]</B> blows out a cinnamon cloud!"
if (4) message = "<B>[M]</B> exhales some cinnamon from [his_or_her(M)] mouth!"
M.visible_message("<span class='alert'>[message]</span>", group = "blow_smoke")
..()

fooddrink/juice_pickle
name = "pickle juice"
id = "juice_pickle"
Expand Down
14 changes: 14 additions & 0 deletions code/modules/food_and_drink/plants.dm
Expand Up @@ -1445,6 +1445,20 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/plant)
validforhat = 1
food_color = "#e0a80c"

/obj/item/reagent_containers/food/snacks/plant/cinnamon
name = "cinnamon stick"
crop_suffix = " stick"
desc = "A spice known for its sweet and aromatic flavor, often used in cooking and baking."
icon_state = "cinnamonstick"
planttype = /datum/plant/veg/cinnamon
edible = 1
validforhat = 1
food_color = "#C58C66"

make_reagents()
..()
reagents.add_reagent("cinnamon", 20)

/obj/item/reagent_containers/food/snacks/plant/lashberry
name = "lashberry"
desc = "Not nearly as violent as the plant it came from."
Expand Down
6 changes: 5 additions & 1 deletion code/modules/food_and_drink/snacks.dm
Expand Up @@ -1460,13 +1460,17 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
icon_state = "donut2"
item_state = "donut2"
heal_amt = 2
bites_left = 4
initial_reagents = list("sugar"=12)

cinnamon
name = "cinnamon sugar donut"
name = "cinnamon donut"
desc = "One of Delectable Dan's seasonal bestsellers."
icon_state = "donut3"
item_state = "donut3"
heal_amt = 3
bites_left = 4
initial_reagents = list("cinnamon"=12)

robust
name = "robust donut"
Expand Down
14 changes: 14 additions & 0 deletions code/modules/hydroponics/plants_veg.dm
Expand Up @@ -90,6 +90,20 @@ ABSTRACT_TYPE(/datum/plant/veg)
commuts = list(/datum/plant_gene_strain/metabolism_slow,/datum/plant_gene_strain/immunity_toxin)
assoc_reagents = list("currypowder")

/datum/plant/veg/cinnamon
name = "Cinnamon"
seedcolor = "#C58C66"
crop = /obj/item/reagent_containers/food/snacks/plant/cinnamon
starthealth = 80
growtime = 200
harvtime = 220
cropsize = 3
harvests = 10
endurance = 8
genome = 13
commuts = list(/datum/plant_gene_strain/damage_res,/datum/plant_gene_strain/metabolism_slow)
assoc_reagents = list("cinnamon")

/datum/plant/veg/beans
name = "Bean"
seedcolor = "#AA7777"
Expand Down
Binary file modified icons/obj/foodNdrink/food_produce.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/plants_veg.dmi
Binary file not shown.