cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix defib paddles burning desync (#44827)

Browse Source
This commit is contained in:
ShizCalev
2019-06-27 00:48:12 -07:00
committed by Tad Hardesty
parent 2940b8f23c
commit 3633e849aa
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/defib.dm
+17
View File
@@ -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