cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Aliens now properly take double burn damage (#24655)

Browse Source
This commit is contained in:
Joan Lung
2017-03-06 11:58:41 +01:00
committed by AnturK
parent ebc86d0163
commit e2c7cda4bb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/damage_procs.dm
-8
View File
@@ -1,18 +1,10 @@
/mob/living/carbon/alien/getToxLoss()
return 0
/mob/living/carbon/alien/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) //alien immune to tox damage
return FALSE
/mob/living/carbon/alien/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE) // Weak to Fire
if(amount > 0)
amount *= 2
. = ..()
//aliens are immune to stamina damage.
/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_stamina = 1)
return
code/modules/surgery/bodyparts/bodyparts.dm
+4
View File
@@ -115,6 +115,10 @@
brute = max(0, brute - 5)
burn = max(0, burn - 4)
switch(animal_origin)
if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take double burn
burn *= 2
var/can_inflict = max_damage - (brute_dam + burn_dam)
if(!can_inflict)
return 0