diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 6ab907ea06..c7629ee0f8 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -11,15 +11,19 @@ var/min_health = -100 var/cleaning = 0 var/patient_laststat = null - var/mob_energy = 30000 //Energy gained from digesting mobs (including PCs) + var/mob_energy = -20000 //Energy gained from digesting mobs (including PCs) var/list/injection_chems = list("inaprovaline", "dexalin", "bicaridine", "kelotane","anti_toxin", "alkysine", "imidazoline", "spaceacillin", "paracetamol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection. var/eject_port = "ingestion" var/list/items_preserved = list() - var/UI_open = 0 + var/UI_open = FALSE + var/datum/research/techonly/files //Analyzerbelly var. + var/synced = FALSE + var/startdrain = 500 /obj/item/device/dogborg/sleeper/New() ..() flags |= NOBLUDGEON //No more attack messages + files = new /datum/research/techonly(src) /obj/item/device/dogborg/sleeper/Exit(atom/movable/O) return 0 @@ -31,10 +35,10 @@ if(!ishuman(target)) return if(target.buckled) - user << "The user is buckled and can not be put into your [src.name]." + to_chat(user, "The user is buckled and can not be put into your [src.name].") return if(patient) - user << "Your [src.name] is already occupied." + to_chat(user, "Your [src.name] is already occupied.") return user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src]...") if(!patient && ishuman(target) && !target.buckled && do_after (user, 50, target)) @@ -51,7 +55,7 @@ user.visible_message("[hound.name]'s medical pod lights up as [target.name] slips inside into their [src.name].", "Your medical pod lights up as [target] slips into your [src]. Life support functions engaged.") message_admins("[key_name(hound)] has eaten [key_name(patient)] as a dogborg. ([hound ? "JMP" : "null"])") playsound(hound, 'sound/vore/gulp.ogg', 100, 1) //POLARISTODO - if(UI_open == 1) + if(UI_open == TRUE) sleeperUI(usr) /obj/item/device/dogborg/sleeper/proc/go_out(var/target) @@ -92,7 +96,7 @@ if(..()) return sleeperUI(user) - UI_open = 1 + UI_open = TRUE /obj/item/device/dogborg/sleeper/proc/sleeperUI(mob/user) var/dat @@ -126,6 +130,9 @@ dat += "Current load: [length(contents)] / [garbo.max_item_count] objects.
" dat += "([list2text(contents,", ")])

