Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] ARDS and AN code cleanup #879

Merged
merged 1 commit into from
Nov 29, 2023
Merged

[MIRROR] ARDS and AN code cleanup #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/choking.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Bonus
to_chat(M, span_userdanger("[pick("Your lungs hurt!", "It hurts to breathe!")]"))
Asphyxiate(M, A)
M.emote("gasp")
if(M.getOxyLoss() >= 120)
if(M.getOxyLoss() >= (M.maxHealth / (200/120)))
M.visible_message(span_warning("[M] stops breathing, as if their lungs have totally collapsed!"))
Asphyxiate_death(M, A)
return
Expand Down
3 changes: 0 additions & 3 deletions code/datums/diseases/advance/symptoms/flesh_eating.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ Bonus
symptom_delay_min = 3
symptom_delay_max = 6
var/chems = FALSE
var/zombie = FALSE
threshold_descs = list(
"Stage Speed 7" = "Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.",
"Stealth 5" = "The symptom remains hidden until active.",
Expand Down Expand Up @@ -128,6 +127,4 @@ Bonus
M.take_overall_damage(brute = get_damage, required_bodytype = BODYTYPE_ORGANIC)
if(chems)
M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
if(zombie)
M.reagents.add_reagent(/datum/reagent/hnz, 1)
return 1
Loading