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

Revert "Fixes lung rupturing"

Browse Source
This commit is contained in:
Yoshax
2016-08-09 15:41:10 +01:00
committed by GitHub
parent 8c363c1ecb
commit 6e2d7587ad
6 changed files with 4 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/breathe.dm
View File

@@ -24,11 +24,6 @@
breath = get_breath_from_internal() //First, check for air from internals
if(!breath)
breath = get_breath_from_environment() //No breath from internals so let's try to get air from our location
if(!breath)
var/static/datum/gas_mixture/vacuum //avoid having to create a new gas mixture for each breath in space
if(!vacuum) vacuum = new
breath = vacuum //still nothing? must be vacuum
handle_breath(breath)
handle_post_breath(breath)

5
code/modules/mob/living/carbon/human/human.dm
View File

@@ -928,8 +928,9 @@
/mob/living/carbon/human/proc/rupture_lung()
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(L)
L.rupture()
if(L && !L.is_bruised())
src.custom_pain("You feel a stabbing pain in your chest!", 1)
L.damage = L.min_bruised_damage
/*
/mob/living/carbon/human/verb/simulate()

6
code/modules/mob/living/carbon/human/life.dm
View File

@@ -332,12 +332,6 @@
adjustOxyLoss(-5)
return
if(should_have_organ(O_LUNGS))
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
if(!L.is_bruised() && prob(5))
rupture_lung()
if(!breath || (breath.total_moles == 0) || suiciding)
failed_last_breath = 1
if(suiciding)

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

@@ -23,11 +23,4 @@
owner.drip(10)
if(prob(4))
spawn owner.emote("me", 1, "gasps for air!")
owner.losebreath += 15
/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]!", 1)
parent.bruise()
owner.losebreath += 15

3
code/modules/organs/organ.dm
View File

@@ -247,9 +247,6 @@ var/list/organ_cache = list()
if(parent && !silent)
owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
/obj/item/organ/proc/bruise()
damage = max(damage, min_bruised_damage)
/obj/item/organ/proc/robotize() //Being used to make robutt hearts, etc
robotic = ORGAN_ROBOT
src.status &= ~ORGAN_BROKEN