Abstracts packaged foods.

Citadel-Station-13 · Sep 26, 2023 · e5187b7 · e5187b7
1 parent a6b0511
commit e5187b7
Show file tree

Hide file tree

Showing 21 changed files with 72 additions and 62 deletions.
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
@@ -734,11 +734,11 @@
 	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
 	icon_state = "snack"
 	products = list(
-		/obj/item/reagent_containers/food/snacks/wrapped = 6,
+		/obj/item/reagent_containers/food/snacks/wrapped/candy = 6,
 		/obj/item/reagent_containers/food/drinks/dry_ramen = 6,
-		/obj/item/reagent_containers/food/snacks/bagged =6,
+		/obj/item/reagent_containers/food/snacks/bagged/chips =6,
 		/obj/item/reagent_containers/food/snacks/bagged/sosjerky = 6,
-		/obj/item/reagent_containers/food/snacks/boxed = 6,
+		/obj/item/reagent_containers/food/snacks/boxed/no_raisin = 6,
 		/obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie = 6,
 		/obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers = 6,
 		/obj/item/reagent_containers/food/snacks/bagged/hotcheesiehonkers = 3,
@@ -756,11 +756,11 @@
 		/obj/item/reagent_containers/food/snacks/boxed/unajerky = 6,
 	)
 	prices = list(
-		/obj/item/reagent_containers/food/snacks/wrapped = 2,
+		/obj/item/reagent_containers/food/snacks/wrapped/candy = 2,
 		/obj/item/reagent_containers/food/drinks/dry_ramen = 5,
-		/obj/item/reagent_containers/food/snacks/bagged = 3,
+		/obj/item/reagent_containers/food/snacks/bagged/chips = 3,
 		/obj/item/reagent_containers/food/snacks/bagged/sosjerky = 3,
-		/obj/item/reagent_containers/food/snacks/boxed = 2,
+		/obj/item/reagent_containers/food/snacks/boxed/no_raisin = 2,
 		/obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie = 2,
 		/obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers = 3,
 		/obj/item/reagent_containers/food/snacks/bagged/hotcheesiehonkers = 6,

diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -155,7 +155,7 @@
 		/obj/item/reagent_containers/hard_candy/lollipop/dylovene,
 		/obj/item/reagent_containers/hard_candy/lollipop/kelotane,
 		/obj/item/reagent_containers/hard_candy/lollipop/tricord,
-		/obj/item/reagent_containers/food/snacks/wrapped,
+		/obj/item/reagent_containers/food/snacks/wrapped/candy,
 		/obj/item/reagent_containers/food/snacks/candy_corn,
 		/obj/item/reagent_containers/food/snacks/cookie,
 		/obj/item/reagent_containers/food/snacks/chocolatebar,
@@ -164,7 +164,7 @@
 		/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket,
 		/obj/item/reagent_containers/food/snacks/ghostburger,
 		/obj/item/reagent_containers/food/snacks/brainburger,
-		/obj/item/reagent_containers/food/snacks/boxed,
+		/obj/item/reagent_containers/food/snacks/boxed/no_raisin,
 		/obj/item/clothing/mask/gas/plaguedoctor,
 		/obj/item/clothing/mask/gas/guy,
 		/obj/item/clothing/mask/gas/goblin,

diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm
@@ -722,14 +722,14 @@
 				/obj/structure/closet/crate/galaksi //GALAKSI JANITOR SUPPLIES
 			),
 			prob(5);list(
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
-				/obj/item/reagent_containers/food/snacks/wrapped,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
+				/obj/item/reagent_containers/food/snacks/wrapped/candy,
 				/obj/structure/closet/crate/allico //GUMMIES
 			),
 			prob(2);list(

diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
@@ -658,7 +658,7 @@
 	drop_get_turf = FALSE
 
 /obj/random/mre/dessert/item_to_spawn()
-	return pick(/obj/item/reagent_containers/food/snacks/wrapped,
+	return pick(/obj/item/reagent_containers/food/snacks/wrapped/candy,
 				/obj/item/reagent_containers/food/snacks/wrapped/proteinbar,
 				/obj/item/reagent_containers/food/snacks/donut/normal,
 				/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
@@ -670,7 +670,7 @@
 	desc = "This is a random vegan dessert for MREs."
 
 /obj/random/mre/dessert/vegan/item_to_spawn()
-	return pick(/obj/item/reagent_containers/food/snacks/wrapped,
+	return pick(/obj/item/reagent_containers/food/snacks/wrapped/candy,
 				/obj/item/reagent_containers/food/snacks/chocolatebar,
 				/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
 				/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit)

diff --git a/code/modules/examine/descriptions/food.dm b/code/modules/examine/descriptions/food.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/snacks/wrapped
+/obj/item/reagent_containers/food/snacks/wrapped/candy
   description_fluff = "The Candy Bar is a copylefted recipe designed by information freedom activists to bring the delicious taste of nougat to the masses. It's cheap, familiar, and easy to synthesize, so most food vendors stock it."
 
 /obj/item/reagent_containers/food/snacks/wrapped/proteinbar
@@ -7,7 +7,7 @@
 /obj/item/reagent_containers/food/snacks/candy_corn
   description_fluff = "Nobody knows why Nanotrasen keeps making these waxy pieces of sugar and bone glue, but a handful of people swear by them. Purportedly popular with Skrell children, dubiously enough."
 
-/obj/item/reagent_containers/food/snacks/bagged
+/obj/item/reagent_containers/food/snacks/bagged/chips
   description_fluff = "Actual potatos haven't been used in potato chips for centuries. They're mostly a denatured nutrient slurry pressed into a chip-shaped mold and salted. Still tastes the same."
 
 /obj/item/reagent_containers/food/snacks/donut
@@ -22,7 +22,7 @@
 /obj/item/reagent_containers/food/snacks/bagged/sosjerky
   description_fluff = "Space Cows, here, being an affectionate name given by early colonists to the massive food synthesizers used to sustain independent outposts before the dominance of hydroponics. Tastes like cardboard rubbed in meat seasoning."
 
-/obj/item/reagent_containers/food/snacks/boxed
+/obj/item/reagent_containers/food/snacks/boxed/no_raisin
   description_fluff = "Originally Raisin Blend no. 4, 4noraisins obtained their current name in the Skadi Positronic Exclusion Crisis of 2442, where they were rebranded as part of the protests." //the exclusion crisis, presumably, involved positronic immigration being banned for no raisin
 
 /obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie

diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm
@@ -18,7 +18,7 @@ var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donu
                                    /obj/item/reagent_containers/food/snacks/popcorn,
                                    /obj/item/reagent_containers/food/snacks/bagged/sosjerky,
                                    /obj/item/reagent_containers/food/snacks/boxed/unajerky,
-                                   /obj/item/reagent_containers/food/snacks/boxed,
+                                   /obj/item/reagent_containers/food/snacks/boxed/no_raisin,
                                    /obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie,
                                    /obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers,
                                    /obj/item/reagent_containers/food/snacks/poppypretzel,

diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
@@ -467,18 +467,6 @@
 	reagents.add_reagent("tricordrazine", 8)
 	bitesize = 3
 
-/obj/item/reagent_containers/food/snacks/wrapped/donor
-	name = "Donor Candy"
-	desc = "A little treat for blood donors."
-	trash = /obj/item/trash/candy
-	nutriment_amt = 9
-	nutriment_desc = list("candy" = 10)
-
-/obj/item/reagent_containers/food/snacks/wrapped/donor/Initialize(mapload)
-	. = ..()
-	reagents.add_reagent("sugar", 3)
-	bitesize = 5
-
 /obj/item/reagent_containers/food/snacks/candy_corn
 	name = "candy corn"
 	desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
@@ -6792,7 +6780,11 @@ END CITADEL CHANGE */
 // Packaged Snack Foods Below
 // Wrapped
 
-/obj/item/reagent_containers/food/snacks/wrapped // Buff 4 >> 8
+/obj/item/reagent_containers/food/snacks/wrapped/candy // Buff 4 >> 8
+	name = "ABSTRACT"
+	desc = "You shouldn't be seeing this. Contact an admin!"
+
+/obj/item/reagent_containers/food/snacks/wrapped/candy // Buff 4 >> 8
 	name = "candy"
 	desc = "Nougat, love it or hate it."
 	icon_state = "candy"
@@ -6804,7 +6796,7 @@ END CITADEL CHANGE */
 	custom_open_sound = 'sound/effects/pageturn2.ogg'
 	open_message = "You peel back the wrapping!"
 
-/obj/item/reagent_containers/food/snacks/wrapped/Initialize(mapload)
+/obj/item/reagent_containers/food/snacks/wrapped/candy/Initialize(mapload)
 	. = ..()
 	reagents.add_reagent("sugar", 4)
 	reagents.add_reagent("protein", 1)
@@ -6868,6 +6860,18 @@ END CITADEL CHANGE */
 	reagents.add_reagent("iron", 1)
 	bitesize = 4
 
+/obj/item/reagent_containers/food/snacks/wrapped/donor
+	name = "Donor Candy"
+	desc = "A little treat for blood donors."
+	trash = /obj/item/trash/candy
+	nutriment_amt = 9
+	nutriment_desc = list("candy" = 10)
+
+/obj/item/reagent_containers/food/snacks/wrapped/donor/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent("sugar", 3)
+	bitesize = 5
+
 /obj/item/reagent_containers/food/snacks/wrapped/proteinbar // Buff 17 >> 21
 	name = "protein bar"
 	desc = "SwoleMAX brand protein bars, guaranteed to get you feeling perfectly overconfident."
@@ -6894,8 +6898,11 @@ END CITADEL CHANGE */
 	bitesize = 2
 
 // Bagged
-
 /obj/item/reagent_containers/food/snacks/bagged // Buff 3 >> 5
+	name = "ABSTRACT"
+	desc = "You shouldn't be seeing this. Contact an admin!"
+
+/obj/item/reagent_containers/food/snacks/bagged/chips // Buff 3 >> 5
 	name = "chips"
 	desc = "Commander Riker's What-The-Crisps"
 	icon_state = "chips"
@@ -6907,7 +6914,7 @@ END CITADEL CHANGE */
 	custom_open_sound = 'sound/bureaucracy/papercrumple.ogg'
 	open_message = "You pull the package open!"
 
-/obj/item/reagent_containers/food/snacks/bagged/Initialize(mapload)
+/obj/item/reagent_containers/food/snacks/bagged/chips/Initialize(mapload)
 	. = ..()
 	bitesize = 2
 
@@ -6951,8 +6958,11 @@ END CITADEL CHANGE */
 	bitesize = 2
 
 // Boxed
+/obj/item/reagent_containers/food/snacks/boxed // Buff 3 >> 5
+	name = "ABSTRACT"
+	desc = "You shouldn't be seeing this. Contact an admin!"
 
-/obj/item/reagent_containers/food/snacks/boxed // Buff 6 >> 12
+/obj/item/reagent_containers/food/snacks/boxed/no_raisin // Buff 6 >> 12
 	name = "4no Raisins"
 	icon_state = "4no_raisins"
 	desc = "Best raisins in the universe. Not sure why."
@@ -6964,7 +6974,7 @@ END CITADEL CHANGE */
 	custom_open_sound = 'sound/misc/boxopen.ogg'
 	open_message = "You pop open the box!"
 
-/obj/item/reagent_containers/food/snacks/boxed/Initialize(mapload)
+/obj/item/reagent_containers/food/snacks/boxed/no_raisin/Initialize(mapload)
 	. = ..()
 	bitesize = 3
 

diff --git a/maps/minitest/levels/sector2.dmm b/maps/minitest/levels/sector2.dmm
@@ -82,7 +82,7 @@
 /area/awaymission/wwmines)
 "as" = (
 /obj/structure/table/woodentable,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet/turcarpet,
 /area/awaymission/wwmines)
 "at" = (

diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm
@@ -3970,7 +3970,7 @@
 /area/shuttle/pirate/bridge)
 "JA" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/tiled/steel_dirty,
 /area/piratebase/mess)
 "JB" = (

diff --git a/maps/sectors/tradeport_140/levels/tradeport_140.dmm b/maps/sectors/tradeport_140/levels/tradeport_140.dmm
@@ -913,7 +913,7 @@
 /area/tradeport)
 "dj" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 8
 	},

diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm
@@ -1460,7 +1460,7 @@
 /area/shuttle/trade_ship/general)
 "fz" = (
 /obj/structure/table/glass,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 8
 	},

