mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
-Re-added the sound effect that Robots made when brought to life.
-Made the alien damage multiplier not heal them better. -Strongly nerfed the amount of burn damage aliens healed naturally (not on weeds) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4873 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user