diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 2079e729f4..6263284584 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -206,7 +206,7 @@ var/dose_available = FALSE var/rid = /datum/reagent/medicine/epinephrine var/ramount = 10 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage. /obj/item/organ/heart/cybernetic/tier2 name = "cybernetic heart" @@ -214,7 +214,7 @@ icon_state = "heart-c-u" maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD dose_available = TRUE - emp_vulnerability = 40 + emp_vulnerability = 2 /obj/item/organ/heart/cybernetic/tier3 name = "upgraded cybernetic heart" @@ -224,7 +224,7 @@ dose_available = TRUE rid = /datum/reagent/medicine/atropine ramount = 5 - emp_vulnerability = 20 + emp_vulnerability = 3 /obj/item/organ/heart/cybernetic/emp_act(severity) . = ..() @@ -239,7 +239,7 @@ owner.Dizzy(10) owner.losebreath += 10 COOLDOWN_START(src, severe_cooldown, 20 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(severity/emp_vulnerability)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. Stop() owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \ diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index afc770efae..2037547d36 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -106,7 +106,7 @@ toxLethality = 1.1 * LIVER_DEFAULT_TOX_LETHALITY maxHealth = STANDARD_ORGAN_THRESHOLD*0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage. /obj/item/organ/liver/cybernetic/tier2 name = "cybernetic liver" @@ -115,7 +115,7 @@ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD toxTolerance = 2 * LIVER_DEFAULT_TOX_TOLERANCE //6 units of toxin purging toxLethality = 0.8 * LIVER_DEFAULT_TOX_LETHALITY //20% less damage than a normal liver - emp_vulnerability = 40 + emp_vulnerability = 2 /obj/item/organ/liver/cybernetic/tier3 name = "upgraded cybernetic liver" @@ -125,7 +125,7 @@ maxHealth = 2 * STANDARD_ORGAN_THRESHOLD toxTolerance = 5 * LIVER_DEFAULT_TOX_TOLERANCE //15 units of toxin purging toxLethality = 0.4 * LIVER_DEFAULT_TOX_LETHALITY //60% less damage than a normal liver - emp_vulnerability = 20 + emp_vulnerability = 3 /obj/item/organ/liver/cybernetic/emp_act(severity) . = ..() @@ -134,5 +134,5 @@ if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people. owner.adjustToxLoss(10) COOLDOWN_START(src, severe_cooldown, 10 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(severity/emp_vulnerability)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 4d19d847f6..c94fb16add 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -553,7 +553,7 @@ organ_flags = ORGAN_SYNTHETIC maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage. /obj/item/organ/lungs/cybernetic/tier2 name = "cybernetic lungs" @@ -562,7 +562,7 @@ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD safe_oxygen_min = 13 safe_oxygen_max = 100 - emp_vulnerability = 40 + emp_vulnerability = 2 /obj/item/organ/lungs/cybernetic/tier3 name = "upgraded cybernetic lungs" @@ -576,7 +576,7 @@ SA_para_min = 30 SA_sleep_min = 50 BZ_trip_balls_min = 30 - emp_vulnerability = 20 + emp_vulnerability = 3 cold_level_1_threshold = 200 cold_level_2_threshold = 140 @@ -590,7 +590,7 @@ if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people. owner.losebreath += 20 COOLDOWN_START(src, severe_cooldown, 30 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(severity/emp_vulnerability)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. /obj/item/organ/lungs/ashwalker diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index f286c294fc..defb062f1a 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -99,7 +99,7 @@ desc = "A basic device designed to mimic the functions of a human stomach" organ_flags = ORGAN_SYNTHETIC maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage. /obj/item/organ/stomach/cybernetic/tier2 name = "cybernetic stomach" @@ -107,7 +107,7 @@ desc = "An electronic device designed to mimic the functions of a human stomach. Handles disgusting food a bit better." maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD disgust_metabolism = 2 - emp_vulnerability = 40 + emp_vulnerability = 2 /obj/item/organ/stomach/cybernetic/tier3 name = "upgraded cybernetic stomach" @@ -115,7 +115,7 @@ desc = "An upgraded version of the cybernetic stomach, designed to improve further upon organic stomachs. Handles disgusting food very well." maxHealth = 2 * STANDARD_ORGAN_THRESHOLD disgust_metabolism = 3 - emp_vulnerability = 20 + emp_vulnerability = 3 /obj/item/organ/stomach/cybernetic/emp_act(severity) . = ..() @@ -124,7 +124,7 @@ if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people. owner.vomit(stun = FALSE) COOLDOWN_START(src, severe_cooldown, 10 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(severity/emp_vulnerability)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. /obj/item/organ/stomach/ipc