cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lungs.dm

Browse Source
This commit is contained in:
Novacat
2020-03-27 08:39:57 -04:00
committed by GitHub
parent c49c1e40f3
commit 702ccbee5c
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/organs/internal/lungs.dm
View File

@@ -15,31 +15,17 @@
if(is_bruised()) if(is_bruised())
if(prob(4)) if(prob(4))
<<<<<<< HEAD
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, "coughs up blood!") spawn owner?.emote("me", 1, "coughs up blood!")
owner.drip(10) owner.drip(10)
if(prob(8)) if(prob(8))
spawn owner?.emote("me", 1, "gasps for air!") spawn owner?.emote("me", 1, "gasps for air!")
>>>>>>> 6f2aec5... Merge pull request #6906 from Meghan-Rossi/lungfix
owner.AdjustLosebreath(15) owner.AdjustLosebreath(15)
if(owner.internal_organs_by_name[O_BRAIN]) // As the brain starts having Trouble, the lungs start malfunctioning. 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] var/obj/item/organ/internal/brain/Brain = owner.internal_organs_by_name[O_BRAIN]
if(Brain.get_control_efficiency() <= 0.8) if(Brain.get_control_efficiency() <= 0.8)
if(prob(4 / max(0.1,Brain.get_control_efficiency()))) if(prob(4 / max(0.1,Brain.get_control_efficiency())))
<<<<<<< HEAD
spawn()
owner?.emote("me", 1, "gasps for air!")
=======
spawn owner?.emote("me", 1, "gasps for air!") spawn owner?.emote("me", 1, "gasps for air!")
>>>>>>> 6f2aec5... Merge pull request #6906 from Meghan-Rossi/lungfix
owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency()))) owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency())))
/obj/item/organ/internal/lungs/proc/rupture() /obj/item/organ/internal/lungs/proc/rupture()