From e08b1859af4a2ca28deba44a6388bd884aedc1a6 Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 21 Oct 2015 23:19:27 +0300 Subject: [PATCH] IPC Organs - final fixes, debug removal More debug message removals. Also fixes the bladder to work properly, depending on its status and so on. --- code/modules/organs/organ_alien.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm index 9300c55d..c473d377 100644 --- a/code/modules/organs/organ_alien.dm +++ b/code/modules/organs/organ_alien.dm @@ -265,8 +265,11 @@ removed_type = /obj/item/organ/machine/bladder /datum/organ/internal/machine/bladder/process() + if(status & ORGAN_CUT_AWAY) + return + if(is_bruised()) - var/leakSmall = rand(1,25) + var/leakSmall = rand(1,5) if(owner.reagents.total_volume > 0) owner.reagents.remove_any(leakSmall) if(owner.reagents.maximum_volume > 500) @@ -282,9 +285,6 @@ else owner.reagents.maximum_volume -= leakLarge - if(!is_bruised() && !is_broken() && owner.reagents.maximum_volume < 1000) - owner.reagents.maximum_volume = 1000 - if(owner.reagents.reagent_list.len) if(owner.reagents.has_reagent("sacid") || owner.reagents.has_reagent("pacid")) take_damage(rand(0,2.5), 1) @@ -313,7 +313,6 @@ Machine.reagents.maximum_volume = 0 /obj/item/organ/machine/bladder/exposed_to_the_world() - msg_scopes("We went here x2.") var/obj/item/robot_parts/robot_component/bladder/Bladder = new(src.loc) if(organ_data.damage) Bladder.brute = organ_data.damage @@ -334,7 +333,6 @@ robotic = 2 /obj/item/organ/machine/diagnosis_unit/exposed_to_the_world() - msg_scopes("We went here.") var/obj/item/robot_parts/robot_component/diagnosis_unit/Diagnosis_unit = new(src.loc) if(organ_data.damage) Diagnosis_unit.brute = organ_data.damage