From 6ada32bd2610cad48eec67ded55eb3ea702e19e3 Mon Sep 17 00:00:00 2001 From: Lostlarry Date: Tue, 3 Dec 2019 13:56:04 +0100 Subject: [PATCH] #fuck merge conflicts --- code/datums/achievements/achievements.dm | 5 +++++ code/game/objects/items/defib.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/datums/achievements/achievements.dm b/code/datums/achievements/achievements.dm index 500c07e318ca..cd522424614b 100644 --- a/code/datums/achievements/achievements.dm +++ b/code/datums/achievements/achievements.dm @@ -13,6 +13,11 @@ desc = "As a roboticist, create a cyborg" id = 2 +/datum/achievement/defib + name = "Lifesaver" + desc = "Successfully defibrillate someone" + id = 3 + /datum/achievement/pa_emag //Should be hidden but that's not a thing yet name = "Catastrophe" desc = "Emag a Particle Accelerator" diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index d121b7e862dc..9de8e49a68ea 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -626,6 +626,7 @@ H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), 0) H.updatehealth() // Previous "adjust" procs don't update health, so we do it manually. user.visible_message("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful.") + SSachievements.unlock_achievement(/datum/achievement/defib, user.client) playsound(src, 'sound/machines/defib_success.ogg', 50, 0) H.set_heartattack(FALSE) H.revive()