cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2560 from nan0desu/for-upstream

Browse Source 
Fix runtime while electrocuting slimes
This commit is contained in:
Christian Bielert
2013-03-18 08:44:41 -07:00
parent 16c676f0d4 e93e0cb0df
commit 05f4aba49f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living.dm
View File

@@ -239,7 +239,7 @@
src.updatehealth() src.updatehealth()
// damage MANY external organs, in random order // damage MANY external organs, in random order
/mob/living/proc/take_overall_damage(var/brute, var/burn) /mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
adjustBruteLoss(brute) adjustBruteLoss(brute)
adjustFireLoss(burn) adjustFireLoss(burn)
src.updatehealth() src.updatehealth()