De-purifies Souto

code/game/objects/items/reagent_containers/food/cans.dm

@@ -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"
 
@@ -349,7 +349,7 @@
 
 /obj/item/reagent_container/food/drinks/cans/souto/diet/Initialize()
 	. = ..()
-	reagents.add_reagent("water", 25)
+
 
 /obj/item/reagent_container/food/drinks/cans/souto/classic
 	name = "\improper Souto Classic"
@@ -359,7 +359,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"
@@ -369,7 +371,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"
@@ -379,7 +383,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"
@@ -389,7 +395,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"
@@ -399,7 +407,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"
@@ -409,7 +419,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"
@@ -419,7 +431,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"
@@ -429,7 +443,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"
@@ -440,7 +456,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"
@@ -450,7 +468,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"
@@ -460,7 +480,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"
@@ -470,7 +492,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"
@@ -480,7 +504,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"
@@ -490,8 +516,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"
@@ -511,29 +538,32 @@
 
 /obj/item/reagent_container/food/drinks/cans/souto/diet/vanilla/Initialize()
 	. = ..()
-	reagents.add_reagent("souto_vanilla", 25)
-	reagents.add_reagent("water", 25)
+	reagents.add_reagent("sodawater", 25)
+	reagents.add_reagent("souto_vanilla", 22)
 
 /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
 

code/modules/client/preferences_gear.dm

@@ -905,10 +905,6 @@ var/global/list/gear_datums_by_name = list()
 	path = /obj/item/clothing/mask/cigarette/cigar
 	cost = 2
 
-/datum/gear/smoking/pack_emerald_green
-	display_name = "Pack Of Emerald Greens"
-	path = /obj/item/storage/fancy/cigarettes/emeraldgreen
-
 /datum/gear/smoking/pack_lucky_strikes
 	display_name = "Pack Of Lucky Strikes"
 	path = /obj/item/storage/fancy/cigarettes/lucky_strikes

code/modules/reagents/chemistry_reagents/other.dm

@@ -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 = 2)
+
+/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"