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

Merge pull request #7013 from VOREStation/upstream-merge-6906

Browse Source 
[MIRROR] Fix runtimes in lungs.dm
This commit is contained in:
Novacat
2020-03-27 09:33:48 -04:00
committed by GitHub
parent 99f27e193b 702ccbee5c
commit e36d3d4e83
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/lungs.dm
+9 -11
View File
@@ -15,31 +15,29 @@
if(is_bruised())
if(prob(4))
spawn()
owner?.emote("me", 1, "coughs up blood!")
spawn owner?.emote("me", 1, "coughs up blood!")
owner.drip(10)
if(prob(8))
spawn()
owner?.emote("me", 1, "gasps for air!")
spawn owner?.emote("me", 1, "gasps for air!")
owner.AdjustLosebreath(15)
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?.emote("me", 1, "gasps for air!")
spawn owner?.emote("me", 1, "gasps for air!")
owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency())))
/obj/item/organ/internal/lungs/proc/rupture()
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(istype(parent))
owner.custom_pain("You feel a stabbing pain in your [parent.name]!", 50)
if(owner)
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(istype(parent))
owner.custom_pain("You feel a stabbing pain in your [parent.name]!", 50)
bruise()
/obj/item/organ/internal/lungs/handle_germ_effects()
. = ..() //Up should return an infection level as an integer
if(!.) return
if(!. || !owner) return
//Bacterial pneumonia
if (. >= 1)
@@ -57,6 +55,6 @@
..()
var/mob/living/carbon/human/H = null
spawn(15)
if(ishuman(owner))
if(owner && ishuman(owner))
H = owner
color = H.species.blood_color