Merge pull request #6253 from CHOMPStation2/upstream-merge-14900

[MIRROR] Better Candy Bars

code/game/objects/items/trash.dm

@@ -431,3 +431,44 @@
 	icon_state = "brainzsnaxred"
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
+
+//Candy Bars (1-10)
+/obj/item/trash/candy/cb01
+	name = "\improper Tau Ceti Bar wrapper"
+	icon_state = "cb01"
+
+/obj/item/trash/candy/cb02
+	name = "\improper Hundred-Thousand Thaler Bar wrapper"
+	icon_state = "cb02"
+
+/obj/item/trash/candy/cb03
+	name = "\improper Lars' Saltlakris wrapper"
+	icon_state = "cb03"
+
+/obj/item/trash/candy/cb04
+	name = "\improper Aerostat Bar wrapper"
+	icon_state = "cb04"
+
+/obj/item/trash/candy/cb05
+	name = "\improper Andromeda Bar wrapper"
+	icon_state = "cb05"
+
+/obj/item/trash/candy/cb06
+	name = "\improper Mocha Crunch wrapper"
+	icon_state = "cb06"
+
+/obj/item/trash/candy/cb07
+	name = "\improper TaroMilk Bar wrapper"
+	icon_state = "cb07"
+
+/obj/item/trash/candy/cb08
+	name = "\improper Cronk Bar wrapper"
+	icon_state = "cb08"
+
+/obj/item/trash/candy/cb09
+	name = "\improper Kaju Mamma! Bar wrapper"
+	icon_state = "cb09"
+
+/obj/item/trash/candy/cb10
+	name = "\improper Shantak Bar wrapper"
+	icon_state = "cb10"

code/modules/food/food/snacks.dm

@@ -6145,6 +6145,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb01"
+	trash = /obj/item/trash/candy/cb01
 	nutriment_amt = 4
 	nutriment_desc = list("stale chocolate" = 2, "nougat" = 1, "caramel" = 1)
 	w_class = 1
@@ -6161,6 +6162,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb02"
+	trash = /obj/item/trash/candy/cb02
 	nutriment_amt = 4
 	nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)
 	w_class = 1
@@ -6177,6 +6179,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb03"
+	trash = /obj/item/trash/candy/cb03
 	nutriment_amt = 4
 	nutriment_desc = list("chocolate" = 4)
 	w_class = 1
@@ -6193,6 +6196,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb04"
+	trash = /obj/item/trash/candy/cb04
 	nutriment_amt = 4
 	nutriment_desc = list("chocolate" = 2, "salt = 1", "licorice" = 1)
 	w_class = 1
@@ -6209,6 +6213,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb05"
+	trash = /obj/item/trash/candy/cb05
 	nutriment_amt = 3
 	nutriment_desc = list("milk chocolate" = 2)
 	w_class = 1
@@ -6225,6 +6230,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb06"
+	trash = /obj/item/trash/candy/cb06
 	nutriment_amt = 4
 	nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1)
 	w_class = 1
@@ -6242,6 +6248,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb07"
+	trash = /obj/item/trash/candy/cb07
 	nutriment_amt = 4
 	nutriment_desc = list("chocolate" = 2, "taro" = 2)
 	w_class = 1
@@ -6258,6 +6265,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb08"
+	trash = /obj/item/trash/candy/cb08
 	nutriment_amt = 3
 	nutriment_desc = list("chocolate" = 2, "malt puffs" = 1)
 	w_class = 1
@@ -6274,6 +6282,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb09"
+	trash = /obj/item/trash/candy/cb09
 	nutriment_amt = 6
 	nutriment_desc = list("peanuts" = 3, "condensed milk" = 1, "cashews" = 2)
 	w_class = 1
@@ -6292,6 +6301,7 @@
 	filling_color = "#552200"
 	icon = 'icons/obj/food_snacks.dmi'
 	icon_state = "cb10"
+	trash = /obj/item/trash/candy/cb10
 	nutriment_amt = 5
 	nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)
 	w_class = 1