diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index fd5ff5eeaca..251ed58617d 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -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" diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 1636921a233..e3e1c155b36 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -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) diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index 33f71c48408..df7eb0272ce 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -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!" diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index c4818067337..903d59df455 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -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?") diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 34d8d912430..ddb62bf5e68 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -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, "You feel gentle warmth spread through your body!") @@ -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" diff --git a/icons/mob/tourists.dmi b/icons/mob/tourists.dmi index 4b16b3903fa..56e72712b62 100644 Binary files a/icons/mob/tourists.dmi and b/icons/mob/tourists.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 46007b1adaf..0c207bf3f07 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/sound/creatures/tourist/tourist_talk_mexican.ogg b/sound/creatures/tourist/tourist_talk_mexican.ogg new file mode 100644 index 00000000000..a4c5b720688 Binary files /dev/null and b/sound/creatures/tourist/tourist_talk_mexican.ogg differ diff --git a/strings/names/mexican_prefix.txt b/strings/names/mexican_prefix.txt new file mode 100644 index 00000000000..7ca7723dcbc --- /dev/null +++ b/strings/names/mexican_prefix.txt @@ -0,0 +1,13 @@ +Ranchero +Señor +Bandito +Mariachi +Presidente +Embajador +Redactor +Deportista +Gonzales +Rio +Pele +Conquistador +Gulf