diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 2ac4871e296..2005af2994d 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -35,11 +35,10 @@ return /mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire - ..(amount * 1.5) - return - -/mob/living/carbon/alien/adjustBruteLoss(amount) // Strong against melee weapons - ..(amount * 0.5) + if(amount > 0) + ..(amount * 1.5) + else + ..(amount) return /mob/living/carbon/alien/proc/getPlasma() @@ -115,12 +114,8 @@ /mob/living/carbon/alien/proc/handle_mutations_and_radiation() if(getFireLoss()) - if((COLD_RESISTANCE in mutations) || prob(50)) - switch(getFireLoss()) - if(1 to 50) - adjustFireLoss(-1) - if(51 to 100) - adjustFireLoss(-5) + if((COLD_RESISTANCE in mutations) || prob(5)) + adjustFireLoss(-1) // Aliens love radiation nom nom nom if (radiation) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 869f6ff81bb..fa728a81218 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -170,7 +170,7 @@ proc/handle_mutations_and_radiation() if(getFireLoss()) - if((COLD_RESISTANCE in mutations) || (prob(1) && prob(75))) + if((COLD_RESISTANCE in mutations) || (prob(1))) heal_organ_damage(0,1) // Make nanoregen heal youu, -3 all damage types diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index ee7f3fbf270..cf2b3a87c67 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -65,6 +65,8 @@ updatename("Default") updateicon() + playsound(src, 'sound/voice/liveagain.ogg', 75, 1) + if(!cell) cell = new /obj/item/weapon/cell(src) cell.maxcharge = 7500