From 37aa581e8624f93ccf9e6b595e2f3eecd9de27aa Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:53:50 +0200 Subject: [PATCH] [MIRROR] Fixes cell explode null usr runtime [MDB IGNORE] (#16058) * Fixes cell explode null usr runtime (#69612) * Fixes cell explode null usr runtime Co-authored-by: ShizCalev --- code/modules/power/cell.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 7d2d5b9cc89..4a9d16db1ef 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -186,21 +186,20 @@ /obj/item/stock_parts/cell/proc/explode() - var/turf/T = get_turf(src.loc) - if (charge==0) + if(!charge) return var/range_devastation = -1 //round(charge/11000) var/range_heavy = round(sqrt(charge)/60) var/range_light = round(sqrt(charge)/30) var/range_flash = range_light - if (range_light==0) + if(!range_light) rigged = FALSE corrupt() return - message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged/corrupted power cell explosion at [AREACOORD(T)].") - usr.log_message("triggered a rigged/corrupted power cell explosion", LOG_GAME) - usr.log_message("triggered a rigged/corrupted power cell explosion", LOG_VICTIM, log_globally = FALSE) + message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged/corrupted power cell explosion at [AREACOORD(loc)].") + usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_GAME) + usr?.log_message("triggered a rigged/corrupted power cell explosion", LOG_VICTIM, log_globally = FALSE) //explosion(T, 0, 1, 2, 2) explosion(src, devastation_range = range_devastation, heavy_impact_range = range_heavy, light_impact_range = range_light, flash_range = range_flash)