Functional organs

code/admin/part_modifier.dm

@@ -1,7 +1,7 @@
 
 /datum/admins/var/datum/partmod_holder/part_modifier = null
 
-var/list/default_organ_paths = list("head" = /obj/item/organ/head, "skull" = /obj/item/skull, "brain" = /obj/item/organ/brain, "left_eye" = /obj/item/organ/eye, "right_eye" = /obj/item/organ/eye, "chest" = /obj/item/organ/chest, "heart" = /obj/item/organ/heart, "left_lung" = /obj/item/organ/lung, "right_lung" = /obj/item/organ/lung, "butt" = /obj/item/clothing/head/butt)
+var/list/default_organ_paths = list("head" = /obj/item/organ/head, "skull" = /obj/item/skull, "brain" = /obj/item/organ/brain, "left_eye" = /obj/item/organ/eye, "right_eye" = /obj/item/organ/eye, "chest" = /obj/item/organ/chest, "heart" = /obj/item/organ/heart, "left_lung" = /obj/item/organ/lung, "right_lung" = /obj/item/organ/lung, "butt" = /obj/item/clothing/head/butt, "liver" = /obj/item/organ/liver, "stomach" = /obj/item/organ/stomach, "intestines" = /obj/item/organ/intestines, "pancreas" = /obj/item/organ/pancreas, "spleen" = /obj/item/organ/spleen, "appendix" = /obj/item/organ/appendix, "left_kidney" = /obj/item/organ/kidney, "right_kidney" = /obj/item/organ/kidney)
 var/list/default_limb_paths = list("l_arm" = /obj/item/parts/human_parts/arm/left, "r_arm" = /obj/item/parts/human_parts/arm/right, "l_leg" = /obj/item/parts/human_parts/leg/left, "r_leg" = /obj/item/parts/human_parts/leg/right)
 
 /client/proc/modify_parts(var/mob/living/carbon/human/target as mob)
