reverts the bleed changes till they can be better tuned

This commit is contained in:
Poojawa
2019-09-12 00:14:26 -05:00
parent 4408d1b684
commit 65a89030eb
13 changed files with 28 additions and 152 deletions
+3 -6
View File
@@ -17,15 +17,14 @@
var/self_delay = 50
/obj/item/stack/medical/attack(mob/living/M, mob/user)
//Let's see if this isn't a horrid mistake. Removes death check from applying medical stack stuff. should help.
/* if(M.stat == DEAD && !stop_bleeding)
if(M.stat == DEAD && !stop_bleeding)
var/t_him = "it"
if(M.gender == MALE)
t_him = "him"
else if(M.gender == FEMALE)
t_him = "her"
to_chat(user, "<span class='danger'>\The [M] is dead, you cannot help [t_him]!</span>")
return */
return
if(!iscarbon(M) && !isanimal(M))
to_chat(user, "<span class='danger'>You don't know how to apply \the [src] to [M]!</span>")
@@ -89,8 +88,6 @@
var/mob/living/carbon/human/H = C
if(stop_bleeding)
if(!H.bleedsuppress) //so you can't stack bleed suppression
if(H.bleed_rate)
H.bleed_rate = 0 //fully stops accumulated bleeding on application, just in case the bleed cap is altered.
H.suppress_bloodloss(stop_bleeding)
if(affecting.status == BODYPART_ORGANIC) //Limb must be organic to be healed - RR
if(affecting.heal_damage(heal_brute, heal_burn))
@@ -127,7 +124,7 @@
icon_state = "gauze"
stop_bleeding = 1800
self_delay = 20
max_amount = 36 //bleeding is a major issue now, let's be nice to our medical team
max_amount = 12
/obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
@@ -76,13 +76,8 @@
L.forceMove(drop_location())
L.emote("scream")
if(iscarbon(L))
if(ishuman(L))
var/mob/living/carbon/human/H = L
H.bleed_rate += 10
H.bleed(10) //less instant blood damage because you're bleeding, and bleeding is bad news.
else
var/mob/living/carbon/C = L
C.bleed(30)
var/mob/living/carbon/C = L
C.bleed(30)
else
L.add_splatter_floor()
L.adjustBruteLoss(30)