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.

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

[PORT] Martian Food: A Taste of the Red Planet #1511

Merged
merged 23 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0735578
Split drinks into different files (#75898)
dragomagol Jun 15, 2023
5cd7987
undoes removals of some bypass restrictions & metabolized_traits rela…
AlbertNanotracen Feb 27, 2024
8ec8875
Merge branch 'Monkestation:master' into Atomized-TG-Drink-Ports
AlbertNanotracen Mar 3, 2024
f1b613c
removed changes to on_hydroponics_apply()
AlbertNanotracen Mar 3, 2024
f225c9b
we had more arguments, missed that
AlbertNanotracen Mar 3, 2024
faf4fa6
sigh
AlbertNanotracen Mar 3, 2024
a778f40
Merge remote-tracking branch 'origin/master' into Atomized-TG-Drink-P…
AlbertNanotracen Mar 16, 2024
22ff035
Merge remote-tracking branch 'origin/master' into Atomized-TG-Drink-P…
AlbertNanotracen Mar 16, 2024
d49db17
Merge remote-tracking branch 'origin/master' into Atomized-TG-Drink-P…
AlbertNanotracen Mar 16, 2024
ea0cf92
Merge remote-tracking branch 'origin/master' into Atomized-TG-Drink-P…
AlbertNanotracen Mar 27, 2024
9601f72
Merge remote-tracking branch 'origin/master' into Atomized-TG-Drink-P…
AlbertNanotracen Mar 27, 2024
3044a71
Merge branch 'Monkestation:master' into Atomized-TG-Drink-Ports
AlbertNanotracen Mar 27, 2024
2dc9342
Merge branch 'Monkestation:master' into Atomized-TG-Drink-Ports
AlbertNanotracen Mar 28, 2024
43a50c3
Martian Food: A Taste of the Red Planet (#75988)
EOBGames Aug 10, 2023
833e773
updates martian can sprites, fixes misc text and bugs in wellcheers (…
CoiledLamb Aug 21, 2023
75c223b
Merge branch 'Monkestation:master' into Atomized-TG-Drink-Ports
AlbertNanotracen Mar 28, 2024
5dc59fe
Removing enriched liquid electricity references
AlbertNanotracen Mar 28, 2024
c6a53c0
look, icons are hard
AlbertNanotracen Mar 29, 2024
4890c80
boiled rice now needs to be boiled and recipe guide for boiled spaghe…
AlbertNanotracen Mar 29, 2024
9c23a68
martian hotfix (#77562)
EOBGames Aug 13, 2023
4b0455f
removed references to butter slices for now
AlbertNanotracen Apr 3, 2024
e538807
Change from improvised medicine
AlbertNanotracen Apr 7, 2024
2afca7a
better block comment formating
AlbertNanotracen Apr 12, 2024
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: 2 additions & 0 deletions code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
#define CAT_LIZARD "Lizard Food"
#define CAT_MEAT "Meats"
#define CAT_SEAFOOD "Seafood"
#define CAT_MARTIAN "Martian Food"
#define CAT_MISCFOOD "Misc. Food"
#define CAT_MEXICAN "Mexican Food"
#define CAT_MOTH "Mothic Food"
Expand All @@ -118,6 +119,7 @@ GLOBAL_LIST_INIT(crafting_category_food, list(
CAT_LIZARD,
CAT_MEAT,
CAT_SEAFOOD,
CAT_MARTIAN,
CAT_MISCFOOD,
CAT_MEXICAN,
CAT_MOTH,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mood_events/drink_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
timeout = 10 MINUTES

/datum/mood_event/wellcheers
description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up."
description = "What a tasty can of Wellcheers! The salty grape flavor is a great pick-me-up."
mood_change = 3
timeout = 7 MINUTES
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
item_path = /obj/item/food/fishmeat
cost_per_order = 12

/datum/orderable_item/milk_eggs/octopus
name = "Octopus Tentacle"
item_path = /obj/item/food/fishmeat/octopus
cost_per_order = 12

/datum/orderable_item/milk_eggs/spider_eggs
name = "Spider Eggs"
item_path = /obj/item/food/spidereggs
Expand Down Expand Up @@ -65,6 +70,16 @@
item_path = /obj/item/food/canned/pine_nuts
cost_per_order = 20

/datum/orderable_item/milk_eggs/canned_squid_ink
name = "Canned Squid Ink"
item_path = /obj/item/food/canned/squid_ink
cost_per_order = 20

/datum/orderable_item/milk_eggs/chap
name = "Can of CHAP"
item_path = /obj/item/food/canned/chap
cost_per_order = 20

/datum/orderable_item/milk_eggs/ready_donk
name = "Ready-Donk Meal: Bachelor Chow"
item_path = /obj/item/food/ready_donk
Expand All @@ -80,6 +95,16 @@
item_path = /obj/item/food/ready_donk/donkhiladas
cost_per_order = 40

/datum/orderable_item/milk_eggs/ready_donk_nachos
name = "Ready-Donk Meal: Donk Sol Series Boritos Nachos Grandes"
item_path = /obj/item/food/ready_donk/nachos_grandes
cost_per_order = 40

/datum/orderable_item/milk_eggs/ready_donk_orange
name = "Ready-Donk Meal: Donk-range Chicken"
item_path = /obj/item/food/ready_donk/donkrange_chicken
cost_per_order = 40

/datum/orderable_item/milk_eggs/tiziran_goods
name = "Tiziran Farm-Fresh Pack"
item_path = /obj/item/storage/box/tiziran_goods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,33 @@
name = "Cherry Jelly"
item_path = /obj/item/reagent_containers/condiment/cherryjelly
cost_per_order = 30

/datum/orderable_item/reagents/worcestershire
name = "Worcestershire Sauce"
item_path = /obj/item/reagent_containers/condiment/worcestershire
cost_per_order = 30

/datum/orderable_item/reagents/red_bay
name = "Red Bay Seasoning"
item_path = /obj/item/reagent_containers/condiment/red_bay
cost_per_order = 30

/datum/orderable_item/reagents/curry_powder
name = "Curry Powder"
item_path = /obj/item/reagent_containers/condiment/curry_powder
cost_per_order = 30

/datum/orderable_item/reagents/dashi_concentrate
name = "Dashi Concentrate"
item_path = /obj/item/reagent_containers/condiment/dashi_concentrate
cost_per_order = 30

/datum/orderable_item/reagents/coconut_milk
name = "Coconut Milk"
item_path = /obj/item/reagent_containers/condiment/coconut_milk
cost_per_order = 30

/datum/orderable_item/reagents/grounding_solution
name = "Grounding Solution"
item_path = /obj/item/reagent_containers/condiment/grounding_solution
cost_per_order = 30
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@
name = "Jar of pickles"
item_path = /obj/item/storage/fancy/pickles_jar
cost_per_order = 60

/datum/orderable_item/veggies/pickled_voltvine
name = "Pickled Voltvine"
item_path = /obj/item/food/pickled_voltvine
cost_per_order = 5
Loading
Loading