Adds organ storage containers

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, "<span class='notice'>There is nothing inside [tool]!</span>")
+			return -1
+		I = tool.contents[1]
+		if(!isorgan(I))
+			to_chat(user, "<span class='notice'>You cannot put [I] into [target]'s [parse_zone(target_zone)]!</span>")
+			return -1
+		tool = I
 	if(isorgan(tool))
 		current_type = "insert"
 		I = tool
@@ -74,7 +83,7 @@
 					"<span class='notice'>You begin to extract [B] from [target]'s [parse_zone(target_zone)]...</span>")
 			return TRUE
 		if(!organs.len)
-			to_chat(user, "<span class='notice'>There is no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
+			to_chat(user, "<span class='notice'>There are no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
 			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)]!",