diff --git a/maps/submaps/mountains/quarantineshuttle.dmm b/maps/submaps/mountains/quarantineshuttle.dmm
@@ -121,7 +121,7 @@
 "as" = (
 /obj/machinery/vending/snack{
 	contraband = null;
-	products = list(/obj/item/reagent_containers/food/snacks/wrapped=0,/obj/item/reagent_containers/food/drinks/dry_ramen=0,/obj/item/reagent_containers/food/snacks/bagged=0,/obj/item/reagent_containers/food/snacks/bagged/sosjerky=0,/obj/item/reagent_containers/food/snacks/boxed=0,/obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie=0,/obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers=0,/obj/item/reagent_containers/food/snacks/tastybread=0,/obj/item/reagent_containers/food/snacks/wrapped/skrellsnacks=0)
+	products = list(/obj/item/reagent_containers/food/snacks/wrapped/candy=0,/obj/item/reagent_containers/food/drinks/dry_ramen=0,/obj/item/reagent_containers/food/snacks/bagged/chips=0,/obj/item/reagent_containers/food/snacks/bagged/sosjerky=0,/obj/item/reagent_containers/food/snacks/boxed/no_raisin=0,/obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie=0,/obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers=0,/obj/item/reagent_containers/food/snacks/tastybread=0,/obj/item/reagent_containers/food/snacks/wrapped/skrellsnacks=0)
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor_white"

diff --git a/maps/submaps/plains/Boathouse.dmm b/maps/submaps/plains/Boathouse.dmm
@@ -83,7 +83,7 @@
 /area/submap/Boathouse)
 "as" = (
 /obj/structure/table/woodentable,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet/turcarpet,
 /area/submap/Boathouse)
 "at" = (

diff --git a/maps/submaps/plains/Boathouse_vr.dmm b/maps/submaps/plains/Boathouse_vr.dmm
@@ -83,7 +83,7 @@
 /area/submap/Boathouse)
 "as" = (
 /obj/structure/table/woodentable,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet/turcarpet,
 /area/submap/Boathouse)
 "at" = (

diff --git a/maps/submaps/plains/Mechpt.dmm b/maps/submaps/plains/Mechpt.dmm
@@ -16,7 +16,7 @@
 "e" = (
 /obj/structure/railing,
 /obj/structure/table/woodentable,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/template_noop,
 /area/submap/Mechpt)
 "f" = (

diff --git a/maps/submaps/plains/Oldhouse.dmm b/maps/submaps/plains/Oldhouse.dmm
@@ -143,8 +143,8 @@
 /turf/simulated/floor/wood,
 /area/submap/Oldhouse)
 "G" = (
-/obj/item/reagent_containers/food/snacks/bagged,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet/turcarpet,
 /area/submap/Oldhouse)
 "H" = (

diff --git a/maps/submaps/plains/Oldhouse_vr.dmm b/maps/submaps/plains/Oldhouse_vr.dmm
@@ -143,8 +143,8 @@
 /turf/simulated/floor/wood,
 /area/submap/Oldhouse)
 "aG" = (
-/obj/item/reagent_containers/food/snacks/bagged,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet/turcarpet,
 /area/submap/Oldhouse)
 "aH" = (

diff --git a/maps/submaps/plains/Smol3.dmm b/maps/submaps/plains/Smol3.dmm
@@ -28,8 +28,8 @@
 /area/submap/Smol3)
 "g" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/food/snacks/bagged,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,

diff --git a/maps/templates/shelters/shelter_a.dmm b/maps/templates/shelters/shelter_a.dmm
@@ -90,17 +90,17 @@
 /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake,
 /obj/item/reagent_containers/food/snacks/wrapped/proteinbar,
 /obj/item/reagent_containers/food/snacks/wrapped/proteinbar,
-/obj/item/reagent_containers/food/snacks/wrapped,
-/obj/item/reagent_containers/food/snacks/wrapped,
+/obj/item/reagent_containers/food/snacks/wrapped/candy,
+/obj/item/reagent_containers/food/snacks/wrapped/candy,
 /obj/item/reagent_containers/food/drinks/dry_ramen,
 /obj/item/reagent_containers/food/drinks/dry_ramen,
 /obj/item/reagent_containers/food/drinks/dry_ramen,
-/obj/item/reagent_containers/food/snacks/bagged,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /obj/item/reagent_containers/food/snacks/bagged/sosjerky,
 /obj/item/reagent_containers/food/snacks/bagged/sosjerky,
-/obj/item/reagent_containers/food/snacks/boxed,
-/obj/item/reagent_containers/food/snacks/boxed,
+/obj/item/reagent_containers/food/snacks/boxed/no_raisin,
+/obj/item/reagent_containers/food/snacks/boxed/no_raisin,
 /obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie,
 /obj/item/reagent_containers/food/snacks/wrapped/spacetwinkie,
 /obj/item/reagent_containers/food/snacks/bagged/cheesiehonkers,

diff --git a/maps/tether/levels/misc.dmm b/maps/tether/levels/misc.dmm
@@ -1504,7 +1504,7 @@
 /area/space)
 "pP" = (
 /obj/structure/table/standard,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/unsimulated/beach/sand,
 /area/space)
 "pQ" = (

diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm
@@ -20343,7 +20343,7 @@
 	dir = 8
 	},
 /obj/structure/table/woodentable,
-/obj/item/reagent_containers/food/snacks/bagged,
+/obj/item/reagent_containers/food/snacks/bagged/chips,
 /turf/simulated/floor/carpet,
 /area/engineering/break_room)
 "OH" = (