cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3437 from Neerti/5/9/2017_defib_fixes

Browse Source 
Defib Fixes
This commit is contained in:
Anewbe
2017-05-09 19:25:32 -05:00
committed by GitHub
parent 8e3d4d1e84 d900b52a33
commit 7502a32fd7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/items/devices/defib.dm
View File

@@ -75,7 +75,7 @@
if(user.r_hand && user.l_hand) if(user.r_hand && user.l_hand)
cell.forceMove(get_turf(user)) cell.forceMove(get_turf(user))
else else
cell.forceMove(user.put_in_hands(cell)) user.put_in_hands(cell)
cell = null cell = null
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
else else
@@ -141,14 +141,15 @@
sleep(15 SECONDS) sleep(15 SECONDS)
break break
if(patient.client) if(!(HUSK in patient.mutations)) // Husked people can't come back with a Defib.
patient.adjustOxyLoss(-20) //Look, blood stays oxygenated for quite some time, but I'm not recoding the entire oxy system if(patient.client)
patient.stat = CONSCIOUS //Note that if whatever killed them in the first place wasn't fixed, they're likely to die again. patient.adjustOxyLoss(-20) //Look, blood stays oxygenated for quite some time, but I'm not recoding the entire oxy system
dead_mob_list -= patient patient.stat = CONSCIOUS //Note that if whatever killed them in the first place wasn't fixed, they're likely to die again.
living_mob_list += patient dead_mob_list -= patient
patient.timeofdeath = null living_mob_list += patient
patient.visible_message("<span class='notice'>[patient]'s eyes open!</span>") patient.timeofdeath = null
log_and_message_admins("[patient] was revived.") patient.visible_message("<span class='notice'>[patient]'s eyes open!</span>")
log_and_message_admins("[patient] was revived by a defib.")
cell.charge -= charge_cost //Always charge the cost after any attempt, failed or not cell.charge -= charge_cost //Always charge the cost after any attempt, failed or not
sleep(20) //Wait 2 seconds before next attempt sleep(20) //Wait 2 seconds before next attempt
statechange(1,patient) //Back to ready statechange(1,patient) //Back to ready