From 90235bb6facbb479db2404ef82ed4ab68da6c569 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Mon, 29 Apr 2024 07:09:01 +0300 Subject: [PATCH] [MIRROR] Lazy load templates now have a prompt for whether or not to send you to the template area upon loading (#2215) (#3093) * Lazy load templates now have a prompt for whether or not to send you to the template area upon loading (#82902) ## About The Pull Request Generating a lazy load template map now gives you a choice for whether or not you want to be ghosted/teleported to the template you are loading. ## Why It's Good For The Game This has always annoyed me, especially when testing stuff related to the nukie base (since it needs to be manually loaded before creating a nukie team to avoid runtime spam). It might be a minor gripe, but I don't think it should be forced. ## Changelog :cl: Rhials admin: Lazy loading map templates now gives you the option to not ghost/teleport to the loaded area upon completion. /:cl: * Lazy load templates now have a prompt for whether or not to send you to the template area upon loading --------- Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> --- code/modules/admin/admin_verbs.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 731de224f8d..0f7d7a3f39b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -593,6 +593,7 @@ ADMIN_VERB(debug_spell_requirements, R_DEBUG, "Debug Spell Requirements", "View ADMIN_VERB(load_lazy_template, R_ADMIN, "Load/Jump Lazy Template", "Loads a lazy template and/or jumps to it.", ADMIN_CATEGORY_EVENTS) var/list/choices = LAZY_TEMPLATE_KEY_LIST_ALL() var/choice = tgui_input_list(user, "Key?", "Lazy Loader", choices) + var/teleport_to_template = tgui_input_list(user, "Jump to template after loading?", "Where to?", list("Yes", "No")) if(!choice) return @@ -611,12 +612,13 @@ ADMIN_VERB(load_lazy_template, R_ADMIN, "Load/Jump Lazy Template", "Loads a lazy to_chat(user, span_boldwarning("Failed to load template!")) return - if(!isobserver(user.mob)) - SSadmin_verbs.dynamic_invoke_verb(user, /datum/admin_verb/admin_ghost) - user.mob.forceMove(reservation.bottom_left_turfs[1]) + if(teleport_to_template == "Yes") + if(!isobserver(user.mob)) + SSadmin_verbs.dynamic_invoke_verb(user, /datum/admin_verb/admin_ghost) + user.mob.forceMove(reservation.bottom_left_turfs[1]) + to_chat(user, span_boldnicegreen("Template loaded, you have been moved to the bottom left of the reservation.")) message_admins("[key_name_admin(user)] has loaded lazy template '[choice]'") - to_chat(user, span_boldnicegreen("Template loaded, you have been moved to the bottom left of the reservation.")) ADMIN_VERB(library_control, R_BAN, "Library Management", "List and manage the Library.", ADMIN_CATEGORY_MAIN) if(!user.holder.library_manager)