Skip to content

Commit

Permalink
Merge pull request #5767 from OliOliOnsiPree/strawberri
Browse files Browse the repository at this point in the history
Drink Addition + Bug Fixs: Strawberry Soda
  • Loading branch information
Trilbyspaceclone authored Oct 18, 2024
2 parents d7b383f + e76d565 commit b05d1bb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
17 changes: 15 additions & 2 deletions code/modules/reagents/reagents/food-Drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@
scannable = TRUE
common = TRUE

// Reasoning: Table salt is usually iodized. Iodine saturates glands.
// Glands are often getting screwed over by isotopes of iodine if exposed to radiation.
// Reasoning: Table salt is usually iodized. Iodine saturates glands.
// Glands are often getting screwed over by isotopes of iodine if exposed to radiation.
// Yes its a preventatitve method IRL but this is gamyfictaion.

/datum/reagent/sodiumchloride/affect_blood(mob/living/carbon/M, alien, effect_multiplier)
Expand Down Expand Up @@ -1545,6 +1545,19 @@
glass_name = "ice"
glass_desc = "Generally, you're supposed to put something else in there too..."

/datum/reagent/drink/strawberry_explosive_blast
name = "Strawberry Explosive Blast"
id = "strawberry_explosive_blast"
description = "Sweetened drink with a strawberry flavor and a blast from the past."
taste_description = "strawberry soda"
taste_tag = list(TASTE_SWEET, TASTE_BUBBLY)
color = "#C83F49"

glass_unique_appearance = TRUE
glass_icon_state = "strawberryblast"
glass_name = "strawberry explosive blast soda"
glass_desc = "Looks like a delicious drink!"

/* Alcohol */

// Basic
Expand Down
9 changes: 7 additions & 2 deletions code/modules/reagents/recipes/recipes_food_drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@

/datum/chemical_reaction/strawberryicecream
result = null
required_reagents = list("icecreambase" = 10, "berryjuice" = 5)
required_reagents = list("icecreambase" = 10, "strawberryjuice" = 5)
result_amount = 1
blacklist_containers = list(/mob, /obj/machinery/microwave)
mix_message = "The solution freezes into icecream!"
Expand Down Expand Up @@ -787,7 +787,7 @@

/datum/chemical_reaction/strawberrymilk
result = "strawberrymilk"
required_reagents = list("berryjuice" = 1, "milk" = 1)
required_reagents = list("strawberryjuice" = 1, "milk" = 1)
result_amount = 2

/datum/chemical_reaction/drinks/fernetcola
Expand Down Expand Up @@ -898,6 +898,11 @@
required_reagents = list("rum" = 2, "iron" = 1, "vodka" = 1)
result_amount = 3

/datum/chemical_reaction/drinks/strawberry_explosive_blast
result = "strawberry_explosive_blast"
required_reagents = list("strawberryjuice" = 2, "cola" = 1)
result_amount = 3


/* Other */

Expand Down
Binary file modified icons/obj/drinks.dmi
Binary file not shown.

0 comments on commit b05d1bb

Please sign in to comment.