Даём возможность пощупать органы и вырывать их

code/datums/spells/inflict_handler.dm

@@ -27,7 +27,7 @@
 				if(ishuman(target) || ismonkey(target))
 					var/mob/living/carbon/C = target
 					if(C.has_brain()) // Their brain is already taken out
-						var/obj/item/brain/B = new(C.loc)
+						var/obj/item/organ/internal/brain/B = new(C.loc)
 						B.transfer_identity(C)
 				target.gib()
 			if("disintegrate")

code/game/dna/dna_modifier.dm

@@ -128,7 +128,7 @@
 				occupant = occupant_body = C
 				break
 			if(isbrain(M))
-				var/obj/item/brain/B = M
+				var/obj/item/organ/internal/brain/B = M
 				occupant = B.brainmob
 				occupant_body = B
 				break

code/modules/food/recipes_microwave.dm

@@ -120,7 +120,7 @@
 /datum/recipe/microwave/brainburger
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,
-		/obj/item/brain
+		/obj/item/organ/internal/brain/
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
 

code/modules/food/recipes_oven.dm

@@ -385,7 +385,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
-		/obj/item/brain
+		/obj/item/organ/internal/brain
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cake/brain
 

code/modules/mob/living/carbon/brain/MMI.dm

@@ -15,8 +15,8 @@
 	var/mob/living/carbon/brain/brainmob = null//The current occupant.
 
 /obj/item/device/mmi/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/brain) && !brainmob) //Time to stick a brain in it --NEO
-		var/obj/item/brain/B = I
+	if(istype(I, /obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO
+		var/obj/item/organ/internal/brain/B = I
 		if(!B.brainmob)
 			to_chat(user, "<span class='warning'>You aren't sure where this brain came from, but you're pretty sure it's a useless brain.</span>")
 			return
@@ -83,7 +83,7 @@
 		QDEL_NULL(brainmob)
 		return
 
-	var/obj/item/brain/brain
+	var/obj/item/organ/internal/brain
 	if(user)
 		to_chat(user, "<span class='notice'>You upend the MMI, spilling the brain onto the floor.</span>")
 		brain = new(get_turf(user))

code/modules/mob/living/carbon/brain/death.dm

@@ -17,5 +17,5 @@
 	..()
 	if(container && isMMI(container))
 		qdel(container)//Gets rid of the MMI if there is one
-	if(istype(old_loc, /obj/item/brain))
+	if(istype(old_loc, /obj/item/organ/internal/brain))
 		qdel(old_loc)//Gets rid of the brain item

code/modules/mob/living/carbon/human/life.dm

@@ -834,6 +834,24 @@ var/global/list/tourette_bad_words= list(
 		else if(ear_damage < 25)	//ear damage heals slowly under this threshold. otherwise you'll need earmuffs
 			ear_damage = max(ear_damage-0.05, 0)
 
+		//Liver
+		if(should_have_organ(O_LIVER) && !has_organ(O_LIVER))
+			adjustToxLoss(0.2)
+			blurEyes(0.5)
+
+		//Kidneys
+		if(should_have_organ(O_KIDNEYS) && !has_organ(O_KIDNEYS))
+			adjustToxLoss(0.4)
+			adjustBruteLoss(0.2)
+
+		//Heart
+		if(should_have_organ(O_HEART) && !has_organ(O_HEART))
+			death()
+
+		//Lungs
+		if(should_have_organ(O_LUNGS) && !has_organ(O_LUNGS))
+			adjustOxyLoss(1.5)
+
 		//Other
 		if(stunned)
 			speech_problem_flag = 1

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -179,7 +179,7 @@
 		/obj/item/stack/sheet/plasteel,
 		/obj/item/weapon/circuitboard,
 		/obj/item/device/mmi,
-		/obj/item/brain,
+		/obj/item/organ/internal/brain,
 		/obj/item/device/mmi/posibrain,
 		/obj/item/robot_parts,
 		/obj/item/weapon/stock_parts,
@@ -199,7 +199,6 @@
 		/obj/item/weapon/storage/pill_bottle,
 		/obj/item/organ/internal,
 		/obj/item/organ/external,
-		/obj/item/brain,
 		/obj/item/robot_parts/l_arm,
 		/obj/item/robot_parts/r_arm,
 		/obj/item/robot_parts/l_leg,

code/modules/organs/organ.dm

@@ -34,14 +34,23 @@
 	loc = null
 	owner = H
 
+/obj/item/organ/proc/del_owner(mob/living/carbon/human/H, datum/species/S)
+	loc = null
+	owner = H
+
 /obj/item/organ/proc/insert_organ(mob/living/carbon/human/H, surgically = FALSE, datum/species/S)
 	set_owner(H, S)
 
-	STOP_PROCESSING(SSobj, src)
-
 	if(parent_bodypart)
 		parent = owner.bodyparts_by_name[parent_bodypart]
 
+
+/obj/item/organ/proc/remove_organ(mob/living/carbon/human/H, surgically = FALSE, datum/species/S)
+	del_owner(H, S)
+
+	if(parent_bodypart)
+		parent = null
+
 /obj/item/organ/process()
 	return 0
 

code/modules/organs/organ_external.dm

@@ -905,7 +905,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 						var/obj/item/device/mmi/posibrain/B = new(loc)
 						B.transfer_identity(brainmob)
 					else
-						var/obj/item/brain/B = new(loc)
+						var/obj/item/organ/internal/brain/B = new(loc)
 						B.transfer_identity(brainmob)
 
 					brain_op_stage = 4.0