From ef9b94990fe3c43bf4c9d5e8ebe5a42a2deddcea Mon Sep 17 00:00:00 2001
From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com>
Date: Sat, 6 Jul 2024 02:17:59 -0600
Subject: [PATCH] Lunchbox additions, fixes liquid ration problem (#6572)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

- Fixes things not being properly pathed and resulting in an invisible
"snack" where LiquidFood was intended instead.

Adds the following to the lunchbox loadout options:
- LiquidProtein Ration
- Blood Sausage
- Moghesian Sea Delight
- Bludbox and Bludbox Light
- Milk and Chocolate Milk
- Dumb Bitch Juice

## Why It's Good For The Game

This is primarily a PR focused on giving vetalan, xenochimera, unathi,
or just someone who likes blood some lunch options for their lunchbox.
Otherwise, fixes good.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Adds a few new options for the lunchbox loadout item, particularly
blood-related foods for vetalan and xenochimera folk.
fix: A few areas where liquidfood was pathed improperly is now pathed
properly.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/game/machinery/vending/drinks.dm         |  2 +-
 code/game/objects/random/maintenance.dm       |  2 +-
 code/modules/awaymissions/loot_vr.dm          |  2 +-
 code/modules/examine/descriptions/food.dm     |  2 +-
 code/modules/food/drinks/carton.dm            |  6 ++---
 code/modules/food/food/lunch.dm               | 13 ++++++++--
 code/modules/food/food/snacks.dm              |  7 ++++++
 .../modules/maps/overmap/space/talon/talon.dm |  2 +-
 code/modules/random_map/drop/drop_types.dm    | 12 +++++-----
 maps/away_missions/140x140/zoo.dmm            |  8 +++----
 maps/away_missions/archive/desertbase.dmm     |  8 +++----
 maps/map_levels/140x140/alienship.dmm         |  8 +++----
 maps/rift/levels/rift-11-orbital.dmm          | 24 +++++++++----------
 maps/submaps/mountains/cultmine.dmm           |  2 +-
 maps/templates/admin/mercbase.dmm             |  8 +++----
 maps/triumph/levels/flagship.dmm              | 24 +++++++++----------
 16 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/code/game/machinery/vending/drinks.dm b/code/game/machinery/vending/drinks.dm
index fd0deaf476f..01cb17e9091 100644
--- a/code/game/machinery/vending/drinks.dm
+++ b/code/game/machinery/vending/drinks.dm
@@ -62,7 +62,7 @@
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5,
-		/obj/item/reagent_containers/food/snacks/liquidfood = 6,
+		/obj/item/reagent_containers/food/snacks/liquid = 6,
 		/obj/item/reagent_containers/food/drinks/cans/dumbjuice = 4,
 		/obj/item/reagent_containers/food/drinks/cans/geometer = 2
 	)
diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm
index 653ccb086ff..a2613ba2563 100644
--- a/code/game/objects/random/maintenance.dm
+++ b/code/game/objects/random/maintenance.dm
@@ -46,7 +46,7 @@ something, make sure it's not in one of the other lists.*/
 				prob(2);/obj/item/clothing/mask/gas/half,
 				prob(4);/obj/item/clothing/mask/breath,
 				prob(2);/obj/item/reagent_containers/glass/rag,
-				prob(4);/obj/item/reagent_containers/food/snacks/liquidfood,
+				prob(4);/obj/item/reagent_containers/food/snacks/liquid,
 				prob(2);/obj/item/storage/secure/briefcase,
 				prob(4);/obj/item/storage/briefcase,
 				prob(5);/obj/item/storage/backpack,
diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm
index c78b8787132..3d628ac9890 100644
--- a/code/modules/awaymissions/loot_vr.dm
+++ b/code/modules/awaymissions/loot_vr.dm
@@ -273,7 +273,7 @@
 			/obj/item/reagent_containers/food/snacks/cookie, \
 			/obj/item/reagent_containers/food/snacks/meatball, \
 			/obj/item/reagent_containers/food/snacks/plump_pie, \
-			/obj/item/reagent_containers/food/snacks/liquidfood)
+			/obj/item/reagent_containers/food/snacks/liquid)
 			for(var/i=0,i<num,i++)
 				new new_type(C)
 		if("alien")
diff --git a/code/modules/examine/descriptions/food.dm b/code/modules/examine/descriptions/food.dm
index 1c59fdd0c20..f9ee74e42b4 100644
--- a/code/modules/examine/descriptions/food.dm
+++ b/code/modules/examine/descriptions/food.dm
@@ -40,7 +40,7 @@
 /obj/item/reagent_containers/food/snacks/twobread
   description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'"
 
-/obj/item/reagent_containers/food/snacks/liquidfood
+/obj/item/reagent_containers/food/snacks/liquid
   description_fluff = "A survival food commonly packed onto short-distance bluespace shuttles and similar vessels. Tastes like chalk, but is packed full of nutrients and will keep you alive."
 
 /obj/item/reagent_containers/food/snacks/tastybread
