Adds new candies/treats, brownies, and refactors existing wrapped can…

…dy code (#17553) Co-authored-by: beshemoth <beeshemoth@gmail.com> Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
goonstation · Jan 29, 2024 · 029a867 · 029a867
1 parent d1cdf28
commit 029a867
Show file tree

Hide file tree

Showing 25 changed files with 653 additions and 98 deletions.
diff --git a/assets/maps/prefabs/space/prefab_candy_shop.dmm b/assets/maps/prefabs/space/prefab_candy_shop.dmm
@@ -345,14 +345,14 @@
 /area/prefab/candy_shop)
 "Ag" = (
 /obj/table/wood/round/auto,
-/obj/item/reagent_containers/food/snacks/candy/wrapped_pbcup{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/pb_cup{
 	pixel_x = 6;
 	rand_pos = 0
 	},
-/obj/item/reagent_containers/food/snacks/candy/wrapped_pbcup{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/pb_cup{
 	rand_pos = 0
 	},
-/obj/item/reagent_containers/food/snacks/candy/wrapped_pbcup{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/pb_cup{
 	pixel_x = -4;
 	pixel_y = 6;
 	rand_pos = 0
@@ -485,15 +485,15 @@
 /obj/machinery/light/incandescent/cool/very{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/snacks/candy/butterscotch{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/butterscotch{
 	pixel_y = 8;
 	rand_pos = 0
 	},
-/obj/item/reagent_containers/food/snacks/candy/butterscotch{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/butterscotch{
 	pixel_y = 4;
 	rand_pos = 0
 	},
-/obj/item/reagent_containers/food/snacks/candy/butterscotch{
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/butterscotch{
 	rand_pos = 0
 	},
 /turf/simulated/floor/wood/four,

diff --git a/assets/maps/prefabs/underwater/nadir_unsafe/prefab_water_honk.dmm b/assets/maps/prefabs/underwater/nadir_unsafe/prefab_water_honk.dmm
@@ -244,15 +244,15 @@
 	},
 /area/prefab/slimy_honk)
 "aY" = (
-/obj/item/reagent_containers/food/snacks/candy/caramel,
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/caramel,
 /turf/simulated/floor/carpet/purple,
 /area/prefab/slimy_honk)
 "aZ" = (
 /obj/item/balloon_animal/random,
 /turf/simulated/floor/carpet/purple,
 /area/prefab/slimy_honk)
 "bb" = (
-/obj/item/reagent_containers/food/snacks/candy/wrapped_pbcup,
+/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/pb_cup,
 /obj/item/mousetrap/armed,
 /turf/simulated/floor/carpet,
 /area/prefab/slimy_honk)

diff --git a/code/WorkInProgress/Hydrothings.dm b/code/WorkInProgress/Hydrothings.dm
@@ -495,13 +495,6 @@
 				logTheThing(LOG_COMBAT, affected_mob, "was gibbed by the disease [name] at [log_loc(affected_mob)].")
 				affected_mob.gib()
 
-/obj/item/reagent_containers/food/snacks/candy/butterscotch
-	name = "butterscotch candy"
-	desc = "It's one of those old timey butterscotch candies like your grampa used to have."
-	real_name = "butterscotch"
-	icon_state = "butterscotch"
-	food_effects = list("food_energized")
-
 /obj/machinery/floorflusher/bathtub
 	name = "bathtub"
 	desc = "Now, that looks cosy!"

diff --git a/code/WorkInProgress/cabinet.dm b/code/WorkInProgress/cabinet.dm
@@ -262,12 +262,12 @@
 /obj/cabinet/taffy // for psychiatrists to prescribe
 
 	New()
-		slots["1"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/cherry(src)
-		slots["2"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/watermelon(src)
-		slots["3"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/blueraspberry(src)
-		slots["4"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/cherry(src)
-		slots["5"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/watermelon(src)
-		slots["6"] = new /obj/item/reagent_containers/food/snacks/candy/taffy/blueraspberry(src)
+		slots["1"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/cherry(src)
+		slots["2"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/watermelon(src)
+		slots["3"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/blueraspberry(src)
+		slots["4"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/cherry(src)
+		slots["5"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/watermelon(src)
+		slots["6"] = new /obj/item/reagent_containers/food/snacks/candy/wrapped_candy/taffy/blueraspberry(src)
 		rebuildOverlays()
 		return ..()
 

diff --git a/code/WorkInProgress/flourish.dm b/code/WorkInProgress/flourish.dm
@@ -172,7 +172,7 @@ var/list/possible_lost_items = list(
 	/obj/item/reagent_containers/food/snacks/onionchips,
 	/obj/item/reagent_containers/food/snacks/chips,
 	/obj/item/reagent_containers/food/snacks/candy/nougat,
-	/obj/item/reagent_containers/food/snacks/candy/wrapped_pbcup,
+	/obj/item/reagent_containers/food/snacks/candy/wrapped_candy/pb_cup,
 	/obj/item/kitchen/peach_rings,
 	/obj/item/reagent_containers/food/snacks/cookie/dog,
 	/obj/item/toy/plush/small/bee,

diff --git a/code/datums/cookingrecipes.dm b/code/datums/cookingrecipes.dm
@@ -2221,3 +2221,22 @@ ABSTRACT_TYPE(/datum/cookingrecipe/mixer)
 			lipstick.name = "[lipstick.color_name] lipstick"
 			lipstick.UpdateIcon()
 		return lipstick
+
+/datum/cookingrecipe/oven/melted_sugar
+	item1 = /obj/item/reagent_containers/food/snacks/ingredient/sugar
+	item2 = /obj/item/plate/tray
+	cookbonus = 10
+	output = /obj/item/reagent_containers/food/snacks/ingredient/melted_sugar
+
+/datum/cookingrecipe/mixer/brownie_batter
+	item1 = /obj/item/reagent_containers/food/snacks/ingredient/dough_s
+	item2 = /obj/item/reagent_containers/food/snacks/ingredient/egg
+	amt2 = 2
+	item3 = /obj/item/reagent_containers/food/snacks/candy/chocolate
+	cookbonus = 10
+	output = /obj/item/reagent_containers/food/snacks/ingredient/brownie_batter
+
+/datum/cookingrecipe/oven/brownie_batch
+	item1 = /obj/item/reagent_containers/food/snacks/ingredient/brownie_batter
+	cookbonus = 14
+	output = /obj/item/reagent_containers/food/snacks/brownie_batch/