Ethereal Rations (#29271)

* Ethereal Rations

Adds in some new ethereal rations options for the ration ticket quirk.  I still need some new icons for various items though

* new icons

* bugfix

* bugfix

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
This commit is contained in:
plsleavemealon
2024-08-21 11:10:37 +07:00
committed by GitHub
co-authored by Waterpig
parent ef018323a4
commit 5844ca6799
5 changed files with 49 additions and 0 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 32 KiB

@@ -58,6 +58,18 @@
new /obj/item/food/grown/potato(src)
new /obj/item/food/grown/potato(src)
// For ethereals
/obj/item/storage/box/spaceman_ration/plants/ethereal
desc = "Contains your allotted ration of produce, which in this case should be a lantern fruit, a jupiter cup, and a pickled voltvine."
icon_state = "plants_ethereal"
box_storage_slots = 3
/obj/item/storage/box/spaceman_ration/plants/ethereal/PopulateContents()
new /obj/item/food/grown/lanternfruit(src)
new /obj/item/food/grown/mushroom/jupitercup(src)
new /obj/item/food/pickled_voltvine(src)
// Contains your allotted meats, tasty!
/obj/item/storage/box/spaceman_ration/meats
@@ -92,6 +104,16 @@
var/secondary_meat = pick(/obj/item/food/raw_tiziran_sausage, /obj/item/food/liver_pate)
new secondary_meat(src)
// For ethereals!
/obj/item/storage/box/spaceman_ration/meats/ethereal
desc = "Contains your allotted ration of meat, which in this case should be two fish fillets."
icon_state = "meats_ethereal"
/obj/item/storage/box/spaceman_ration/meats/ethereal/PopulateContents()
new /obj/item/food/fishmeat(src)
new /obj/item/food/fishmeat(src)
// Paper sack that spawns a random two slices of bread
/obj/item/storage/box/papersack/ration_bread_slice
@@ -39,6 +39,12 @@
icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi'
list_reagents = list(/datum/reagent/consumable/milk = 15)
/obj/item/reagent_containers/condiment/dashi_concentrate/small_ration
name = "small dashi"
desc = "It's concentrated dashi in a small container, containing just enough to be able to make some dashi for cooking!"
icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi'
list_reagents = list(/datum/reagent/consumable/dashi_concentrate = 5)
/obj/item/reagent_containers/cup/glass/bottle/small/tiny
name = "tiny glass bottle"
volume = 10
@@ -77,3 +83,10 @@
desc = "A maritime ration-sized bottle of caramel, in the past these used to be something called 'treacle', which was \
the tar left over from refining sugar. Nowadays, governments are rich enough to just send caramel instead."
list_reagents = list(/datum/reagent/consumable/caramel = 10)
/obj/item/reagent_containers/cup/soda_cans/skyrat/wine_voltaic
name = "canned voltaic wine"
desc = "A can of electrically infused wine, recharges ethereals and is safe for consumption."
icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi'
icon_state = "wine_voltaic_canned"
list_reagents = list(/datum/reagent/consumable/ethanol/wine_voltaic = 30)
@@ -27,6 +27,7 @@
"Standard Meats" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "meats"),
"Seafood Meats" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "meats_fish"),
"Tizirian Meats" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "meats_lizard"),
"Ethereal Meats" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "meats_ethereal"),
)
var/meats_choice = show_radial_menu(user, object_we_attack, radial_meat_options, require_near = TRUE)
@@ -44,6 +45,8 @@
items_we_deliver += /obj/item/storage/box/spaceman_ration/meats/fish
if("Tizirian Meats")
items_we_deliver += /obj/item/storage/box/spaceman_ration/meats/lizard
if("Ethereal Meats")
items_we_deliver += /obj/item/storage/box/spaceman_ration/meats/ethereal
// List of produce options we get
var/list/radial_produce_options = list(
@@ -51,6 +54,7 @@
"Alternative Produce" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "plants_alt"),
"Mothic Produce" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "plants_moth"),
"Tizirian Produce" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "plants_lizard"),
"Ethereal Produce" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "plants_ethereal"),
)
var/produce_choice = show_radial_menu(user, object_we_attack, radial_produce_options, require_near = TRUE)
@@ -72,6 +76,8 @@
items_we_deliver += /obj/item/storage/box/spaceman_ration/plants/mothic
if("Tizirian Produce")
items_we_deliver += /obj/item/storage/box/spaceman_ration/plants/lizard
if("Ethereal Produce")
items_we_deliver += /obj/item/storage/box/spaceman_ration/plants/ethereal
items_we_deliver += /obj/item/storage/box/papersack/ration_bread_slice
@@ -79,6 +85,7 @@
var/list/radial_flour_options = list(
"Standard Flour" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "flour"),
"Korta Flour" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "flour_korta"),
"Ethereal Stock" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "stock_ethereal"),
)
var/flour_choice = show_radial_menu(user, object_we_attack, radial_flour_options, require_near = TRUE)
@@ -97,6 +104,9 @@
if("Korta Flour")
items_we_deliver += /obj/item/reagent_containers/condiment/small_ration_korta_flour
items_we_deliver += /obj/item/reagent_containers/condiment/soymilk/small_ration
if("Ethereal Stock")
items_we_deliver += /obj/item/reagent_containers/cup/soda_cans/volt_energy
items_we_deliver += /obj/item/reagent_containers/condiment/dashi_concentrate/small_ration
items_we_deliver += /obj/item/reagent_containers/condiment/rice/small_ration
items_we_deliver += /obj/item/reagent_containers/condiment/sugar/small_ration
@@ -169,6 +179,7 @@
"Navy Rum" = image(icon = 'modular_skyrat/master_files/icons/obj/drinks.dmi', icon_state = "navy_rum"),
"Ginger Beer" = image(icon = 'modular_skyrat/master_files/icons/obj/drinks.dmi', icon_state = "gingie_beer"),
"Kortara" = image(icon = 'modular_skyrat/master_files/icons/obj/drinks.dmi', icon_state = "kortara"),
"Voltaic Wine" = image(icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi', icon_state = "wine_voltaic_canned")
)
var/alcohol_choice = show_radial_menu(user, object_we_attack, radial_alcohol_options, require_near = TRUE)
@@ -188,6 +199,9 @@
if("Kortara")
items_we_deliver += /obj/item/reagent_containers/cup/soda_cans/skyrat/kortara
items_we_deliver += /obj/item/reagent_containers/cup/soda_cans/skyrat/kortara
if("Voltaic Wine")
items_we_deliver += /obj/item/reagent_containers/cup/soda_cans/skyrat/wine_voltaic
items_we_deliver += /obj/item/reagent_containers/cup/soda_cans/skyrat/wine_voltaic
// List of produce options we get
var/list/radial_consumables_options = list(
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB