From 3633e849aa1c62e6dc5b7222d142d3cea287c21e Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 27 Jun 2019 03:48:12 -0400 Subject: [PATCH] Fix defib paddles burning desync (#44827) --- code/game/objects/items/defib.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index d4b6d05f6e2..3555ed717d1 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -40,6 +40,16 @@ update_icon() return +/obj/item/defibrillator/fire_act(exposed_temperature, exposed_volume) + . = ..() + if(paddles?.loc == src) + paddles.fire_act(exposed_temperature, exposed_volume) + +/obj/item/defibrillator/extinguish() + . = ..() + if(paddles?.loc == src) + paddles.extinguish() + /obj/item/defibrillator/update_icon() update_power() update_overlays() @@ -285,6 +295,7 @@ force = 0 throwforce = 6 w_class = WEIGHT_CLASS_BULKY + resistance_flags = INDESTRUCTIBLE var/revivecost = 1000 var/cooldown = FALSE @@ -310,6 +321,12 @@ . = ..() check_range() + +/obj/item/twohanded/shockpaddles/fire_act(exposed_temperature, exposed_volume) + . = ..() + if((req_defib && defib) && loc != defib) + defib.fire_act(exposed_temperature, exposed_volume) + /obj/item/twohanded/shockpaddles/proc/check_range() if(!req_defib) return