From 13af501432fffa69b273c69f6c95855aa65cc999 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Tue, 29 Aug 2017 14:04:42 +0100 Subject: [PATCH 1/2] ctrl click shortcut to toggle paddles on defibrillators --- code/game/objects/items/weapons/defib.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 2ac5fb102e1..722d95124e4 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -77,6 +77,9 @@ /obj/item/weapon/defibrillator/ui_action_click() toggle_paddles() +/obj/item/weapon/defibrillator/CtrlClick() + toggle_paddles() + /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W From ea18a5f474b5a784a88d92a62817cd01c514a3f7 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Tue, 29 Aug 2017 15:48:21 +0100 Subject: [PATCH 2/2] bugfix --- code/game/objects/items/weapons/defib.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 722d95124e4..85e24757517 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -78,7 +78,8 @@ toggle_paddles() /obj/item/weapon/defibrillator/CtrlClick() - toggle_paddles() + if(ishuman(usr) && Adjacent(usr)) + toggle_paddles() /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell))