diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index ada2c12b9a..d568d66d78 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -1,6 +1,7 @@ #define LIVER_DEFAULT_HEALTH 100 //amount of damage required for liver failure #define LIVER_DEFAULT_TOX_TOLERANCE 3 //amount of toxins the liver can filter out #define LIVER_DEFAULT_TOX_LETHALITY 0.01 //lower values lower how harmful toxins are to the liver +#define LIVER_SWELLING_MOVE_MODIFY "pharma" /obj/item/organ/liver name = "liver" @@ -57,7 +58,7 @@ //Just in case /obj/item/organ/liver/Remove(mob/living/carbon/M, special = 0) - M.remove_movespeed_modifier("pharma") + M.remove_movespeed_modifier(LIVER_SWELLING_MOVE_MODIFY) M.ResetBloodVol() //At the moment, this shouldn't allow application twice. You either have this OR a thirsty ferret. sizeMoveMod(1, M) @@ -69,7 +70,7 @@ if(prob(5)) to_chat(owner, "You feel a stange ache in your side, almost like a sitch. This pain is affecting your movements and making you feel lightheaded.") var/mob/living/carbon/human/H = owner - H.add_movespeed_modifier("pharma", TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) + H.add_movespeed_modifier(LIVER_SWELLING_MOVE_MODIFY, TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = moveCalc) H.AdjustBloodVol(moveCalc/3) sizeMoveMod(moveCalc, H) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index c13a7b249b..4e72693a68 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -62,8 +62,7 @@ //TODO: lung health affects lung function /obj/item/organ/lungs/proc/adjustLungLoss(damage_mod, mob/living/carbon/M) //damage might be too low atm. - message_admins("[M] lung damage: [damage_mod], damage: [damage]") - if (maxHealth == "plasma") + if (maxHealth == INFINITY) return if(damage+damage_mod < 0) damage = 0 @@ -446,7 +445,7 @@ safe_oxygen_max = 0 // Like, at all. safe_toxins_min = 16 //We breath THIS! safe_toxins_max = 0 - maxHealth = "plasma"//I don't understand how plamamen work, so I'm not going to try t give them special lungs atm + maxHealth = INFINITY//I don't understand how plamamen work, so I'm not going to try t give them special lungs atm /obj/item/organ/lungs/cybernetic name = "cybernetic lungs"