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.

Sign up for GitHub

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

Jump to bottom

De-purifies Souto #290

Merged
merged 8 commits into from
Jun 25, 2024
+67 −26
Merged

De-purifies Souto #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40f0a45
rare cigs
Meatstuff882 May 28, 2024
bda2444
delicious corn syrup
Meatstuff882 Jun 6, 2024
e109162
adds sucralose for diet SOUTO
Meatstuff882 Jun 6, 2024
0f7e6ac
new souto flavour
Meatstuff882 Jun 9, 2024
e268c9a
Merge branch 'master' into SOUTO
AndroBetel Jun 11, 2024
b18c924
Merge branch 'PvE-CMSS13:master' into SOUTO
Meatstuff882 Jun 12, 2024
3118a6e
Update cans.dm
Meatstuff882 Jun 23, 2024
257d6fd
Update other.dm
Meatstuff882 Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 52 additions & 26 deletions code/game/objects/items/reagent_containers/food/cans.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
/obj/item/reagent_container/food/drinks/cans/boda
name = "\improper Boda"
desc = "State regulated soda beverage. Enjoy comrades."
desc_lore = "Designed back in 2159, the advertising campaign for BODA started out as an attempt by the UPP to win the hearts and minds of colonists and settlers across the galaxy. Soon after, the ubiquitous cyan vendors and large supplies of the drink began to crop up in UA warehouses with seemingly no clear origin. Despite some concerns, after initial testing determined that the stored products were safe for consumption and surprisingly popular when blind-tested with focus groups, the strange surplus of BODA was authorized for usage within the UA-associated colonies. Subsequently, it enjoyed a relative popularity before falling into obscurity in the coming decades as supplies dwindled."
desc_lore = "Designed back in 2159, the advertising campaign for BODA started out as an attempt by the UPP to win the hearts and minds of colonists and settlers across the galaxy. Soon after, the ubiquitous cyan vendors and large supplies of the drink began to crop up in UA warehouses with seemingly no clear origin. Despite some concerns, after initial testing determined that the stored products were safe for consumption and surprisingly popular when blind-tested with focus groups, the strange surplus of BODA was authorized for usage within the UA-associated colonies. Subsequently, it enjoyed a relative popularity before falling into obscurity in the coming decades as supplies dwindled."
icon_state = "boda"
center_of_mass = "x=16;y=10"

Expand Down Expand Up @@ -347,10 +347,6 @@
icon_state = "souto_diet_classic"
item_state = "souto_diet_classic"

