cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Adds Mexican tourists to the restaurant system, plus some QOL tweaks. (#3969)

Browse Source 
* Adds Mexican tourists to the restaurant system, plus some QOL tweaks. (#57447)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Adds Mexican tourists to the restaurant system, plus some QOL tweaks.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-07 01:55:37 +00:00
committed by GitHub
co-authored by Ghom ArcaneMusic
parent 7bb8e5f009
commit c0067da3ab
9 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/misc.dm
+11 -1
View File
@@ -307,6 +307,7 @@
tastes = list("torilla" = 2, "meat" = 3)
foodtypes = GRAIN | MEAT
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_NORMAL
/obj/item/food/cheesyburrito
name = "cheesy burrito"
@@ -316,6 +317,7 @@
tastes = list("torilla" = 2, "meat" = 3, "cheese" = 1)
foodtypes = GRAIN | MEAT | DAIRY
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/carneburrito
name = "carne asada burrito"
@@ -325,6 +327,7 @@
tastes = list("torilla" = 2, "meat" = 4)
foodtypes = GRAIN | MEAT
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/fuegoburrito
name = "fuego plasma burrito"
@@ -334,6 +337,7 @@
tastes = list("torilla" = 2, "meat" = 3, "hot peppers" = 1)
foodtypes = GRAIN | MEAT
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_LEGENDARY
/obj/item/food/yakiimo
name = "yaki imo"
@@ -373,6 +377,7 @@
tastes = list("nachos" = 1)
foodtypes = VEGETABLES | FRIED
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cheesynachos
name = "cheesy nachos"
@@ -382,6 +387,7 @@
tastes = list("nachos" = 2, "cheese" = 1)
foodtypes = VEGETABLES | FRIED | DAIRY
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/cubannachos
name = "Cuban nachos"
@@ -419,6 +425,7 @@
tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
foodtypes = MEAT
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_LEGENDARY
/obj/item/food/powercrepe
name = "Powercrepe"
@@ -618,20 +625,23 @@
qdel(src)
/obj/item/food/taco
name = "taco"
name = "classic taco"
desc = "A traditional taco with meat, cheese, and lettuce."
icon_state = "taco"
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
foodtypes = MEAT | DAIRY | GRAIN | VEGETABLES
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_NORMAL
/obj/item/food/taco/plain
name = "plain taco"
desc = "A traditional taco with meat and cheese, minus the rabbit food."
icon_state = "taco_plain"
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2)
foodtypes = MEAT | DAIRY | GRAIN
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/branrequests
name = "Bran Requests Cereal"
code/game/objects/items/food/pie.dm
+1
View File
@@ -229,6 +229,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 8)
tastes = list("jelly" = 1, "sweet potato" = 1)
foodtypes = GRAIN | VEGETABLES | SUGAR
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/pie/dulcedebatata/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/dulcedebatata, 5, 20)
code/modules/food_and_drinks/restaurant/_venue.dm
+2 -1
View File
@@ -5,7 +5,7 @@
///Max amount of guests at any time
var/max_guests = 6
///Weighted list of customer types
var/list/customer_types = list(/datum/customer_data/american = 5, /datum/customer_data/italian = 3, /datum/customer_data/french = 3, /datum/customer_data/japanese = 3, /datum/customer_data/japanese/salaryman = 2)
var/list/customer_types = list(/datum/customer_data/american = 5, /datum/customer_data/italian = 3, /datum/customer_data/french = 3, /datum/customer_data/japanese = 3, /datum/customer_data/japanese/salaryman = 2, /datum/customer_data/mexican = 10)
///Is the venue open at the moment?
var/open
///Portal linked to this venue at the moment
@@ -159,6 +159,7 @@
/obj/item/holosign_creator/robot_seat
name = "seating indicator placer"
icon_state = "signmaker_service"
creation_time = 1 SECONDS
holosign_type = /obj/structure/holosign/robot_seat
desc = "Use this to place seats for your restaurant guests!"
code/modules/food_and_drinks/restaurant/customers/_customer.dm
+17
View File
@@ -125,3 +125,20 @@
orderable_objects = list(
/datum/venue/restaurant = list(/obj/item/food/tofu = 5, /obj/item/food/soup/milo = 6, /obj/item/food/soup/vegetable = 4, /obj/item/food/sashimi = 4, /obj/item/food/chawanmushi = 4, /obj/item/food/meatbun = 4, /obj/item/food/beef_stroganoff = 2),
/datum/venue/bar = list(/datum/reagent/consumable/ethanol/beer = 14, /datum/reagent/consumable/ethanol/sake = 9, /datum/reagent/consumable/cafe_latte = 3, /datum/reagent/consumable/coffee = 3, /datum/reagent/consumable/soy_latte = 3, /datum/reagent/consumable/ethanol/atomicbomb = 1))
/datum/customer_data/mexican
nationality = "Space-Mexican"
base_icon = "mexican"
prefix_file = "strings/names/mexican_prefix.txt"
speech_sound = 'sound/creatures/tourist/tourist_talk_mexican.ogg'
clothing_sets = list("mexican_poncho")
orderable_objects = list(
/datum/venue/restaurant = list(/obj/item/food/taco/plain = 25, /obj/item/food/taco = 15 , /obj/item/food/burrito = 15, /obj/item/food/fuegoburrito = 1, /obj/item/food/cheesyburrito = 4, /obj/item/food/nachos = 10, /obj/item/food/cheesynachos = 6, /obj/item/food/pie/dulcedebatata = 2, /obj/item/food/cubannachos = 3, /obj/item/food/stuffedlegion = 1),
/datum/venue/bar = list(/datum/reagent/consumable/ethanol/whiskey = 6, /datum/reagent/consumable/ethanol/tequila = 20, /datum/reagent/consumable/ethanol/tequila_sunrise = 1, /datum/reagent/consumable/ethanol/beer = 15, /datum/reagent/consumable/ethanol/patron = 5, /datum/reagent/consumable/ethanol/brave_bull = 5, /datum/reagent/consumable/ethanol/margarita = 8))
found_seat_lines = list("¿Como te va, space station 13?", "Who's ready to party!", "Ah, muchas gracias.", "Ahhh, smells like mi abuela's cooking!")
cant_find_seat_lines = list("¿En Serio? Seriously, no seats?", "Andele! I want a table to watch the football match!", "Ay Caramba...")
leave_mad_lines = list("Aye dios mio, I'm out of here.", "Esto es ridículo! I'm leaving!", "I've seen better cooking at taco campana!", "I though this was a restaurant, pero es porquería!")
leave_happy_lines = list("Amigo, era delicio. Thank you!", "Yo tuve el mono, and you friend? You hit the spot.", "Just the right amount of spicy!")
wait_for_food_lines = list("Ay ay ay, what's taking so long...", "Are you ready yet, amigo?")
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+6
View File
@@ -183,6 +183,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
shot_glass_icon_state = "shotglassbrown"
ph = 4.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_STOCK
/datum/reagent/consumable/ethanol/whiskey/kong
name = "Kong"
@@ -360,6 +361,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
shot_glass_icon_state = "shotglassgold"
ph = 4
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_STOCK
/datum/reagent/consumable/ethanol/vermouth
name = "Vermouth"
@@ -558,6 +560,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
shot_glass_icon_state = "shotglassclear"
ph = 4.5
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_HIGH
/datum/reagent/consumable/ethanol/gintonic
name = "Gin and Tonic"
@@ -714,6 +717,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/tough_text
glass_price = DRINK_PRICE_EASY
/datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/M)
tough_text = pick("brawny", "tenacious", "tough", "hardy", "sturdy") //Tuff stuff
@@ -738,6 +742,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
var/obj/effect/light_holder
glass_price = DRINK_PRICE_MEDIUM
/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/M)
to_chat(M, "<span class='notice'>You feel gentle warmth spread through your body!</span>")
@@ -925,6 +930,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Margarita"
glass_desc = "On the rocks with salt on the rim. Arriba~!"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_MEDIUM
/datum/reagent/consumable/ethanol/black_russian
name = "Black Russian"
icons/mob/tourists.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

icons/obj/device.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

sound/creatures/tourist/tourist_talk_mexican.ogg
BIN
View File
Binary file not shown.
strings/names/mexican_prefix.txt
+13
View File
@@ -0,0 +1,13 @@
Ranchero
Señor
Bandito
Mariachi
Presidente
Embajador
Redactor
Deportista
Gonzales
Rio
Pele
Conquistador
Gulf