cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes more sleeps from init (#17332)

Browse Source 
* splits emotes into original (custom_emote) and automatic (automatic_custom_emote)

* no copy paste

* immunosuprizine touchup

* srcining
This commit is contained in:
Cameron Lennox
2025-03-16 18:11:04 +01:00
committed by GitHub
parent 8878a8ef49
commit 17ec1d700b
31 changed files with 154 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/appendix.dm
+2 -2
View File
@@ -23,11 +23,11 @@
if(inflamed == 1)
if(prob(5))
to_chat(owner, span_warning("You feel a stinging pain in your abdomen!"))
owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces slightly.", check_stat = TRUE)
if(inflamed > 1)
if(prob(3))
to_chat(owner, span_warning("You feel a stabbing pain in your abdomen!"))
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces painfully.", check_stat = TRUE)
owner.adjustToxLoss(1)
if(inflamed > 2)
if(prob(1))
code/modules/organs/internal/lungs.dm
+5 -5
View File
@@ -13,27 +13,27 @@
if(is_broken())
if(prob(4))
spawn owner?.custom_emote(VISIBLE_MESSAGE, "coughs up a large amount of blood!")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "coughs up a large amount of blood!", check_stat = TRUE)
var/bleeding_rng = rand(3,5)
owner.drip(bleeding_rng)
if(prob(8)) //This is a medical emergency. Will kill within minutes unless exceedingly lucky.
spawn owner?.custom_emote(VISIBLE_MESSAGE, "gasps for air!")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "gasps for air!", check_stat = TRUE)
owner.AdjustLosebreath(15)
else if(is_bruised()) //Only bruised? That's an annoyance and can cause some more damage (via brainloss due to oxyloss)
if(prob(2)) //But let's not kill people too quickly.
spawn owner?.custom_emote(VISIBLE_MESSAGE, "coughs up a small amount of blood!")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "coughs up a small amount of blood!", check_stat = TRUE)
var/bleeding_rng = rand(1,2)
owner.drip(bleeding_rng)
if(prob(4)) //Get to medical quickly. but shouldn't kill without exceedingly bad RNG.
spawn owner?.custom_emote(VISIBLE_MESSAGE, "gasps for air!")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "gasps for air!", check_stat = TRUE)
owner.AdjustLosebreath(10) //Losebreath is a DoT that does 1:1 damage and prevents oxyloss healing via breathing.
if(owner.internal_organs_by_name[O_BRAIN]) // As the brain starts having Trouble, the lungs start malfunctioning.
var/obj/item/organ/internal/brain/Brain = owner.internal_organs_by_name[O_BRAIN]
if(Brain.get_control_efficiency() <= 0.8)
if(prob(4 / max(0.1,Brain.get_control_efficiency())))
spawn owner?.custom_emote(VISIBLE_MESSAGE, "gasps for air!")
owner.automatic_custom_emote(VISIBLE_MESSAGE, "gasps for air!", check_stat = TRUE)
owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency())))
/obj/item/organ/internal/lungs/proc/rupture()