diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9c3739d9d4d..11d7e23472e 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -411,6 +411,34 @@ name = "cookie wrapper" icon_state = "foysnack_trash" +/obj/item/trash/readies + name = "readies wrapper" + icon_state = "readies_trash" + +/obj/item/trash/getmore + name = "getmore chocolate wrapper" + icon_state = "getmore_wrapper" + +/obj/item/trash/getmore_nuts + name = "getmore chocolate wrapper" + icon_state = "getmore_wrapper2" + +/obj/item/trash/getmore_bubbles + name = "getmore chocolate wrapper" + icon_state = "getmore_wrapper3" + +/obj/item/trash/getmore_kelp + name = "getmore chocolate wrapper" + icon_state = "getmore_wrapper4" + +/obj/item/trash/cetibar + name = "tau ceti bar wrapper" + icon_state = "cetibar_wrapper" + +/obj/item/trash/idrisbar + name = "one hundred thousand bar wrapper" + icon_state = "idrisbar_wrapper" + /obj/item/trash/papad name = "empty papad box" icon_state = "papad_trash" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 911f600853e..f777a7c8f3a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1075,16 +1075,17 @@ /obj/item/storage/box/large/candy/fill() var/list/assorted_list = list( - /obj/item/reagent_containers/food/snacks/cb01 = 1, - /obj/item/reagent_containers/food/snacks/cb02 = 1, - /obj/item/reagent_containers/food/snacks/cb03 = 1, - /obj/item/reagent_containers/food/snacks/cb04 = 1, - /obj/item/reagent_containers/food/snacks/cb05 = 1, - /obj/item/reagent_containers/food/snacks/cb06 = 1, - /obj/item/reagent_containers/food/snacks/cb07 = 1, - /obj/item/reagent_containers/food/snacks/cb08 = 1, - /obj/item/reagent_containers/food/snacks/cb09 = 1, - /obj/item/reagent_containers/food/snacks/cb10 = 1 + /obj/item/reagent_containers/food/snacks/chocolate_bar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/nuts = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/kelp = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1 ) for(var/i in 1 to 24) diff --git a/code/game/objects/random/food.dm b/code/game/objects/random/food.dm index 6677ecb8380..0aaf247149e 100644 --- a/code/game/objects/random/food.dm +++ b/code/game/objects/random/food.dm @@ -36,22 +36,23 @@ icon_state = "mre_desert" spawnlist = list( /obj/item/reagent_containers/food/snacks/candy, - /obj/item/reagent_containers/food/snacks/cb01, - /obj/item/reagent_containers/food/snacks/cb02, - /obj/item/reagent_containers/food/snacks/cb03, - /obj/item/reagent_containers/food/snacks/cb04, - /obj/item/reagent_containers/food/snacks/cb05, - /obj/item/reagent_containers/food/snacks/cb06, - /obj/item/reagent_containers/food/snacks/cb07, - /obj/item/reagent_containers/food/snacks/cb08, - /obj/item/reagent_containers/food/snacks/cb09, - /obj/item/reagent_containers/food/snacks/cb10, /obj/item/reagent_containers/food/snacks/proteinbar, /obj/item/reagent_containers/food/snacks/donut/normal, /obj/item/reagent_containers/food/snacks/donut/cherryjelly, /obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/cookie, /obj/item/reagent_containers/food/snacks/poppypretzel, + /obj/item/reagent_containers/food/snacks/chocolate_bar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/nuts, + /obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles, + /obj/item/reagent_containers/food/snacks/chocolate_bar/kelp, + /obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1, /obj/item/storage/box/fancy/gum ) @@ -60,17 +61,6 @@ desc = "This is a random vegan dessert for MREs." spawnlist = list( /obj/item/reagent_containers/food/snacks/candy, - /obj/item/reagent_containers/food/snacks/cb01, - /obj/item/reagent_containers/food/snacks/cb02, - /obj/item/reagent_containers/food/snacks/cb03, - /obj/item/reagent_containers/food/snacks/cb04, - /obj/item/reagent_containers/food/snacks/cb05, - /obj/item/reagent_containers/food/snacks/cb06, - /obj/item/reagent_containers/food/snacks/cb07, - /obj/item/reagent_containers/food/snacks/cb08, - /obj/item/reagent_containers/food/snacks/cb09, - /obj/item/reagent_containers/food/snacks/cb10, - /obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/donut/cherryjelly, /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit ) @@ -278,3 +268,22 @@ spawnlist = list( /obj/structure/reagent_dispensers/cookingoil ) + +/obj/random/chocolate + name = "random chocolate" + desc = "This is a random chocolate." + icon_state = "mre_desert" + spawnlist = list( + /obj/item/reagent_containers/food/snacks/chocolate_bar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/nuts, + /obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles, + /obj/item/reagent_containers/food/snacks/chocolate_bar/kelp, + /obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar, + /obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1, + /obj/item/storage/box/fancy/readies + ) diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm index 88f5213036b..d99e96b10b2 100644 --- a/code/modules/cooking/machinery/commissary.dm +++ b/code/modules/cooking/machinery/commissary.dm @@ -358,7 +358,20 @@ /obj/item/reagent_containers/food/snacks/seaweed = 4, /obj/item/reagent_containers/food/snacks/tuna = 2, /obj/item/reagent_containers/food/drinks/dry_ramen = 3, - /obj/item/reagent_containers/food/snacks/sosjerky = 3 + /obj/item/reagent_containers/food/snacks/sosjerky = 3, + // chocolate + /obj/item/reagent_containers/food/snacks/chocolate_bar = 3, + /obj/item/reagent_containers/food/snacks/chocolate_bar/nuts = 2, + /obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles = 2, + /obj/item/reagent_containers/food/snacks/chocolate_bar/kelp = 2, + /obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar = 2, + /obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar = 5, + /obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar = 1, + /obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar = 1, + /obj/item/storage/box/fancy/readies = 3 ) /obj/item/storage/box/fancy/commissary_restock/food/xeno diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 455239483ca..1ae746f1ac5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -509,118 +509,130 @@ flavor = pick("chocolate", "peanut butter cookie", "scrambled eggs", "beef taco", "tofu", "pizza", "spaghetti", "cheesy potatoes", "hamburger", "baked beans", "maple sausage", "chili macaroni", "veggie burger") return ..() -/obj/item/reagent_containers/food/snacks/cb01 - name = "tau ceti bar" - desc = "A dark chocolate caramel and nougat bar made famous in Biesel." +// Chocolate Bars + +/obj/item/reagent_containers/food/snacks/chocolate_bar + name = "getmore chocolate bar" + desc = "The basic GetMore bar. Cheap milk chocolate loaded with sugar." filling_color = "#552200" icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb01" - - reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) - reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "nougat" = 1, "caramel" = 1)) - bitesize = 2 - w_class = WEIGHT_CLASS_TINY - -/obj/item/reagent_containers/food/snacks/cb02 - name = "hundred thousand credit bar" - desc = "An ironically cheap puffed rice caramel milk chocolate bar." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb02" - - reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) - reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)) - bitesize = 2 - w_class = WEIGHT_CLASS_TINY - -/obj/item/reagent_containers/food/snacks/cb03 - name = "spacewind bar" - desc = "Bubbly milk chocolate." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb03" - reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) - reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 4)) - bitesize = 2 - w_class = WEIGHT_CLASS_TINY - -/obj/item/reagent_containers/food/snacks/cb04 - name = "crunchy crisp" - desc = "An almond flake bar covered in milk chocolate." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb04" - reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) - reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 3, "almonds" = 1)) - bitesize = 2 - w_class = WEIGHT_CLASS_TINY - -/obj/item/reagent_containers/food/snacks/cb05 - name = "hearsay bar" - desc = "A cheap milk chocolate bar loaded with sugar." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb05" + icon_state = "getmore" + trash = /obj/item/trash/getmore reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/sugar = 3) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "vomit" = 1)) - bitesize = 3 + bitesize = 2 w_class = WEIGHT_CLASS_TINY -/obj/item/reagent_containers/food/snacks/cb06 +/obj/item/reagent_containers/food/snacks/chocolate_bar/bubbles + name = "getmore bubbles bar" + desc = "Bubbly milk chocolate. Made by GetMore Corporation!" + icon_state = "getmore_3" + + trash = /obj/item/trash/getmore_bubbles + +/obj/item/reagent_containers/food/snacks/chocolate_bar/nuts + name = "getmore nuts bar" + desc = "An almond flake bar covered in milk chocolate. Made by GetMore Corporation!" + icon_state = "getmore_2" + + trash = /obj/item/trash/getmore_nuts + reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 3, "almonds" = 1)) + +/obj/item/reagent_containers/food/snacks/chocolate_bar/kelp + name = "getmore kelp bar" + desc = "A milk chocolate bar with sea salt and kelp. A favourite on New Gibson. Made by GetMore Corporation!" + icon_state = "getmore_4" + + trash = /obj/item/trash/getmore_kelp + reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "sea salt" = 2, "sugar kelp" = 2)) + +/obj/item/reagent_containers/food/snacks/chocolate_bar/cetibar + name = "tau ceti bar" + desc = "A dark chocolate caramel and nougat bar, a favourite in the Republic of Biesel. Made by GetMore Corporation!" + icon_state = "cetibar" + + trash = /obj/item/trash/cetibar + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) + reagent_data = list(/singleton/reagent/nutriment = list("dark chocolate" = 2, "nougat" = 1, "caramel" = 1)) + +/obj/item/reagent_containers/food/snacks/chocolate_bar/idrisbar + name = "hundred thousand credit bar" + desc = "An ironically cheap puffed rice caramel milk chocolate bar. Made by Idris Incorporated!" + icon_state = "idrisbar" + + trash = /obj/item/trash/idrisbar + reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)) + +/obj/item/reagent_containers/food/snacks/chocolate_bar/lattecrunch name = "latte crunch" desc = "A large latte flavored wafer chocolate bar." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb06" + icon_state = "lattecrunch" reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1)) - bitesize = 3 - w_class = WEIGHT_CLASS_TINY -/obj/item/reagent_containers/food/snacks/cb07 +/obj/item/reagent_containers/food/snacks/chocolate_bar/marsbar name = "martian bar" - desc = "Dark chocolate with a nougat and caramel center. Known as the first chocolate bar grown and produced on Mars." + desc = "Dark chocolate with a nougat and caramel center. A Martian product for a time, but now marketted Spur-wide by GetMore Corp." filling_color = "#552200" icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb07" + icon_state = "marsbar" reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) - reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "nougat" = 1)) - bitesize = 3 - w_class = WEIGHT_CLASS_TINY + reagent_data = list(/singleton/reagent/nutriment = list("dark chocolate" = 2, "caramel" = 1, "nougat" = 1)) -/obj/item/reagent_containers/food/snacks/cb08 +/obj/item/reagent_containers/food/snacks/chocolate_bar/crispbar name = "crisp bar" desc = "A large puffed rice milk chocolate bar." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb08" + icon_state = "crispbar" reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/sugar = 1) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "puffed rice" = 1)) - bitesize = 3 - w_class = WEIGHT_CLASS_TINY -/obj/item/reagent_containers/food/snacks/cb09 +/obj/item/reagent_containers/food/snacks/chocolate_bar/ohdaddybar name = "oh daddy bar" desc = "A massive cluster of peanuts covered in caramel and chocolate." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb09" + icon_state = "ohdaddybar" reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/sugar = 1) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 3, "caramel" = 1, "peanuts" = 2)) - bitesize = 3 - w_class = WEIGHT_CLASS_TINY -/obj/item/reagent_containers/food/snacks/cb10 +/obj/item/reagent_containers/food/snacks/chocolate_bar/laughterbar name = "laughter bar" desc = "Nuts, nougat, peanuts, and caramel covered in chocolate." - filling_color = "#552200" - icon = 'icons/obj/item/reagent_containers/food/processed.dmi' - icon_state = "cb10" + icon_state = "laughterbar" reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/sugar = 1) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)) + +// Chocolate Bars end + +/obj/item/storage/box/fancy/readies + name = "readies eleta balls" + desc = "A packet of ultra-sweet, caramelised soy milk balls in a chocolate shell. A knock off Readian Elata, in turn a knock off of Cytherean Elata. Made by GetMore Corporation!" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "getmore_readies" + icon_type = "getmore_readies" + storage_type = "packaging" + starts_with = list(/obj/item/reagent_containers/food/snacks/readies = 6) + can_hold = list(/obj/item/reagent_containers/food/snacks/readies) + make_exact_fit = TRUE + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/readies + closable = FALSE + icon_overlays = FALSE + +/obj/item/reagent_containers/food/snacks/readies + name = "readies ball" + desc = "An ultra-sweet, caramelised soy milk balls in a chocolate shell." + filling_color = "#552200" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "getmore_readies_ball" + + reagents_to_add = list(/singleton/reagent/sugar = 1, /singleton/reagent/nutriment/glucose = 2) + reagent_data = list(/singleton/reagent/nutriment/glucose = list("overwhelming sweetness" = 8, "sweet caramel" = 4)) bitesize = 3 w_class = WEIGHT_CLASS_TINY diff --git a/html/changelogs/kermit-chocolate-bars.yml b/html/changelogs/kermit-chocolate-bars.yml new file mode 100644 index 00000000000..3df2978dca5 --- /dev/null +++ b/html/changelogs/kermit-chocolate-bars.yml @@ -0,0 +1,9 @@ + +author: kermit + +delete-after: True + +changes: + - rscadd: "Replaces some of the IRL chocolate bars with lore chocolate bars (GetMore chocolate, Readies, an Idris Bar)." + - rscadd: "Adds the chocolate bars (old and new) to commissary restock vendors." + diff --git a/icons/obj/item/reagent_containers/food/processed.dmi b/icons/obj/item/reagent_containers/food/processed.dmi index a93429504b5..bcfe22e5352 100644 Binary files a/icons/obj/item/reagent_containers/food/processed.dmi and b/icons/obj/item/reagent_containers/food/processed.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 8aa593f8c3c..7910e04dd89 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index 506feb7f9f5..d6be2106908 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -2668,13 +2668,13 @@ /area/city/bar) "iM" = ( /obj/structure/table/wood/gamblingtable, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, -/obj/item/reagent_containers/food/snacks/cb04, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, +/obj/item/reagent_containers/food/snacks/ohdaddybar, /obj/effect/map_effect/perma_light{ color = "#300056"; light_color = "#300056" @@ -3945,12 +3945,12 @@ /area/city/costumeroom) "qH" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 }, @@ -7312,13 +7312,13 @@ /area/city/bar) "EO" = ( /obj/structure/table/wood/gamblingtable, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, -/obj/item/reagent_containers/food/snacks/cb07, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, /turf/simulated/floor/carpet/red, /area/city/bar) "EP" = ( @@ -7394,501 +7394,501 @@ /obj/structure/sign/flag/halloween/left{ pixel_y = 29 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb01{ +/obj/random/chocolate{ pixel_y = -6; pixel_x = -12 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb02{ +/obj/random/chocolate{ pixel_y = -6 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb03{ +/obj/random/chocolate{ pixel_x = 16; pixel_y = -5 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb04{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = -9 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb05{ +/obj/random/chocolate{ pixel_y = -2 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb06{ +/obj/random/chocolate{ pixel_y = -2; pixel_x = 10 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb07{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate9{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb09{ +/obj/random/chocolate{ pixel_y = 2; pixel_x = 5 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, -/obj/item/reagent_containers/food/snacks/cb10{ +/obj/random/chocolate{ pixel_y = 8 }, /turf/simulated/floor/marble/dark, @@ -8515,15 +8515,15 @@ /area/city/horrorhouse) "If" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, -/obj/item/reagent_containers/food/snacks/cb08, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, +/obj/random/chocolate, /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 },