diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 5795854ec9..5a3ed2ff8c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -271,6 +271,7 @@
/obj/item/roller/robo,
/obj/item/borg/cyborghug/medical,
/obj/item/stack/medical/gauze/cyborg,
+ /obj/item/weapon/organ_storage,
/obj/item/borg/lollipop)
emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/hacked)
ratvar_modules = list(
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 1808a45b08..6e3c224924 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -24,7 +24,7 @@
/datum/surgery_step/manipulate_organs
time = 64
name = "manipulate organs"
- implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0)
+ implements = list(/obj/item/organ = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0, /obj/item/weapon/organ_storage = 100)
var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55)
var/implements_mend = list(/obj/item/weapon/cautery = 100, /obj/item/weapon/weldingtool = 70, /obj/item/weapon/lighter = 45, /obj/item/weapon/match = 20)
var/current_type
@@ -55,6 +55,15 @@
/datum/surgery_step/manipulate_organs/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
I = null
+ if(istype(tool, /obj/item/weapon/organ_storage))
+ if(!tool.contents.len)
+ to_chat(user, "There is nothing inside [tool]!")
+ return -1
+ I = tool.contents[1]
+ if(!isorgan(I))
+ to_chat(user, "You cannot put [I] into [target]'s [parse_zone(target_zone)]!")
+ return -1
+ tool = I
if(isorgan(tool))
current_type = "insert"
I = tool
@@ -74,7 +83,7 @@
"You begin to extract [B] from [target]'s [parse_zone(target_zone)]...")
return TRUE
if(!organs.len)
- to_chat(user, "There is no removeable organs in [target]'s [parse_zone(target_zone)]!")
+ to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!")
return -1
else
for(var/obj/item/organ/O in organs)
@@ -108,7 +117,14 @@
target.heal_bodypart_damage(45,0)
return 1
else if(current_type == "insert")
- I = tool
+ if(istype(tool, /obj/item/weapon/organ_storage))
+ I = tool.contents[1]
+ tool.icon_state = "evidenceobj"
+ tool.desc = "A container for holding body parts."
+ tool.cut_overlays()
+ tool = I
+ else
+ I = tool
user.drop_item()
I.Insert(target)
user.visible_message("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!",
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index b054626f4e..53520679c2 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -16,11 +16,20 @@
/datum/surgery_step/add_prosthetic
name = "add prosthetic"
- implements = list(/obj/item/bodypart = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100)
+ implements = list(/obj/item/bodypart = 100, /obj/item/weapon/organ_storage = 100, /obj/item/weapon/twohanded/required/chainsaw = 100, /obj/item/weapon/melee/synthetic_arm_blade = 100)
time = 32
var/organ_rejection_dam = 0
/datum/surgery_step/add_prosthetic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(istype(tool, /obj/item/weapon/organ_storage))
+ if(!tool.contents.len)
+ to_chat(user, "There is nothing inside [tool]!")
+ return -1
+ var/obj/item/I = tool.contents[1]
+ if(!isbodypart(I))
+ to_chat(user, "[I] cannot be attached!")
+ return -1
+ tool = I
if(istype(tool, /obj/item/bodypart))
var/obj/item/bodypart/BP = tool
if(ismonkey(target))// monkey patient only accept organic monkey limbs
@@ -49,6 +58,11 @@
return -1
/datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(istype(tool, /obj/item/weapon/organ_storage))
+ tool.icon_state = "evidenceobj"
+ tool.desc = "A container for holding body parts."
+ tool.cut_overlays()
+ tool = tool.contents[1]
if(istype(tool, /obj/item/bodypart))
var/obj/item/bodypart/L = tool
user.drop_item()
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 92dba6eede..90cb344cf5 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -97,4 +97,57 @@
/obj/item/weapon/surgical_drapes/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))
- ..()
\ No newline at end of file
+ ..()
+
+/obj/item/weapon/organ_storage //allows medical cyborgs to manipulate organs without hands
+ name = "organ storage bag"
+ desc = "A container for holding body parts."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "evidenceobj"
+
+/obj/item/weapon/organ_storage/afterattack(obj/item/I, mob/user, proximity)
+ if(!proximity)
+ return
+ if(contents.len)
+ to_chat(user, "[src] already has something inside it.")
+ return
+ if(isorgan(I))
+ var/obj/item/organ/O = I
+ if(O.status != ORGAN_ORGANIC)
+ to_chat(user, "[src] can only hold organic body parts!")
+ return
+ else if(isbodypart(I))
+ var/obj/item/bodypart/BP = I
+ if(BP.status != BODYPART_ORGANIC)
+ to_chat(user, "[src] can only hold organic body parts!")
+ return
+ else
+ return
+
+ user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].")
+ icon_state = "evidence"
+ var/xx = I.pixel_x
+ var/yy = I.pixel_y
+ I.pixel_x = 0
+ I.pixel_y = 0
+ var/image/img = image("icon"=I, "layer"=FLOAT_LAYER)
+ img.plane = FLOAT_PLANE
+ I.pixel_x = xx
+ I.pixel_y = yy
+ add_overlay(img)
+ add_overlay("evidence")
+ desc = "An organ storage container holding [I]."
+ I.loc = src
+ w_class = I.w_class
+
+/obj/item/weapon/organ_storage/attack_self(mob/user)
+ if(contents.len)
+ var/obj/item/I = contents[1]
+ user.visible_message("[user] dumps [I] from [src].", "You dump [I] from [src].")
+ cut_overlays()
+ I.forceMove(get_turf(src))
+ icon_state = "evidenceobj"
+ desc = "A container for holding body parts."
+ else
+ to_chat(user, "[src] is empty.")
+ return
\ No newline at end of file