This commit is contained in:
Serket
2018-02-10 12:26:30 -07:00
parent bd50420a50
commit 00d501c7df
5 changed files with 10756 additions and 10757 deletions
@@ -170,9 +170,9 @@ I use this to standardize shadowling dethrall code
-- Crazylemon
*/
/mob/living/carbon/human/proc/named_organ_parent(var/organ_name)
if(!get_int_organ(organ_name))
if(!get_int_organ_tag(organ_name))
return null
var/obj/item/organ/internal/O = get_int_organ(organ_name)
var/obj/item/organ/internal/O = get_int_organ_tag(organ_name)
return O.parent_organ
/mob/living/carbon/human/has_organic_damage()
@@ -187,4 +187,4 @@ I use this to standardize shadowling dethrall code
splinted_limbs.Cut()
for(var/obj/item/organ/external/limb in bodyparts)
if(limb.status & ORGAN_SPLINTED)
splinted_limbs += limb
splinted_limbs += limb
+6 -2
View File
@@ -27,7 +27,11 @@
/obj/item/projectile/magic/death/on_hit(var/mob/living/carbon/G)
. = ..()
if(isliving(G))
G.adjustFireLoss(3000)
if(istype(G, /mob/living/carbon/human/machine)) //speshul snowfleks deserv speshul treetment
G.adjustFireLoss(6969) //remember - slimes love fire
else
G.death()
visible_message("<span class='danger'>[G] topples backwards as the death bolt impacts them!</span>")
/obj/item/projectile/magic/fireball/Range()
@@ -293,4 +297,4 @@ proc/wabbajack(mob/living/M)
damage_type = BURN
flag = "magic"
dismemberment = 50
nodamage = 0
nodamage = 0