Merge pull request #2433 from Anewbe/blood_drain

Improves Blood Drain rune
This commit is contained in:
Neerti
2016-09-17 13:26:44 -04:00
committed by GitHub
2 changed files with 51 additions and 0 deletions
+15
View File
@@ -273,6 +273,21 @@ var/list/sacrificed = list()
for (,drain>0,drain-=5)
sleep(2)
user.heal_organ_damage(5, 0)
if(ishuman(user))
var/mob/living/carbon/human/H = user
for(var/obj/item/organ/I in H.internal_organs)
if(I.damage > 0)
I.damage = max(I.damage - 5, 0) //Heals 5 damage per organ per use
if(I.damage <= 5 && I.organ_tag == O_EYES)
H.sdisabilities &= ~BLIND
for(var/obj/item/organ/E in H.bad_external_organs)
var/obj/item/organ/external/affected = E
if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN))
affected.status &= ~ORGAN_BROKEN
for(var/datum/wound/W in affected.wounds)
if(istype(W, /datum/wound/internal_bleeding))
affected.wounds -= W
affected.update_damages()
return
+36
View File
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Anewbe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Blood Drain now heals internal damage, including broken bones and internal bleeding."