" + if(istype(src, /obj/item/device/dogborg/sleeper/compactor/analyzer) && synced == FALSE) + dat += "Sync Files
" + //Cleaning and there are still un-preserved items if(cleaning && length(contents - items_preserved)) dat += "Self-cleaning mode. [length(contents - items_preserved)] object(s) remaining.
" @@ -180,8 +187,6 @@ //popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) //I have no idea what this is, but it feels irrelevant and causes runtimes idk. popup.set_content(dat) popup.open() - onclose(user, "sleeper") - UI_open = 0 return /obj/item/device/dogborg/sleeper/Topic(href, href_list) @@ -197,6 +202,9 @@ go_out() sleeperUI(usr) return + if( href_list["close"] ) + UI_open = FALSE + return if(href_list["clean"]) if(!cleaning) var/confirm = alert(usr, "You are about to engage self-cleaning mode. This will fill your [src] with caustic enzymes to remove any objects or biomatter, and convert them into energy. Are you sure?", "Confirmation", "Self-Clean", "Cancel") @@ -205,11 +213,11 @@ return else cleaning = 1 - drain(500) + drain(startdrain) processing_objects.Add(src) sleeperUI(usr) if(patient) - patient << "[hound.name]'s [src.name] fills with caustic enzymes around you!" + to_chat(patient, "[hound.name]'s [src.name] fills with caustic enzymes around you!") return if(cleaning) sleeperUI(usr) @@ -223,13 +231,32 @@ sleeperUI(usr) return + if(href_list["sync"]) + synced = TRUE + var/success = 0 + for(var/obj/machinery/r_n_d/server/S in machines) + for(var/datum/tech/T in files.known_tech) //Uploading + S.files.AddTech2Known(T) + for(var/datum/tech/T in S.files.known_tech) //Downloading + files.AddTech2Known(T) + success = 1 + files.RefreshResearch() + if(success) + to_chat(usr, "You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch.") + playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) + else + to_chat(usr, "Reserch server ping response timed out. Unable to connect. Please contact the system administrator.") + playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1) + sleeperUI(usr) + return + if(patient && !(patient.stat & DEAD)) //What is bitwise NOT? ... Thought it was tilde. if(href_list["inject"] == "inaprovaline" || patient.health > min_health) inject_chem(usr, href_list["inject"]) else - usr << "ERROR: Subject is not in stable condition for injections." + to_chat(usr, "ERROR: Subject is not in stable condition for injections.") else - usr << "ERROR: Subject cannot metabolise chemicals." + to_chat(usr, "ERROR: Subject cannot metabolise chemicals.") src.updateUsrDialog() sleeperUI(usr) //Needs a callback to boop the page to refresh. @@ -239,15 +266,15 @@ if(patient && patient.reagents) if(chem in injection_chems + "inaprovaline") if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it. - hound << "You don't have enough power to synthesize fluids." + to_chat(hound, "You don't have enough power to synthesize fluids.") return else if(patient.reagents.get_reagent_amount(chem) + 10 >= 20) //Preventing people from accidentally killing themselves by trying to inject too many chemicals! - hound << "Your stomach is currently too full of fluids to secrete more fluids of this kind." + to_chat(hound, "Your stomach is currently too full of fluids to secrete more fluids of this kind.") else if(patient.reagents.get_reagent_amount(chem) + 10 <= 20) //No overdoses for you patient.reagents.add_reagent(chem, inject_amount) drain(750) //-750 charge per injection var/units = round(patient.reagents.get_reagent_amount(chem)) - hound << "Injecting [units] unit\s of [chemical_reagents_list[chem]] into occupant." //If they were immersed, the reagents wouldn't leave with them. + to_chat(hound, "Injecting [units] unit\s of [chemical_reagents_list[chem]] into occupant.") //If they were immersed, the reagents wouldn't leave with them. //For if the dogborg's existing patient uh, doesn't make it. /obj/item/device/dogborg/sleeper/proc/update_patient() @@ -289,6 +316,11 @@ hound.sleeper_r = TRUE hound.sleeper_g = FALSE + //Letting analyzer gut swell if overloaded. + if(istype(src,/obj/item/device/dogborg/sleeper/compactor/analyzer) && (length(contents) > 1)) + hound.sleeper_r = TRUE + hound.sleeper_g = FALSE + //Couldn't find anyone, and not cleaning else if(!cleaning && !patient) hound.sleeper_r = FALSE @@ -297,7 +329,7 @@ patient_laststat = null patient = null hound.updateicon() - if(UI_open == 1) + if(UI_open == TRUE) sleeperUI(usr) return @@ -313,7 +345,7 @@ //Belly is entirely empty if(!length(contents)) - hound << "Your [src.name] is now clean. Ending self-cleaning cycle." + to_chat(hound, "Your [src.name] is now clean. Ending self-cleaning cycle.") cleaning = 0 update_patient() return @@ -358,9 +390,9 @@ //Mob is now dead if(T.stat & DEAD) message_admins("[key_name(hound)] has digested [key_name(T)] as a dogborg. ([hound ? "JMP" : "null"])") - hound << "You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems." - T << "You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems." - src.drain(-30000) //Fueeeeellll + to_chat(hound, "You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems.") + to_chat(T, "You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems.") + src.drain(mob_energy) //Fueeeeellll var/deathsound = pick( 'sound/vore/death1.ogg', 'sound/vore/death2.ogg', @@ -384,7 +416,7 @@ for (var/mob/subprey in belly.internal_contents) subprey.loc = src belly.internal_contents -= subprey - subprey << "As [T] melts away around you, you find yourself in [hound]'s [name]" + to_chat(subprey, "As [T] melts away around you, you find yourself in [hound]'s [name]") for(var/obj/item/I in T) if(istype(I,/obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = I @@ -397,21 +429,26 @@ T.drop_from_inventory(I, src) qdel(T) src.update_patient() - if(UI_open == 1) + if(UI_open == TRUE) sleeperUI(hound) //Handle the target being anything but a /mob/living/carbon/human else var/obj/item/T = target if(istype(T)) + if(istype(src,/obj/item/device/dogborg/sleeper/compactor/analyzer)) + var/obj/item/tech_item = T + for(var/tech in tech_item.origin_tech) + files.UpdateTech(tech, tech_item.origin_tech[tech]) + synced = FALSE var/digested = T.digest_act(item_storage = src) if(!digested) items_preserved |= T else hound.cell.charge += (50 * digested) - if(UI_open == 1) - update_patient() + if(UI_open == TRUE) + src.update_patient() sleeperUI(hound) return @@ -444,30 +481,22 @@ /obj/item/device/dogborg/sleeper/K9 //The K9 portabrig name = "Brig-Belly" desc = "Equipment for a K9 unit. A mounted portable-brig that holds criminals." - icon = 'icons/mob/dogborg_vr.dmi' icon_state = "sleeperb" - inject_amount = 10 - min_health = -100 - injection_chems = list("inaprovaline") //So they don't have all the same chems as the medihound! + injection_chems = null //So they don't have all the same chems as the medihound! /obj/item/device/dogborg/sleeper/compactor //Janihound gut. name = "Garbage Processor" desc = "A mounted garbage compactor unit with fuel processor." - icon = 'icons/mob/dogborg_vr.dmi' icon_state = "compactor" - inject_amount = 10 - min_health = -100 injection_chems = null //So they don't have all the same chems as the medihound! var/max_item_count = 25 -/obj/item/device/dogborg/sleeper/analyzer //sci-borg gut. - name = "Dogborg Digestive Analyzer" +/obj/item/device/dogborg/sleeper/compactor/analyzer //sci-borg gut. + name = "Digestive Analyzer" desc = "A mounted destructive analyzer unit with fuel processor." - icon = 'icons/mob/dogborg_vr.dmi' icon_state = "analyzer" - inject_amount = 10 - min_health = -100 - injection_chems = null //So they don't have all the same chems as the medihound! + max_item_count = 1 + startdrain = 100 /obj/item/device/dogborg/sleeper/compactor/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS hound = loc @@ -481,23 +510,62 @@ if(target in hound.module.modules) return if(length(contents) > (max_item_count - 1)) - user << "Your [src.name] is full. Eject or process contents to continue." + to_chat(user, "Your [src.name] is full. Eject or process contents to continue.") + return + + if(istype(src,/obj/item/device/dogborg/sleeper/compactor/analyzer)) + if(istype(target, /obj/item)) + var/obj/target_obj = target + if(target_obj.w_class >= ITEMSIZE_LARGE) + to_chat(user, "\The [target] is too large to fit into your [src.name]") + return + user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src.name]...") + if(do_after(user, 30, target) && length(contents) < max_item_count) + target.forceMove(src) + user.visible_message("[hound.name]'s internal analyzer groans lightly as [target.name] slips inside.", "Your internal analyzer groans lightly as [target] slips inside.") + playsound(hound, 'sound/vore/gulp.ogg', 30, 1) + if(istype(target,/obj/item)) + var/obj/item/tech_item = target + for(var/T in tech_item.origin_tech) + to_chat(user, "\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)].") + src.update_patient() + if(UI_open == TRUE) + sleeperUI(usr) + return + + else if(ishuman(target)) + var/mob/living/carbon/human/trashman = target + if(patient) + to_chat(user, "Your [src.name] is already occupied.") + return + if(trashman.buckled) + to_chat(user, "[trashman] is buckled and can not be put into your [src.name].") + return + user.visible_message("[hound.name] is ingesting [trashman] into their [src.name].", "You start ingesting [trashman] into your [src.name]...") + if(do_after(user, 30, trashman) && !patient && !trashman.buckled && length(contents) < max_item_count) + trashman.forceMove(src) + trashman.reset_view(src) + processing_objects.Add(src) + user.visible_message("[hound.name]'s internal analyzer groans lightly as [trashman] slips inside.", "Your internal analyzer groans lightly as [trashman] slips inside.") + playsound(hound, 'sound/vore/gulp.ogg', 80, 1) + src.update_patient() + if(UI_open == TRUE) + sleeperUI(usr) + return return if(istype(target, /obj/item) || istype(target, /obj/effect/decal/remains)) var/obj/target_obj = target if(target_obj.w_class > ITEMSIZE_LARGE) - user << "\The [target] is too large to fit into your [src.name]" + to_chat(user, "\The [target] is too large to fit into your [src.name]") return user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src.name]...") if(do_after(user, 30, target) && length(contents) < max_item_count) target.forceMove(src) user.visible_message("[hound.name]'s garbage processor groans lightly as [target.name] slips inside.", "Your garbage compactor groans lightly as [target] slips inside.") playsound(hound, 'sound/vore/gulp.ogg', 30, 1) - if(length(contents) > 11) //grow that tum after a certain junk amount - hound.sleeper_r = TRUE - hound.updateicon() - if(UI_open == 1) + src.update_patient() + if(UI_open == TRUE) sleeperUI(usr) return @@ -509,32 +577,28 @@ trashmouse.reset_view(src) user.visible_message("[hound.name]'s garbage processor groans lightly as [trashmouse] slips inside.", "Your garbage compactor groans lightly as [trashmouse] slips inside.") playsound(hound, 'sound/vore/gulp.ogg', 30, 1) - if(length(contents) > 11) //grow that tum after a certain junk amount - hound.sleeper_r = TRUE - hound.updateicon() - if(UI_open == 1) + src.update_patient() + if(UI_open == TRUE) sleeperUI(usr) return else if(ishuman(target)) var/mob/living/carbon/human/trashman = target if(patient) - user << "Your [src.name] is already occupied." + to_chat(user, "Your [src.name] is already occupied.") return if(trashman.buckled) - user << "[trashman] is buckled and can not be put into your [src.name]." + to_chat(user, "[trashman] is buckled and can not be put into your [src.name].") return user.visible_message("[hound.name] is ingesting [trashman] into their [src.name].", "You start ingesting [trashman] into your [src.name]...") if(do_after(user, 30, trashman) && !patient && !trashman.buckled && length(contents) < max_item_count) trashman.forceMove(src) trashman.reset_view(src) - update_patient() processing_objects.Add(src) user.visible_message("[hound.name]'s garbage processor groans lightly as [trashman] slips inside.", "Your garbage compactor groans lightly as [trashman] slips inside.") playsound(hound, 'sound/vore/gulp.ogg', 80, 1) - hound.sleeper_r = TRUE - hound.updateicon() - if(UI_open == 1) + src.update_patient() + if(UI_open == TRUE) sleeperUI(usr) return return diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 5a063fd307..aa0a7ecec3 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -100,9 +100,9 @@ T.update_icon() else T.charge_tick = 0 - var/obj/item/weapon/melee/baton/robot/B = locate() in src.modules + /*var/obj/item/weapon/melee/baton/robot/B = locate() in src.modules //Borg baton uses borg cell. if(B && B.bcell) - B.bcell.give(amount) + B.bcell.give(amount)*/ /obj/item/weapon/robot_module/robot/medihound @@ -204,8 +204,8 @@ src.modules += new /obj/item/weapon/dogborg/jaws/small(src) src.modules += new /obj/item/device/dogborg/boop_module(src) src.modules += new /obj/item/device/dogborg/tongue(src) - src.modules += new /obj/item/device/dogborg/sleeper/analyzer(src) //doesnt have a destructive analyzer in it yet - src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) + src.modules += new /obj/item/device/dogborg/sleeper/compactor/analyzer(src) + //src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) //Belly works now. src.modules += new /obj/item/weapon/gripper/research(src) src.modules += new /obj/item/weapon/gripper/no_use/loader(src) src.modules += new /obj/item/weapon/screwdriver/cyborg(src)