Adds canned iced coffee (#22590)

* canned coffee

* Update cola.dm

* Update drinks.dmi

* sprite

* Update drinks.dm

* it never mattered

* Revert "it never mattered"

This reverts commit 88d82a31c4.

* Update drinks.dm

* Update drinks.dm

* Update drinks.dm

code/__DEFINES/food.dm

@@ -19,6 +19,7 @@
 #define SEAFOOD		(1<<18)
 #define MICE		(1<<19) //disliked/liked by anything that dislikes/likes any of RAW, MEAT, or GROSS, except felinids
 #define NUTS 		(1<<20)
+#define COFFEE 		(1<<21)
 
 /// A list of food type names, in order of their flags
 #define FOOD_FLAGS list( \

code/datums/traits/negative.dm

@@ -646,7 +646,8 @@
 	reagent_type = /datum/reagent/drug/caffeine
 	junkie_warning = "You suddenly feel like you need some caffeine..."
 	var/list/weighted_items = list(
-		/obj/item/reagent_containers/food/drinks/coffee = 200,
+		/obj/item/reagent_containers/food/drinks/soda_cans/icedcoffee = 200,
+		/obj/item/reagent_containers/food/drinks/coffee = 100, //who just carries around a styrofoam cup of coffee in their backpack
 		/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 100,
 		/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 100,
 		/obj/item/reagent_containers/food/drinks/mug/tea = 50,

code/modules/food_and_drinks/drinks/drinks.dm

@@ -209,7 +209,7 @@
 	list_reagents = list(/datum/reagent/consumable/coffee/hot = 30)
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
-	foodtype = BREAKFAST
+	foodtype = BREAKFAST | COFFEE
 	var/lid_open = 0
 
 /obj/item/reagent_containers/food/drinks/coffee/no_lid
@@ -595,6 +595,13 @@
 	list_reagents = list(/datum/reagent/consumable/energy_drink/monkey_energy = 50)
 	foodtype = SUGAR | JUNKFOOD
 
+/obj/item/reagent_containers/food/drinks/soda_cans/icedcoffee
+	name = "cold fusion"
+	desc = "Not theoretically possible to be this good."
+	icon_state = "icedcoffeecan"
+	list_reagents = list(/datum/reagent/consumable/coffee/ice = 30)
+	foodtype = DAIRY | COFFEE
+
 /obj/item/reagent_containers/food/drinks/soda_cans/sprited_cranberry
 	name = "Sprited Cranberry"
 	desc = "A limited edition winter spiced cranberry drink."
@@ -618,8 +625,11 @@
 	name = "Mystery Fizz"
 	desc = "Delicious soda with the added flair of mystery flavor! Note, Fizzfazz Inc. not liable for any damages caused by drinking this product."
 	icon_state = "mysterysoda"
-	var/static/list/descs = list("The entire label seems to just be a legal disclaimer.","The label reads off over 200 possible flavors."\
-	, "The date on the cap reads off that the bottle expired a decade ago...")
+	var/static/list/descs = list(
+		"The entire label seems to just be a legal disclaimer.",
+		"The label reads off over 200 possible flavors.",
+		"The date on the cap reads off that the bottle expired a decade ago..."
+		)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/mystery/Initialize(mapload)
 	list_reagents = list(get_random_reagent_id() = 30)

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -806,7 +806,7 @@
 	color = "#ffffff" //very white
 	metabolization_rate = REAGENTS_METABOLISM
 	overdose_threshold = 20 //please don't consume pure caffeine
-	addiction_threshold = 30 //not easy to get addicted to unless you have way too much
+	addiction_threshold = 20 //the addiction isn't that dangerous
 	trippy = FALSE
 	var/list/overdose_text = list("Your head pounds.", "You feel lethargic.", "You feel drowsy.", "You feel weak.", "You just want to sleep.")
 
@@ -833,17 +833,17 @@
  * doesn't call the parent addiction acts because it doesn't function the same way
  */
 /datum/reagent/drug/caffeine/addiction_act_stage1(mob/living/M)
+	if(prob(50) && iscarbon(M))
+		to_chat(M, span_warning(pick(overdose_text))) //don't start getting drowsy right away, just start with warnings from headaches and the like
+
+/datum/reagent/drug/caffeine/addiction_act_stage2(mob/living/M)
 	if(prob(75) && iscarbon(M))
 		apply_drowsy(M)
 
-/datum/reagent/drug/caffeine/addiction_act_stage2(mob/living/M)
+/datum/reagent/drug/caffeine/addiction_act_stage3(mob/living/M)
 	if(prob(60) && iscarbon(M))
 		apply_drowsy(M)
 
-/datum/reagent/drug/caffeine/addiction_act_stage3(mob/living/M)
+/datum/reagent/drug/caffeine/addiction_act_stage4(mob/living/M)
 	if(prob(45) && iscarbon(M))
 		apply_drowsy(M)
-
-/datum/reagent/drug/caffeine/addiction_act_stage4(mob/living/M)
-	if(prob(30) && iscarbon(M))
-		apply_drowsy(M)

code/modules/vending/cola.dm

@@ -15,7 +15,9 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer=10,
-					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
+					/obj/item/reagent_containers/glass/beaker/waterbottle = 10,
+					/obj/item/reagent_containers/food/drinks/soda_cans/icedcoffee = 10 
+					)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
 		              /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
 					  /obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz = 5,