cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Defib oversights fixes (#4611)

Browse Source 
* Defib oversights fixes

Well, ripping someone's heart out causes them to have a heart attack
right? Well, if you applied a defib to said person before they died from
said heart attack, the heart attack would be stopped, and you would now
have  a heartless living person, spooky right? This prevents that.
Also fixes defibs saying they didn't work when you applied them to
someone with a heart attack, when they in fact did work. And removed a
magic number too.

🆑 pinatacolada
fix: Fixes defibing people without a heart
fix: Fixes defib saying it didn't work stopping a heart attack when they
do
/🆑

* Update defib.dm

* slimespls

* FIXEDIT
This commit is contained in:
pinatacolada
2016-06-11 17:19:45 +01:00
committed by Fox McCloud
parent e7950cd599
commit 3566e6bc91
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/defib.dm
+21 -3
View File
@@ -368,8 +368,26 @@
update_icon()
return
if(H.heart_attack)
H.heart_attack = 0
if(H.stat == 2)
if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.</span>")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
return
else
H.heart_attack = 0
user.visible_message("<span class='boldnotice'>[defib] pings: Cardiac arrhythmia corrected.</span>")
M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
defib.deductcharge(revivecost)
busy = 0
cooldown = 1
update_icon()
defib.cooldowncheck(user)
return
if(H.stat == DEAD)
var/health = H.health
M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
@@ -377,7 +395,7 @@
for(var/obj/item/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)