From 49c0aba205fa98234ef5db86293fcfcd17aac1a1 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sat, 14 Mar 2020 04:25:12 +1100 Subject: [PATCH] bleeding out from a toolbox smack is not cool gamers --- code/_onclick/item_attack.dm | 6 +----- code/modules/mob/living/carbon/carbon_defense.dm | 3 ++- code/modules/mob/living/carbon/human/species.dm | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index cba53eb4a5..2fa2a8e85f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -125,11 +125,7 @@ if(prob(33)) I.add_mob_blood(src) var/turf/location = get_turf(src) - if(iscarbon(src)) - var/mob/living/carbon/C = src - C.bleed(totitemdamage) - else - add_splatter_floor(location) + add_splatter_floor(location) if(totitemdamage >= 10 && get_dist(user, src) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(src) return TRUE //successful attack diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 5bbc6d6a64..ad8837e149 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -104,7 +104,8 @@ var/basebloodychance = affecting.brute_dam + totitemdamage if(prob(basebloodychance)) I.add_mob_blood(src) - bleed(totitemdamage) + var/turf/location = get_turf(src) + add_splatter_floor(location) if(totitemdamage >= 10 && get_dist(user, src) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(src) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 85a7a09d5c..ad98a4500d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1712,7 +1712,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) bloody = 1 var/turf/location = H.loc if(istype(location)) - H.bleed(totitemdamage) + H.add_splatter_floor(location) if(get_dist(user, H) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(H)