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

Jump to bottom

MORE linter fixes!! #2658

Merged
merged 2 commits into from
Jul 19, 2023
Merged

MORE linter fixes!! #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7ea80
fixes the runtime for breath
GremlingSS Jul 19, 2023
b281937
Attempts to fix runtime with gibbers
GremlingSS Jul 19, 2023
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
5 changes: 3 additions & 2 deletions code/modules/mob/living/carbon/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@

//CRIT
if(health <= HEALTH_THRESHOLD_FULLCRIT || !lungs || lungs.failed)
if(reagents.has_reagent(/datum/reagent/medicine/epinephrine) && lungs)
return
if(reagents) // I know this is scuffed, but it stops unit testing from getting upset :')
if(reagents.has_reagent(/datum/reagent/medicine/epinephrine) && lungs)
return
adjustOxyLoss(0.5)

failed_last_breath = 1
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/simple_animal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns)
if(deathmessage || !del_on_death)
INVOKE_ASYNC(src, .proc/emote, "deathgasp")
if(del_on_death)
..()
..(gibbed)
//Prevent infinite loops if the mob Destroy() is overridden in such
//a manner as to cause a call to death() again
del_on_death = FALSE
Expand All @@ -705,7 +705,7 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns)
icon_state = icon_dead
density = FALSE
lying = 1
..()
..(gibbed)

/mob/living/simple_animal/drop_all_held_items(skip_worn = FALSE)
if(internal_storage && !skip_worn)
Expand Down