meanwhile as i driver tiger INSANE

code/modules/mob/living/carbon/alien/alien.dm

@@ -58,7 +58,6 @@
 
 
 /mob/living/carbon/alien/adjustToxLoss(amount)
-	//moved to xeno organs
 	return
 
 /mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
@@ -68,8 +67,6 @@
 		..(amount)
 	return
 
-///mob/living/carbon/alien/getPlasma()
-//	return storedPlasma
 
 /mob/living/carbon/alien/eyecheck()
 	return 2
@@ -83,16 +80,6 @@
 
 /mob/living/carbon/alien/handle_environment(var/datum/gas_mixture/environment)
 
-	//If there are alien weeds on the ground then heal if needed or give some toxins
-	/*if(locate(/obj/structure/alien/weeds) in loc)
-		if(health >= maxHealth - getCloneLoss())
-			adjustToxLoss(plasma_rate)
-		else
-			adjustBruteLoss(-heal_rate)
-			adjustFireLoss(-heal_rate)
-			adjustOxyLoss(-heal_rate)
-		*///moved to organs
-
 	if(!environment)
 		return
 
@@ -179,8 +166,6 @@
 
 	..()
 
-	//if (client.statpanel == "Status")//ORGANS
-	//	stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
 
 	show_stat_emergency_shuttle_eta()
 

code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm

@@ -16,7 +16,7 @@
 	internal_organs += new /obj/item/organ/internal/xenos/acidgland
 	internal_organs += new /obj/item/organ/internal/xenos/resinspinner
 	..()
-//
+
 //Drones use the same base as generic humanoids.
 //Drone verbs
 
@@ -29,7 +29,7 @@
 		// Queen check
 		var/no_queen = 1
 		for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list)
-			if(!Q.key && Q.get_int_organ(/obj/item/organ/internal/brain/))//Q.brain_op_stage != 4)
+			if(!Q.key && Q.get_int_organ(/obj/item/organ/internal/brain/))
 				continue
 			no_queen = 0
 

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -13,7 +13,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 /obj/item/organ/internal/body_egg/alien_embryo/on_find(mob/living/finder)
 	..()
 	if(stage < 4)
-		finder << "It's small and weak, barely the size of a foetus."
+		finder << "It's small and weak, barely the size of a fetus."
 	else
 		finder << "It's grown quite large, and writhes slightly as you look at it."
 		if(prob(10))
@@ -72,10 +72,6 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 
 
 	if(stage == 5 && prob(50))
-		//for(var/datum/surgery/S in owner.surgeries)
-		//	if(S.location == "chest" && istype(S.get_surgery_step(), /datum/surgery_step/manipulate_organs))
-		//		AttemptGrow(0)
-		//		return
 		AttemptGrow()
 
 /obj/item/organ/internal/body_egg/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)

code/modules/mob/living/carbon/carbon_defines.dm

@@ -19,9 +19,6 @@
 	var/obj/item/head = null
 	var/obj/item/clothing/suit/wear_suit = null		//TODO: necessary? Are they even used? ~Carn
 
-	//Surgery info
-	//var/datum/surgery_status/op_stage = new/datum/surgery_status
-
 	//Active emote/pose
 	var/pose = null
 

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

@@ -253,13 +253,13 @@
 	if(getBrainLoss() >= 60)
 		msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 
-	if(species.show_ssd && (!species.has_organ["brain"] || src.get_int_organ(/obj/item/organ/internal/brain)) && stat != DEAD)
+	if(species.show_ssd && (!species.has_organ["brain"] || get_int_organ(/obj/item/organ/internal/brain)) && stat != DEAD)
 		if(!key)
 			msg += "<span class='deadsay'>[t_He] [t_is] fast asleep. It doesn't look like they are waking up anytime soon.</span>\n"
 		else if(!client)
 			msg += "[t_He] [t_has] suddenly fallen asleep.\n"
 
-	if(!src.get_int_organ(/obj/item/organ/internal/brain) && !species.name == "Diona")
+	if(!get_int_organ(/obj/item/organ/internal/brain))
 		msg += "<span class='deadsay'>It appears that [t_his] brain is missing...</span>\n"
 
 	var/list/wound_flavor_text = list()

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

@@ -4,10 +4,8 @@
 		eyes.update_colour()
 		regenerate_icons()
 
-///mob/living/carbon/var/list/internal_organs = list()
 /mob/living/carbon/human/var/list/organs = list()
 /mob/living/carbon/human/var/list/organs_by_name = list() // map organ names to organs
-//mob/living/carbon/human/var/list/internal_organs_by_name = list() // so internal organs have less ickiness too
 
 // Takes care of organ related updates, such as broken and missing limbs
 /mob/living/carbon/human/proc/handle_organs()

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

@@ -216,7 +216,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	if(!(species.flags & RADIMMUNE))
 		if (radiation)
 
-			if(src.get_int_organ(/obj/item/organ/internal/nucleation/resonant_crystal))
+			if(get_int_organ(/obj/item/organ/internal/nucleation/resonant_crystal))
 				var/rads = radiation/25
 				radiation -= rads
 				radiation -= 0.1
@@ -886,7 +886,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		//Vision //god knows why this is here
 		var/obj/item/organ/vision
 		if(species.vision_organ)
-			vision = src.get_int_organ(species.vision_organ)
+			vision = get_int_organ(species.vision_organ)
 
 		if(!species.vision_organ) // Presumably if a species has no vision organs, they see via some other means.
 			eye_blind =  0
@@ -1206,7 +1206,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 /mob/living/carbon/human/proc/handle_heartbeat()
 	var/client/C = src.client
 	if(C && C.prefs.sound & SOUND_HEARTBEAT) //disable heartbeat by pref
-		var/obj/item/organ/internal/heart/H = src.get_int_organ(/obj/item/organ/internal/heart)
+		var/obj/item/organ/internal/heart/H = get_int_organ(/obj/item/organ/internal/heart)
 
 		if(!H) //H.status will runtime if there is no H (obviously)
 			return

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

@@ -144,15 +144,14 @@
 
 
 	for(var/obj/item/organ/internal/iorgan in H.internal_organs)
-		if((iorgan in H.internal_organs))
+		if(iorgan in H.internal_organs)
 			qdel(iorgan)
 
 	for(var/obj/item/organ/organ in H.contents)
-		if((organ in H.organs))
+		if(organ in H.organs)
 			qdel(organ)
 
 	if(H.organs)                  H.organs.Cut()
-	//if(H.internal_organs)         H.internal_organs.Cut()
 	if(H.organs_by_name)          H.organs_by_name.Cut()
 
 	H.organs = list()

code/modules/mob/mob_grab.dm

@@ -360,7 +360,7 @@
 						assailant.attack_log += text("\[[time_stamp()]\] <font color='red'>Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])</font>")
 						affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])</font>")
 						msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.")
-						var/obj/item/organ/internal/eyes/eyes = affected.internal_organs_by_name["eyes"]
+						var/obj/item/organ/internal/eyes/eyes = affected.get_int_organ(/obj/item/organ/internal/eyes)
 						eyes.damage += rand(3,4)
 						if (eyes.damage >= eyes.min_broken_damage)
 							if(M.stat != 2)