cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Medical borg enables Gripper Use (#32234)

Browse Source 
* 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>
This commit is contained in:
juryteacher67
2026-08-01 06:13:31 +00:00
committed by GitHub
co-authored by CRUNCH Kameň
parent 218bc83cfa
commit 71a31c147c
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -1
View File
@@ -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,
code/modules/reagents/reagent_containers/glass_containers.dm
+10
View File
@@ -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."