Organs update 3

code/modules/surgery/organ_manipulation.dm

@@ -23,7 +23,7 @@
 /datum/surgery_step/manipulate_organs
 	time = 64
 	name = "manipulate organs"
-	implements = list(/obj/item/organ/internal = 100)
+	implements = list(/obj/item/organ/internal = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0)
 	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
@@ -84,7 +84,12 @@
 
 	else if(implement_type in implements_mend)
 		current_type = "mend"
+		user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].",
+			"<span class='notice'>You begin to mend the incision in [target]'s [parse_zone(target_zone)]...</span>")
 
+	else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ))
+		user << "<span class='warning'>[tool] was biten by someone! It's too damaged to use!</span>"
+		return -1
 
 /datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	if(current_type == "mend")

code/modules/surgery/organs/augments_eyes.dm

@@ -8,9 +8,11 @@
 	w_class = 1
 
 	var/sight_flags = 0
+	var/dark_view = 0
 	var/eye_color = "fff"
 	var/old_eye_color = "fff"
 	var/flash_protect = 0
+	var/see_invisible = 0
 	var/aug_message = "Your vision is augmented!"
 
 
@@ -36,6 +38,10 @@
 /obj/item/organ/internal/cyberimp/eyes/on_life()
 	..()
 	owner.sight |= sight_flags
+	if(dark_view)
+		owner.see_in_dark = dark_view
+	if(see_invisible)
+		owner.see_invisible = see_invisible
 
 /obj/item/organ/internal/cyberimp/eyes/emp_act(severity)
 	if(!owner)
@@ -60,6 +66,7 @@
 	eye_color = "000"
 	implant_color = "#000000"
 	origin_tech = "materials=6;programming=4;biotech=6;magnets=5"
+	dark_view = 8
 	sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
 
 /obj/item/organ/internal/cyberimp/eyes/thermals
@@ -67,9 +74,11 @@
 	desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
 	eye_color = "FC0"
 	implant_color = "#FFCC00"
-	sight_flags = SEE_MOBS
-	flash_protect = -1
 	origin_tech = "materials=6;programming=4;biotech=5;magnets=5;syndicate=4"
+	sight_flags = SEE_MOBS
+	see_invisible = SEE_INVISIBLE_MINIMUM
+	flash_protect = -1
+	dark_view = 8
 	aug_message = "You see prey everywhere you look..."
 
 

code/modules/surgery/organs/helpers.dm

@@ -14,13 +14,12 @@ mob/living/carbon/getorgan(typepath)
 mob/living/carbon/getorganszone(zone, var/subzones = 0)
 	var/list/returnorg = list()
 	if(subzones)
+		// Include subzones - groin for chest, eyes and mouth for head
 		if(zone == "head")
 			returnorg = getorganszone("eyes") + getorganszone("mouth")
-			// We don't have mouth organs now, but who knows?
 		if(zone == "chest")
 			returnorg = getorganszone("groin")
 
-
 	for(var/obj/item/organ/internal/O in internal_organs)
 		if(zone == O.zone)
 			returnorg += O

code/modules/surgery/organs/organ_internal.dm

@@ -40,17 +40,24 @@
 	return
 
 /obj/item/organ/internal/proc/prepare_eat()
-	var/obj/item/weapon/reagent_containers/food/snacks/S = new
+	var/obj/item/weapon/reagent_containers/food/snacks/organ/S = new
 	S.name = name
 	S.desc = desc
 	S.icon = icon
 	S.icon_state = icon_state
 	S.origin_tech = origin_tech
 	S.w_class = w_class
-	S.reagents.add_reagent("nutriment", 5)
 
 	return S
 
+/obj/item/weapon/reagent_containers/food/snacks/organ
+	name = "appendix"
+	icon_state = "appendix"
+	icon = 'icons/obj/surgery.dmi'
+
+	list_reagents = list("nutriment" = 5)
+
+
 /obj/item/organ/internal/Destroy()
 	if(owner)
 		Remove(owner, 1)