/obj/item/reagent_container/food/drinks/cans/souto/diet/Initialize()
. = ..()
reagents.add_reagent("water", 25)
AndroBetel marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/reagent_container/food/drinks/cans/souto/classic
name = "\improper Souto Classic"
desc = "The can boldly proclaims it to be tangerine flavored. You can't help but think that's a lie. Canned in Havana."
Expand All @@ -359,7 +355,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/classic/Initialize()
. = ..()
reagents.add_reagent("souto_classic", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_classic", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/classic
name = "\improper Diet Souto"
Expand All @@ -369,7 +367,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/classic/Initialize()
. = ..()
reagents.add_reagent("souto_classic", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_classic", 20)

/obj/item/reagent_container/food/drinks/cans/souto/cherry
name = "\improper Cherry Souto"
Expand All @@ -379,7 +379,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/cherry/Initialize()
. = ..()
reagents.add_reagent("souto_cherry", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_cherry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry
name = "\improper Diet Cherry Souto"
Expand All @@ -389,7 +391,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/cherry/Initialize()
. = ..()
reagents.add_reagent("souto_cherry", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_cherry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/lime
name = "\improper Lime Souto"
Expand All @@ -399,7 +403,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/lime/Initialize()
. = ..()
reagents.add_reagent("souto_lime", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_lime", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/lime
name = "\improper Diet Lime Souto"
Expand All @@ -409,7 +415,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/lime/Initialize()
. = ..()
reagents.add_reagent("souto_lime", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_lime", 20)

/obj/item/reagent_container/food/drinks/cans/souto/grape
name = "\improper Grape Souto"
Expand All @@ -419,7 +427,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/grape/Initialize()
. = ..()
reagents.add_reagent("souto_grape", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_grape", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/grape
name = "\improper Diet Grape Souto"
Expand All @@ -429,7 +439,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/grape/Initialize()
. = ..()
reagents.add_reagent("souto_grape", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_grape", 20)

/obj/item/reagent_container/food/drinks/cans/souto/blue
name = "\improper Blue Raspberry Souto"
Expand All @@ -440,7 +452,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/blue/Initialize()
. = ..()
reagents.add_reagent("souto_blueraspberry", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_blueraspberry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/blue
name = "\improper Diet Blue Raspberry Souto"
Expand All @@ -450,7 +464,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/blue/Initialize()
. = ..()
reagents.add_reagent("souto_blueraspberry", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_blueraspberry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/peach
name = "\improper Peach Souto"
Expand All @@ -460,7 +476,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/peach/Initialize()
. = ..()
reagents.add_reagent("souto_peach", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_peach", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/peach
name = "\improper Diet Peach Souto"
Expand All @@ -470,7 +488,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/peach/Initialize()
. = ..()
reagents.add_reagent("souto_peach", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_peach", 20)

/obj/item/reagent_container/food/drinks/cans/souto/cranberry
name = "\improper Cranberry Souto"
Expand All @@ -480,7 +500,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/cranberry/Initialize()
. = ..()
reagents.add_reagent("souto_cranberry", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_cranberry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry
name = "\improper Diet Cranberry Souto"
Expand All @@ -490,8 +512,9 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/cranberry/Initialize()
. = ..()
reagents.add_reagent("souto_cranberry", 25)
reagents.add_reagent("water", 25)
reagents.add_reagent("sucralose", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_cranberry", 20)

/obj/item/reagent_container/food/drinks/cans/souto/vanilla
name = "\improper Vanilla Souto"
Expand All @@ -511,29 +534,32 @@

/obj/item/reagent_container/food/drinks/cans/souto/diet/vanilla/Initialize()
. = ..()
reagents.add_reagent("sodawater", 25)
reagents.add_reagent("souto_vanilla", 25)
reagents.add_reagent("water", 25)

/obj/item/reagent_container/food/drinks/cans/souto/pineapple
name = "\improper Pineapple Souto"
desc = "This tastes like battery acid with a full cup of sugar mixed in. Canned in Havana."
desc = "This tastes like battery acid with a full cup of corn syrup mixed in. Canned in Havana."
icon_state = "souto_pineapple"
item_state = "souto_pineapple"

/obj/item/reagent_container/food/drinks/cans/souto/pineapple/Initialize()
. = ..()
reagents.add_reagent("souto_pineapple", 50)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_pineapple", 20)

/obj/item/reagent_container/food/drinks/cans/souto/diet/pineapple
name = "\improper Diet Pineapple Souto"
desc = "This tastes like battery acid with a half cup of sugar mixed in. Canned in Havana."
desc = "This tastes like battery acid with a full cup of sugar substitute mixed in. Canned in Havana."
icon_state = "souto_diet_pineapple"
item_state = "souto_diet_pineapple"

/obj/item/reagent_container/food/drinks/cans/souto/diet/pineapple/Initialize()
. = ..()
reagents.add_reagent("souto_pineapple", 25)
reagents.add_reagent("water", 25)
reagents.add_reagent("cornsyrup", 15)
reagents.add_reagent("sodawater", 15)
reagents.add_reagent("souto_pineapple", 20)

//ASPEN

Expand Down
15 changes: 15 additions & 0 deletions code/modules/reagents/chemistry_reagents/other.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,21 @@
properties = list(PROPERTY_NUTRITIOUS = 1)
flags = REAGENT_TYPE_MEDICAL

/datum/reagent/cornsyrup
name = "High-Fructose Corn Syrup"
id = "cornsyrup"
description = "Ah, some good old, all-american, high-fructose corn syrup. Sickeningly sweet. There's worse things you can put in your body, but very few of them are made to be put there."
color = "#593512" // rgb: 89, 53, 18
chemclass = CHEM_CLASS_NONE
properties = list(PROPERTY_NUTRITIOUS = 1)

/datum/reagent/sucralose
name = "Sucralose"
id = "sucralose"
description = "600 times the flavor of sugar, with none of the calories!"
color = "#FFFFFF" // rgb: 255, 255, 255
chemclass = CHEM_CLASS_NONE

/datum/reagent/glycerol
name = "Glycerol"
id = "glycerol"
Expand Down
Loading