Quite a few brainmed changes + fixes. (#9015)

This commit is contained in:
Matt Atlas
2020-06-05 20:54:17 +02:00
committed by GitHub
parent 7e0a96a264
commit 76fec1fea2
7 changed files with 62 additions and 17 deletions
+1 -1
View File
@@ -96,7 +96,7 @@
degree = " a lot"
if(damage < 5)
degree = " a bit"
owner.custom_pain("Something inside your [parent.name] hurts[degree]!", amount)
owner.custom_pain("Something inside your [parent.name] hurts[degree]!", amount, affecting = parent)
/obj/item/organ/internal/proc/get_visible_state()
if(damage > max_damage)
+4 -4
View File
@@ -325,7 +325,7 @@
var/laser = (damage_flags & DAM_LASER)
var/sharp = (damage_flags & DAM_SHARP)
if(laser)
if(laser || BP_IS_ROBOTIC(src))
damage_amt += burn
cur_damage += burn_dam
@@ -334,7 +334,7 @@
var/organ_damage_threshold = 10
if(sharp)
organ_damage_threshold *= 0.3
organ_damage_threshold *= 0.5
if(laser)
organ_damage_threshold *= 2
@@ -452,8 +452,8 @@ This function completely restores a damaged organ to perfect condition.
/obj/item/organ/external/proc/createwound(var/type = CUT, var/damage)
if(damage <= 0) return
if(damage <= 0)
return
//moved this before the open_wound check so that having many small wounds for example doesn't somehow protect you from taking internal damage (because of the return)
//Possibly trigger an internal wound, too.