diff --git a/code/modules/food/drinks/carton.dm b/code/modules/food/drinks/carton.dm
index 14644aff852..1f298f68fb5 100644
--- a/code/modules/food/drinks/carton.dm
+++ b/code/modules/food/drinks/carton.dm
@@ -48,7 +48,7 @@
 
 /obj/item/reagent_containers/food/drinks/bludboxmax
 	name = "Bludbox MAX carton"
-	desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietry needs!"
+	desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietary needs!"
 	volume = 30
 	icon_state = "bludboxmax"
 	center_of_mass = list("x"=16, "y"=9)
@@ -68,7 +68,7 @@
 
 /obj/item/reagent_containers/food/drinks/bludbox
 	name = "Bludbox carton"
-	desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends."
+	desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietary requirements for your undead friends."
 	volume = 30
 	icon_state = "bludbox"
 	center_of_mass = list("x"=16, "y"=9)
@@ -78,7 +78,7 @@
 
 /obj/item/reagent_containers/food/drinks/bludboxlight
 	name = "Bludbox Light carton"
-	desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends. This one has less sweeteners, gross!"
+	desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietary requirements for your undead friends. This one has less sweeteners, gross!"
 	volume = 30
 	icon_state = "bludboxlight"
 	center_of_mass = list("x"=16, "y"=9)
diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm
index 5b988fe7ee9..c75cb4d568b 100644
--- a/code/modules/food/food/lunch.dm
+++ b/code/modules/food/food/lunch.dm
@@ -7,9 +7,11 @@ var/list/lunchables_lunches_ = list(/obj/item/reagent_containers/food/snacks/san
                                   /obj/item/reagent_containers/food/snacks/slice/mushroompizza/filled,
                                   /obj/item/reagent_containers/food/snacks/slice/vegetablepizza/filled,
                                   /obj/item/reagent_containers/food/snacks/tastybread,
-                                  /obj/item/reagent_containers/food/snacks/liquidfood,
+                                  /obj/item/reagent_containers/food/snacks/liquid,
+								  /obj/item/reagent_containers/food/snacks/liquid/protein,
                                   /obj/item/reagent_containers/food/snacks/jellysandwich/cherry,
                                   /obj/item/reagent_containers/food/snacks/tossedsalad,
+								  /obj/item/reagent_containers/food/snacks/riztizkzi_sea/include_blood,
                                   /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose)
 
 var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donut/jelly,
@@ -39,6 +41,7 @@ var/list/lunchables_snacks_ = list(/obj/item/reagent_containers/food/snacks/donu
                                    /obj/item/reagent_containers/food/snacks/watermelonslice,
                                    /obj/item/reagent_containers/food/snacks/slice/applecake/filled,
                                    /obj/item/reagent_containers/food/snacks/slice/pumpkinpie/filled,
+								   /obj/item/reagent_containers/food/snacks/bloodsausage,
                                    /obj/item/reagent_containers/food/snacks/wrapped/skrellsnacks)
 
 var/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans/cola,
@@ -52,8 +55,14 @@ var/list/lunchables_drinks_ = list(/obj/item/reagent_containers/food/drinks/cans
                                    /obj/item/reagent_containers/food/drinks/cans/grape_juice,
                                    /obj/item/reagent_containers/food/drinks/cans/tonic,
                                    /obj/item/reagent_containers/food/drinks/cans/sodawater,
+								   /obj/item/reagent_containers/food/drinks/cans/dumbjuice,
                                    /obj/item/reagent_containers/food/drinks/bottle/small/sassafras,
-                                   /obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla)
+                                   /obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla,
+								   /obj/item/reagent_containers/food/drinks/smallmilk,
+								   /obj/item/reagent_containers/food/drinks/smallchocmilk,
+								   /obj/item/reagent_containers/food/drinks/bludbox,
+								   /obj/item/reagent_containers/food/drinks/bludboxlight,
+								   )
 
 // This default list is a bit different, it contains items we don't want
 var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing,
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index ccfdd4d9bed..e4bcd83093d 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -5014,6 +5014,13 @@ END CITADEL CHANGE */
 	. = ..()
 	reagents.add_reagent("egg", 4)
 
+//for spawning in by admins, or loadout, since blood isn't added into the reagents otherwise.
+/obj/item/reagent_containers/food/snacks/riztizkzi_sea/include_blood
+
+/obj/item/reagent_containers/food/snacks/riztizkzi_sea/include_blood/Initialize(mapload)
+	. = ..()
+	reagents.add_reagent("blood", 15)
+
 /obj/item/reagent_containers/food/snacks/father_breakfast
 	name = "breakfast of champions"
 	desc = "A sausage and an omelette on top of a grilled steak."
diff --git a/code/modules/maps/overmap/space/talon/talon.dm b/code/modules/maps/overmap/space/talon/talon.dm
index 6c89bea14d5..a890bf27df6 100644
--- a/code/modules/maps/overmap/space/talon/talon.dm
+++ b/code/modules/maps/overmap/space/talon/talon.dm
@@ -347,7 +347,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/talon, 26)
 		/obj/item/clothing/under/rank/pilot1,
 		/obj/item/clothing/suit/storage/toggle/bomber/pilot,
 		/obj/item/clothing/gloves/fingerless,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
