From 094fdbd271f25502febc2986f202cc1f02b957ca Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 19 Oct 2019 19:49:48 -0700
Subject: [PATCH] Update defib.dm
---
code/game/objects/items/defib.dm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index a4f286bf88..5a9d7476a6 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -27,6 +27,8 @@
var/pullshocksafely = FALSE //Dose the unit have the healdisk upgrade?
var/primetime = 0 // is the defib faster
var/timedeath = 10
+ var/disarm_shock_time = 10
+ var/always_emagged = FALSE
/obj/item/defibrillator/get_cell()
return cell
@@ -141,6 +143,7 @@
/obj/item/defibrillator/emag_act(mob/user)
. = ..()
+ always_emagged = TRUE
safety = !safety
to_chat(user, "You silently [safety ? "enable" : "disable"] [src]'s safety protocols with the cryptographic sequencer.")
return TRUE
@@ -155,7 +158,7 @@
safety = FALSE
visible_message("[src] beeps: Safety protocols disabled!")
playsound(src, 'sound/machines/defib_saftyOff.ogg', 50, 0)
- else
+ else if(!always_emagged)
safety = TRUE
visible_message("[src] beeps: Safety protocols enabled!")
playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0)
@@ -259,6 +262,8 @@
desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
combat = TRUE
safety = FALSE
+ always_emagged = TRUE
+ disarm_shock_time = 0
/obj/item/defibrillator/compact/combat/loaded/Initialize()
. = ..()
@@ -473,7 +478,7 @@
M.visible_message("[user] hastily places [src] on [M]'s chest!", \
"[user] hastily places [src] on [M]'s chest!")
busy = TRUE
- if(do_after(user, 10, target = M))
+ if(do_after(user, disarm_shock_time, target = M))
M.visible_message("[user] zaps [M] with [src]!", \
"[user] zaps [M] with [src]!")
M.adjustStaminaLoss(50)