diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 72615b43033..6d1b3a4121d 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -490,7 +490,7 @@ return user.visible_message("\red \The [user] patches some dents on \the [M] with \the [src]",\ - "\red \You patches some of the dents on \the [M].",\ + "\red You patch some of the dents on \the [M].",\ "You hear a welder.") H.heal_overall_damage(5,0) return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 8d198123db0..1ceec2a6b90 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -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 << "You feel nauseous..." diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 1c61af73353..5ed404d2d71 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 292be653b44..e8d4b4cb51e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -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)