From 5ee35f32ba36cb8361c12acb7709d00f4a8ede4d Mon Sep 17 00:00:00 2001 From: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Date: Sun, 11 May 2025 01:08:18 +0500 Subject: [PATCH] Update borg hypospray (#29014) * Update borghydro.dm * Update borghydro.dm * typo * maybe also this * fix runtime * what's that language --- .../reagents/reagent_containers/borghydro.dm | 153 ++++++++++-------- 1 file changed, 84 insertions(+), 69 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 981fa51b601..d1ae9228325 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -6,22 +6,25 @@ item_state = "hypo" icon = 'icons/obj/hypo.dmi' icon_state = "borghypo" - amount_per_transfer_from_this = 5 - possible_transfer_amounts = null - /// It doesn't matter what reagent is used in the autohypos, so we don't! - var/total_reagents = 50 - /// Maximum reagents that the base autohypo can store - var/maximum_reagents = 50 + possible_transfer_amounts = list(1, 2, 3, 4, 5, 10, 15, 20, 25, 30) + volume = 50 + /// Cyborg that our module is attached to + var/mob/living/silicon/robot/cyborg + /// Amount of charge that we will deduct from cell on each successful `refill_hypo()` var/charge_cost = 50 - /// Used for delay with the recharge time, each charge tick is worth 2 seconds of real time + /// Delay in ticks we apply before refilling our hypo + var/refill_delay = 2 + /// Tracking for how long we didn't make a refill. Refills on every (charge_tick > refill_delay) tick var/charge_tick = 0 - /// How many SSobj ticks it takes for the reagents to recharge by 10 units - var/recharge_time = 3 /// Can the autohypo inject through thick materials? var/penetrate_thick = FALSE - var/choosen_reagent = "salglu_solution" - var/list/datum/reagents/reagent_list = list() + /// if true - will play a sound on use + var/play_sound = TRUE + /// reagent that we will transfer on hypo use + var/reagent_selected = "salglu_solution" + /// reagents that we are able to dispense var/list/reagent_ids = list("salglu_solution", "epinephrine", "spaceacillin", "charcoal", "hydrocodone", "mannitol", "salbutamol") + /// reagents that we will be able to dispense when someone emaggs us var/list/reagent_ids_emagged = list("tirizene") var/static/list/reagent_icons = list("salglu_solution" = image(icon = 'icons/goonstation/objects/iv.dmi', icon_state = "ivbag"), "epinephrine" = image(icon = 'icons/obj/hypo.dmi', icon_state = "autoinjector"), @@ -38,74 +41,73 @@ "corazone" = image(icon = 'icons/obj/abductor.dmi', icon_state = "bed"), "tirizene" = image(icon = 'icons/obj/aibots.dmi', icon_state = "pancbot")) -/obj/item/reagent_containers/borghypo/surgeon - reagent_ids = list("styptic_powder", "epinephrine", "salbutamol") - total_reagents = 60 - maximum_reagents = 60 - -/obj/item/reagent_containers/borghypo/crisis - reagent_ids = list("salglu_solution", "epinephrine", "sal_acid") - total_reagents = 60 - maximum_reagents = 60 - -/obj/item/reagent_containers/borghypo/syndicate - name = "syndicate cyborg hypospray" - desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and hydrocodone, for field surgery and pain relief." - icon_state = "borghypo_s" - charge_cost = 20 - recharge_time = 2 // No time to recharge - reagent_ids = list("syndicate_nanites", "potass_iodide", "hydrocodone") - total_reagents = 30 - maximum_reagents = 30 - penetrate_thick = TRUE - choosen_reagent = "syndicate_nanites" - -/obj/item/reagent_containers/borghypo/abductor - charge_cost = 40 - recharge_time = 3 - reagent_ids = list("salglu_solution", "epinephrine", "hydrocodone", "spaceacillin", "charcoal", "mannitol", "salbutamol", "corazone") - penetrate_thick = TRUE - /obj/item/reagent_containers/borghypo/Initialize(mapload) . = ..() - START_PROCESSING(SSobj, src) + cyborg = loc.loc // yeah.. + refill_hypo(quick = TRUE) // start with a full hypo /obj/item/reagent_containers/borghypo/Destroy() STOP_PROCESSING(SSobj, src) + cyborg = null return ..() -/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg - charge_tick++ - if(charge_tick < recharge_time) - return FALSE - charge_tick = 0 - refill_borghypo() - return TRUE +/obj/item/reagent_containers/borghypo/process() + if(!should_refill()) // no need to refill + STOP_PROCESSING(SSobj, src) + return + if(!refill_delay) // no delay, refill it now + refill_hypo(cyborg) + return + if(charge_tick < refill_delay) // not ready to refill + charge_tick++ + else // ready to refill + refill_hypo(cyborg) // Use this to add more chemicals for the borghypo to produce. -/obj/item/reagent_containers/borghypo/proc/refill_borghypo(reagent_id, mob/living/silicon/robot/robot) - if(istype(robot)) - robot.cell.use(charge_cost) - total_reagents = min((total_reagents + BORGHYPO_REFILL_VALUE), maximum_reagents) +/obj/item/reagent_containers/borghypo/proc/refill_hypo(mob/living/silicon/robot/user, quick = FALSE) + if(quick) // gives us a hypo full of reagents no matter what + for(var/reagent as anything in reagent_ids) + if(reagent_ids[reagent] < volume) + reagent_ids[reagent] = volume + return + if(istype(user) && user.cell && user.cell.use(charge_cost)) // we are a robot, we have a cell and enough charge? let's refill now + if(charge_tick) + charge_tick = 0 + for(var/reagent as anything in reagent_ids) + if(reagent_ids[reagent] < volume) + var/reagents_to_add = min(volume - reagent_ids[reagent], BORGHYPO_REFILL_VALUE) + reagent_ids[reagent] = (reagent_ids[reagent] || 0) + reagents_to_add // in case if it's null somehow, set it to 0 + +// whether our hypo's reagents are at max volume or not +/obj/item/reagent_containers/borghypo/proc/should_refill() + for(var/reagent as anything in reagent_ids) + if(reagent_ids[reagent] < volume) + return TRUE + return FALSE /obj/item/reagent_containers/borghypo/interact_with_atom(atom/target, mob/living/user, list/modifiers) if(ishuman(target)) var/mob/living/carbon/human/mob = target - if(!total_reagents) + if(!reagent_ids[reagent_selected]) to_chat(user, "The injector is empty.") return ITEM_INTERACT_COMPLETE if(!mob.can_inject(user, TRUE, user.zone_selected, penetrate_thick)) return ITEM_INTERACT_COMPLETE - to_chat(user, "You inject [mob] with the injector.") + to_chat(user, "You inject [mob] with [src].") to_chat(mob, "You feel a tiny prick!") - mob.reagents.add_reagent(choosen_reagent, 5) - total_reagents = (total_reagents - 5) + var/reagents_to_transfer = min(amount_per_transfer_from_this, reagent_ids[reagent_selected]) + mob.reagents.add_reagent(reagent_selected, reagents_to_transfer) + reagent_ids[reagent_selected] -= reagents_to_transfer + user.changeNext_move(CLICK_CD_MELEE) + START_PROCESSING(SSobj, src) // start processing so we can refill hypo + if(play_sound) + playsound(loc, 'sound/goonstation/items/hypo.ogg', 80, FALSE) if(mob.reagents) - var/datum/reagent/injected = GLOB.chemical_reagents_list[choosen_reagent] + var/datum/reagent/injected = GLOB.chemical_reagents_list[reagent_selected] var/contained = injected.name - add_attack_logs(user, mob, "Injected with [name] containing [contained], transfered [5] units", injected.harmless ? ATKLOG_ALMOSTALL : null) - to_chat(user, "[5] units injected. [total_reagents] units remaining.") + add_attack_logs(user, mob, "Injected with [name] containing [contained], transfered [reagents_to_transfer] units", injected.harmless ? ATKLOG_ALMOSTALL : null) + to_chat(user, "[reagents_to_transfer] units injected. [reagent_ids[reagent_selected]] units remaining.") return ITEM_INTERACT_COMPLETE if(isliving(target)) // ignore non-human mobs @@ -122,31 +124,44 @@ var/selected_reagent = show_radial_menu(user, src, get_radial_contents(), radius = 48) if(!selected_reagent) return - charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes. var/datum/reagent/R = GLOB.chemical_reagents_list[selected_reagent] - to_chat(user, "Synthesizer is now producing [R.name].") - choosen_reagent = selected_reagent + to_chat(user, "Synthesizer is now dispensing [R.name].") + reagent_selected = selected_reagent /obj/item/reagent_containers/borghypo/examine(mob/user) . = ..() - var/datum/reagent/get_reagent_name = GLOB.chemical_reagents_list[choosen_reagent] - . |= "It is currently dispensing [get_reagent_name.name]. Contains [total_reagents] units of various reagents." // We couldn't care less what actual reagent is in the container, just if there IS reagent in it + var/datum/reagent/get_reagent_name = GLOB.chemical_reagents_list[reagent_selected] + . |= "Contains [reagent_ids[reagent_selected]] units of [get_reagent_name.name]." /obj/item/reagent_containers/borghypo/emag_act(mob/user) if(!emagged) emagged = TRUE penetrate_thick = TRUE + play_sound = FALSE reagent_ids += reagent_ids_emagged + refill_hypo(quick = TRUE) return emagged = FALSE penetrate_thick = FALSE + play_sound = initial(play_sound) reagent_ids -= reagent_ids_emagged + refill_hypo(quick = TRUE) -/obj/item/reagent_containers/borghypo/basic - name = "Basic Medical Hypospray" - desc = "A very basic medical hypospray, capable of providing simple medical treatment in emergencies." - reagent_ids = list("salglu_solution", "epinephrine") - total_reagents = 30 - maximum_reagents = 30 +/obj/item/reagent_containers/borghypo/syndicate + name = "syndicate cyborg hypospray" + desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and hydrocodone, for field surgery and pain relief." + icon_state = "borghypo_s" + penetrate_thick = TRUE + refill_delay = FALSE // recharges each tick + play_sound = FALSE + volume = 30 + charge_cost = 20 + reagent_ids = list("syndicate_nanites", "potass_iodide", "hydrocodone") + reagent_selected = "syndicate_nanites" + +/obj/item/reagent_containers/borghypo/abductor + penetrate_thick = TRUE + charge_cost = 40 + reagent_ids = list("salglu_solution", "epinephrine", "spaceacillin", "charcoal", "hydrocodone", "mannitol", "salbutamol", "corazone") #undef BORGHYPO_REFILL_VALUE