This commit is contained in:
Fermi
2019-09-19 15:33:40 +01:00
parent 40bac8c807
commit a398f64b66
7 changed files with 69 additions and 17 deletions
+21 -1
View File
@@ -116,4 +116,24 @@
name = "tin ears"
desc = "The robust ears of a bronze golem. "
damage_multiplier = 0.1 //STRONK
bang_protect = 1 //Fear me weaklings.
bang_protect = 1 //Fear me weaklings.
/obj/item/organ/ears/cybernetic
name = "cybernetic ears"
icon_state = "ears-c"
desc = "a basic cybernetic designed to mimic the operation of ears."
damage_multiplier = 0.9
organ_flags = ORGAN_SYNTHETIC
/obj/item/organ/ears/cybernetic/upgraded
name = "upgraded cybernetic ears"
icon_state = "ears-c-u"
desc = "an advanced cybernetic ear, surpassing the performance of organic ears"
damage_multiplier = 0.5
This conversation was marked as resolved by ExcessiveUseOfCobblestone
/obj/item/organ/ears/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
damage += 40/severity
+9 -8
View File
@@ -73,27 +73,28 @@
//TODO: lung health affects lung function
/obj/item/organ/lungs/onDamage(damage_mod) //damage might be too low atm.
cached_damage = damage
if (maxHealth == INFINITY)
return
if(damage+damage_mod < 0)
damage = 0
if(cached_damage+damage_mod < 0)
cached_damage = 0
return
damage += damage_mod
if ((damage / maxHealth) > 1)
cached_damage += damage_mod
if ((cached_damage/ maxHealth) > 1)
to_chat(owner, "<span class='userdanger'>You feel your lungs collapse within your chest as you gasp for air, unable to inflate them anymore!</span>")
owner.emote("gasp")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Lungs lost")
//qdel(src) - Handled elsewhere for now.
else if ((damage / maxHealth) > 0.75)
else if ((cached_damage / maxHealth) > 0.75)
to_chat(owner, "<span class='warning'>It's getting really hard to breathe!!</span>")
owner.emote("gasp")
owner.Dizzy(3)
else if ((damage / maxHealth) > 0.5)
else if ((cached_damage / maxHealth) > 0.5)
owner.Dizzy(2)
to_chat(owner, "<span class='notice'>Your chest is really starting to hurt.</span>")
owner.emote("cough")
else if ((damage / maxHealth) > 0.2)
else if ((cached_damage / maxHealth) > 0.2)
to_chat(owner, "<span class='notice'>You feel an ache within your chest.</span>")
owner.emote("cough")
owner.Dizzy(1)
@@ -540,4 +541,4 @@
/obj/item/organ/lungs/yamerol/on_life()
..()
damage += 2 //Yamerol lungs are temporary
damage += 2 //Yamerol lungs are temporary
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/item/organ/tongue/proc/handle_speech(datum/source, list/speech_args)
/obj/item/organ/tongue/proc/adjustTongueLoss(mob/living/carbon/M, damage_mod)
/obj/item/organ/tongue/proc/onDamage(damage_mod)
if (maxHealth == "alien")
return
if (maxHealth == "bone")