Several IPC adjustments.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
This commit is contained in:
Zuhayr
2014-05-03 21:29:10 +09:30
committed by ZomgPonies
parent 8986c20a4c
commit e79097add3
4 changed files with 15 additions and 3 deletions
@@ -85,6 +85,7 @@
hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
hud_list[STATUS_HUD_OOC] = image('icons/mob/hud.dmi', src, "hudhealthy")
..()
if(dna)
@@ -931,8 +932,13 @@
xylophone=0
return
/mob/living/carbon/human/proc/vomit(hairball=0)
if(stat==2)return
if(species.flags & IS_SYNTHETIC)
return //Machines don't throw up.
if(!lastpuke)
lastpuke = 1
src << "<spawn class='warning'>You feel nauseous..."
@@ -75,6 +75,10 @@
/mob/living/carbon/human/adjustCloneLoss(var/amount)
..()
if(species.flags & IS_SYNTHETIC)
return
var/heal_prob = max(0, 80 - getCloneLoss())
var/mut_prob = min(80, getCloneLoss()+10)
if (amount > 0)
+4 -2
View File
@@ -256,6 +256,9 @@
proc/handle_mutations_and_radiation()
if(species.flags & IS_SYNTHETIC) //Robots don't suffer from mutations or radloss.
return
if(getFireLoss())
if((M_RESIST_HEAT in mutations) || (prob(1)))
heal_organ_damage(0,1)
@@ -279,6 +282,7 @@
radiation = 0
else
if(species.flags & RAD_ABSORB)
var/rads = radiation/25
radiation -= rads
@@ -288,8 +292,6 @@
adjustToxLoss(-(rads))
updatehealth()
return
if(species.flags & IS_SYNTHETIC)
return
var/damage = 0
switch(radiation)