Skip to content

Commit

Permalink
gutting moth rations (we have our own rations)
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Nov 13, 2023
1 parent 94f0363 commit 034c181
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 68 deletions.
16 changes: 0 additions & 16 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1542,19 +1542,3 @@
/obj/item/stack/wrapping_paper/small=1
)
generate_items_inside(items_inside,src)

/obj/item/storage/box/rations
name = "Surplus Rations Box"
desc = "A box containing a few rations and some Activin gum, for keeping a starving crew going."
icon_state = "rations_package"
illustration = null

/obj/item/storage/box/rations/PopulateContents()
for(var/i in 1 to 3)
var/randomFood = pick(list(/obj/item/reagent_containers/food/snacks/sustenance_bar,
/obj/item/reagent_containers/food/snacks/sustenance_bar/cheese,
/obj/item/reagent_containers/food/snacks/sustenance_bar/mint,
/obj/item/reagent_containers/food/snacks/sustenance_bar/neapolitan,
/obj/item/reagent_containers/food/snacks/sustenance_bar/wonka))
new randomFood(src)
new /obj/item/storage/box/gum/wake_up(src)
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,4 @@
close_sound_volume = 50
material_drop = /obj/item/stack/sheet/plasteel

/obj/structure/closet/cardboard/rations
name = "Supply box"
desc = "For holding supplies, presumably."
#undef SNAKE_SPAM_TICKS
7 changes: 0 additions & 7 deletions code/modules/cargo/packs/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,6 @@
crate_name = "beekeeping starter crate"
crate_type = /obj/structure/closet/crate/hydroponics

/datum/supply_pack/food/rations
name = "Surplus Mothic Ration Pack"
desc = "A single surplus ration pack from the Mothic Fleet. Comes with 3 random sustenance bars, and a package of Activin chewing gum."
cost = 200
contains = list(/obj/item/storage/box/rations)

/datum/supply_pack/food/ready_donk
name = "Ready-Donk Single Meal"
desc = "A complete meal package for the terminally lazy. Contains one Ready-Donk meal."
Expand Down Expand Up @@ -283,4 +277,3 @@
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration)
crate_name = "ration crate"
crate_type = /obj/structure/closet/cardboard/rations
42 changes: 0 additions & 42 deletions code/modules/food_and_drinks/food/snacks_moth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,48 +375,6 @@
foodtype = DAIRY | VEGETABLES | FRIED | GRAIN
w_class = WEIGHT_CLASS_SMALL

/obj/item/reagent_containers/food/snacks/sustenance_bar
name = "surplus fleet PSB"
desc = "The PSB, or Prepacked Sustenance Bar, is a densely packed, nutrient rich food which is designed to hold the populace over \
during times of food shortage. Made from soy and pea protein, each lasts 3 days if adequately rationed. While they have a long shelf life, \
they do eventually go bad- prompting them to be sold as surplus by the fleet. This particular one is, like most artificially-flavoured moth food, mixed-herb flavoured."
icon = 'icons/obj/food/moth.dmi'
icon_state = "sustenance_bar"
list_reagents = list(/datum/reagent/consumable/nutriment = 20)
tastes = list("herbs" = 1)
foodtype = VEGETABLES | GRAIN
w_class = WEIGHT_CLASS_SMALL

/obj/item/reagent_containers/food/snacks/sustenance_bar/neapolitan
name = "surplus fleet PSB- neapolitan flavour"
desc = "The PSB, or Prepacked Sustenance Bar, is a densely packed, nutrient rich food which is designed to hold the populace over \
during times of food shortage. Made from soy and pea protein, each lasts 3 days if adequately rationed. While they have a long shelf life, \
they do eventually go bad- prompting them to be sold as surplus by the fleet. This particular one is neapolitan flavoured- strawberry, vanilla, and chocolate."
tastes = list("strawberry" = 1, "vanilla" = 1, "chocolate" = 1)

/obj/item/reagent_containers/food/snacks/sustenance_bar/cheese
name = "surplus fleet PSB- three-cheese flavour"
desc = "The PSB, or Prepacked Sustenance Bar, is a densely packed, nutrient rich food which is designed to hold the populace over \
during times of food shortage. Made from soy and pea protein, each lasts 3 days if adequately rationed. While they have a long shelf life, \
they do eventually go bad- prompting them to be sold as surplus by the fleet. This particular one is three-cheese flavoured- parmesan, mozzarella, and cheddar."
tastes = list("parmesan" = 1, "mozzarella" = 1, "cheddar" = 1)

/obj/item/reagent_containers/food/snacks/sustenance_bar/mint
name = "surplus fleet PSB- mint choc chip flavour"
desc = "The PSB, or Prepacked Sustenance Bar, is a densely packed, nutrient rich food which is designed to hold the populace over \
during times of food shortage. Made from soy and pea protein, each lasts 3 days if adequately rationed. While they have a long shelf life, \
they do eventually go bad- prompting them to be sold as surplus by the fleet. This particular one is mint choc chip flavoured- peppermint, \
dark chocolate, and potato chips, showing that mothkind has no idea what mint choc chip is."
tastes = list("peppermint" = 1, "potato chips(?)" = 1, "dark chocolate" = 1)

/obj/item/reagent_containers/food/snacks/sustenance_bar/wonka
name = "surplus fleet PSB- three course dinner"
desc = "The PSB, or Prepacked Sustenance Bar, is a densely packed, nutrient rich food which is designed to hold the populace over \
during times of food shortage. Made from soy and pea protein, each lasts 3 days if adequately rationed. While they have a long shelf life, \
they do eventually go bad- prompting them to be sold as surplus by the fleet. This particular one is split into three flavours, \
making up a typical meal- tomato soup, roast pumpkin, and blueberry pie." //Thankfully not made by Willy Wonka
tastes = list("tomato soup" = 1, "roast pumpkin" = 1, "blueberry pie" = 1)

//Soups
/obj/item/reagent_containers/food/snacks/soup/moth_cotton_soup
name = "flöfrölenmæsch" //flöf = cotton, rölen = ball, mæsch = soup
Expand Down
Binary file modified icons/obj/food/moth.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.

0 comments on commit 034c181

Please sign in to comment.