Overhauls borg hypos to work like chem dispensers (#18662)

* We sorta kinda got a start here

* Implements chemical searching

* Stretches UI window for drinks, moves recording blinker to search

* accounts for hypos with different maximums and transfer amounts

* SFX + selected chem fix

* modularizes chem dispenser macro UI

* Adds recipe recorder UI to hypo

* further modularizes chemical dispenser chemicals UI

* tweaks borg hypo UI to account for chem UI changes

* magic letter begone

* Words this argument's description better

* UI doesn't need to be passed ui_title, also usr to ui.user

* TIL: UNTYPED_LIST_ADD is a thing

* Apply borg UI theme

* further modularizes chem dispenser settings UI

* tweaks settings UI to fit new chem settings changes

* MANY miscellaneous hypo changes

* Implements proper recipe recording and selecting

* More single letter vars be gone

* gets rid of unnecessary stack

* applies spans to recipe errors

* ig this wasn't necessary

* oops lol

* oops missed this one

* be careful with using the wrong elements

* Uses static data + proper usage of borg theme; uses drink dispenser boolean for TGUI

* func

* fix that too

* .

* in case they get emagged

* lil fix

* implements functional recipe macros

* typo fix

* makes macro usage work with all types of hypos

* Sort listed chemicals in UI by name

* veritcally stretches drink UI a bit more

* Fixes some button selection jank

* wait we already have a confirm dialogue built in here!

* Better balloon alerts + varies hypo sound

* improves hypo alerts

* in case people get injected by some reagents

* removes balloon alert for synthesizer recording

* fixes hypo not actually injecting stuff into mobs (oops)

* better documentation

* better-er documentation oopsie lol

* O okay I'll move it here then

* better words status flags

* quick im/export basics

* dispenser update

* typo fix

* sanitizing

* cleanup of theming

* .

* Update ChemDispenserSettings.tsx

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Ryumi
2025-11-07 16:26:48 +01:00
committed by GitHub
co-authored by Kashargul
parent 41ef2d8278
commit 4044b3d511
29 changed files with 758 additions and 174 deletions
@@ -249,9 +249,7 @@
UNTYPED_LIST_ADD(robot_chems, list("id" = possible_reagent.id, "name" = possible_reagent.name))
data["name"] = name
var/robot_theme = robot_user.get_ui_theme()
if(robot_theme)
data["theme"] = robot_theme
data["theme"] = robot_user.get_ui_theme()
data["chems"] = robot_chems
return data
@@ -49,10 +49,8 @@
var/mob/living/silicon/robot/R = host
data["module_name"] = R.module ? "[R.module]" : null
if(R.emagged)
data["theme"] = "syndicate"
else if (R.ui_theme)
data["theme"] = R.ui_theme
data["theme"] = R.get_ui_theme()
if(!R.module)
return data
@@ -25,9 +25,7 @@
var/mob/living/silicon/robot/R = host
data["active_decals"] = R.robotdecal_on
var/robot_theme = R.get_ui_theme()
if(robot_theme)
data["theme"] = robot_theme
data["theme"] = R.get_ui_theme()
return data
@@ -52,10 +52,7 @@
modules |= module_name
data["possible_modules"] = modules
data["mind_name"] = R.mind.name
if(R.emagged)
data["theme"] = "syndicate"
else if (R.ui_theme)
data["theme"] = R.ui_theme
data["theme"] = R.get_ui_theme()
return data
@@ -202,6 +202,20 @@
container = null
. = TRUE
if("import_config")
var/list/our_data = params["config"]
if(!islist(our_data))
return FALSE
var/list/new_recipes = list()
for(var/key, value in our_data)
if(istext(key) && islist(value))
for(var/list/steps in value)
if(istext(steps["id"]) && isnum(steps["amount"]))
new_recipes[key] += list(list("id" = steps["id"], "amount" = steps["amount"]))
if(length(new_recipes))
saved_recipes = new_recipes
. = TRUE
if("record_recipe")
recording_recipe = list()
. = TRUE
@@ -260,7 +274,7 @@
var/amount_actually_dispensed = C.reagents.trans_to(container, dispense_amount)
if(dispense_amount != amount_actually_dispensed)
visible_message(span_warning("[src] buzzes."), span_warning("You hear a faint buzz."))
to_chat(ui.user, span_warning("[src] was only able to dispense [amount_actually_dispensed]u out of [dispense_amount]u requested of <b>[label]</b>!"))
to_chat(ui.user, span_warning("[src] was only able to dispense [amount_actually_dispensed ? amount_actually_dispensed : 0]u out of [dispense_amount]u requested of <b>[label]</b>!"))
playsound(src, 'sound/machines/buzz-two.ogg', 50, TRUE)
break
else
@@ -5,18 +5,40 @@
item_state = "hypo"
icon_state = "borghypo"
amount_per_transfer_from_this = 5
min_transfer_amount = 1
volume = 30
max_transfer_amount = null
max_transfer_amount = 10
/// The single chemical we have currently selected. Used to index `reagent_volumes`, `reagent_names`, and `reagent_ids`.
var/mode = 1
/// Amount of power this hypo will remove from the robot user's internal cell when a reagent's stores are replenished.
var/charge_cost = 50
var/charge_tick = 0
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/bypass_protection = FALSE // If true, can inject through things like spacesuits and armor.
/// Time it takes for shots to recharge (in seconds)
var/recharge_time = 5
/// If true, can inject through things like spacesuits and armor.
var/bypass_protection = FALSE
/// Affects whether the TGUI will display itself as a chem or drink dispenser.
var/is_dispensing_drinks = FALSE
/// String contents in the TGUI search bar.
var/ui_chemical_search
/// Whether or not we're dispensing just a single reagent or are dispensing multiple reagents via a recipe
var/is_dispensing_recipe = FALSE
/// The recipe we will dispense if `is_dispensing_recipe` is `TRUE`
var/selected_recipe_id
var/hypo_sound = 'sound/effects/hypospray.ogg' // What sound do we play on use?
var/list/reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_DEXALIN ,REAGENT_ID_SPACEACILLIN)
/// Associated list of how many units of each reagent we have. Indexed via the reagent's ID.
var/list/reagent_volumes = list()
/// Associated list of the names of each of our reagents. Indexed via `mode`.
var/list/reagent_names = list()
/// If we're currently recording a recipe, this will be set to a list containing the recipe's steps.
var/list/recording_recipe
/// Associated list of the recipes we have saved. Indexed via the string ID of the recipe.
var/list/saved_recipes = list()
/// In the hypo's TGUI, this determines the amount buttons that will be available to change this hypo's transfer amount.
var/list/transfer_amounts = list(5, 10)
/obj/item/reagent_containers/borghypo/surgeon
reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
@@ -34,13 +56,54 @@
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
/// Performs a single reagent addition. Returns its success (or error) status at doing so.
/obj/item/reagent_containers/borghypo/proc/try_add_reagent(var/datum/reagents/target_reagents, var/mob/user, var/reagent_id, var/amount)
var/reagent_volume = reagent_volumes[reagent_id]
if(!reagent_volume || reagent_volume < amount)
return BORGHYPO_STATUS_NOCHARGE
if(!target_reagents.get_free_space())
return BORGHYPO_STATUS_CONTAINERFULL
if(hypo_sound)
playsound(src, hypo_sound, 25, TRUE)
var/amount_to_add = min(amount, reagent_volumes[reagent_id])
target_reagents.add_reagent(reagent_id, amount_to_add)
reagent_volumes[reagent_id] -= amount_to_add
return BORGHYPO_STATUS_SUCCESS
/// Attempts to add one reagent or multiple reagents, depending on if this hypo is currently set to dispense a recipe, (see `is_dispensing_recipe`.) Returns its success (or error) status at doing so.
/obj/item/reagent_containers/borghypo/proc/try_injection(var/datum/reagents/target_reagents, var/mob/user)
if(is_dispensing_recipe && selected_recipe_id)
// Add reagents with our selected ID
var/foundRecipe = saved_recipes[selected_recipe_id]
if(!foundRecipe)
to_chat(user, span_warning("Couldn't find recipe ") + span_boldwarning(selected_recipe_id) + span_warning("! Contact a coder."))
return BORGHYPO_STATUS_NORECIPE
for(var/recipe_step in foundRecipe)
var/step_reagent_id = recipe_step["id"]
var/step_dispense_amount = recipe_step["amount"]
var/result = try_add_reagent(target_reagents, user, step_reagent_id, step_dispense_amount)
switch(result)
if(BORGHYPO_STATUS_CONTAINERFULL)
return result
if(BORGHYPO_STATUS_NOCHARGE)
var/datum/reagent/empty_reagent = SSchemistry.chemical_reagents[step_reagent_id]
to_chat(user, span_warning("[src] doesn't have enough ") + span_boldwarning(empty_reagent.name) + span_warning(" to complete this recipe!"))
return result
return BORGHYPO_STATUS_SUCCESS
else
// Just add reagents
return try_add_reagent(target_reagents, user, reagent_ids[mode], amount_per_transfer_from_this)
/obj/item/reagent_containers/borghypo/Initialize(mapload)
. = ..()
for(var/T in reagent_ids)
reagent_volumes[T] = volume
var/datum/reagent/R = SSchemistry.chemical_reagents[T]
reagent_names += R.name
var/datum/reagent/hypo_reagent = SSchemistry.chemical_reagents[T]
reagent_names += hypo_reagent.name
START_PROCESSING(SSobj, src)
@@ -54,11 +117,11 @@
charge_tick = 0
if(isrobot(loc))
var/mob/living/silicon/robot/R = loc
if(R && R.cell)
var/mob/living/silicon/robot/robot_user = loc
if(robot_user && robot_user.cell)
for(var/T in reagent_ids)
if(reagent_volumes[T] < volume)
R.cell.use(charge_cost)
robot_user.cell.use(charge_cost)
reagent_volumes[T] = min(reagent_volumes[T] + 5, volume)
return 1
@@ -66,10 +129,6 @@
if(!istype(M))
return
if(!reagent_volumes[reagent_ids[mode]])
balloon_alert(user, "the injector is empty.")
return
var/mob/living/carbon/human/H = M
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
@@ -83,55 +142,210 @@
*/
if(M.can_inject(user, 1, ignore_thickness = bypass_protection))
balloon_alert(user, "you inject [M] with the injector.")
balloon_alert(M, "you feel a tiny prick!")
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
M.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
add_attack_logs(user, M, "Borg injected with [reagent_ids[mode]]")
to_chat(user, span_notice("[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining."))
var/reagent_id = reagent_ids[mode]
var/amount_to_add = min(amount_per_transfer_from_this, reagent_volumes[reagent_id])
var/result = try_injection(M.reagents, user)
if(is_dispensing_recipe)
// Log every reagent injected in the recipe
var/foundRecipe = saved_recipes[selected_recipe_id]
for(var/recipe_step in foundRecipe)
var/step_reagent_id = recipe_step["id"]
var/step_dispense_amount = recipe_step["amount"]
add_attack_logs(user, M, "Borg injected with [step_dispense_amount] units of '[step_reagent_id]'")
else
add_attack_logs(user, M, "Borg injected with [amount_to_add] units of '[reagent_id]'")
switch(result)
if(BORGHYPO_STATUS_CONTAINERFULL)
balloon_alert(user, "\the [M] has too many reagents in [M.p_their()] system!")
return
if(BORGHYPO_STATUS_NOCHARGE)
if(is_dispensing_recipe)
balloon_alert(user, "not enough reagents to inject full recipe!")
balloon_alert(M, "you feel multiple tiny pricks in quick succession!")
else
var/datum/reagent/empty_reagent = SSchemistry.chemical_reagents[reagent_id]
balloon_alert(user, "\the [src] doesn't have enough [empty_reagent.name]!")
return
if(BORGHYPO_STATUS_NORECIPE)
balloon_alert(user, "recipe '[selected_recipe_id]' not found!")
return
else
if(is_dispensing_recipe)
balloon_alert(user, "recipe '[selected_recipe_id]' injected into \the [M].")
balloon_alert(M, "you feel multiple tiny pricks in quick succession!")
else
balloon_alert(user, "[amount_to_add] units injected into \the [M].")
balloon_alert(M, "you feel a tiny prick!")
return
/obj/item/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode
var/t
for(var/i = 1 to reagent_ids.len)
if(t)
t += ", "
if(mode == i)
t += span_bold("[reagent_names[i]]")
else
t += "<a href='byond://?src=\ref[src];reagent=[reagent_ids[i]]'>[reagent_names[i]]</a>"
t = "Available reagents: [t]."
to_chat(user,span_infoplain(t))
tgui_interact(user)
return
/* No longer necessary because we use TGUI for this now!
/obj/item/reagent_containers/borghypo/Topic(var/href, var/list/href_list)
if(href_list["reagent"])
var/t = reagent_ids.Find(href_list["reagent"])
if(t)
playsound(src, 'sound/effects/pop.ogg', 50, 0)
mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
balloon_alert(usr, "synthesizer is now producing '[R.name]'")
var/datum/reagent/new_reagent = SSchemistry.chemical_reagents[reagent_ids[mode]]
balloon_alert(usr, "synthesizer is now producing '[new_reagent.name]'")
*/
/obj/item/reagent_containers/borghypo/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui, custom_state)
. = ..()
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
// Assuming the user is opening the UI, empty the chem search preemptively.
ui_chemical_search = null
ui = new(user, src, "BorgHypo", "Integrated [is_dispensing_drinks ? "Drink Dispenser" : "Chemical Hypo"]")
ui.open()
/obj/item/reagent_containers/borghypo/tgui_static_data(mob/user)
var/list/static_data = list()
static_data["isDispensingDrinks"] = is_dispensing_drinks
static_data["minTransferAmount"] = min_transfer_amount
static_data["maxTransferAmount"] = max_transfer_amount
return static_data
/obj/item/reagent_containers/borghypo/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
var/list/data = list()
if(!isrobot(user))
return data
var/mob/living/silicon/robot/robot_user = user
data["theme"] = robot_user.get_ui_theme()
data["amount"] = amount_per_transfer_from_this
data["transferAmounts"] = transfer_amounts
var/list/chemicals = list()
for(var/key, value in reagent_volumes)
var/datum/reagent/available_reagent = SSchemistry.chemical_reagents[key]
// If the user is searching for a particular chemical by name, only add this one if its name matches their search!
if((ui_chemical_search && findtext(available_reagent.name, ui_chemical_search)) || !ui_chemical_search)
UNTYPED_LIST_ADD(chemicals, list("name" = available_reagent.name, "id" = key, "volume" = value))
data["chemicals"] = chemicals
data["uiChemicalSearch"] = ui_chemical_search
data["selectedReagentId"] = reagent_ids[mode]
data["recipes"] = saved_recipes
data["recordingRecipe"] = recording_recipe
data["isDispensingRecipe"] = is_dispensing_recipe
data["selectedRecipeId"] = selected_recipe_id
return data
/obj/item/reagent_containers/borghypo/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
. = ..()
if(.)
return
switch(action)
if("select_reagent")
var/new_mode = reagent_ids.Find(params["selectedReagentId"])
if(new_mode)
var/datum/reagent/selected_reagent = SSchemistry.chemical_reagents[reagent_ids[new_mode]]
playsound(src, 'sound/effects/pop.ogg', 50, 0)
if(recording_recipe)
UNTYPED_LIST_ADD(recording_recipe, list("id" = selected_reagent.id, "amount" = amount_per_transfer_from_this))
else
mode = new_mode
balloon_alert(ui.user, "synthesizer is now producing '[selected_reagent.name]'")
is_dispensing_recipe = FALSE
. = TRUE
if("set_amount")
amount_per_transfer_from_this = clamp(round(text2num(params["amount"]), 1), min_transfer_amount, max_transfer_amount) // Round to nearest 1, clamp between min and max transfer amount
. = TRUE
if("import_config")
var/list/our_data = params["config"]
if(!islist(our_data))
return FALSE
var/list/new_recipes = list()
for(var/key, value in our_data)
if(istext(key) && islist(value))
for(var/list/steps in value)
if(istext(steps["id"]) && isnum(steps["amount"]))
new_recipes[key] += list(list("id" = steps["id"], "amount" = steps["amount"]))
if(length(new_recipes))
saved_recipes = new_recipes
. = TRUE
if("record_recipe")
recording_recipe = list()
. = TRUE
if("cancel_recording")
recording_recipe = null
. = TRUE
if("clear_recipes")
saved_recipes = list()
. = TRUE
if("save_recording")
var/name = tgui_input_text(ui.user, "What do you want to name this recipe?", "Recipe Name?", "Recipe Name", MAX_NAME_LEN)
if(tgui_status(ui.user, state) != STATUS_INTERACTIVE)
return
if(saved_recipes[name] && tgui_alert(ui.user, "\"[name]\" already exists, do you want to overwrite it?",, list("No", "Yes")) != "Yes")
return
if(name && recording_recipe)
for(var/list/L in recording_recipe)
var/label = L["id"]
// Verify this hypo can dispense every chemical
if(!reagent_ids.Find(label))
to_chat(ui.user, span_warning("\The [src] cannot find ") + span_boldwarning(label) + span_warning("!"))
return
saved_recipes[name] = recording_recipe
recording_recipe = null
. = TRUE
if("remove_recipe")
var/recipe_name = params["recipe"]
// If we've selected the recipe we're deleting, un-select it!
if(selected_recipe_id == recipe_name)
selected_recipe_id = null
is_dispensing_recipe = FALSE
saved_recipes -= recipe_name
. = TRUE
if("select_recipe")
// Make sure we actually have a recipe saved with the given name before setting it!
var/recipe_name = params["recipe"]
var/selectedRecipe = saved_recipes[recipe_name]
if(!selectedRecipe)
to_chat(ui.user, span_warning("\The [src] cannot find the recipe ") + span_boldwarning(recipe_name) + span_warning("!"))
return
playsound(ui.user, 'sound/effects/pop.ogg', 50, 0)
balloon_alert(ui.user, "synthesizer is using macro: '[recipe_name]'")
is_dispensing_recipe = TRUE
selected_recipe_id = recipe_name
. = TRUE
if("set_chemical_search")
ui_chemical_search = params["uiChemicalSearch"]
. = TRUE
/obj/item/reagent_containers/borghypo/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
. += span_notice("It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.")
var/datum/reagent/current_reagent = SSchemistry.chemical_reagents[reagent_ids[mode]]
. += span_notice("It is currently producing [current_reagent.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.")
/obj/item/reagent_containers/borghypo/service
name = "cyborg drink synthesizer"
desc = "A portable drink dispencer."
name = "integrated drink synthesizer"
desc = "An inbuilt synthesizer capable of fabricating a broad variety of drinks."
icon = 'icons/obj/drinks.dmi'
icon_state = "shaker"
charge_cost = 20
recharge_time = 3
volume = 60
max_transfer_amount = 30
is_dispensing_drinks = TRUE
transfer_amounts = list(5, 10, 20, 30)
hypo_sound = 'sound/machines/reagent_dispense.ogg'
reagent_ids = list(REAGENT_ID_ALE,
REAGENT_ID_BEER,
REAGENT_ID_BERRYJUICE,
@@ -188,16 +402,24 @@
if(!target.is_open_container() || !target.reagents)
return
if(!reagent_volumes[reagent_ids[mode]])
to_chat(user, span_notice("[src] is out of this reagent, give it some time to refill."))
return
if(!target.reagents.get_free_space())
balloon_alert(user, "[target] is full!")
return
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
target.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
balloon_alert(user, "transfered [t] units to [target].")
var/result = try_injection(target.reagents, user)
switch(result)
if(BORGHYPO_STATUS_CONTAINERFULL)
if(is_dispensing_recipe)
balloon_alert(user, "\the [target] is too full to finish the recipe!")
else
balloon_alert(user, "\the [target] is full!")
if(BORGHYPO_STATUS_NOCHARGE)
if(is_dispensing_recipe)
balloon_alert(user, "not enough reagents to finish recipe '[selected_recipe_id]'!")
else
var/datum/reagent/empty_reagent = SSchemistry.chemical_reagents[reagent_ids[mode]]
balloon_alert(user, "not enough of reagent '[empty_reagent.name]'!")
if(BORGHYPO_STATUS_NORECIPE)
balloon_alert(user, "recipe '[selected_recipe_id]' not found!")
else
if(is_dispensing_recipe)
balloon_alert(user, "recipe '[selected_recipe_id]' dispensed to \the [target].")
else
balloon_alert(user, "[amount_per_transfer_from_this] units dispensed to \the [target].")
return