diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 02a5e7338a0e..b90c029240cc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -634,7 +634,6 @@ var/they_lung = C.getorganslot(ORGAN_SLOT_LUNGS) var/they_ashlung = C.getorgan(/obj/item/organ/lungs/ashwalker) // yogs - Do they have ashwalker lungs? var/we_ashlung = getorgan(/obj/item/organ/lungs/ashwalker) // yogs - Does the guy doing CPR have ashwalker lungs? - var/anticpr = min(C.getOxyLoss(), 10) // yogs - for incompatible lungs if(C.health > C.crit_threshold) return @@ -645,16 +644,11 @@ log_combat(src, C, "CPRed") SSachievements.unlock_achievement(/datum/achievement/cpr, client) // yogs start - can't CPR people with ash walker lungs whithout having them yourself - if(they_breathe && they_ashlung && !we_ashlung) - C.adjustOxyLoss(anticpr) + if(they_breathe && !!they_ashlung != !!we_ashlung) + C.adjustOxyLoss(10) C.updatehealth() to_chat(C, "You feel a breath of fresh air enter your lungs... you feel worse...") SSachievements.unlock_achievement(/datum/achievement/anticpr, client) //you can get both achievements at the same time I guess - else if(they_breathe && they_lung && we_ashlung) - C.adjustOxyLoss(anticpr) - C.updatehealth() - to_chat(C, "You feel a breath of fresh air enter your lungs... you feel worse...") - SSachievements.unlock_achievement(/datum/achievement/anticpr, client) //yogs end else if(they_breathe && they_lung) var/suff = min(C.getOxyLoss(), 7)