From 34712ecc3779ccc73cc3cd233a5a241ea9a9bfe3 Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Wed, 16 Jul 2014 20:17:50 +0100 Subject: [PATCH] Fix for internal organ surgery Fixes internal organ surgery, and some other places where the same problem would have cropped up --- .../gamemodes/changeling/changeling_powers.dm | 2 +- .../objects/items/devices/laserpointer.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 2 +- code/modules/surgery/ribcage.dm | 24 +++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 8d228da20e2..8e74a80cf54 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -503,7 +503,7 @@ O.wounds = list() O.wound_update_accuracy = 1 for(var/organ_name in H.internal_organs) - var/datum/organ/internal/IO = H.internal_organs[organ_name] + var/datum/organ/internal/IO = H.internal_organs_by_name[organ_name] IO.damage = 0 IO.trace_chemicals = list() H.updatehealth() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 4810203d976..9c8f766714f 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -112,7 +112,7 @@ severity -= 1 severity = min(max(severity, 0), 4) var/mob/living/carbon/human/H = C - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] switch(severity) if(0) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index b9949c8fc34..d3a109bc07c 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1747,7 +1747,7 @@ datum // M.sdisabilities &= ~BLIND //doesn't even do anythig cos of the sdisabilities = 0 bit if(ishuman(M)) var/mob/living/carbon/human/H = M - var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if(istype(E)) E.damage = max(E.damage-5 , 0) M.SetWeakened(0) diff --git a/code/modules/surgery/ribcage.dm b/code/modules/surgery/ribcage.dm index be7734b4a68..84aba221f29 100644 --- a/code/modules/surgery/ribcage.dm +++ b/code/modules/surgery/ribcage.dm @@ -209,10 +209,10 @@ return ..() && is_chest_organ_damaged && target.op_stage.ribcage == 2 begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] - var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"] - var/datum/organ/internal/liver/liver = target.internal_organs["liver"] - var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] + var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"] + var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"] + var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"] if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack)) if(lungs.damage > 0) @@ -270,10 +270,10 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] - var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"] - var/datum/organ/internal/liver/liver = target.internal_organs["liver"] - var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] + var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"] + var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"] + var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"] if(lungs.damage > 0) user.visible_message("\blue [user] mends the rupture in [target]'s lungs with \the [tool].", \ @@ -300,10 +300,10 @@ kidney.damage = 0 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - var/datum/organ/internal/heart/heart = target.internal_organs["heart"] - var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"] - var/datum/organ/internal/liver/liver = target.internal_organs["liver"] - var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"] + var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] + var/datum/organ/internal/lungs/lungs = target.internal_organs_by_name["lungs"] + var/datum/organ/internal/liver/liver = target.internal_organs_by_name["liver"] + var/datum/organ/internal/liver/kidney = target.internal_organs_by_name["kidney"] var/datum/organ/external/chest/affected = target.get_organ("chest") user.visible_message("\red [user]'s hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!", \ "\red Your hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!")