Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

fix ashwalker cpr #7370

Merged
Amelia0010 merged 4 commits into from
Dec 24, 2019
Merged

fix ashwalker cpr #7370

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cb2ae7
bruh
SomeguyManperson Dec 20, 2019
4c5b80b
forgot to remove this
SomeguyManperson Dec 20, 2019
5ff8f25
code is C O M P A C T
SomeguyManperson Dec 20, 2019
21fc6f1
Update code/modules/mob/living/carbon/human/human.dm
SomeguyManperson Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions code/modules/mob/living/carbon/human/human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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, "<span class='unconscious'>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, "<span class='unconscious'>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)
Expand Down