Merge pull request #9943 from Certhic/autopsy-scan-unresponsive-fix

fix: autopsy scanner unresponsiveness
This commit is contained in:
tigercat2000
2018-10-22 11:19:41 -07:00
committed by GitHub
3 changed files with 61 additions and 85 deletions
+1 -1
View File
@@ -203,7 +203,7 @@
// Let's not drag this on, medbay has only so much antibiotics
//Adds autopsy data for used_weapon.
/obj/item/organ/proc/add_autopsy_data(var/used_weapon, var/damage)
/obj/item/organ/proc/add_autopsy_data(var/used_weapon = "Unknown", var/damage)
var/datum/autopsy_data/W = autopsy_data[used_weapon]
if(!W)
W = new()
@@ -175,6 +175,8 @@
owner.handle_splints()
if(used_weapon)
add_autopsy_data("[used_weapon]", brute + burn)
else
add_autopsy_data(null, brute + burn)
// Make sure we don't exceed the maximum damage a limb can take before dismembering
if((brute_dam + burn_dam + brute + burn) < max_damage)