shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13679 from DeltaFire15/system-corruption

Browse Source 
[TESTMERGE ONLY] System Corruption for robotic species
This commit is contained in:
silicons
2020-11-18 22:54:51 -07:00
committed by GitHub
parent 84c90db0e7 8f04d7f0d1
commit f8d43b7544
38 changed files with 437 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/damage_procs.dm
+1 -1
View File
@@ -25,7 +25,7 @@
else if(damage_coeff[OXY])
. = adjustHealth(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced)
/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE)
/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT)
if(forced)
. = adjustHealth(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced)
else if(damage_coeff[TOX])