From 0cb2ae71765ad227331a669147bf4e6a35bf1ea6 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 20 Dec 2019 17:26:17 -0500 Subject: [PATCH 1/4] bruh --- code/modules/mob/living/carbon/human/human.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 02a5e7338a0e..89c57875efe3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -646,12 +646,12 @@ 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) + 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) + else 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) From 4c5b80bd2b86235fb2535df220ed633db618bace Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 20 Dec 2019 17:30:12 -0500 Subject: [PATCH 2/4] forgot to remove this --- code/modules/mob/living/carbon/human/human.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 89c57875efe3..e1152a17130d 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 From 5ff8f25d583071a961a9e99cf3389a6a0e8456a8 Mon Sep 17 00:00:00 2001 From: Theos Date: Fri, 20 Dec 2019 17:53:00 -0500 Subject: [PATCH 3/4] code is C O M P A C T --- code/modules/mob/living/carbon/human/human.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e1152a17130d..0aee8035be93 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -644,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) + if(they_breathe && (they_ashlung? TRUE : FALSE) != (we_ashlung? TRUE : FALSE)) 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_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) //yogs end else if(they_breathe && they_lung) var/suff = min(C.getOxyLoss(), 7) From 21fc6f12bdf1d441c6e9cc5a7b83ac3e6d083d84 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 23 Dec 2019 07:23:17 -0500 Subject: [PATCH 4/4] Update code/modules/mob/living/carbon/human/human.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0aee8035be93..b90c029240cc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -644,7 +644,7 @@ 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? TRUE : FALSE) != (we_ashlung? TRUE : FALSE)) + 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...")