cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #831 from Miniature/master

Browse Source 
Fixed a recursion crash in organs taking damage.
This commit is contained in:
Miniature
2012-04-13 03:06:54 -07:00
parent 8444351921 0a8b9f8813
commit e001b59006
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/organ/organ.dm
+7 -6
View File
@@ -82,7 +82,7 @@
del(W)
..()
proc/take_damage(brute, burn, sharp, used_weapon = null)
proc/take_damage(brute, burn, sharp, used_weapon = null, spread=0)
if((brute <= 0) && (burn <= 0))
return 0
if(destroyed)
@@ -144,11 +144,12 @@
if(!possible_points.len)
message_admins("Oh god WHAT! [owner]'s [src] was unable to find an organ to pass overdamage too!")
else
var/datum/organ/external/target = pick(possible_points)
if(brute)
target.take_damage(passed_dam, 0, sharp, used_weapon)
else
target.take_damage(0, passed_dam, sharp, used_weapon)
if(!spread)
var/datum/organ/external/target = pick(possible_points)
if(brute)
target.take_damage(passed_dam, 0, sharp, used_weapon,1)
else
target.take_damage(0, passed_dam, sharp, used_weapon,1)
else
droplimb(1) //Robot limbs just kinda fail at full damage.