Update with some bay optimizations for mobs.

Conflicts:
	code/defines/obj.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/organs/blood.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
	compare_report.txt
This commit is contained in:
Rob Nelson
2014-04-27 15:59:01 -07:00
committed by ZomgPonies
parent fcdcef5931
commit 96d90dc28a
10 changed files with 117 additions and 105 deletions
-2
View File
@@ -37,7 +37,6 @@
/mob/living/carbon/human/var/list/organs_by_name = list() // map organ names to organs
/mob/living/carbon/human/var/list/internal_organs_by_name = list() // so internal organs have less ickiness too
// Takes care of organ related updates, such as broken and missing limbs
/mob/living/carbon/human/proc/handle_organs()
number_wounds = 0
@@ -53,7 +52,6 @@
bad_external_organs.Cut()
for(var/datum/organ/external/Ex in organs)
bad_external_organs += Ex
for(var/datum/organ/external/E in bad_external_organs)
if(!E)
continue
+1 -1
View File
@@ -279,7 +279,7 @@ This function completely restores a damaged organ to perfect condition.
//Determines if we even need to process this organ.
/datum/organ/external/proc/need_process()
if(status && status != ORGAN_ROBOT) // If it's robotic, that's fine it will have a status.
if(status && status & ORGAN_ROBOT) // If it's robotic, that's fine it will have a status.
return 1
if(brute_dam || burn_dam)
return 1
+2
View File
@@ -9,6 +9,8 @@ mob/var/next_pain_time = 0
// amount is a num from 1 to 100
mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
if(stat >= 2) return
if(reagents.has_reagent("paracetamol"))
return
if(reagents.has_reagent("tramadol"))
return
if(reagents.has_reagent("oxycodone"))