+		/obj/item/reagent_containers/food/snacks/liquid,
 		/obj/item/reagent_containers/food/drinks/cans/waterbottle,
 		/obj/item/radio,
 		/obj/item/clothing/under/utility/blue,
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index ef1d9044b9f..0b7db3ee822 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -181,12 +181,12 @@ var/global/list/datum/supply_drop_loot/supply_drop
 /datum/supply_drop_loot/food/New()
 	..()
 	contents = list(
-		/obj/item/reagent_containers/food/snacks/liquidfood,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
-		/obj/item/reagent_containers/food/snacks/liquidfood,
+		/obj/item/reagent_containers/food/snacks/liquid,
+		/obj/item/reagent_containers/food/snacks/liquid,
+		/obj/item/reagent_containers/food/snacks/liquid,
+		/obj/item/reagent_containers/food/snacks/liquid,
+		/obj/item/reagent_containers/food/snacks/liquid,
+		/obj/item/reagent_containers/food/snacks/liquid,
 		/obj/item/reagent_containers/food/snacks/tastybread,
 		/obj/item/reagent_containers/food/snacks/tastybread,
 		/obj/item/reagent_containers/food/snacks/tastybread,
diff --git a/maps/away_missions/140x140/zoo.dmm b/maps/away_missions/140x140/zoo.dmm
index 21cd0d63ed6..47f5dc81a4c 100644
--- a/maps/away_missions/140x140/zoo.dmm
+++ b/maps/away_missions/140x140/zoo.dmm
@@ -2634,10 +2634,10 @@
 /area/awaymission/zoo/syndieship)
 "hK" = (
 /obj/structure/closet,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /obj/machinery/light{
 	dir = 4
 	},
diff --git a/maps/away_missions/archive/desertbase.dmm b/maps/away_missions/archive/desertbase.dmm
index 2b6b30f98a9..172db77ad87 100644
--- a/maps/away_missions/archive/desertbase.dmm
+++ b/maps/away_missions/archive/desertbase.dmm
@@ -386,10 +386,10 @@
 /area/space)
 "bm" = (
 /obj/structure/closet,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /obj/machinery/light{
 	dir = 4
 	},
diff --git a/maps/map_levels/140x140/alienship.dmm b/maps/map_levels/140x140/alienship.dmm
index 26e10b82749..f04b8e78d4e 100644
--- a/maps/map_levels/140x140/alienship.dmm
+++ b/maps/map_levels/140x140/alienship.dmm
@@ -186,8 +186,8 @@
 /obj/item/tool/screwdriver,
 /obj/item/weldingtool,
 /obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/simulated/shuttle/floor/alien,
 /area/tether_away/alienship)
 "aM" = (
@@ -552,7 +552,7 @@
 /turf/simulated/shuttle/floor/alienplating,
 /area/tether_away/alienship)
 "gG" = (
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/simulated/shuttle/floor/alienplating,
 /area/tether_away/alienship)
 "nr" = (
@@ -577,7 +577,7 @@
 /turf/simulated/shuttle/floor/alien,
 /area/tether_away/alienship/equip_dump)
 "Rx" = (
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/simulated/shuttle/floor/alien,
 /area/tether_away/alienship)
 "YP" = (
diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm
index 1b88d57ae0f..2d6e875df43 100644
--- a/maps/rift/levels/rift-11-orbital.dmm
+++ b/maps/rift/levels/rift-11-orbital.dmm
@@ -7812,18 +7812,18 @@
 /area/centcom/specops)
 "Dh" = (
 /obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/unsimulated/floor/dark,
 /area/centcom/specops)
 "Dk" = (
diff --git a/maps/submaps/mountains/cultmine.dmm b/maps/submaps/mountains/cultmine.dmm
index 1593700cb23..d48dbd66fe8 100644
--- a/maps/submaps/mountains/cultmine.dmm
+++ b/maps/submaps/mountains/cultmine.dmm
@@ -427,7 +427,7 @@
 /area/submap/cave/cultmine)
 "bG" = (
 /obj/structure/table/steel,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
 /obj/effect/debris/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
 /area/submap/cave/cultmine)
diff --git a/maps/templates/admin/mercbase.dmm b/maps/templates/admin/mercbase.dmm
index 259bf3732a0..02f76b2c745 100644
--- a/maps/templates/admin/mercbase.dmm
+++ b/maps/templates/admin/mercbase.dmm
@@ -3515,10 +3515,10 @@
 /area/shuttle/mercenary)
 "ge" = (
 /obj/structure/closet,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor_yellow"
 	},
diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm
index 5e119575cd6..9a561c6ff19 100644
--- a/maps/triumph/levels/flagship.dmm
+++ b/maps/triumph/levels/flagship.dmm
@@ -7533,18 +7533,18 @@
 /area/centcom/control)
 "xJ" = (
 /obj/structure/closet/crate/medical,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
-/obj/item/reagent_containers/food/snacks/liquidfood,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
+/obj/item/reagent_containers/food/snacks/liquid,
 /turf/unsimulated/floor{
 	icon_state = "dark"
 	},