@@ -331,6 +331,73 @@ var/list/default_limb_paths = list("l_arm" = /obj/item/parts/human_parts/arm/lef
 				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=butt'>\[X\]</a></td>
 				[(see_vars) ? "[organs.butt ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.butt]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
 			</tr>
+			---------------------------------
+			<tr>
+				<td>Left Kidney</td>
+				<td>[organs.left_kidney ? organs.left_kidney : "None"]</td>
+				<td>[organs.left_kidney ? organs.left_kidney.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=left_kidney'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=left_kidney'>\[X\]</a></td>
+				[(see_vars) ? "[organs.left_kidney ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.left_kidney]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Right Kidney</td>
+				<td>[organs.right_kidney ? organs.right_kidney : "None"]</td>
+				<td>[organs.right_kidney ? organs.right_kidney.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=right_kidney'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=right_kidney'>\[X\]</a></td>
+				[(see_vars) ? "[organs.right_kidney ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.right_kidney]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Liver</td>
+				<td>[organs.liver ? organs.liver : "None"]</td>
+				<td>[organs.liver ? organs.liver.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=liver'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=liver'>\[X\]</a></td>
+				[(see_vars) ? "[organs.liver ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.liver]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Stomach</td>
+				<td>[organs.stomach ? organs.stomach : "None"]</td>
+				<td>[organs.stomach ? organs.stomach.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=stomach'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=stomach'>\[X\]</a></td>
+				[(see_vars) ? "[organs.stomach ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.stomach]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Intestines</td>
+				<td>[organs.intestines ? organs.intestines : "None"]</td>
+				<td>[organs.intestines ? organs.intestines.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=intestines'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=intestines'>\[X\]</a></td>
+				[(see_vars) ? "[organs.intestines ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.intestines]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Spleen</td>
+				<td>[organs.spleen ? organs.spleen : "None"]</td>
+				<td>[organs.spleen ? organs.spleen.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=spleen'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=spleen'>\[X\]</a></td>
+				[(see_vars) ? "[organs.spleen ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.spleen]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Pancreas</td>
+				<td>[organs.pancreas ? organs.pancreas : "None"]</td>
+				<td>[organs.pancreas ? organs.pancreas.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=pancreas'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=pancreas'>\[X\]</a></td>
+				[(see_vars) ? "[organs.pancreas ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.pancreas]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+			<tr>
+				<td>Appendix</td>
+				<td>[organs.appendix ? organs.appendix : "None"]</td>
+				<td>[organs.appendix ? organs.appendix.type : "None"]</td>
+				<td><a href='byond://?src=\ref[src];action=drop_organ;target=\ref[organs];part=appendix'>\[X\]</a></td>
+				<td><a href='byond://?src=\ref[src];action=replace_organ;target=\ref[organs];part=appendix'>\[X\]</a></td>
+				[(see_vars) ? "[organs.appendix ? "<td><a href='byond://?src=\ref[src];action=view_vars;target=\ref[organs.appendix]'>\[X\]</a></td>" : "<td>None</td>"]" : null]
+			</tr>
+
+			------------------------------------
 			<tr>
 				<td>All Organs</td>
 				<td><i>N/A</i></td>

code/admin/randomverbs.dm

@@ -1400,7 +1400,7 @@
 		return
 		//target = input(usr, "Target", "Target") as mob in world
 
-	boutput(usr, scan_health(target, 1, 255))
+	boutput(usr, scan_health(target, 1, 255, 1))
 	return
 
 /client/proc/cmd_admin_check_reagents(var/atom/target as null|mob|obj|turf in world)

code/datums/abilities/changeling/regeneration.dm

@@ -51,6 +51,12 @@
 					C.reagents.clear_reagents()
 					C.lying = 0
 					C.canmove = 1
+
+					if (C.organHolder)
+						C.organHolder.heal_organs(1000, 1000, 1000, 100, list("liver", "left_kidney", "right_kidney", "stomach", "intestines","spleen", "left_lung", "right_lung","appendix", "pancreas", "heart", "brain", "left_eye", "right_eye"))
+						if (C.organHolder.is_missing_organs())
+							C.organHolder.create_organs()
+
 					boutput(C, "<span style=\"color:blue\">We have regenerated.</span>")
 					logTheThing("combat", C, null, "[C] finishes regenerative statis as a changeling [log_loc(C)].")
 					C.visible_message(__red("<B>[C] appears to wake from the dead, having healed all wounds.</span>"))
@@ -130,6 +136,11 @@
 				C.visible_message("<span style=\"color:red\"><B> [C]'s right leg grows back!</span>")
 				C.set_body_icon_dirty()
 
+			if (C.organHolder)
+				C.organHolder.heal_organs(5, 5, 5, 90, list("liver", "left_kidney", "right_kidney", "stomach", "intestines","spleen", "left_lung", "right_lung","appendix", "pancreas", "heart", "brain", "left_eye", "right_eye"))
+				if (C.organHolder.is_missing_organs())
+					C.organHolder.create_organs()
+
 		if (prob(25)) C.visible_message("<span style=\"color:red\"><B>[C]'s flesh is moving and sliding around oddly!</B></span>")
 
 /datum/targetable/changeling/regeneration

code/datums/chemistry/Chemistry-Reagents.dm

@@ -142,6 +142,12 @@ datum
 				var/mob/living/carbon/human/H = M
 				if(H.traitHolder.hasTrait("slowmetabolism"))
 					deplRate /= 2
+				if (H.organHolder)
+					if (!H.organHolder.liver || H.organHolder.liver.get_damage() >= 100)	//if no liver or liver is dead, deplete slower
+						deplRate /= 2
+					if (H.organHolder.get_working_kidney_amt() == 0)	//same with kidneys
+						deplRate /= 2
+
 			holder.remove_reagent(src.id, deplRate) //By default it slowly disappears.
 
 			if(M && overdose > 0) check_overdose(M)

code/datums/chemistry/Reagents-Base.dm

@@ -147,7 +147,9 @@ datum
 							H.stuttering += rand(1,10)
 						if (H.canmove && isturf(H.loc) && prob(8))
 							step(H, pick(cardinal))
-					if (holder.get_reagent_amount(src.id) >= 275)
+
+					var/has_cyberliver = H.organHolder && H.organHolder.liver && H.organHolder.liver.robotic
+					if (holder.get_reagent_amount(src.id) >= 275 && !has_cyberliver)
 						if(prob(10))
 							H.emote(pick("hiccup", "fart", "mumble", "grumble"))
 						H.stuttering += 1
@@ -163,7 +165,7 @@ datum
 							new /obj/decal/cleanable/vomit(H.loc)
 						if(prob(15))
 							H.make_dizzy(5)
-					if (holder.get_reagent_amount(src.id) >= 300)
+					if (holder.get_reagent_amount(src.id) >= 300 && !has_cyberliver)
 						H.change_eye_blurry(10, 50)
 						if(prob(6)) H.drowsyness += 5
 						if(prob(5)) H.take_toxin_damage(rand(1,2))
@@ -172,8 +174,14 @@ datum
 
 			do_overdose(var/severity, var/mob/M)
 				var/mob/living/carbon/human/H = M
-				if (!istype(H) || !H.bioHolder.HasEffect("resist_alcohol"))
-					..()
+				if (istype(H) && !H.bioHolder.HasEffect("resist_alcohol"))
+					if (prob(25))
+						if (H.organHolder.liver)
+							if (!H.organHolder.liver.robotic)
+								H.organHolder.liver.take_damage(0, 0, rand(1,2))
+							else 
+								H.organHolder.liver.heal_damage(0, 0, rand(1,2))
+				..()
 
 		hydrogen
 			name = "hydrogen"
@@ -489,6 +497,9 @@ datum
 						M.weakened += 4 * severity
 
 					if (prob(8))
+						var/mob/living/carbon/human/H = M
+						if (istype(H) && H.organHolder.pancreas)
+							H.organHolder.pancreas.take_damage(0, 0, rand(1,2))
 						M.take_toxin_damage(severity)
 						M.updatehealth()
 

code/datums/chemistry/Reagents-Medical.dm

@@ -399,6 +399,8 @@ datum
 					var/mob/living/carbon/human/H = M
 					if (H.bleeding && prob(33))
 						H.bleeding--
+					H.organHolder.heal_organs(2, 2, 2, 60,  list("liver", "left_kidney", "right_kidney", "stomach", "intestines","spleen", "left_lung", "right_lung","appendix", "pancreas", "heart", "brain"))
+
 				M.updatehealth()
 				//M.UpdateDamageIcon()
 				..(M)
@@ -999,6 +1001,9 @@ datum
 					if(M.get_toxin_damage())
 						M.take_toxin_damage(-3)
 					M.HealDamage("All", 12, 12)
+					if (istype(M, /mob/living/carbon/human))
+						var/mob/living/carbon/human/H = M
+						H.organHolder.heal_organs(1, 1, 1, 60,  list("liver", "left_kidney", "right_kidney", "stomach", "intestines","spleen", "left_lung", "right_lung","appendix", "pancreas", "heart", "brain"))
 
 				M.updatehealth()
 				if(prob(25)) M.UpdateDamageIcon() // gonna leave this one on for now, but only call it a quarter of the time
@@ -1176,3 +1181,93 @@ datum
 					M.updatehealth()
 				..(M)
 				return
+
+		//heals spleen/lungs
+		medical/organ_drug1
+			name = "organ drug Class 1"
+			id = "organ_drug1"
+			description = "A drug that targets spleen/lungs for healing."
+			reagent_state = LIQUID
+			fluid_r = 10
+			fluid_g = 180
+			fluid_b = 120
+			transparency = 255
+			depletion_rate = 0.2
+			value = 3
+
+			on_mob_life(var/mob/M)
+				if(!M) M = holder.my_atom
+
+				if (istype(M, /mob/living/carbon/human))
+					var/mob/living/carbon/human/H = M
+
+					if (H.organHolder.spleen && H.organHolder.spleen.get_damage() < 90 && H.organHolder.spleen.get_damage() > 0)
+						H.organHolder.spleen.heal_damage(2, 2, 2, "spleen")
+
+					if (H.organHolder.left_lung && H.organHolder.left_lung.get_damage() < 90 && H.organHolder.left_lung.get_damage() > 0)
+						H.organHolder.spleen.heal_damage(2, 2, 2, "left_lung")
+
+					if (H.organHolder.right_lung && H.organHolder.right_lung.get_damage() < 90 && H.organHolder.right_lung.get_damage() > 0)
+						H.organHolder.spleen.heal_damage(2, 2, 2, "right_lung")
+					M.updatehealth()
+				..(M)
+
+		//heals liver/kidneys/stomach/intestines
+		medical/organ_drug2
+			name = "organ drug Class 2"
+			id = "organ_drug2"
+			description = "A drug that targets liver/kidneys/stomach/intestines for healing."
+			reagent_state = LIQUID
+			fluid_r = 10
+			fluid_g = 120
+			fluid_b = 180
+			transparency = 255
+			depletion_rate = 0.2
+			value = 3
+
+			on_mob_life(var/mob/M)
+				if(!M) M = holder.my_atom
+				if (istype(M, /mob/living/carbon/human))
+					var/mob/living/carbon/human/H = M
+
+					if (H.organHolder.liver && H.organHolder.liver.get_damage() < 90 && H.organHolder.liver.get_damage() > 0)
+						H.organHolder.liver.heal_damage(2, 2, 2)
+
+					if (H.organHolder.left_kidney && H.organHolder.left_kidney.get_damage() < 90 && H.organHolder.left_kidney.get_damage() > 0)
+						H.organHolder.left_kidney.heal_damage(2, 2, 2)
+
+					if (H.organHolder.right_kidney && H.organHolder.right_kidney.get_damage() < 90 && H.organHolder.right_kidney.get_damage() > 0)
+						H.organHolder.right_kidney.heal_damage(2, 2, 2)
+
+					if (H.organHolder.stomach && H.organHolder.stomach.get_damage() < 90 && H.organHolder.stomach.get_damage() > 0)
+						H.organHolder.stomach.heal_damage(2, 2, 2)
+
+					if (H.organHolder.intestines && H.organHolder.intestines.get_damage() < 90 && H.organHolder.intestines.get_damage() > 0)
+						H.organHolder.intestines.heal_damage(2, 2, 2)
+					M.updatehealth()
+				..(M)
+
+		//heals appendix/pancreas
+		medical/organ_drug3
+			name = "organ drug Class 3"
+			id = "organ_drug3"
+			description = "A drug that targets appendix/pancreas for healing."
+			reagent_state = LIQUID
+			fluid_r = 80
+			fluid_g = 120
+			fluid_b = 120
+			transparency = 255
+			depletion_rate = 0.2
+			value = 3
+
+			on_mob_life(var/mob/M)
+				if(!M) M = holder.my_atom
+				if (istype(M, /mob/living/carbon/human))
+					var/mob/living/carbon/human/H = M
+
+					if (H.organHolder.appendix && H.organHolder.appendix.get_damage() < 90 && H.organHolder.appendix.get_damage() > 0)
+						H.organHolder.appendix.heal_damage(2, 2, 2)
+					if (H.organHolder.pancreas && H.organHolder.pancreas.get_damage() < 90 && H.organHolder.pancreas.get_damage() > 0)
+						H.organHolder.pancreas.heal_damage(2, 2, 2)
+					M.updatehealth()
+				..(M)

code/datums/chemistry/tools/bottles.dm

@@ -244,6 +244,37 @@
 		..()
 		reagents.add_reagent("fluorosurfactant", 30)
 
+//organ healing chems
+/obj/item/reagent_containers/glass/bottle/organ_drug1
+	name = "organ_drug1 bottle"
+	desc = "A small bottle."
+	bottle_style = "1"
+	amount_per_transfer_from_this = 5
+
+	New()
+		..()
+		reagents.add_reagent("organ_drug1", 30)
+
+/obj/item/reagent_containers/glass/bottle/organ_drug2
+	name = "organ_drug2 bottle"
+	desc = "A small bottle."
+	bottle_style = "1"
+	amount_per_transfer_from_this = 5
+
+	New()
+		..()
+		reagents.add_reagent("organ_drug2", 30)
+
+/obj/item/reagent_containers/glass/bottle/organ_drug3
+	name = "organ_drug3 bottle"
+	desc = "A small bottle."
+	bottle_style = "1"
+	amount_per_transfer_from_this = 5
+
+	New()
+		..()
+		reagents.add_reagent("organ_drug3", 30)
+
 /* ========================================================= */
 /* -------------------- Chem Precursors -------------------- */
 /* ========================================================= */