Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324

[MIRROR] Fix defibrillator mount runtiming continously while empty
This commit is contained in:
deathride58
2018-02-06 02:48:52 +00:00
committed by GitHub
+1 -1
View File
@@ -38,7 +38,7 @@
if(defib && defib.cell && defib.cell.charge < defib.cell.maxcharge)
use_power(20)
defib.cell.give(18) //90% efficiency, slightly better than the cell charger's 87.5%
if(isliving(defib.paddles.loc))
if(defib && defib.paddles && isliving(defib.paddles.loc))
var/mob/living/L = defib.paddles.loc
if(!L.Adjacent(src))
to_chat(L, "<span class='warning'>[defib]'s paddles overextend and come out of your hands!</span>")