Skip to content

Commit

Permalink
[PORT] Martian Food: A Taste of the Red Planet (#1511)
Browse files Browse the repository at this point in the history
* Split drinks into different files (tgstation#75898)

Splits our nearly 4000 and 1600 line long files. Mostly just moves the
glass appearances into their own files.

* undoes removals of some bypass restrictions & metabolized_traits related things

* removed changes to on_hydroponics_apply()

* we had more arguments, missed that

* sigh

* Martian Food: A Taste of the Red Planet (tgstation#75988)

Adds a selection of new foods and drinks based around Mars.
More information on Mars can be found here:
https://github.com/tgstation/common_core/blob/master/Interesting%20Planets/Human%20Space/The%20Sol%20System.md
To summarise for the general audience, Mars is a vital colony of the
Terran Federation, having been primarily settled (at least originally)
by Cybersun Industries to harvest its lucrative supplies of plasma, the
second largest in human space behind Lavaland. This has given Mars a
diverse culture evolving from the mostly East Asian colonists, and their
food reflects this.

Thanks to Melbert for their work on the soup portion of this PR.

The food:
Martian cuisine draws upon the culinary traditions of East Asia, and
adds in fusion cuisine from the later colonists. Expect classics such as
ramen, curry, noodles and donburi, as well as new takes on the formula
like the Croque-Martienne, Peanut Butter Ice Cream Mochi, and the
Kitzushi- chilli cheese and rice inside a fried tofu casing. Oh, and
lots of pineapple. The Martians love pineapple:

![image](https://github.com/tgstation/tgstation/assets/58124831/c9ae33a1-e03a-4f94-8ce0-8ad124e88e8d)
Also included are some foods for Ethereals, which may or may not be
hinting at something I've got planned...

The drinks:
Four new base drinks make their way to the game, bringing with them a
host of new cocktails: enjoy new ventures in bartending with Coconut
Rum, Shochu/Soju, Yuyake (our favourite legally-distinct melon liqueur),
and Mars' favourite alcoholic beverage, rice beer. Each is available in
the dispenser, as well as bottles in the booze-o-mat:

![image](https://github.com/tgstation/tgstation/assets/58124831/914a6e2a-7ef5-4791-ae31-d08fa9211083)

The recipes:
To make your (and the wiki editors) lives easier, please find below the
recipes for both foods and drinks:
Food: https://hackmd.io/@EOBGames/BkVFU0w9Y
Drinks: https://hackmd.io/@EOBGames/rJ1OhnsJ2

Another lot of variety for the chef and bartender, as well as continuing
the work started with lizard and moth food in getting Common Core into
the game in a tangible and fun way.

:cl: EOBGames, MrMelbert
add: Mars celebrates the 250th anniversary of the Martian Concession
this year, and this has brought Martian cuisine to new heights of
popularity. Find a new selection of Martian foods and drinks available
in your crafting menu today!
/:cl:

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>

* updates martian can sprites, fixes misc text and bugs in wellcheers (tgstation#77757)

this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up
with a larger resprite of the new cans that were added with tgstation#75988. you
can see everything visually changed (other than inhands) in the image
below

![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051)
and then the inhands here:

![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175)
also changes wellcheers mood event text, and the mood switch to be based
on sanity instead. apparently the mood test allowed for foolproof
traitor testing, which is not ideal. this hopefully fixes that.

the new martian drinks used the previous style of cans, which was
updated in tgstation#77424. this makes them consistent with that style.
everything else is minor things i missed or forgot to do in that PR.
also things that enable traitor testing are not great, even if they're
niche and require amputation to pull off.

:cl:
fix: wellcheers is now based on sanity rather than mood
image: resprites martian cans
image: adds inhands for martian cans and wellcheers
image: minor tweaks to other cans
spellcheck: updates wellcheers mood text
/:cl:

* Removing enriched liquid electricity references

* look, icons are hard

* boiled rice now needs to be boiled and recipe guide for boiled spaghetti/rice

* martian hotfix (tgstation#77562)

## About The Pull Request
Fixes a few issues with Martian food. Makes stuff that's cooked on the
grill or oven not burn, and adds guide recipes for the non-crafting-menu
stuff.
## Why It's Good For The Game
Fixes some problems, removes some confusion
## Changelog
:cl:
fix: a few issues with Martian food
/:cl:

* removed references to butter slices for now

* Change from improvised medicine

* better block comment formating

---------

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
  • Loading branch information
5 people committed Apr 13, 2024
1 parent e4e4df9 commit 5e882f8
Show file tree
Hide file tree
Showing 47 changed files with 3,782 additions and 18 deletions.
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

0 comments on commit 5e882f8

Please sign in to comment.