From 71a31c147c8ce078e6ec0810f9267e7790594af2 Mon Sep 17 00:00:00 2001 From: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> Date: Sat, 1 Aug 2026 01:13:31 -0500 Subject: [PATCH] Medical borg enables Gripper Use (#32234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Medical Borg Useful Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Enable medical gripper to hold specific items Added can_hold list for medical gripper to allow holding various medical containers. Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Add iv_bag to Can_hold list Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Add large glass beaker to robot modules Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Reverted Request Got flip flopped around accidentally added it Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Remove large glass beaker from robot modules Removed large glass beaker from robot modules. Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Fixes robot beaker * Rename large robot beaker to large integrated beaker to seperate the beaker and to prevent the borg from grabbing in the inventory Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Fix typo in interaction message for large integrated beaker] beaker Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/glass_containers.dm Co-authored-by: Kameň <167246105+StoneyFox29@users.noreply.github.com> Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/glass_containers.dm Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> --------- Signed-off-by: juryteacher67 <129633830+juryteacher67@users.noreply.github.com> Signed-off-by: Kameň <167246105+StoneyFox29@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Co-authored-by: Kameň <167246105+StoneyFox29@users.noreply.github.com> --- code/game/objects/items/robot/cyborg_gripper.dm | 10 +++++++--- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- .../reagents/reagent_containers/glass_containers.dm | 10 ++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/robot/cyborg_gripper.dm b/code/game/objects/items/robot/cyborg_gripper.dm index 70c60ffc723..ffde5ac0b28 100644 --- a/code/game/objects/items/robot/cyborg_gripper.dm +++ b/code/game/objects/items/robot/cyborg_gripper.dm @@ -335,14 +335,18 @@ // Medical Gripper // For medical borgs, for doing medical stuff! -// Not giving this anything to hold yet, but stuff may be added in the future. Organs/implants are currently viewed as too strong to hold. /obj/item/gripper/medical name = "medical gripper" desc = "A grasping tool for cyborgs. This one is covered with hygenic medical-grade silicone rubber. \ Use it to help patients up once surgery is complete, or to substitute for hands in surgical operations." can_help_up = TRUE - // REMOVE actions_types from here if you add a can_hold list for this gripper! - actions_types = list() + can_hold = list( + /obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/glass/bottle, + /obj/item/reagent_containers/applicator, + /obj/item/reagent_containers/patch, + /obj/item/reagent_containers/pill + ) /obj/item/gripper/medical/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 837380fb0ad..95f5880f4b6 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -346,7 +346,7 @@ /obj/item/bonegel, /obj/item/fix_o_vein, /obj/item/extinguisher/mini/cyborg, - /obj/item/reagent_containers/glass/beaker/large, + /obj/item/reagent_containers/glass/beaker/large/robot, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/stack/medical/bruise_pack/advanced/cyborg, diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index a172b87e52e..f5d0a17c4de 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -236,6 +236,16 @@ volume = 100 possible_transfer_amounts = list(5,10,15,25,30,50,100) +/obj/item/reagent_containers/glass/beaker/large/robot // Only for borgs. + name = "large integrated beaker" + desc = "An internal chemical beaker used for holding a large reserve of chemicals." + +/obj/item/reagent_containers/glass/beaker/large/robot/item_interaction(mob/living/user, obj/item/used, list/modifiers) + if(istype(used, /obj/item/gripper)) // So the borg isn't able to take out its beaker. + to_chat(user, SPAN_NOTICE("You can't grab [src].")) + return ITEM_INTERACT_COMPLETE + return ..() + /obj/item/reagent_containers/glass/beaker/vial name = "vial" desc = "A small glass vial, often used by virologists of the 25th century."