Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rations 2 Electric Boogalo #2373

Merged
merged 13 commits into from
Oct 10, 2023
Merged

Rations 2 Electric Boogalo #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
440119f
packening
FalloutFalcon Sep 23, 2023
ce6aff7
2% crayon chance,rations heat food,vodka has name
FalloutFalcon Sep 23, 2023
7bf8420
laptop commit
FalloutFalcon Sep 25, 2023
c7a74fc
oops it didnt work will test this later tho
FalloutFalcon Sep 25, 2023
474a962
wording
FalloutFalcon Sep 25, 2023
87a9ba0
silliest clown syntax error?
FalloutFalcon Sep 25, 2023
8b82e40
Merge branch 'master' into ration2
FalloutFalcon Sep 25, 2023
dadb4cc
minor styff
FalloutFalcon Sep 25, 2023
bf661c8
Merge branch 'ration2' of https://github.com/FalloutFalcon/Shiptest i…
FalloutFalcon Sep 25, 2023
12742cf
we done?
FalloutFalcon Sep 26, 2023
39078f4
i dunno what to do :c
FalloutFalcon Sep 28, 2023
22817a1
better....
FalloutFalcon Sep 28, 2023
b2bb1c3
fix c:
FalloutFalcon Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/lootdrop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,5 +1273,5 @@
/obj/item/storage/ration/blackened_calamari = 5,
/obj/item/storage/ration/elbow_macaroni = 5,
/obj/item/storage/ration/cheese_pizza_slice = 5,
/obj/item/storage/ration/crayons
/obj/item/storage/ration/crayons = 2 // :)
)
39 changes: 18 additions & 21 deletions code/game/objects/items/storage/ration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
icon_state = "[icon_state]_open"
return ..()


/obj/item/storage/ration/vegan_chili
name = "vegan chili with beans ration"
desc = "A complete meal package containing a hearty vegan chili with beans, complemented by vegetable crackers, savory cornbread, flavorful pizza crackers, and more. A perfect choice for plant-based nourishment."
Expand All @@ -47,7 +46,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/cornbread = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/pizza_crackers = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/grape_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside,src)
Expand All @@ -63,7 +62,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/fruit_puree = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/cinnamon_bun = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/hot_cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/chocolate_protein_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/chocolate_protein_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside,src)
Expand All @@ -79,7 +78,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/dried_raisins = 1,
/obj/item/reagent_containers/food/snacks/ration/side/bread_sticks = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/lemonade_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside,src)
Expand All @@ -96,7 +95,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/corn_kernels = 1,
/obj/item/reagent_containers/food/snacks/ration/bar/energy_bar = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/fruit_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/fruit_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside,src)
Expand All @@ -113,12 +112,11 @@
/obj/item/reagent_containers/food/snacks/ration/snack/blackberry_preserves = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/candy_rings = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/peanut_butter = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/fruit_smoothie_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/fruit_smoothie_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside,src)


/obj/item/storage/ration/chili_macaroni
name = "chili and macaroni ration"
desc = "Indulge in the comforting combination of chili and macaroni in this flavorful ration. Satisfy your taste buds with a mix of sweet and savory treats."
Expand All @@ -131,7 +129,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/lemon_pound_cake = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/cherry_snackers = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/hot_cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -147,7 +145,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/strawberry_preserves = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/mint_chocolate_snack_cake = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/peanut_butter = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cherry_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/cherry_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -164,7 +162,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/wheat_bread = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/sour_gummy_worms = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/garlic_cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_orange = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_orange = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -180,7 +178,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/pretzel_sticks_honey_mustard = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/blue_raspberry_candies = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/peanut_cranberry_mix = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_chocolate = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_chocolate = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand Down Expand Up @@ -212,7 +210,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/pretzel_sticks_honey_mustard = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/pick_me_up_energy_gum = 1,
/obj/item/reagent_containers/food/snacks/ration/bar/rationers_guild_chocolate_bar = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_hazelnut = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_hazelnut = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -228,7 +226,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/fried_potato_curls = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/chocolate_orange_snack_cake = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/apple_slices = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/pineapple_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/pineapple_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -237,7 +235,6 @@
name = "assorted salted offal ration"
desc = "An adventurous choice, this ration offers an assortment of salted offal, providing a unique culinary experience."


/obj/item/storage/ration/assorted_salted_offal/PopulateContents()
var/static/items_inside = list(
/obj/item/reagent_containers/food/snacks/ration/entree/assorted_salted_offal = 1,
Expand All @@ -262,7 +259,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/maple_muffin = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/smoked_almonds = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/maple_syrup = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/grape_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -279,7 +276,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/chocolate_chunk_oatmeal_cookie = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/peanut_candies = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/bacon_cheddar_cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage_sugar_free = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage_sugar_free = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -296,7 +293,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/strawberry_preserves = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/patriotic_sugar_cookies = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/chunky_peanut_butter = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -312,7 +309,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/vegan_crackers = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/oatmeal_cookie = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/hot_cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/lemonade_beverage_suger_free = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage_suger_free = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -329,7 +326,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/dried_cranberries = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/dry_roasted_peanuts = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage_sugar_free = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage_sugar_free = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -346,7 +343,7 @@
/obj/item/reagent_containers/food/snacks/ration/side/white_bread_mini_loaf = 1,
/obj/item/reagent_containers/food/snacks/ration/snack/strawberry_preserves = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/peanut_butter = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/chocolate_protein_beverage = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/chocolate_protein_beverage = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand All @@ -363,7 +360,7 @@
/obj/item/reagent_containers/food/snacks/ration/snack/jalapeno_cashews = 1,
/obj/item/reagent_containers/food/snacks/ration/bar/quik_energy_bar_chocolate = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/chunky_peanut_butter = 1,
/obj/item/reagent_containers/food/snacks/ration/condiment/grape_beverage_sugar_free = 1,
/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage_sugar_free = 1,
/obj/item/ration_heater = 1
)
generate_items_inside(items_inside, src)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/food_and_drinks/drinks/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,4 +772,6 @@
return ..()

/obj/item/reagent_containers/food/drinks/ration/pan_genezan_vodka
list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 30)
name = "Pan-Genezan vodka"
desc = "Vodka made from the finest potatoes."
list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 15)
Loading