diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 38dc4d225ab..0bc94089e84 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -148,7 +148,7 @@
#define G_FEMALE 2
#define G_PLURAL 3
-/// Defines how a mob's internal_organs_slot is ordered
+/// Defines how a mob's organs_slot is ordered
/// Exists so Life()'s organ process order is consistent
GLOBAL_LIST_INIT(organ_process_order, list(
ORGAN_SLOT_BRAIN,
diff --git a/code/__HELPERS/duplicating.dm b/code/__HELPERS/duplicating.dm
index 53dd5d23137..f5d56cc879d 100644
--- a/code/__HELPERS/duplicating.dm
+++ b/code/__HELPERS/duplicating.dm
@@ -23,8 +23,8 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list(
"hud_list",
"implants",
"important_recursive_contents",
- "internal_organs",
- "internal_organs_slot",
+ "organs",
+ "organs_slot",
"key",
"lastKnownIP",
"loc",
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index e8e0caa1473..db3993fa66e 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -35,7 +35,7 @@
else if(iscarbon(object_to_check))
var/mob/living/carbon/mob_to_check = object_to_check
- for(var/organ in mob_to_check.internal_organs)
+ for(var/organ in mob_to_check.organs)
found_organ = organ
found_organ.organ_flags ^= ORGAN_FROZEN
diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm
index 219780e7e94..a26384a6a2b 100644
--- a/code/datums/components/phylactery.dm
+++ b/code/datums/components/phylactery.dm
@@ -199,7 +199,7 @@
if(iscarbon(corpse))
var/mob/living/carbon/carbon_body = corpse
- for(var/obj/item/organ/to_drop as anything in carbon_body.internal_organs)
+ for(var/obj/item/organ/to_drop as anything in carbon_body.organs)
// Skip the brain - it can disappear, we don't need it anymore
if(istype(to_drop, /obj/item/organ/internal/brain))
continue
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index b741d86052b..734f67eb0ce 100644
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -130,7 +130,7 @@
return FALSE
for(var/thing in D.required_organs)
- if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs)))
+ if(!((locate(thing) in bodyparts) || (locate(thing) in organs)))
return FALSE
return ..()
diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm
index 8a2c3992d15..52901f13b8d 100644
--- a/code/datums/diseases/gastrolisis.dm
+++ b/code/datums/diseases/gastrolisis.dm
@@ -36,7 +36,7 @@
if(isopenturf(OT))
OT.MakeSlippery(TURF_WET_LUBE, 100)
if(4)
- var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes/snail) in affected_mob.internal_organs
+ var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes/snail) in affected_mob.organs
if(!eyes && DT_PROB(2.5, delta_time))
var/obj/item/organ/internal/eyes/snail/new_eyes = new()
new_eyes.Insert(affected_mob, drop_if_replaced = TRUE)
@@ -56,7 +56,7 @@
affected_mob.emote("scream")
return
- var/obj/item/organ/internal/tongue/tongue = locate(/obj/item/organ/internal/tongue/snail) in affected_mob.internal_organs
+ var/obj/item/organ/internal/tongue/tongue = locate(/obj/item/organ/internal/tongue/snail) in affected_mob.organs
if(!tongue && DT_PROB(2.5, delta_time))
var/obj/item/organ/internal/tongue/snail/new_tongue = new()
new_tongue.Insert(affected_mob)
@@ -83,11 +83,11 @@
. = ..()
if(affected_mob && !is_species(affected_mob, /datum/species/snail)) //undo all the snail fuckening
var/mob/living/carbon/human/H = affected_mob
- var/obj/item/organ/internal/tongue/tongue = locate(/obj/item/organ/internal/tongue/snail) in H.internal_organs
+ var/obj/item/organ/internal/tongue/tongue = locate(/obj/item/organ/internal/tongue/snail) in H.organs
if(tongue)
var/obj/item/organ/internal/tongue/new_tongue = new H.dna.species.mutanttongue ()
new_tongue.Insert(H)
- var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes/snail) in H.internal_organs
+ var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes/snail) in H.organs
if(eyes)
var/obj/item/organ/internal/eyes/new_eyes = new H.dna.species.mutanteyes ()
new_eyes.Insert(H)
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 7d58d1de2d6..c71c7ccfb34 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -628,7 +628,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
if(dna.features["pod_hair"])
dna.features["pod_hair"] = GLOB.pod_hair_list[deconstruct_block(get_uni_feature_block(features, DNA_POD_HAIR_BLOCK), GLOB.pod_hair_list.len)]
- for(var/obj/item/organ/external/external_organ in internal_organs)
+ for(var/obj/item/organ/external/external_organ in organs)
external_organ.mutate_feature(features, src)
if(icon_update)
@@ -844,7 +844,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
ForceContractDisease(new/datum/disease/decloning()) //slow acting, non-viral clone damage based GBS
if(8)
var/list/elligible_organs = list()
- for(var/obj/item/organ/internal/internal_organ as anything in internal_organs) //make sure we dont get an implant or cavity item
+ for(var/obj/item/organ/internal/internal_organ in organs) //make sure we dont get an implant or cavity item
elligible_organs += internal_organ
vomit(20, TRUE)
if(elligible_organs.len)
@@ -894,7 +894,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
/mob/living/carbon/human/proc/something_horrible_mindmelt()
if(!is_blind())
- var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes) in internal_organs
+ var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes) in organs
if(!eyes)
return
eyes.Remove(src)
diff --git a/code/datums/mutations/tongue_spike.dm b/code/datums/mutations/tongue_spike.dm
index ed41a9804c9..d0d8fca4c5f 100644
--- a/code/datums/mutations/tongue_spike.dm
+++ b/code/datums/mutations/tongue_spike.dm
@@ -30,7 +30,7 @@
to_chat(cast_on, span_notice("You concentrate really hard, but nothing happens."))
return
- var/obj/item/organ/internal/tongue/to_fire = locate() in cast_on.internal_organs
+ var/obj/item/organ/internal/tongue/to_fire = locate() in cast_on.organs
if(!to_fire)
to_chat(cast_on, span_notice("You don't have a tongue to shoot!"))
return
diff --git a/code/datums/quirks/negative_quirks.dm b/code/datums/quirks/negative_quirks.dm
index 1f68cb6a044..097451fce18 100644
--- a/code/datums/quirks/negative_quirks.dm
+++ b/code/datums/quirks/negative_quirks.dm
@@ -1094,7 +1094,7 @@
for(var/obj/item/bodypart/limb as anything in owner.bodyparts)
if(!IS_ORGANIC_LIMB(limb))
cybernetics_level++
- for(var/obj/item/organ/organ as anything in owner.internal_organs)
+ for(var/obj/item/organ/organ as anything in owner.organs)
if(organ.organ_flags & ORGAN_SYNTHETIC)
cybernetics_level++
update_mood()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index f69732a68ec..3f0d0d513ed 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -129,7 +129,7 @@
var/their = M.p_their()
var/list/mouth_organs = new
- for(var/obj/item/organ/organ as anything in M.internal_organs)
+ for(var/obj/item/organ/organ as anything in M.organs)
if(organ.zone == BODY_ZONE_PRECISE_MOUTH)
mouth_organs.Add(organ)
var/organ_list = ""
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index 3feccdeaa5d..019788e29ad 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -248,7 +248,7 @@
var/mob/living/carbon/human/humantarget = target
// Organ damage, missing organs
- if(humantarget.internal_organs && humantarget.internal_organs.len)
+ if(humantarget.organs && humantarget.organs.len)
var/render = FALSE
var/toReport = "Organs:\
\
@@ -256,7 +256,7 @@
[advanced ? "| Dmg | " : ""]\
Status | "
- for(var/obj/item/organ/organ as anything in humantarget.internal_organs)
+ for(var/obj/item/organ/organ as anything in humantarget.organs)
var/status = organ.get_status_text()
if (status != "")
render = TRUE
@@ -366,7 +366,7 @@
if(iscarbon(target))
var/mob/living/carbon/carbontarget = target
var/cyberimp_detect
- for(var/obj/item/organ/internal/cyberimp/CI in carbontarget.internal_organs)
+ for(var/obj/item/organ/internal/cyberimp/CI in carbontarget.organs)
if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant)
cyberimp_detect += "[!cyberimp_detect ? "[CI.get_examine_string(user)]" : ", [CI.get_examine_string(user)]"]"
if(cyberimp_detect)
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index fb97a356b5c..4e02905a896 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -335,7 +335,7 @@
if (QDELETED(human_user))
return
if(!QDELETED(our_brain))
- human_user.internal_organs -= our_brain
+ human_user.organs -= our_brain
qdel(our_brain)
new /obj/effect/gibspawner/generic(human_user.drop_location(), human_user)
return BRUTELOSS
diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm
index d3d1ddfc67b..db8e2a86e01 100644
--- a/code/modules/admin/verbs/manipulate_organs.dm
+++ b/code/modules/admin/verbs/manipulate_organs.dm
@@ -40,7 +40,7 @@
message_admins("[key_name_admin(usr)] has added implant [organ.type] to [ADMIN_LOOKUPFLW(C)]")
if("drop organ/implant", "remove organ/implant")
- for(var/obj/item/organ/user_organs as anything in C.internal_organs)
+ for(var/obj/item/organ/user_organs as anything in C.organs)
organs["[user_organs.name] ([user_organs.type])"] = user_organs
for(var/obj/item/implant/user_implants as anything in C.implants)
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 530f390b141..7103c4f545c 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -612,7 +612,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
species = span_notice("[H.dna.species.name]")
if(L.mind && L.mind.has_antag_datum(/datum/antagonist/changeling))
species = span_warning("Changeling lifeform")
- var/obj/item/organ/internal/heart/gland/temp = locate() in H.internal_organs
+ var/obj/item/organ/internal/heart/gland/temp = locate() in H.organs
if(temp)
helptext = span_warning("Experimental gland detected!")
else
diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
index 458f30261d6..408b8da862e 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
@@ -30,7 +30,7 @@
var/list/organ_types = list(/obj/item/organ/internal/heart)
/datum/surgery_step/extract_organ/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- for(var/atom/A in target.internal_organs)
+ for(var/atom/A in target.organs)
if(A.type in organ_types)
IC = A
break
diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm
index 06b823603cd..f50ccbba894 100644
--- a/code/modules/antagonists/abductor/equipment/glands/heal.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm
@@ -16,7 +16,7 @@
reject_implant(implant)
return
- for(var/organ in owner.internal_organs)
+ for(var/organ in owner.organs)
if(istype(organ, /obj/item/organ/internal/cyberimp))
reject_cyberimp(organ)
return
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index de1c8a2f2c0..cb64d972c53 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -132,7 +132,7 @@
if(H.stat == DEAD)
say("Specimen deceased - please provide fresh sample.")
return "Specimen deceased."
- var/obj/item/organ/internal/heart/gland/GlandTest = locate() in H.internal_organs
+ var/obj/item/organ/internal/heart/gland/GlandTest = locate() in H.organs
if(!GlandTest)
say("Experimental dissection not detected!")
return "No glands detected!"
@@ -153,7 +153,7 @@
user_abductor.team.abductees += H.mind
H.mind.add_antag_datum(/datum/antagonist/abductee)
- for(var/obj/item/organ/internal/heart/gland/G in H.internal_organs)
+ for(var/obj/item/organ/internal/heart/gland/G in H.organs)
G.Start()
point_reward++
if(point_reward > 0)
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index d561a741a1f..0674a75fc53 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -128,7 +128,7 @@
/// If cast on a carbon, we'll try to steal one of their organs directly from their person.
/datum/action/cooldown/spell/touch/flesh_surgery/proc/steal_organ_from_mob(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster)
var/mob/living/carbon/carbon_victim = victim
- if(!istype(carbon_victim) || !length(carbon_victim.internal_organs))
+ if(!istype(carbon_victim) || !length(carbon_victim.organs))
victim.balloon_alert(caster, "no organs!")
return FALSE
@@ -137,7 +137,7 @@
var/parsed_zone = parse_zone(zone_to_check)
var/list/organs_we_can_remove = list()
- for(var/obj/item/organ/organ as anything in carbon_victim.internal_organs)
+ for(var/obj/item/organ/organ as anything in carbon_victim.organs)
// Only show organs which are in our generic zone
if(deprecise_zone(organ.zone) != zone_to_check)
continue
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 413eee78d0c..0e95acc207b 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -254,7 +254,7 @@
break
if (effectOrgans) //effectOrgans means remove every organ in our mob
var/mob/living/carbon/carbon_target_mob = target_living
- for(var/obj/item/organ/organ_to_yeet as anything in carbon_target_mob.internal_organs)
+ for(var/obj/item/organ/organ_to_yeet as anything in carbon_target_mob.organs)
var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs)) //Pick a random direction to toss them in
organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists
organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e9c0f74849e..03c00729113 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -577,7 +577,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
body_bag.forceMove(morgue_tray)
new_human.death() //here lies the mans, rip in pepperoni.
- for (var/part in new_human.internal_organs) //randomly remove organs from each body, set those we keep to be in stasis
+ for (var/part in new_human.organs) //randomly remove organs from each body, set those we keep to be in stasis
if (prob(40))
qdel(part)
else
diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm
index 35823020c04..0417e167d82 100644
--- a/code/modules/mob/living/carbon/alien/adult/adult.dm
+++ b/code/modules/mob/living/carbon/alien/adult/adult.dm
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
AddElement(/datum/element/strippable, GLOB.strippable_alien_humanoid_items)
/mob/living/carbon/alien/adult/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/stomach/alien()
+ organs += new /obj/item/organ/internal/stomach/alien()
return ..()
/mob/living/carbon/alien/adult/cuff_resist(obj/item/I)
diff --git a/code/modules/mob/living/carbon/alien/adult/caste/drone.dm b/code/modules/mob/living/carbon/alien/adult/caste/drone.dm
index 1d9404fed4b..1859abf58b0 100644
--- a/code/modules/mob/living/carbon/alien/adult/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/adult/caste/drone.dm
@@ -11,9 +11,9 @@
return ..()
/mob/living/carbon/alien/adult/drone/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel/large
- internal_organs += new /obj/item/organ/internal/alien/resinspinner
- internal_organs += new /obj/item/organ/internal/alien/acid
+ organs += new /obj/item/organ/internal/alien/plasmavessel/large
+ organs += new /obj/item/organ/internal/alien/resinspinner
+ organs += new /obj/item/organ/internal/alien/acid
return ..()
/datum/action/cooldown/alien/evolve_to_praetorian
diff --git a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
index 701558c7a60..b68b1c99ca9 100644
--- a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
@@ -7,7 +7,7 @@
var/atom/movable/screen/leap_icon = null
/mob/living/carbon/alien/adult/hunter/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel/small
+ organs += new /obj/item/organ/internal/alien/plasmavessel/small
..()
//Hunter verbs
diff --git a/code/modules/mob/living/carbon/alien/adult/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/adult/caste/praetorian.dm
index df3c9da6618..babb909bec6 100644
--- a/code/modules/mob/living/carbon/alien/adult/caste/praetorian.dm
+++ b/code/modules/mob/living/carbon/alien/adult/caste/praetorian.dm
@@ -17,10 +17,10 @@
return ..()
/mob/living/carbon/alien/adult/royal/praetorian/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel/large
- internal_organs += new /obj/item/organ/internal/alien/resinspinner
- internal_organs += new /obj/item/organ/internal/alien/acid
- internal_organs += new /obj/item/organ/internal/alien/neurotoxin
+ organs += new /obj/item/organ/internal/alien/plasmavessel/large
+ organs += new /obj/item/organ/internal/alien/resinspinner
+ organs += new /obj/item/organ/internal/alien/acid
+ organs += new /obj/item/organ/internal/alien/neurotoxin
return ..()
/datum/action/cooldown/alien/evolve_to_queen
diff --git a/code/modules/mob/living/carbon/alien/adult/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/adult/caste/sentinel.dm
index 6c629a32325..e36a6150216 100644
--- a/code/modules/mob/living/carbon/alien/adult/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/adult/caste/sentinel.dm
@@ -11,7 +11,7 @@
return ..()
/mob/living/carbon/alien/adult/sentinel/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel
- internal_organs += new /obj/item/organ/internal/alien/acid
- internal_organs += new /obj/item/organ/internal/alien/neurotoxin
+ organs += new /obj/item/organ/internal/alien/plasmavessel
+ organs += new /obj/item/organ/internal/alien/acid
+ organs += new /obj/item/organ/internal/alien/neurotoxin
..()
diff --git a/code/modules/mob/living/carbon/alien/adult/queen.dm b/code/modules/mob/living/carbon/alien/adult/queen.dm
index c6fe38ac2a9..1f344a98fb2 100644
--- a/code/modules/mob/living/carbon/alien/adult/queen.dm
+++ b/code/modules/mob/living/carbon/alien/adult/queen.dm
@@ -63,11 +63,11 @@
return ..()
/mob/living/carbon/alien/adult/royal/queen/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel/large/queen
- internal_organs += new /obj/item/organ/internal/alien/resinspinner
- internal_organs += new /obj/item/organ/internal/alien/acid
- internal_organs += new /obj/item/organ/internal/alien/neurotoxin
- internal_organs += new /obj/item/organ/internal/alien/eggsac
+ organs += new /obj/item/organ/internal/alien/plasmavessel/large/queen
+ organs += new /obj/item/organ/internal/alien/resinspinner
+ organs += new /obj/item/organ/internal/alien/acid
+ organs += new /obj/item/organ/internal/alien/neurotoxin
+ organs += new /obj/item/organ/internal/alien/eggsac
return ..()
//Queen verbs
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 8ff7f6d3e85..d6f17e685e0 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -35,12 +35,12 @@
. = ..()
/mob/living/carbon/alien/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/brain/alien
- internal_organs += new /obj/item/organ/internal/alien/hivenode
- internal_organs += new /obj/item/organ/internal/tongue/alien
- internal_organs += new /obj/item/organ/internal/eyes/alien
- internal_organs += new /obj/item/organ/internal/liver/alien
- internal_organs += new /obj/item/organ/internal/ears
+ organs += new /obj/item/organ/internal/brain/alien
+ organs += new /obj/item/organ/internal/alien/hivenode
+ organs += new /obj/item/organ/internal/tongue/alien
+ organs += new /obj/item/organ/internal/eyes/alien
+ organs += new /obj/item/organ/internal/liver/alien
+ organs += new /obj/item/organ/internal/ears
..()
/mob/living/carbon/alien/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) // beepsky won't hunt aliums
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 46dc8a2c54f..8e92d9038ac 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -38,7 +38,7 @@
return ..()
/mob/living/carbon/alien/larva/create_internal_organs()
- internal_organs += new /obj/item/organ/internal/alien/plasmavessel/small/tiny
+ organs += new /obj/item/organ/internal/alien/plasmavessel/small/tiny
..()
//This needs to be fixed
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 91b9d18ae1e..ee2e2dc3e83 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -19,7 +19,7 @@
. = ..()
QDEL_LIST(hand_bodyparts)
- QDEL_LIST(internal_organs)
+ QDEL_LIST(organs)
QDEL_LIST(bodyparts)
QDEL_LIST(implants)
for(var/wound in all_wounds) // these LAZYREMOVE themselves when deleted so no need to remove the list here
@@ -481,9 +481,9 @@
/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
for(var/i in 1 to amt)
- if(!internal_organs.len)
+ if(!organs.len)
break //Guess we're out of organs!
- var/obj/item/organ/guts = pick(internal_organs)
+ var/obj/item/organ/guts = pick(organs)
var/turf/T = get_turf(src)
guts.Remove(src)
guts.forceMove(T)
@@ -855,7 +855,7 @@
if(dna && !HAS_TRAIT(src, TRAIT_NOBLOOD))
blood_volume += (excess_healing * 2) //1 excess = 10 blood
- for(var/obj/item/organ/organ as anything in internal_organs)
+ for(var/obj/item/organ/organ as anything in organs)
if(organ.organ_flags & ORGAN_SYNTHETIC)
continue
organ.applyOrganDamage(excess_healing * -1) //1 excess = 5 organ damage healed
@@ -963,11 +963,11 @@
if(QDELETED(src))
return
var/organs_amt = 0
- for(var/obj/item/organ/internal_organ as anything in internal_organs)
+ for(var/obj/item/organ/organ as anything in organs)
if(prob(50))
organs_amt++
- internal_organ.Remove(src)
- internal_organ.forceMove(drop_location())
+ organ.Remove(src)
+ organ.forceMove(drop_location())
if(organs_amt)
to_chat(user, span_notice("You retrieve some of [src]\'s internal organs!"))
remove_all_embedded_objects()
@@ -1029,7 +1029,7 @@
/mob/living/carbon/proc/create_internal_organs()
- for(var/obj/item/organ/internal/internal_organ in internal_organs)
+ for(var/obj/item/organ/internal/internal_organ in organs)
internal_organ.Insert(src)
/proc/cmp_organ_slot_asc(slot_a, slot_b)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 04a11623828..af15a79a70d 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -371,8 +371,8 @@
. = ..()
if(. & EMP_PROTECT_CONTENTS)
return
- for(var/obj/item/organ/internal_organ as anything in internal_organs)
- internal_organ.emp_act(severity)
+ for(var/obj/item/organ/organ as anything in organs)
+ organ.emp_act(severity)
///Adds to the parent by also adding functionality to propagate shocks through pulling and doing some fluff effects.
/mob/living/carbon/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 5714249537c..d4686a08c46 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -12,9 +12,9 @@
mobility_flags = MOBILITY_FLAGS_CARBON_DEFAULT
blocks_emissive = NONE
///List of [/obj/item/organ/internal] in the mob. They don't go in the contents for some reason I don't want to know.
- var/list/obj/item/organ/internal/internal_organs = list()
- ///Same as [above][/mob/living/carbon/var/internal_organs], but stores "slot ID" - "organ" pairs for easy access.
- var/list/internal_organs_slot = list()
+ var/list/obj/item/organ/internal/organs = list()
+ ///Same as [above][/mob/living/carbon/var/organs], but stores "slot ID" - "organ" pairs for easy access.
+ var/list/organs_slot = list()
///How many dream images we have left to send
var/dreaming = 0
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 55202e5e631..2f874966411 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -41,11 +41,11 @@
var/atom/Tsec = drop_location()
if(!no_bodyparts)
if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop.
- for(var/X in internal_organs)
+ for(var/X in organs)
if(no_brain || !istype(X, /obj/item/organ/internal/brain))
qdel(X)
else //we're going to drop all bodyparts except chest, so the only organs that needs spilling are those inside it.
- for(var/obj/item/organ/organs as anything in internal_organs)
+ for(var/obj/item/organ/organs as anything in organs)
if(no_brain && istype(organs, /obj/item/organ/internal/brain))
qdel(organs) //so the brain isn't transfered to the head when the head drops.
continue
@@ -55,7 +55,7 @@
organs.forceMove(Tsec)
organs.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
else
- for(var/obj/item/organ/organs as anything in internal_organs)
+ for(var/obj/item/organ/organs as anything in organs)
if(no_brain && istype(organs, /obj/item/organ/internal/brain))
qdel(organs)
continue
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index f65d54beefa..16d9d008283 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -372,7 +372,7 @@
. += "Rank: [target_record.rank]\n\[Front photo\]\[Side photo\]"
if(HAS_TRAIT(user, TRAIT_MEDICAL_HUD))
var/cyberimp_detect
- for(var/obj/item/organ/internal/cyberimp/CI in internal_organs)
+ for(var/obj/item/organ/internal/cyberimp/CI in organs)
if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant)
cyberimp_detect += "[!cyberimp_detect ? "[CI.get_examine_string(user)]" : ", [CI.get_examine_string(user)]"]"
if(cyberimp_detect)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index e9b6e47b726..1d0d91b1446 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -758,7 +758,7 @@
var/broken_plural
var/damaged_plural
//Sets organs into their proper list
- for(var/obj/item/organ/organ as anything in internal_organs)
+ for(var/obj/item/organ/organ as anything in organs)
if(organ.organ_flags & ORGAN_FAILING)
if(broken.len)
broken += ", "
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 605d37cbc3d..3eb448aa90c 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -394,7 +394,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(current_organ)
current_organ.Remove(C)
QDEL_NULL(current_organ)
- for(var/obj/item/organ/external/external_organ in C.internal_organs)
+ for(var/obj/item/organ/external/external_organ in C.organs)
// External organ checking. We need to check the external organs owned by the carbon itself,
// because we want to also remove ones not shared by its species.
// This should be done even if species was not changed.
@@ -511,7 +511,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
C.dna.blood_type = random_blood_type()
for(var/X in inherent_traits)
REMOVE_TRAIT(C, X, SPECIES_TRAIT)
- for(var/obj/item/organ/external/organ in C.internal_organs)
+ for(var/obj/item/organ/external/organ in C.organs)
organ.Remove(C)
qdel(organ)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 40a9a36273f..f2504d0d145 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -456,7 +456,7 @@
if(stat == DEAD)
if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/cryostylane)) // No organ decay if the body contains formaldehyde.
return
- for(var/obj/item/organ/internal/organ in internal_organs)
+ for(var/obj/item/organ/internal/organ in organs)
// On-death is where organ decay is handled
organ?.on_death(delta_time, times_fired) // organ can be null due to reagent metabolization causing organ shuffling
// We need to re-check the stat every organ, as one of our others may have revived us
@@ -464,11 +464,11 @@
break
return
- // NOTE: internal_organs_slot is sorted by GLOB.organ_process_order on insertion
- for(var/slot in internal_organs_slot)
+ // NOTE: organs_slot is sorted by GLOB.organ_process_order on insertion
+ for(var/slot in organs_slot)
// We don't use getorganslot here because we know we have the organ we want, since we're iterating the list containing em already
// This code is hot enough that it's just not worth the time
- var/obj/item/organ/internal/organ = internal_organs_slot[slot]
+ var/obj/item/organ/internal/organ = organs_slot[slot]
if(organ?.owner) // This exist mostly because reagent metabolization can cause organ reshuffling
organ.on_life(delta_time, times_fired)
@@ -528,7 +528,7 @@
/**
* Handles calling metabolization for dead people.
* Due to how reagent metabolization code works this couldn't be done anywhere else.
- *
+ *
* Arguments:
* - delta_time: The amount of time that has elapsed since the last tick.
* - times_fired: The number of times SSmobs has ticked.
diff --git a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
index b2822fd02a0..34a7d6f420a 100644
--- a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
@@ -83,7 +83,7 @@
var/mob/living/carbon/jedi = user
to_chat(jedi, span_userdanger("That was a really dense idea."))
jedi.ghostize()
- var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.internal_organs
+ var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.organs
if(rip_u)
rip_u.Remove(jedi)
qdel(rip_u)
diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm
index 124dcaf9433..5c68669e6e2 100644
--- a/code/modules/power/supermatter/supermatter_hit_procs.dm
+++ b/code/modules/power/supermatter/supermatter_hit_procs.dm
@@ -52,7 +52,7 @@
to_chat(jedi, span_userdanger("That was a really dense idea."))
jedi.investigate_log("had [jedi.p_their()] brain dusted by touching [src] with telekinesis.", INVESTIGATE_DEATHS)
jedi.ghostize()
- var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.internal_organs
+ var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.organs
if(rip_u)
rip_u.Remove(jedi)
qdel(rip_u)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 3e9bf4dc998..34c6b551344 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -164,7 +164,7 @@
return
var/mob/living/carbon/jedi = user
to_chat(jedi, span_userdanger("That was a shockingly dumb idea."))
- var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.internal_organs
+ var/obj/item/organ/internal/brain/rip_u = locate(/obj/item/organ/internal/brain) in jedi.organs
jedi.ghostize(jedi)
if(rip_u)
qdel(rip_u)
diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
index 6268e721fb8..ed318b5a652 100644
--- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm
@@ -126,7 +126,7 @@
if(!HAS_TRAIT(breather, TRAIT_KNOCKEDOUT))
return ..()
- for(var/obj/item/organ/organ_being_healed as anything in breather.internal_organs)
+ for(var/obj/item/organ/organ_being_healed as anything in breather.organs)
organ_being_healed.applyOrganDamage(-0.5 * REM * delta_time)
return ..()
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index d3627f8ae2a..2e48e72ec04 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -389,7 +389,7 @@
var/mob/living/carbon/C = A
if(trans_volume >= 0.6) //prevents cheesing with ultralow doses.
C.adjustToxLoss((-1.5 * min(2, trans_volume) * REM) * normalise_creation_purity(), FALSE, required_biotype = affected_biotype) //This is to promote iv pole use for that chemotherapy feel.
- var/obj/item/organ/internal/liver/L = C.internal_organs_slot[ORGAN_SLOT_LIVER]
+ var/obj/item/organ/internal/liver/L = C.organs_slot[ORGAN_SLOT_LIVER]
if(!L || L.organ_flags & ORGAN_FAILING)
return
conversion_amount = (trans_volume * (min(100 -C.getOrganLoss(ORGAN_SLOT_LIVER), 80) / 100)*normalise_creation_purity()) //the more damaged the liver the worse we metabolize.
diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm
index 2da73f3499b..6704367f5d9 100644
--- a/code/modules/reagents/withdrawal/generic_addictions.dm
+++ b/code/modules/reagents/withdrawal/generic_addictions.dm
@@ -245,7 +245,7 @@
if(affected_carbon.stat >= SOFT_CRIT)
return
- var/obj/item/organ/organ = pick(affected_carbon.internal_organs)
+ var/obj/item/organ/organ = pick(affected_carbon.organs)
if(organ.low_threshold)
to_chat(affected_carbon, organ.low_threshold_passed)
return
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index ab0ea8bcc05..f06d01c5e18 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -390,7 +390,7 @@
return FALSE
var/list/bodypart_organs
- for(var/obj/item/organ/organ_check as anything in owner.internal_organs) //internal organs inside the dismembered limb are dropped.
+ for(var/obj/item/organ/organ_check as anything in owner.organs) //internal organs inside the dismembered limb are dropped.
if(check_zone(organ_check.zone) == body_zone)
LAZYADD(bodypart_organs, organ_check) // this way if we don't have any, it'll just return null
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 673a7c95257..faa44c464ed 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -61,7 +61,7 @@
if(isturf(chest_owner.loc))
chest_owner.add_splatter_floor(chest_owner.loc)
playsound(get_turf(chest_owner), 'sound/misc/splort.ogg', 80, TRUE)
- for(var/obj/item/organ/organ as anything in chest_owner.internal_organs)
+ for(var/obj/item/organ/organ as anything in chest_owner.organs)
var/org_zone = check_zone(organ.zone)
if(org_zone != BODY_ZONE_CHEST)
continue
@@ -124,7 +124,7 @@
to_chat(phantom_owner, span_warning("You feel your [mutation] deactivating from the loss of your [body_zone]!"))
phantom_owner.dna.force_lose(mutation)
- for(var/obj/item/organ/organ as anything in phantom_owner.internal_organs) //internal organs inside the dismembered limb are dropped.
+ for(var/obj/item/organ/organ as anything in phantom_owner.organs) //internal organs inside the dismembered limb are dropped.
var/org_zone = check_zone(organ.zone)
if(org_zone != body_zone)
continue
diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm
index 54bfe2250dd..a7d39e1da34 100644
--- a/code/modules/surgery/organs/_organ.dm
+++ b/code/modules/surgery/organs/_organ.dm
@@ -11,7 +11,7 @@
var/zone = BODY_ZONE_CHEST
///The organ slot this organ is supposed to inhabit. This should be unique by type. (Lungs, Appendix, Stomach, etc)
var/slot
- // DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
+ // DO NOT add slots with matching names to different zones - it will break organs_slot list!
var/organ_flags = ORGAN_EDIBLE
var/maxHealth = STANDARD_ORGAN_THRESHOLD
/// Total damage this organ has sustained
@@ -78,8 +78,8 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
else
qdel(replaced)
- receiver.internal_organs |= src
- receiver.internal_organs_slot[slot] = src
+ receiver.organs |= src
+ receiver.organs_slot[slot] = src
owner = receiver
moveToNullspace()
@@ -103,9 +103,9 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
UnregisterSignal(organ_owner, COMSIG_PARENT_EXAMINE)
- organ_owner.internal_organs -= src
- if(organ_owner.internal_organs_slot[slot] == src)
- organ_owner.internal_organs_slot.Remove(slot)
+ organ_owner.organs -= src
+ if(organ_owner.organs_slot[slot] == src)
+ organ_owner.organs_slot.Remove(slot)
owner = null
for(var/datum/action/action as anything in actions)
@@ -240,7 +240,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
dna.species.regenerate_organs(src, replace_current = regenerate_existing)
// Species regenerate organs doesn't ALWAYS handle healing the organs because it's dumb
- for(var/obj/item/organ/organ as anything in internal_organs)
+ for(var/obj/item/organ/organ as anything in organs)
organ.setOrganDamage(0)
set_heartattack(FALSE)
return
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 56d21bc3a5a..fa404914f00 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -184,7 +184,7 @@
continue
choice_list[augment_item] = image(augment_item)
var/obj/item/choice = show_radial_menu(owner, owner, choice_list)
- if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !active_item && (choice in contents))
+ if(owner && owner == usr && owner.stat != DEAD && (src in owner.organs) && !active_item && (choice in contents))
// This monster sanity check is a nice example of how bad input is.
Extend(choice)
else
@@ -344,7 +344,7 @@
slot = ORGAN_SLOT_RIGHT_ARM_AUG
actions_types = list()
-
+
///The amount of damage dealt by the empowered attack.
var/punch_damage = 13
///IF true, the throw attack will not smash people into walls
@@ -356,7 +356,7 @@
///Maximum throw power of the attack
var/throw_power_max = 4
///How long will the implant malfunction if it is EMP'd
- var/emp_base_duration = 9 SECONDS
+ var/emp_base_duration = 9 SECONDS
/obj/item/organ/internal/cyberimp/arm/muscle/Insert(mob/living/carbon/reciever, special = FALSE, drop_if_replaced = TRUE)
. = ..()
@@ -425,7 +425,7 @@
living_target.throw_at(throw_target, attack_throw_range, rand(throw_power_min,throw_power_max), source, gentle = non_harmful_throw)
living_target.visible_message(
- span_danger("[source] [picked_hit_type]ed [living_target]!"),
+ span_danger("[source] [picked_hit_type]ed [living_target]!"),
span_userdanger("You're [picked_hit_type]ed by [source]!"),
span_hear("You hear a sickening sound of flesh hitting flesh!"),
COMBAT_MESSAGE_RANGE,
diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm
index e5c7f4b0af3..28a5ab3cf1a 100644
--- a/code/modules/surgery/organs/external/spines.dm
+++ b/code/modules/surgery/organs/external/spines.dm
@@ -20,7 +20,7 @@
/obj/item/organ/external/spines/Insert(mob/living/carbon/receiver, special, drop_if_replaced)
. = ..()
if(.)
- paired_tail = locate(/obj/item/organ/external/tail/lizard) in receiver.internal_organs //We want specifically a lizard tail, so we don't use the slot.
+ paired_tail = locate(/obj/item/organ/external/tail/lizard) in receiver.organs //We want specifically a lizard tail, so we don't use the slot.
/obj/item/organ/external/spines/Remove(mob/living/carbon/organ_owner, special, moving)
. = ..()
diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm
index d6fc115a0c4..c9b8b117da4 100644
--- a/code/modules/surgery/organs/helpers.dm
+++ b/code/modules/surgery/organs/helpers.dm
@@ -27,11 +27,11 @@
return
/mob/living/carbon/getorgan(typepath)
- return (locate(typepath) in internal_organs)
+ return (locate(typepath) in organs)
/mob/living/carbon/getorganszone(zone, include_children = FALSE)
var/valid_organs = list()
- for(var/obj/item/organ/organ as anything in internal_organs)
+ for(var/obj/item/organ/organ as anything in organs)
if(zone == organ.zone)
valid_organs += organ
else if(include_children && zone == deprecise_zone(organ.zone))
@@ -39,5 +39,5 @@
return valid_organs
/mob/living/carbon/getorganslot(slot)
- . = internal_organs_slot[slot]
+ . = organs_slot[slot]
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 640937e8be1..63dacfb3d8c 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -19,9 +19,9 @@
if(!. || !owner)
return
- // internal_organs_slot must ALWAYS be ordered in the same way as organ_process_order
+ // organs_slot must ALWAYS be ordered in the same way as organ_process_order
// Otherwise life processing breaks down
- sortTim(owner.internal_organs_slot, GLOBAL_PROC_REF(cmp_organ_slot_asc))
+ sortTim(owner.organs_slot, GLOBAL_PROC_REF(cmp_organ_slot_asc))
STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index a74712c66e7..920c0f4f4c9 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -184,7 +184,7 @@
//INFO
//Check /mob/living/carbon/attackby for how surgery progresses, and also /mob/living/carbon/attack_hand.
//As of Feb 21 2013 they are in code/modules/mob/living/carbon/carbon.dm, lines 459 and 51 respectively.
-//Other important variables are var/list/surgeries (/mob/living) and var/list/internal_organs (/mob/living/carbon)
+//Other important variables are var/list/surgeries (/mob/living) and var/list/organs (/mob/living/carbon)
// var/list/bodyparts (/mob/living/carbon/human) is the LIMBS of a Mob.
//Surgical procedures are initiated by attempt_initiate_surgery(), which is called by surgical drapes and bedsheets.
diff --git a/code/modules/unit_tests/full_heal.dm b/code/modules/unit_tests/full_heal.dm
index 850334ea4f1..beec2dbf9e2 100644
--- a/code/modules/unit_tests/full_heal.dm
+++ b/code/modules/unit_tests/full_heal.dm
@@ -4,12 +4,12 @@
/datum/unit_test/full_heal_heals_organs/Run()
var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent)
- for(var/obj/item/organ/internal/organ in dummy.internal_organs)
+ for(var/obj/item/organ/internal/organ in dummy.organs)
organ.applyOrganDamage(50)
dummy.fully_heal(HEAL_ORGANS)
- for(var/obj/item/organ/internal/organ in dummy.internal_organs)
+ for(var/obj/item/organ/internal/organ in dummy.organs)
if(organ.damage <= 0)
continue
TEST_FAIL("Organ [organ] did not get healed by fullyheal flag HEAL_ORGANS.")
@@ -22,7 +22,7 @@
var/list/we_started_with = list()
- for(var/obj/item/organ/internal/organ in dummy.internal_organs)
+ for(var/obj/item/organ/internal/organ in dummy.organs)
if(organ.organ_flags & ORGAN_VITAL) // leave this for now
continue
we_started_with += organ.type
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index 3c9f5c59c9f..4969e07734f 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -43,7 +43,7 @@
/obj/item/organ/internal/zombie_infection/process(delta_time, times_fired)
if(!owner)
return
- if(!(src in owner.internal_organs))
+ if(!(src in owner.organs))
Remove(owner)
if(owner.mob_biotypes & MOB_MINERAL)//does not process in inorganic things
return