Merge pull request #7198 from Crazylemon64/organ_varname_refactor

Refactors "organs" to be "bodyparts" to end confusion once and for all

code/modules/surgery/limb_reattach.dm

@@ -198,7 +198,7 @@
 	user.visible_message("<span class='notice'>[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>",	\
 	"<span class='notice'>You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].</span>")
 	E.status &= ~ORGAN_DESTROYED
-	var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
+	var/obj/item/organ/external/stump = target.bodyparts_by_name["limb stump"]
 	if(stump)
 		stump.remove(target)
 	if(E.children)
@@ -248,7 +248,7 @@
 			if(!organ_data)
 				continue
 			// This will break if there's more than one stump ever
-			var/obj/item/organ/external/stump = target.organs_by_name["limb stump"]
+			var/obj/item/organ/external/stump = target.bodyparts_by_name["limb stump"]
 			if(stump)
 				stump.remove(target)
 			var/new_limb_type = organ_data["path"]

code/modules/surgery/organs/blood.dm

@@ -118,7 +118,7 @@
 
 		//Bleeding out
 		var/blood_max = 0
-		for(var/obj/item/organ/external/temp in organs)
+		for(var/obj/item/organ/external/temp in bodyparts)
 			if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT)
 				continue
 			for(var/datum/wound/W in temp.wounds)

code/modules/surgery/organs/helpers.dm

@@ -43,6 +43,6 @@
 	return istype(A, /obj/item/organ/internal)
 
 /mob/living/carbon/human/proc/get_limb_by_name(limb_name) //Look for a limb with the given limb name in the source mob, and return it if found.
-	for(var/obj/item/organ/external/O in organs)
+	for(var/obj/item/organ/external/O in bodyparts)
 		if(limb_name == O.limb_name)
 			return O

code/modules/surgery/organs/organ_external.dm

@@ -92,7 +92,7 @@
 			qdel(O)
 
 	if(owner)
-		owner.organs_by_name[limb_name] = null
+		owner.bodyparts_by_name[limb_name] = null
 
 	if(children)
 		for(var/obj/item/organ/external/C in children)
@@ -157,15 +157,15 @@
 	status = status & ~ORGAN_DESTROYED
 	forceMove(owner)
 	if(istype(owner))
-		if(!isnull(owner.organs_by_name[limb_name]))
+		if(!isnull(owner.bodyparts_by_name[limb_name]))
 			log_debug("Duplicate organ in slot \"[limb_name]\", mob '[target]'")
-		owner.organs_by_name[limb_name] = src
-		owner.organs |= src
+		owner.bodyparts_by_name[limb_name] = src
+		owner.bodyparts |= src
 		for(var/atom/movable/stuff in src)
 			stuff.attempt_become_organ(src, owner)
 
 	if(parent_organ)
-		parent = owner.organs_by_name[src.parent_organ]
+		parent = owner.bodyparts_by_name[src.parent_organ]
 		if(parent)
 			if(!parent.children)
 				parent.children = list()
@@ -726,7 +726,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 			if(status & ORGAN_ROBOT)
 				stump.robotize()
 			stump.wounds |= W
-			victim.organs |= stump
+			victim.bodyparts |= stump
 			stump.update_damages()
 		parent = null
 
@@ -946,9 +946,9 @@ Note that amputating the affected organ does in fact remove the infection from t
 		thing.forceMove(src)
 
 	release_restraints(victim)
-	victim.organs -= src
+	victim.bodyparts -= src
 	if(is_primary_organ(victim))
-		victim.organs_by_name[limb_name] = null	// Remove from owner's vars.
+		victim.bodyparts_by_name[limb_name] = null	// Remove from owner's vars.
 
 	//Robotic limbs explode if sabotaged.
 	if(is_robotic && sabotaged)
@@ -984,7 +984,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		O = owner
 	if(!istype(O)) // You're not the primary organ of ANYTHING, bucko
 		return 0
-	return src == O.organs_by_name[limb_name]
+	return src == O.bodyparts_by_name[limb_name]
 
 // The callback we use to remove wounds from an un-processed limb
 /obj/item/organ/external/proc/cleanup_wounds(var/list/slated_wounds)

code/modules/surgery/organs/organ_icon.dm

@@ -55,7 +55,7 @@ var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/H)
 	..()
-	var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_organs_by_name["eyes"]
+	var/obj/item/organ/internal/eyes/eyes = owner.get_int_organ(/obj/item/organ/internal/eyes)//owner.internal_bodyparts_by_name["eyes"]
 	if(eyes) eyes.update_colour()
 
 /obj/item/organ/external/head/remove()

code/modules/surgery/organs/organ_internal.dm

@@ -42,7 +42,7 @@
 			log_runtime(EXCEPTION("[src] attempted to insert into a [parent_organ], but [parent_organ] wasn't an organ! [atom_loc_line(M)]"), src)
 		else
 			parent.internal_organs |= src
-	//M.internal_organs_by_name[src] |= src(H,1)
+	//M.internal_bodyparts_by_name[src] |= src(H,1)
 	loc = null
 	for(var/X in actions)
 		var/datum/action/A = X

code/modules/surgery/organs/pain.dm

@@ -92,7 +92,7 @@ mob/living/carbon/human/proc/handle_pain()
 		return
 	var/maxdam = 0
 	var/obj/item/organ/external/damaged_organ = null
-	for(var/obj/item/organ/external/E in organs)
+	for(var/obj/item/organ/external/E in bodyparts)
 		if(E.status & ORGAN_DEAD|ORGAN_ROBOT) continue
 		var/dam = E.get_damage()
 		// make the choice of the organ depend on damage,

code/modules/surgery/organs/subtypes/diona.dm

@@ -89,7 +89,7 @@
 /* /obj/item/organ/external/diona/removed()
 	var/mob/living/carbon/human/H = owner
 	..()
-	if(!istype(H) || !H.organs || !H.organs.len)
+	if(!istype(H) || !H.bodyparts || !H.bodyparts.len)
 		H.death()
 	if(prob(50) && spawn_diona_nymph_from_organ(src))
 		qdel(src) */
@@ -141,7 +141,7 @@
 /*/obj/item/organ/diona/removed(var/mob/living/user)
 	var/mob/living/carbon/human/H = owner
 	..()
-	if(!istype(H) || !H.organs || !H.organs.len)
+	if(!istype(H) || !H.bodyparts || !H.bodyparts.len)
 		H.death()
 	if(prob(50) && spawn_diona_nymph_from_organ(src))
 		qdel(src) */