From 9c9cc9110a40091d4bd86397a98c6a88ff71abbe Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Mon, 8 Apr 2019 12:53:44 -0700 Subject: [PATCH] Improve cancellability of Run Weather admin verb (#43528) --- code/modules/admin/verbs/randomverbs.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 220796778d7..8285d455327 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1103,11 +1103,10 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits if(!weather_type) return - var/z_level = input("Z-Level to target? Leave blank to target current Z-Level.", "Z-Level") as num|null + var/turf/T = get_turf(mob) + var/z_level = input("Z-Level to target?", "Z-Level", T?.z) as num|null if(!isnum(z_level)) - if(!src.mob) - return - z_level = src.mob.z + return SSweather.run_weather(weather_type, z_level)