mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 22:42:26 +01:00
Barista QoL Expansion (#19395)
Adds the ability to use pens to write names and orders on takeaway cups. Allows you to click on syrup dispensers with a cup to dispense the syrup, rather than having to pick them up. Moves the chemical heater from the bar backroom to the front, so bartenders don't need to walk away and come back every time they need to make steamed milk.
This commit is contained in:
@@ -327,7 +327,10 @@
|
||||
return 0
|
||||
|
||||
// Ensure we don't splash beakers and similar containers.
|
||||
if(!target.is_open_container() && istype(target, /obj/item/reagent_containers))
|
||||
if(!target.is_open_container())
|
||||
if(target.atom_flags & ATOM_FLAG_DISPENSER && istype(target, /obj/item/reagent_containers))
|
||||
var/obj/item/reagent_containers/dispenser = target
|
||||
return dispenser.standard_pour_into(user, src)
|
||||
to_chat(user, SPAN_NOTICE("\The [target] is closed."))
|
||||
return 1
|
||||
// Otherwise don't care about splashing.
|
||||
|
||||
@@ -299,6 +299,26 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
|
||||
pickup_sound = 'sound/items/pickup/papercup.ogg'
|
||||
possible_transfer_amounts = null
|
||||
volume = 30
|
||||
/**
|
||||
* Details written on the cup, a la IRL coffee places
|
||||
*/
|
||||
var/list/details = list("Customer" = null, "Order" = null)
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/takeaway_cup_idris/attackby(obj/item/attacking_item, mob/user)
|
||||
if(attacking_item.ispen() && !use_check_and_message(user))
|
||||
var/choice = tgui_input_list(user, "Which detail do you want to edit?", "Detail Editor", list("Customer", "Order"))
|
||||
switch(choice)
|
||||
if("Customer")
|
||||
details["Customer"] = sanitize(tgui_input_text(user, "What is the customer's name?", "Enter Customer Name"))
|
||||
if("Order")
|
||||
details["Order"] = sanitize(tgui_input_text(user, "What is the ordered drink?", "Enter Ordered Drink"))
|
||||
return
|
||||
return ..()
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/takeaway_cup_idris/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended)
|
||||
. = ..()
|
||||
. += "Order: [details["Order"]]"
|
||||
. += "For: [details["Customer"]]"
|
||||
|
||||
//////////////////////////drinkingglass and shaker//
|
||||
//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
|
||||
|
||||
@@ -245,7 +245,7 @@
|
||||
desc = "A small bottle dispenser."
|
||||
icon_state = "syrup"
|
||||
filling_states = "20;40;60;80;100"
|
||||
atom_flags = ATOM_FLAG_POUR_CONTAINER
|
||||
atom_flags = ATOM_FLAG_POUR_CONTAINER | ATOM_FLAG_DISPENSER
|
||||
volume = 50
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/syrup/chocolate
|
||||
|
||||
Reference in New Issue
Block a user