Skip to content

Commit

Permalink
status
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Feb 29, 2024
1 parent 1f8f35a commit 744a392
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion code/modules/borer/borer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,12 @@ GLOBAL_LIST_EMPTY(living_borers)
CR = "Forbidden"
else if((enzymes < BORER_LARVAE_COST))
CR = "No"
var/bore_status = "AWAKE"
if(hibernating)
bore_status = "HIBERNATING"

. += ""
. += "Borer:"
. += "Borer: [bore_status]"
. += "Name: [real_name]"
. += "Can Reproduce: [CR]"
. += "Enzymes: [round(enzymes)]/[round(max_enzymes)]"
Expand All @@ -361,6 +364,7 @@ GLOBAL_LIST_EMPTY(living_borers)
. += "Host Integrity: [host.health / health_perc]%"
if(ishuman(host))
. += "Host Brain Damage: [host.brainloss]%"
. += "Host Blood Level: [host.blood_volume / 5.6]%"
else if(isxeno(host))
var/mob/living/carbon/xenomorph/xeno_host = host
if(xeno_host.plasma_max)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,15 @@
CR = "No"

. += ""
. += "Borer:"
. += "Borer: CONTROLLING"
. += "Name: [B.real_name]"
. += "Can Reproduce: [CR]"
. += "Enzymes: [round(B.enzymes)]/[round(B.max_enzymes)]"
. += "Health: [B.health]/[B.maxHealth]"
. += "Injuries: Brute:[round(B.getBruteLoss())] Burn:[round(B.getFireLoss())] Toxin:[round(B.getToxLoss())]"
. += ""
. += "Host Brain Damage: [brainloss]/100"
. += "Host Blood Level: [blood_volume / 5.6]%"


/mob/living/carbon/human/ex_act(severity, direction, datum/cause_data/cause_data)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
CR = "No"

. += ""
. += "Borer:"
. += "Borer: CONTROLLING"
. += "Name: [B.real_name]"
. += "Can Reproduce: [CR]"
. += "Enzymes: [round(B.enzymes)]/[round(B.max_enzymes)]"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
if(M.behavior_delegate && M.behavior_delegate.handle_slash(src))
return XENO_NO_DELAY_ACTION

if(stat == DEAD)
if(stat == DEAD || (status_flags & FAKEDEATH))
to_chat(M, SPAN_WARNING("[src] is dead, why would we want to touch it?"))
return XENO_NO_DELAY_ACTION

Expand Down

0 comments on commit 744a392

Please sign in to comment.