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

Fixes human internal organs list

Browse Source
This commit is contained in:
mwerezak
2014-07-12 16:15:37 -04:00
parent 9b08a35180
commit c0487b9c90
18 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1086,8 +1086,7 @@
H.brainmob.mind.transfer_to(src)
del(H)
for(var/E in internal_organs)
var/datum/organ/internal/I = internal_organs[E]
for(var/datum/organ/internal/I in internal_organs)
I.damage = 0
for (var/datum/disease/virus in viruses)
@@ -1099,11 +1098,11 @@
..()
/mob/living/carbon/human/proc/is_lung_ruptured()
var/datum/organ/internal/lungs/L = internal_organs["lungs"]
var/datum/organ/internal/lungs/L = internal_organs_by_name["lungs"]
return L.is_bruised()
/mob/living/carbon/human/proc/rupture_lung()
var/datum/organ/internal/lungs/L = internal_organs["lungs"]
var/datum/organ/internal/lungs/L = internal_organs_by_name["lungs"]
if(!L.is_bruised())
src.custom_pain("You feel a stabbing pain in your chest!", 1)

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -17,7 +17,7 @@
/mob/living/carbon/human/getBrainLoss()
var/res = brainloss
var/datum/organ/internal/brain/sponge = internal_organs["brain"]
var/datum/organ/internal/brain/sponge = internal_organs_by_name["brain"]
if (sponge.is_bruised())
res += 20
if (sponge.is_broken())